From 69944a5535b16007bd2cd8c546e8be6dfc35adf8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 25 Aug 2009 10:26:56 -0400
Subject: [PATCH] Merged revisions 1281 - 1333

---
 interface/web/sites/templates/database_edit.htm              |    2 
 interface/web/mail/mail_user_filter_edit.php                 |    3 
 interface/web/sites/lib/lang/br_shell_user_list.lng          |   13 
 interface/web/admin/lib/lang/hu_server_config_list.lng       |    5 
 interface/web/admin/lib/lang/pl_language_complete.lng        |    7 
 interface/web/sites/lib/lang/se_ftp_user.lng                 |    1 
 interface/web/admin/lib/lang/es_server_config.lng            |    2 
 interface/web/mail/lib/lang/pl_mail_domain_catchall.lng      |    9 
 interface/web/sites/lib/lang/fr_shell_user.lng               |    1 
 interface/web/login/lib/lang/ru.lng                          |   11 
 interface/web/mail/templates/spamfilter_policy_list.htm      |  126 
 interface/web/admin/lib/lang/de_server_config.lng            |   48 
 interface/web/admin/lib/lang/nl_server_config.lng            |   37 
 interface/web/designer/lib/lang/br_form_show.lng             |   33 
 interface/web/login/lib/lang/de.lng                          |   17 
 interface/lib/classes/listform_actions.inc.php               |    2 
 interface/web/admin/lib/lang/nl_server_list.lng              |   17 
 interface/web/mail/lib/lang/br_spamfilter_config_list.lng    |    7 
 interface/web/mail/lib/lang/pl_mail_get.lng                  |   15 
 interface/web/mail/templates/spamfilter_users_list.htm       |  126 
 interface/web/mail/lib/lang/br_spamfilter_whitelist_list.lng |   15 
 interface/web/admin/lib/lang/pl_server.lng                   |   11 
 interface/web/admin/lib/lang/pl_server_ip_list.lng           |    6 
 interface/web/mail/lib/lang/de_spamfilter_config.lng         |    4 
 interface/web/dns/lib/lang/pl_dns_mx.lng                     |   16 
 interface/web/dns/lib/lang/br_dns_aaaa.lng                   |   29 
 interface/web/dns/lib/lang/de_dns_aaaa.lng                   |   18 
 interface/web/sites/lib/lang/de_web_domain.lng               |   12 
 interface/web/admin/lib/lang/nl_groups.lng                   |    3 
 interface/web/sites/lib/lang/ru_cron_list.lng                |   22 
 interface/lib/lang/bg.lng                                    |    9 
 interface/web/sites/templates/cron_list.htm                  |  142 
 interface/web/mail/lib/lang/nl_mail_blacklist.lng            |    5 
 server/conf/index/standard_index.html_br                     |   60 
 interface/web/dns/lib/lang/nl_dns_mx.lng                     |    9 
 interface/web/admin/lib/lang/pl_groups.lng                   |    5 
 interface/web/client/templates/client_template_list.htm      |  104 
 interface/web/mail/lib/lang/de_mail_domain.lng               |    2 
 interface/web/mail/lib/lang/pl_mail_domain.lng               |   13 
 interface/web/mail/lib/lang/pl_spamfilter_policy.lng         |   38 
 server/plugins-available/powerdns_plugin.inc.php             |  349 +
 interface/web/client/lib/lang/nl.lng                         |    6 
 interface/web/dns/lib/lang/nl_dns_alias.lng                  |    9 
 interface/web/admin/lib/lang/pl_system_config.lng            |   13 
 interface/web/admin/lib/lang/nl_server.lng                   |    9 
 interface/web/designer/lib/lang/nl_module_nav_item_edit.lng  |    1 
 interface/web/mail/lib/lang/nl_mail_transport.lng            |    7 
 interface/web/sites/lib/lang/pl_shell_user_list.lng          |    8 
 interface/web/admin/lib/lang/pl_language_list.lng            |    7 
 interface/web/mail/lib/lang/hu_mail_get_list.lng             |   10 
 interface/web/help/templates/support_message_list.htm        |  106 
 interface/web/mail/lib/lang/hu_spamfilter_whitelist_list.lng |   10 
 interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng |    7 
 interface/web/sites/lib/lang/hu_ftp_user.lng                 |   26 
 interface/web/admin/lib/lang/hu_users.lng                    |   29 
 interface/web/mail/lib/lang/de.lng                           |    2 
 interface/web/mail/templates/mail_user_list.htm              |  110 
 interface/web/sites/lib/lang/pl_cron_list.lng                |   12 
 interface/web/client/lib/lang/bg.lng                         |    3 
 interface/web/dns/lib/lang/de_dns_mx.lng                     |   20 
 interface/web/admin/lib/lang/nl_groups_list.lng              |    5 
 interface/web/admin/language_edit.php                        |    2 
 interface/web/dns/lib/lang/fi_dns_aaaa.lng                   |   28 
 interface/web/admin/lib/lang/ru_server_config.lng            |    2 
 interface/web/mail/lib/lang/br_mail_user_list.lng            |    9 
 interface/web/mail/lib/lang/br_mail_content_filter_list.lng  |   13 
 interface/web/mail/lib/lang/hu_mail_user_stats_list.lng      |    9 
 interface/web/designer/lib/lang/hu_module_nav_edit.lng       |    7 
 interface/lib/lang/nl.lng                                    |   30 
 interface/web/sites/templates/database_list.htm              |    2 
 interface/web/admin/lib/lang/pl_language_edit.lng            |    8 
 interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng |    9 
 server/plugins-available/shelluser_jailkit_plugin.inc.php    |   35 
 interface/web/dns/lib/lang/nl_dns_a_list.lng                 |   11 
 interface/web/admin/lib/lang/en_server_config.lng            |    1 
 interface/web/mail/lib/lang/hu_mail_spamfilter_list.lng      |    9 
 interface/web/designer/lib/lang/nl_module_nav_edit.lng       |    1 
 interface/web/mail/lib/lang/de_mail_whitelist_list.lng       |    2 
 interface/web/client/lib/lang/nl_client_template.lng         |   81 
 interface/web/mail/lib/lang/de_spamfilter_policy.lng         |   64 
 interface/web/admin/lib/lang/br_software_repo_list.lng       |    9 
 interface/web/designer/lib/lang/hu_form_edit.lng             |   25 
 interface/web/client/lib/lang/hu_client_template.lng         |   50 
 interface/web/mail/lib/lang/hu_mail_user_filter.lng          |   10 
 interface/web/designer/lib/lang/br_module_nav_edit.lng       |    9 
 server/conf/error/br/400.html                                |  122 
 interface/web/designer/lib/lang/nl_module_list.lng           |    3 
 interface/web/dns/lib/lang/pl_dns_cname.lng                  |   15 
 interface/web/mail/lib/lang/de_mail_alias.lng                |    4 
 interface/web/mail/templates/spamfilter_whitelist_list.htm   |  126 
 interface/web/sites/lib/lang/br_web_subdomain.lng            |   75 
 server/conf/error/br/403.html                                |  122 
 interface/web/mail/lib/lang/pl_mail_blacklist_list.lng       |   10 
 interface/web/mail/lib/lang/pl_mail_whitelist.lng            |    9 
 interface/web/client/lib/lang/pl_clients_list.lng            |    9 
 interface/web/mail/lib/lang/hu_mail_user.lng                 |   31 
 interface/web/help/lib/lang/pl.lng                           |    7 
 interface/web/admin/lib/lang/es_firewall.lng                 |    2 
 interface/web/sites/lib/lang/fi_cron_list.lng                |   22 
 interface/web/mail/lib/lang/pl_mail_user_filter.lng          |    9 
 interface/web/admin/lib/lang/hu_filesync.lng                 |   13 
 interface/lib/classes/listform_tpl_generator.inc.php         |  276 
 interface/web/admin/lib/lang/hu_server_config.lng            |   42 
 server/plugins-available/apache2_plugin.inc.php              |   52 
 interface/web/mail/lib/lang/br_spamfilter_users.lng          |   13 
 interface/web/sites/lib/lang/de.lng                          |    2 
 interface/web/admin/lib/lang/pl.lng                          |   34 
 interface/web/mail/lib/lang/br_mail_domain_catchall.lng      |   15 
 interface/web/mail/lib/lang/hu_mail_domain_catchall_list.lng |   10 
 interface/web/sites/lib/lang/it_cron.lng                     |    4 
 interface/web/dns/lib/lang/nl_dns_cname.lng                  |    5 
 server/conf/error/br/404.html                                |  122 
 interface/web/tools/lib/lang/nl.lng                          |    5 
 interface/web/mail/lib/lang/br_mail_content_filter.lng       |   15 
 interface/web/sites/lib/lang/hu_database.lng                 |   22 
 interface/web/mail/lib/lang/nl_mail_alias.lng                |   19 
 interface/web/sites/lib/lang/nl_web_sites_stats_list.lng     |    5 
 interface/web/admin/lib/lang/hu_language_add.lng             |    9 
 interface/web/dns/lib/lang/de_dns_a_list.lng                 |   18 
 interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng    |   13 
 interface/web/client/lib/lang/pl_reseller.lng                |   90 
 interface/web/mail/lib/lang/hu_mail_forward.lng              |    7 
 interface/lib/config.inc.php                                 |    2 
 interface/web/monitor/lib/lang/nl.lng                        |  229 
 interface/web/dns/lib/lang/br_dns_txt.lng                    |   27 
 interface/web/sites/lib/lang/hu_shell_user.lng               |   22 
 interface/web/mail/lib/lang/br_mail_domain_catchall_list.lng |   15 
 interface/web/mail/lib/lang/de_mail_blacklist.lng            |    2 
 interface/web/admin/lib/lang/br_firewall.lng                 |    2 
 interface/web/mail/lib/lang/pl_mail_content_filter.lng       |    9 
 interface/web/client/lib/lang/bg_resellers_list.lng          |    9 
 interface/web/sites/lib/lang/it_ftp_user.lng                 |    1 
 interface/web/sites/lib/lang/hu_web_subdomain.lng            |   40 
 interface/web/admin/lib/lang/pl_server_config_list.lng       |    4 
 interface/web/sites/database_edit.php                        |   13 
 interface/web/admin/lib/lang/hu_language_edit.lng            |    9 
 interface/web/dns/lib/lang/pl_dns_srv.lng                    |   15 
 interface/web/mail/lib/lang/pl_mail_user_stats_list.lng      |    8 
 interface/web/login/lib/lang/es.lng                          |   11 
 interface/web/admin/lib/lang/hu_filesync_list.lng            |    7 
 interface/web/admin/lib/lang/pl_firewall_list.lng            |    8 
 interface/web/designer/lib/lang/pl.lng                       |    2 
 interface/web/client/lib/lang/es_resellers_list.lng          |    9 
 interface/web/sites/lib/lang/hu_database_list.lng            |    9 
 interface/web/designer/lib/lang/hu_form_list.lng             |    8 
 interface/web/dns/templates/dns_template_list.htm            |  106 
 interface/web/dns/lib/lang/es_dns_aaaa.lng                   |   28 
 interface/web/sites/lib/lang/es_cron.lng                     |    4 
 interface/web/dns/lib/lang/de_dns_rp.lng                     |   14 
 interface/web/admin/lib/lang/br_server_config.lng            |    8 
 interface/web/designer/lib/lang/pl_module_list.lng           |    5 
 interface/web/sites/lib/lang/bg_ftp_user.lng                 |    1 
 interface/web/mail/lib/lang/nl_mail_user_stats_list.lng      |    7 
 interface/web/admin/lib/lang/nl_users_list.lng               |    5 
 interface/web/dns/lib/lang/br.lng                            |    3 
 interface/web/mail/lib/lang/pl_mail_user_filter_list.lng     |    7 
 interface/web/client/templates/clients_list.htm              |  124 
 interface/web/mail/lib/lang/hu_spamfilter_users_list.lng     |   11 
 interface/web/dns/lib/lang/de_dns_txt.lng                    |    4 
 interface/web/sites/lib/lang/bg_shell_user.lng               |    1 
 interface/web/mail/lib/lang/br_mail_whitelist_list.lng       |   17 
 interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng |   13 
 interface/web/mail/lib/lang/nl_mail_get_list.lng             |    7 
 interface/web/mail/lib/lang/pl_mail_get_list.lng             |    9 
 interface/web/admin/lib/lang/nl_software_repo.lng            |    7 
 interface/web/mail/lib/lang/nl_spamfilter_config_list.lng    |    1 
 interface/web/dns/lib/lang/de_dns_wizard.lng                 |   36 
 interface/web/mail/lib/lang/nl.lng                           |   35 
 interface/web/monitor/lib/lang/hu_syslog_list.lng            |    8 
 interface/web/mail/lib/lang/nl_mail_user_filter_list.lng     |    9 
 interface/web/dns/lib/lang/hu_dns_soa.lng                    |   25 
 interface/web/admin/lib/lang/hu_software_package_list.lng    |    8 
 server/conf/vhost.conf.master                                |   10 
 interface/web/designer/lib/lang/hu_form_show.lng             |   19 
 interface/web/mail/lib/lang/br_mail_alias.lng                |   18 
 interface/web/admin/lib/lang/nl_language_export.lng          |    3 
 interface/web/sites/lib/lang/nl_ftp_user_list.lng            |    7 
 interface/web/mail/lib/lang/nl_mail_blacklist_list.lng       |    9 
 interface/web/mail/mail_forward_edit.php                     |    4 
 interface/web/mail/lib/lang/nl_spamfilter_users_list.lng     |    5 
 interface/web/mail/lib/lang/br_spamfilter_blacklist.lng      |   14 
 interface/web/dns/lib/lang/hu_dns_ptr.lng                    |   16 
 interface/web/mail/lib/lang/nl_mail_forward.lng              |    9 
 interface/web/tools/lib/lang/nl_usersettings.lng             |    9 
 interface/web/mail/lib/lang/hu_mail_forward_list.lng         |    9 
 interface/web/mail/lib/lang/hu_mail_blacklist.lng            |   10 
 interface/web/sites/lib/lang/nl_shell_user.lng               |   20 
 interface/web/monitor/lib/lang/hu.lng                        |  138 
 interface/web/dns/dns_a_edit.php                             |    2 
 interface/web/admin/lib/lang/pl_server_list.lng              |   11 
 interface/web/sites/lib/lang/br_cron.lng                     |   41 
 interface/web/sites/lib/lang/ru_cron.lng                     |    4 
 interface/web/admin/lib/lang/se_server_config.lng            |    2 
 interface/web/mail/lib/lang/pl_mail_content_filter_list.lng  |    8 
 interface/web/admin/lib/lang/nl_server_config_list.lng       |    5 
 interface/web/mail/lib/lang/pl.lng                           |   45 
 interface/web/dns/lib/lang/nl_dns_template_list.lng          |    3 
 interface/web/mail/lib/lang/hu_spamfilter_config_list.lng    |    6 
 interface/web/admin/lib/lang/pl_groups_list.lng              |    6 
 interface/web/sites/lib/lang/es_shell_user.lng               |    1 
 interface/web/sites/lib/lang/nl.lng                          |   15 
 interface/web/dns/lib/lang/pl_dns_soa.lng                    |   24 
 interface/web/mail/lib/lang/de_mail_user.lng                 |    8 
 interface/web/mail/lib/lang/en_mail_user.lng                 |    1 
 interface/web/mail/templates/mail_alias_list.htm             |  114 
 interface/web/client/lib/lang/de_client_template.lng         |   18 
 interface/web/dns/lib/lang/hu_dns_mx.lng                     |   17 
 interface/web/dns/lib/lang/nl_dns_template.lng               |    9 
 interface/web/login/lib/lang/pl.lng                          |   17 
 interface/web/admin/lib/lang/nl_language_list.lng            |    1 
 interface/web/sites/lib/lang/fi_shell_user.lng               |    1 
 interface/web/dns/lib/lang/pl_dns_alias.lng                  |   15 
 interface/web/mail/lib/lang/hu_mail_transport.lng            |   11 
 interface/web/sites/lib/lang/nl_web_subdomain_list.lng       |    7 
 interface/web/mail/lib/lang/br_mail_whitelist.lng            |   15 
 server/conf/index/user_standard_index.html_br                |   60 
 interface/web/mail/lib/lang/br_mail_forward_list.lng         |   13 
 interface/web/admin/lib/lang/hu_firewall.lng                 |   10 
 interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng      |    7 
 interface/web/admin/lib/lang/nl_software_repo_list.lng       |    3 
 interface/web/mail/templates/mail_domain_list.htm            |  114 
 interface/web/client/lib/lang/hu_client_template_list.lng    |    6 
 interface/web/mail/lib/lang/br_mail_alias_list.lng           |   13 
 interface/lib/lang/de.lng                                    |    9 
 interface/web/designer/lib/lang/hu_module_list.lng           |    6 
 interface/lib/lang/it.lng                                    |    9 
 interface/web/admin/lib/lang/nl_language_add.lng             |    7 
 interface/web/designer/lib/lang/pl_module_nav_item_edit.lng  |    8 
 interface/web/admin/lib/lang/hu_dbsync.lng                   |   17 
 interface/web/admin/lib/lang/br_users_list.lng               |   13 
 interface/web/client/templates/client_edit_limits.htm        |    2 
 interface/web/sites/lib/lang/nl_cron_list.lng                |   23 
 interface/web/dns/lib/lang/nl_dns_rp.lng                     |    9 
 interface/web/dns/lib/lang/nl_dns_soa_list.lng               |   13 
 interface/web/sites/lib/lang/br_web_domain.lng               |   86 
 interface/web/sites/web_domain_edit.php                      |   14 
 interface/web/designer/lib/lang/pl_module_edit.lng           |   22 
 interface/web/mail/lib/lang/pl_mail_whitelist_list.lng       |   10 
 interface/web/admin/lib/lang/hu.lng                          |   35 
 interface/web/mail/lib/lang/hu_mail_transport_list.lng       |   10 
 interface/web/mail/mail_alias_edit.php                       |    4 
 interface/web/designer/lib/lang/hu_module_nav_item_edit.lng  |    9 
 interface/web/mail/lib/lang/nl_mail_alias_list.lng           |   13 
 interface/web/mail/lib/lang/br_mail_get_list.lng             |   15 
 interface/web/mail/lib/lang/br_mail_get.lng                  |   27 
 interface/web/sites/lib/lang/br_database.lng                 |   40 
 interface/web/dns/lib/lang/nl_dns_hinfo.lng                  |    7 
 interface/web/client/lib/lang/nl_clients_list.lng            |    7 
 interface/web/client/lib/lang/it_resellers_list.lng          |    9 
 interface/web/login/lib/lang/br.lng                          |   11 
 server/plugins-available/firewall_plugin.inc.php             |    4 
 interface/web/dns/lib/lang/pl_dns_wizard.lng                 |   25 
 interface/web/help/lib/lang/hu_support_message.lng           |    8 
 interface/web/dns/lib/lang/ru_dns_aaaa.lng                   |   28 
 interface/web/admin/lib/lang/pl_language_import.lng          |    7 
 interface/web/mail/lib/lang/nl_mail_transport_list.lng       |   11 
 interface/web/designer/lib/lang/nl.lng                       |    1 
 interface/web/admin/lib/lang/de_firewall.lng                 |    2 
 interface/web/dns/lib/lang/hu_dns_a_list.lng                 |   15 
 interface/web/dns/templates/dns_a_list.htm                   |    2 
 interface/web/client/lib/lang/nl_client_template_list.lng    |    1 
 interface/web/dns/lib/lang/hu_dns_template.lng               |    6 
 interface/web/mail/lib/lang/hu_spamfilter_blacklist.lng      |   10 
 interface/web/admin/lib/lang/pl_software_repo.lng            |    7 
 interface/web/admin/lib/lang/br_language_import.lng          |    7 
 interface/web/dns/lib/lang/hu.lng                            |   18 
 interface/web/client/lib/lang/ru_resellers_list.lng          |    9 
 install/lib/installer_base.lib.php                           |    7 
 interface/web/dns/lib/lang/pl_dns_ns.lng                     |   15 
 interface/web/mail/lib/lang/nl_spamfilter_users.lng          |    3 
 interface/web/client/lib/lang/br_clients_list.lng            |    2 
 interface/web/admin/lib/lang/pl_users.lng                    |   28 
 interface/web/mail/lib/lang/de_mail_user_filter_list.lng     |    2 
 interface/web/client/lib/lang/fi_reseller.lng                |   93 
 interface/web/help/lib/lang/hu_support_message_list.lng      |    7 
 interface/web/admin/lib/lang/br.lng                          |    2 
 interface/web/mail/lib/lang/de_spamfilter_blacklist.lng      |    2 
 interface/web/sites/lib/lang/br_ftp_user_list.lng            |   13 
 interface/web/dns/lib/lang/de_dns_a.lng                      |    6 
 interface/web/admin/lib/lang/hu_language_export.lng          |    7 
 interface/web/mail/lib/lang/pl_spamfilter_config_list.lng    |    5 
 interface/web/designer/lib/lang/br_module_nav_item_edit.lng  |   13 
 server/conf/error/br/401.html                                |  122 
 interface/web/dns/lib/lang/br_dns_ptr.lng                    |   27 
 interface/web/sites/lib/lang/pl_web_domain_list.lng          |    8 
 interface/web/client/lib/lang/de_client.lng                  |   36 
 interface/web/sites/lib/lang/br_web_domain_list.lng          |   13 
 interface/web/admin/lib/lang/pl_server_ip.lng                |    6 
 interface/web/client/lib/lang/br_client_template.lng         |    5 
 interface/web/client/lib/lang/pl_client_template_list.lng    |    5 
 interface/web/admin/lib/lang/hu_language_complete.lng        |    8 
 interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng      |    9 
 interface/web/dns/lib/lang/nl_dns_soa.lng                    |   33 
 interface/web/mail/form/mail_user.tform.php                  |    5 
 interface/web/sites/templates/web_aliasdomain_list.htm       |  118 
 interface/web/client/lib/lang/pl_client_template.lng         |   52 
 interface/web/mail/lib/lang/hu_spamfilter_blacklist_list.lng |   10 
 interface/web/admin/lib/lang/pl_users_list.lng               |    8 
 interface/web/mail/lib/lang/hu_mail_content_filter.lng       |   10 
 interface/web/dns/lib/lang/br_dns_wizard.lng                 |   20 
 interface/web/mail/lib/lang/br_mail_user_stats_list.lng      |   13 
 interface/web/dns/lib/lang/de_dns_srv.lng                    |    8 
 interface/web/monitor/lib/lang/nl_syslog_list.lng            |    3 
 interface/web/sites/lib/lang/nl_shell_user_list.lng          |    9 
 interface/web/strengthmeter/lib/lang/hu_strengthmeter.lng    |    9 
 interface/web/dns/lib/lang/br_dns_ns.lng                     |   27 
 interface/web/client/lib/lang/hu_clients_list.lng            |   10 
 interface/web/help/lib/lang/nl_support_message_list.lng      |    3 
 interface/web/sites/lib/lang/nl_database.lng                 |   23 
 interface/web/client/lib/lang/bg_reseller.lng                |   93 
 interface/web/dns/lib/lang/nl_dns_ptr.lng                    |    3 
 interface/web/dns/lib/lang/se_dns_aaaa.lng                   |   28 
 interface/web/dns/lib/lang/br_dns_hinfo.lng                  |   27 
 interface/web/sites/lib/lang/nl_cron.lng                     |   41 
 interface/web/sites/lib/lang/it_cron_list.lng                |   22 
 interface/web/dns/lib/lang/nl_dns_a.lng                      |   13 
 interface/web/client/lib/lang/br_client.lng                  |    7 
 interface/web/designer/lib/lang/br_form_list.lng             |   11 
 interface/web/mail/lib/lang/nl_mail_get.lng                  |   21 
 interface/web/sites/lib/lang/nl_web_subdomain.lng            |   23 
 interface/web/sites/lib/lang/de_web_subdomain.lng            |    4 
 interface/web/sites/lib/lang/nl_web_domain.lng               |   51 
 interface/web/client/lib/lang/de.lng                         |    3 
 interface/web/sites/lib/lang/pl_web_subdomain.lng            |   39 
 interface/web/login/lib/lang/it.lng                          |   11 
 interface/web/mail/lib/lang/nl_mail_user_filter.lng          |    3 
 interface/web/help/lib/lang/pl_support_message_list.lng      |    6 
 interface/web/mail/lib/lang/hu_mail_blacklist_list.lng       |   11 
 interface/web/dns/lib/lang/pl_dns_txt.lng                    |   15 
 interface/web/sites/lib/lang/hu_shell_user_list.lng          |    9 
 interface/web/mail/templates/mail_whitelist_list.htm         |  120 
 interface/web/admin/lib/lang/it_server_config.lng            |    2 
 interface/web/admin/lib/lang/nl_server_ip_list.lng           |    5 
 interface/web/client/lib/lang/pl_client.lng                  |   89 
 interface/web/dns/lib/lang/pl_dns_aaaa.lng                   |   15 
 interface/web/sites/tools.inc.php                            |    1 
 interface/web/help/lib/lang/hu.lng                           |    8 
 interface/web/admin/lib/lang/br_firewall_list.lng            |   13 
 interface/web/login/lib/lang/en.lng                          |   38 
 interface/web/client/templates/resellers_list.htm            |    2 
 interface/web/sites/lib/lang/pl_database.lng                 |   23 
 interface/web/sites/templates/ftp_user_list.htm              |  118 
 interface/web/mail/mail_user_edit.php                        |    2 
 interface/web/designer/lib/lang/nl_form_edit.lng             |    1 
 interface/web/dns/lib/lang/hu_dns_rp.lng                     |   16 
 interface/web/client/lib/lang/nl_client.lng                  |  111 
 interface/web/admin/lib/lang/hu_datalog_list.lng             |    8 
 interface/web/mail/lib/lang/nl_spamfilter_config.lng         |    1 
 interface/web/sites/lib/lang/pl_cron.lng                     |   21 
 interface/web/mail/lib/lang/pl_mail_alias.lng                |   11 
 interface/web/mail/templates/mail_user_filter_list.htm       |   90 
 interface/web/sites/lib/lang/hu_web_domain.lng               |   50 
 interface/web/sites/lib/lang/de_ftp_user.lng                 |    1 
 interface/web/dns/templates/dns_soa_list.htm                 |  124 
 interface/web/mail/templates/spamfilter_config_list.htm      |  102 
 interface/web/admin/lib/lang/hu_language_import.lng          |    8 
 interface/web/dns/lib/lang/hu_dns_srv.lng                    |   16 
 interface/web/designer/lib/lang/hu_module_show.lng           |   17 
 interface/web/sites/lib/lang/br_cron_list.lng                |   23 
 interface/web/admin/lib/lang/fi_server_config.lng            |    2 
 interface/web/mail/lib/lang/pl_spamfilter_users_list.lng     |   10 
 server/conf/bash.bashrc.master                               |    2 
 interface/web/mail/lib/lang/nl_mail_content_filter_list.lng  |    5 
 interface/web/tools/lib/lang/hu.lng                          |    7 
 interface/lib/lang/pl.lng                                    |   33 
 interface/web/dns/lib/lang/de_dns_ns.lng                     |    2 
 interface/web/client/lib/lang/es.lng                         |    3 
 interface/web/sites/lib/lang/br_web_sites_stats_list.lng     |   15 
 interface/web/help/lib/lang/pl_support_message.lng           |    7 
 interface/web/sites/lib/lang/pl_web_domain.lng               |   49 
 interface/web/mail/lib/lang/hu_mail_alias.lng                |   11 
 interface/web/dns/lib/lang/nl_dns_aaaa.lng                   |   29 
 interface/web/dns/lib/lang/de_dns_soa.lng                    |   26 
 interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng |    9 
 interface/web/sites/templates/web_domain_edit.htm            |    2 
 interface/web/admin/lib/lang/nl.lng                          |   19 
 interface/web/mail/lib/lang/nl_mail_content_filter.lng       |    1 
 interface/web/monitor/datalog_list.php                       |    4 
 interface/web/dns/lib/lang/de_dns_cname.lng                  |   18 
 interface/web/sites/database_phpmyadmin.php                  |    1 
 interface/web/admin/lib/lang/nl_language_complete.lng        |   11 
 interface/web/mail/lib/lang/br_spamfilter_blacklist_list.lng |   15 
 interface/web/admin/lib/lang/nl_firewall.lng                 |    5 
 interface/web/dns/dns_soa_edit.php                           |    3 
 interface/lib/lang/hu.lng                                    |   25 
 interface/web/dns/lib/lang/de_dns_alias.lng                  |   18 
 interface/web/sites/templates/web_domain_list.htm            |  118 
 interface/web/sites/lib/lang/nl_web_domain_list.lng          |    7 
 interface/web/sites/lib/lang/se_cron.lng                     |    4 
 interface/web/dns/lib/lang/nl.lng                            |    7 
 interface/web/sites/templates/web_subdomain_list.htm         |  120 
 server/lib/app.inc.php                                       |    5 
 interface/web/help/lib/lang/nl_support_message.lng           |    7 
 interface/web/sites/lib/lang/fi_ftp_user.lng                 |    1 
 interface/web/mail/lib/lang/pl_mail_transport.lng            |   10 
 interface/web/sites/ajax_get_ip.php                          |    4 
 interface/web/dns/lib/lang/br_dns_mx.lng                     |   29 
 install/install.php                                          |    2 
 interface/web/dns/lib/lang/br_dns_soa.lng                    |   45 
 interface/web/mail/lib/lang/nl_spamfilter_policy.lng         |   23 
 interface/web/mail/lib/lang/pl_mail_transport_list.lng       |    9 
 interface/web/mail/lib/lang/pl_mail_blacklist.lng            |    9 
 interface/web/sites/lib/lang/br_ftp_user.lng                 |   49 
 interface/lib/lang/es.lng                                    |    9 
 interface/web/designer/lib/lang/nl_form_list.lng             |    1 
 interface/web/dns/lib/lang/pl_dns_hinfo.lng                  |   15 
 interface/web/designer/lib/lang/pl_module_show.lng           |   16 
 interface/web/mail/lib/lang/pl_mail_forward_list.lng         |    8 
 interface/web/admin/lib/lang/hu_server_ip_list.lng           |    7 
 interface/web/sites/lib/lang/pl_web_sites_stats_list.lng     |    8 
 interface/web/tools/lib/lang/hu_usersettings.lng             |    9 
 interface/web/tools/lib/lang/pl.lng                          |    6 
 interface/web/designer/lib/lang/br_module_list.lng           |    7 
 interface/web/dns/lib/lang/nl_dns_wizard.lng                 |   43 
 interface/web/admin/lib/lang/hu_groups_list.lng              |    7 
 interface/web/dns/lib/lang/hu_dns_template_list.lng          |    6 
 interface/web/dns/lib/lang/pl_dns_a_list.lng                 |   14 
 interface/web/mail/lib/lang/hu_mail_alias_list.lng           |    9 
 interface/web/sites/lib/lang/pl_ftp_user_list.lng            |    8 
 install/sql/ispconfig3.sql                                   |    2 
 interface/web/admin/lib/lang/pl_server_config.lng            |   49 
 interface/web/dns/lib/lang/hu_dns_soa_list.lng               |   10 
 interface/web/dns/dns_wizard.php                             |   22 
 interface/web/client/lib/lang/se_reseller.lng                |   93 
 interface/web/admin/lib/lang/hu_syslog_list.lng              |    7 
 interface/web/sites/lib/lang/br_database_list.lng            |   13 
 interface/web/mail/templates/mail_content_filter_list.htm    |  120 
 interface/web/admin/lib/lang/nl_software_update_list.lng     |    9 
 interface/web/designer/lib/lang/pl_form_list.lng             |    7 
 interface/web/js/scrigo.js.php                               |  973 +-
 interface/web/mail/lib/lang/br_mail_blacklist.lng            |   15 
 interface/web/sites/lib/lang/br_shell_user.lng               |   40 
 interface/web/sites/lib/lang/hu.lng                          |   18 
 server/lib/classes/db_mysql.inc.php                          |    4 
 interface/web/mail/lib/lang/br_mail_domain_list.lng          |   11 
 interface/web/admin/lib/lang/de_system_config.lng            |   12 
 interface/web/dns/lib/lang/br_dns_template.lng               |    9 
 interface/web/login/templates/index.htm                      |    6 
 interface/web/client/lib/lang/fr_resellers_list.lng          |    9 
 interface/web/mail/lib/lang/br_mail_blacklist_list.lng       |   17 
 interface/web/admin/lib/lang/nl_language_import.lng          |    7 
 interface/web/admin/templates/software_repo_list.htm         |  112 
 interface/web/mail/lib/lang/hu_mail_domain_list.lng          |    8 
 interface/web/sites/lib/lang/de_cron_list.lng                |    2 
 interface/web/mail/lib/lang/pl_mail_spamfilter.lng           |   17 
 interface/web/admin/lib/lang/nl_system_config.lng            |   21 
 interface/web/monitor/lib/lang/pl_datalog_list.lng           |    8 
 interface/web/admin/templates/groups_list.htm                |  108 
 interface/web/client/lib/lang/br_resellers_list.lng          |   10 
 server/conf/error/br/503.html                                |  122 
 interface/web/dns/lib/lang/hu_dns_cname.lng                  |   16 
 interface/web/client/lib/lang/pl.lng                         |   12 
 interface/web/client/lib/lang/fi.lng                         |    3 
 interface/web/admin/lib/lang/bg_firewall.lng                 |    2 
 interface/web/client/lib/lang/ru_reseller.lng                |   93 
 interface/web/mail/lib/lang/nl_mail_domain_list.lng          |    9 
 interface/web/mail/lib/lang/br.lng                           |    7 
 interface/web/mail/templates/spamfilter_blacklist_list.htm   |  126 
 interface/web/dns/lib/lang/pl_dns_template.lng               |    6 
 interface/lib/lang/ru.lng                                    |    9 
 interface/web/client/lib/lang/fi_resellers_list.lng          |    9 
 interface/web/dns/lib/lang/it_dns_aaaa.lng                   |   28 
 interface/web/login/lib/lang/nl.lng                          |   24 
 interface/web/mail/lib/lang/de_mail_spamfilter.lng           |   28 
 server/lib/classes/modules.inc.php                           |    4 
 server/conf/error/br/405.html                                |  122 
 interface/web/mail/lib/lang/br_spamfilter_whitelist.lng      |   14 
 interface/web/sites/lib/lang/se_cron_list.lng                |   22 
 interface/web/admin/lib/lang/nl_firewall_list.lng            |    5 
 interface/web/dns/lib/lang/pl_dns_ptr.lng                    |   15 
 interface/web/dns/lib/lang/hu_dns_hinfo.lng                  |   16 
 interface/web/mail/templates/mail_get_list.htm               |  126 
 interface/web/mail/lib/lang/nl_mail_whitelist.lng            |    5 
 server/cron_daily.php                                        |   18 
 interface/web/admin/lib/lang/fr_server_config.lng            |    2 
 interface/web/mail/lib/lang/nl_mail_spamfilter.lng           |   27 
 interface/web/mail/lib/lang/br_mail_transport.lng            |   17 
 interface/web/themes/default/templates/main.tpl.htm          |  230 
 interface/web/monitor/lib/lang/br_datalog_list.lng           |    9 
 interface/web/client/lib/lang/nl_reseller.lng                |   91 
 interface/web/client/lib/lang/hu_client_list.lng             |   15 
 interface/web/admin/lib/lang/hu_software_repo.lng            |    8 
 interface/web/mail/lib/lang/br_mail_transport_list.lng       |   15 
 interface/web/mail/lib/lang/hu_mail_user_list.lng            |    7 
 interface/web/dns/lib/lang/br_dns_a.lng                      |   28 
 interface/web/mail/lib/lang/hu_mail_spamfilter.lng           |   18 
 interface/web/admin/lib/lang/it_firewall.lng                 |    2 
 interface/web/dns/lib/lang/nl_dns_txt.lng                    |    9 
 interface/web/designer/lib/lang/nl_form_show.lng             |    1 
 interface/lib/lang/br.lng                                    |   11 
 interface/web/client/lib/lang/fr_reseller.lng                |   93 
 interface/web/client/lib/lang/se.lng                         |    3 
 interface/web/client/lib/lang/fr.lng                         |    3 
 interface/web/mail/lib/lang/br_spamfilter_users_list.lng     |   17 
 interface/web/sites/templates/shell_user_list.htm            |  118 
 interface/web/admin/templates/server_ip_list.htm             |  106 
 interface/web/client/lib/lang/pl_resellers_list.lng          |    9 
 interface/web/sites/lib/lang/es_ftp_user.lng                 |    1 
 interface/web/designer/lib/lang/hu_module_edit.lng           |   23 
 interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng    |    3 
 interface/web/sites/lib/lang/de_database.lng                 |    2 
 interface/web/admin/templates/firewall_list.htm              |  120 
 interface/web/admin/lib/lang/nl_server_ip.lng                |    7 
 interface/web/client/lib/lang/de_resellers_list.lng          |    9 
 interface/web/client/lib/lang/it.lng                         |    3 
 interface/web/dns/lib/lang/hu_dns_txt.lng                    |   16 
 interface/web/dns/lib/lang/br_dns_alias.lng                  |   27 
 interface/web/mail/lib/lang/de_mail_get.lng                  |    4 
 interface/web/dns/lib/lang/br_dns_rp.lng                     |   27 
 interface/web/dns/lib/lang/br_dns_template_list.lng          |    9 
 interface/web/mail/lib/lang/hu_spamfilter_policy_list.lng    |   10 
 interface/web/admin/lib/lang/hu_groups.lng                   |    6 
 interface/web/sites/lib/lang/ru_shell_user.lng               |    1 
 interface/web/login/lib/lang/bg.lng                          |   11 
 interface/web/mail/lib/lang/br_mail_user_filter_list.lng     |   10 
 interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng |    9 
 interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng    |    8 
 interface/web/dns/lib/lang/de_dns_hinfo.lng                  |   16 
 interface/web/mail/lib/lang/nl_mail_domain_catchall.lng      |   13 
 interface/web/admin/lib/lang/fr_firewall.lng                 |    2 
 interface/web/login/lib/lang/hu.lng                          |   15 
 interface/web/client/lib/lang/it_reseller.lng                |   93 
 interface/web/sites/lib/lang/pl_web_subdomain_list.lng       |    8 
 interface/web/dns/lib/lang/hu_dns_a.lng                      |   16 
 interface/web/mail/lib/lang/hu_mail_whitelist.lng            |   10 
 interface/web/mail/lib/lang/pl_mail_alias_list.lng           |    8 
 interface/web/mail/lib/lang/nl_mail_domain.lng               |   11 
 install/tpl/mailfilter.master                                |    4 
 interface/web/mail/lib/lang/hu_spamfilter_policy.lng         |   39 
 interface/web/mail/lib/lang/hu_spamfilter_users.lng          |    9 
 interface/web/sites/lib/lang/es_cron_list.lng                |   22 
 interface/web/mail/lib/lang/br_mail_forward.lng              |   10 
 interface/web/admin/lib/lang/nl_users.lng                    |   25 
 interface/web/admin/lib/lang/hu_server_ip.lng                |    7 
 interface/lib/lang/en.lng                                    |    9 
 interface/web/dns/lib/lang/de_dns_template_list.lng          |    6 
 interface/web/admin/lib/lang/hu_server_list.lng              |   12 
 server/mods-available/dns_module.inc.php                     |  105 
 interface/web/mail/lib/lang/nl_mail_forward_list.lng         |   13 
 interface/web/dns/lib/lang/hu_dns_ns.lng                     |   16 
 interface/web/mail/lib/lang/br_mail_user_filter.lng          |   15 
 interface/web/sites/lib/lang/pl.lng                          |   17 
 interface/web/designer/lib/lang/br_module_show.lng           |   24 
 interface/web/sites/lib/lang/fi_cron.lng                     |    4 
 interface/web/admin/lib/lang/hu_software_update_list.lng     |    9 
 interface/web/client/lib/lang/hu_client.lng                  |   85 
 interface/web/mail/lib/lang/de_spamfilter_whitelist.lng      |    2 
 interface/web/designer/lib/lang/br_form_edit.lng             |   47 
 interface/web/mail/lib/lang/pl_mail_user.lng                 |   31 
 interface/web/mail/lib/lang/hu_mail_get.lng                  |   16 
 interface/web/monitor/lib/lang/br.lng                        |    2 
 interface/web/admin/lib/lang/hu_firewall_list.lng            |    9 
 interface/web/mail/templates/mail_blacklist_list.htm         |  120 
 interface/web/monitor/lib/lang/hu_datalog_list.lng           |    9 
 interface/web/sites/lib/lang/br_web_subdomain_list.lng       |   13 
 interface/web/dns/lib/lang/pl_dns_rp.lng                     |   15 
 interface/web/client/lib/lang/br_reseller.lng                |   91 
 interface/web/sites/lib/lang/de_shell_user.lng               |    1 
 interface/web/client/lib/lang/ru.lng                         |    3 
 interface/web/mail/lib/lang/hu_mail_content_filter_list.lng  |    9 
 interface/web/monitor/lib/lang/pl_syslog_list.lng            |    7 
 interface/lib/classes/tform.inc.php                          |   24 
 interface/web/mail/lib/lang/nl_mail_user_list.lng            |    7 
 interface/web/admin/lib/lang/pl_software_update_list.lng     |    8 
 interface/web/sites/lib/lang/br_web_aliasdomain_list.lng     |   19 
 interface/web/admin/lib/lang/nl_language_edit.lng            |    5 
 interface/web/admin/lib/lang/pl_language_add.lng             |    8 
 interface/web/admin/lib/lang/ru_firewall.lng                 |    2 
 interface/web/client/lib/lang/de_reseller.lng                |   90 
 interface/web/sites/lib/lang/it_shell_user.lng               |    1 
 interface/web/dns/lib/lang/pl_dns_template_list.lng          |    6 
 interface/web/mail/lib/lang/de_mail_transport_list.lng       |    4 
 interface/web/admin/lib/lang/hu_dbsync_list.lng              |   14 
 interface/web/designer/lib/lang/hu.lng                       |    3 
 interface/web/admin/templates/users_list.htm                 |    2 
 interface/web/mail/lib/lang/nl_mail_user.lng                 |   38 
 interface/web/sites/lib/lang/se_shell_user.lng               |    1 
 interface/web/dns/lib/lang/br_dns_soa_list.lng               |   15 
 interface/web/mail/lib/lang/hu_spamfilter_whitelist.lng      |   10 
 interface/web/mail/lib/lang/pl_spamfilter_users.lng          |    8 
 interface/web/mail/lib/lang/nl_mail_whitelist_list.lng       |    9 
 interface/web/admin/lib/lang/bg_server_config.lng            |    2 
 interface/web/admin/lib/lang/hu_language_list.lng            |    8 
 interface/lib/lang/fr.lng                                    |    9 
 interface/web/dns/lib/lang/pl_dns_a.lng                      |   16 
 interface/web/mail/templates/mail_forward_list.htm           |  114 
 interface/web/client/lib/lang/hu.lng                         |   10 
 interface/web/mail/lib/lang/br_mail_user.lng                 |   57 
 interface/web/mail/lib/lang/hu_mail_whitelist_list.lng       |   11 
 interface/web/dns/lib/lang/hu_dns_aaaa.lng                   |   15 
 interface/web/client/lib/lang/se_resellers_list.lng          |    9 
 interface/web/login/index.php                                |  391 
 interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng      |    7 
 interface/web/admin/lib/lang/pl_software_package_list.lng    |    7 
 interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng     |   23 
 interface/web/client/lib/lang/es_reseller.lng                |   93 
 interface/web/sites/lib/lang/pl_shell_user.lng               |   22 
 interface/web/mail/lib/lang/br_spamfilter_policy.lng         |   73 
 interface/web/dns/lib/lang/nl_dns_ns.lng                     |    3 
 interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng      |    9 
 interface/web/admin/lib/lang/hu_software_repo_list.lng       |    7 
 interface/web/admin/lib/lang/pl_firewall.lng                 |   11 
 interface/web/mail/lib/lang/de_mail_whitelist.lng            |    2 
 interface/web/mail/lib/lang/hu.lng                           |   46 
 interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng |    7 
 interface/web/dns/lib/lang/br_dns_a_list.lng                 |   23 
 interface/web/monitor/lib/lang/pl.lng                        |  137 
 interface/web/admin/lib/lang/hu_users_list.lng               |    9 
 interface/web/dns/lib/lang/de_dns_soa_list.lng               |    6 
 interface/web/mail/lib/lang/de_mail_alias_list.lng           |    4 
 interface/web/dns/lib/lang/br_dns_srv.lng                    |   27 
 interface/web/mail/lib/lang/hu_mail_user_filter_list.lng     |    7 
 interface/web/login/lib/lang/fi.lng                          |   11 
 interface/web/mail/lib/lang/hu_mail_domain.lng               |   14 
 interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng     |   11 
 interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng      |    9 
 interface/web/client/lib/lang/br.lng                         |    3 
 interface/lib/lang/se.lng                                    |    9 
 interface/web/mail/lib/lang/pl_mail_user_list.lng            |    6 
 interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng    |    9 
 interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng      |    8 
 interface/web/sites/lib/lang/ru_ftp_user.lng                 |    1 
 interface/web/admin/lib/lang/fi_firewall.lng                 |    2 
 interface/web/admin/lib/lang/hu_server.lng                   |   12 
 interface/web/admin/lib/lang/se_firewall.lng                 |    2 
 interface/web/sites/lib/lang/br.lng                          |    3 
 server/conf/error/br/500.html                                |  122 
 interface/web/dns/lib/lang/pl_dns_soa_list.lng               |    9 
 interface/lib/lang/fi.lng                                    |    9 
 interface/web/dns/lib/lang/br_dns_cname.lng                  |   27 
 interface/web/sites/lib/lang/de_cron.lng                     |    2 
 interface/web/admin/lib/lang/de_users.lng                    |    4 
 interface/web/tools/lib/lang/pl_usersettings.lng             |    8 
 interface/web/dns/lib/lang/nl_dns_srv.lng                    |    9 
 interface/web/dns/lib/lang/de_dns_ptr.lng                    |   18 
 interface/web/login/lib/lang/fr.lng                          |   11 
 interface/web/designer/lib/lang/nl_module_edit.lng           |    1 
 interface/web/login/lib/lang/se.lng                          |   11 
 interface/web/dns/lib/lang/pl.lng                            |   17 
 interface/web/sites/lib/lang/fr_ftp_user.lng                 |    1 
 interface/web/help/lib/lang/nl.lng                           |    1 
 interface/web/mail/lib/lang/de_mail_forward.lng              |    4 
 interface/web/sites/lib/lang/hu_ftp_user_list.lng            |    9 
 interface/web/client/lib/lang/hu_users_list.lng              |   14 
 interface/web/mail/lib/lang/de_mail_domain_catchall.lng      |    2 
 interface/web/sites/lib/lang/hu_web_subdomain_list.lng       |    9 
 interface/web/designer/lib/lang/br_module_edit.lng           |   24 
 interface/web/sites/lib/lang/pl_database_list.lng            |    8 
 interface/web/sites/lib/lang/nl_database_list.lng            |    7 
 interface/web/designer/lib/lang/pl_form_show.lng             |   18 
 interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng     |   12 
 interface/web/admin/lib/lang/pl_language_export.lng          |    6 
 interface/web/sites/lib/lang/nl_ftp_user.lng                 |   28 
 interface/web/designer/lib/lang/pl_module_nav_edit.lng       |    6 
 interface/web/designer/lib/lang/br.lng                       |    2 
 interface/web/dns/lib/lang/hu_dns_wizard.lng                 |   27 
 interface/web/mail/lib/lang/pl_spamfilter_config.lng         |   20 
 interface/web/mail/lib/lang/hu_spamfilter_config.lng         |   21 
 interface/web/designer/lib/lang/nl_module_show.lng           |    1 
 interface/web/mail/lib/lang/br_mail_spamfilter.lng           |   31 
 interface/web/sites/lib/lang/en_database.lng                 |    2 
 interface/web/sites/lib/lang/pl_ftp_user.lng                 |   27 
 interface/web/mail/templates/mail_domain_catchall_list.htm   |  114 
 interface/web/designer/lib/lang/pl_form_edit.lng             |   24 
 interface/web/mail/lib/lang/pl_mail_forward.lng              |    7 
 interface/web/admin/lib/lang/nl_software_package_list.lng    |    1 
 interface/web/monitor/lib/lang/nl_datalog_list.lng           |    9 
 interface/web/mail/lib/lang/br_spamfilter_policy_list.lng    |   15 
 interface/web/mail/lib/lang/pl_mail_domain_list.lng          |    7 
 interface/web/admin/lib/lang/pl_software_repo_list.lng       |    6 
 interface/web/dns/lib/lang/hu_dns_alias.lng                  |   16 
 interface/web/client/lib/lang/nl_resellers_list.lng          |   10 
 interface/web/mail/lib/lang/hu_mail_domain_catchall.lng      |   10 
 interface/web/admin/lib/lang/hu_system_config.lng            |   15 
 interface/web/mail/templates/mail_transport_list.htm         |  126 
 675 files changed, 11,172 insertions(+), 5,244 deletions(-)

diff --git a/install/install.php b/install/install.php
index 4378fd7..15defd6 100644
--- a/install/install.php
+++ b/install/install.php
@@ -358,7 +358,7 @@
 	}
 	
 	//** Configure Apache
-	swriteln("\nHint: If this server shall run the ispconfig interface, select 'y' in the next option.\n");
+	swriteln("\nHint: If this server shall run the ispconfig interface, select 'y' in the 'Configure Apache Server' option.\n");
 	if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {	
 		$conf['services']['web'] = true;
 		swriteln('Configuring Apache');
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 4886536..535eb6f 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -301,6 +301,13 @@
             if(!$this->dbmaster->query($query)) {
                 $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage);
             }
+			
+			$query = "GRANT UPDATE(`updated`) ON ".$conf['mysql']['master_database'].".`server` "
+                    ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' "
+                    ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';";
+            if(!$this->dbmaster->query($query)) {
+                $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage);
+            }
             
             $query = "GRANT UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`) ON ".$conf['mysql']['master_database'].".`web_domain` "
                     ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' "
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index c74261b..b229a69 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -512,7 +512,7 @@
   `uid` int(11) unsigned NOT NULL default '5000',
   `gid` int(11) unsigned NOT NULL default '5000',
   `maildir` varchar(255) NOT NULL default '',
-  `quota` int(11) NOT NULL default '0',
+  `quota` int(11) NOT NULL default '-1',
   `homedir` varchar(255) NOT NULL,
   `autoresponder` enum('n','y') NOT NULL default 'n',
   `autoresponder_text` mediumtext NULL,
diff --git a/install/tpl/mailfilter.master b/install/tpl/mailfilter.master
index 54d0b85..8588b14 100644
--- a/install/tpl/mailfilter.master
+++ b/install/tpl/mailfilter.master
@@ -5,8 +5,8 @@
 LOGNAME=tolower("$LOGNAME")
 EXTENSION="$1"
 RECIPIENT=tolower("$2")
-USER="$3"
-HOST="$4"
+USER=tolower("$3")
+HOST=tolower("$4")
 SENDER="$5"
 DEFAULT="{dist_postfix_vmail_mailbox_base}/$HOST/$USER/."
 
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index 26abeef..70d6652 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -143,7 +143,7 @@
 		include($lng_file);
 		$app->tpl->setVar($wb);
 		
-		
+		$app->tpl->setVar('toolsarea_head_txt',$app->lng('toolsarea_head_txt'));
 		$app->tpl->setVar($app->listform->wordbook);
 		$app->tpl->setVar('form_action', $app->listform->listDef['file']);
 		
diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php
index 86c3a4c..1d14775 100644
--- a/interface/lib/classes/listform_tpl_generator.inc.php
+++ b/interface/lib/classes/listform_tpl_generator.inc.php
@@ -1,139 +1,139 @@
-<?php
-
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-class listform_tpl_generator {
-	
-	function buildHTML($listDef,$module = '') {
-		
-		global $app;
-		
-		if($module == '') $module = $_SESSION["s"]["module"]["name"];
-
-		$lang = array();
-		$html = '<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_list_'.$listDef["name"].'">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="'."loadContent('".$module."/".$listDef["edit_file"]."');".'">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-';
-		
-		$lang["list_head_txt"] = $listDef["name"];
-		foreach($listDef["item"] as $field) {
-			$key = $field["field"];
-			$html .= "            <th class=\"tbl_col_".$key."\" scope=\"col\"><tmpl_var name=\"".$key."_txt\"></th>\r\n";
-			$lang[$key."_txt"] = $key;
-		}
-		
-		$html .= '            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-';
-  
-  		foreach($listDef["item"] as $field) {
-			$key = $field["field"];
-			if($field["formtype"] == 'SELECT') {
-				$html .= "            <td class=\"tbl_col_".$key."\"><select name=\"".$listDef["search_prefix"].$key."\" onChange=\"submitForm('pageForm','".$module."/".$listDef["file"]."');\">{tmpl_var name='".$listDef["search_prefix"].$key."'}</select></td>\r\n";
-			} else {
-				$html .= "            <td class=\"tbl_col_".$key."\"><input type=\"text\" name=\"".$listDef["search_prefix"].$key."\" value=\"{tmpl_var name='".$listDef["search_prefix"].$key."'}\" /></td>\r\n";
-			}
-		}
-		
-		$html .= '            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="'."submitForm('pageForm','".$module."/".$listDef["file"]."');".'"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name=\'__EVEN__\'}even<tmpl_else>uneven</tmpl_if>">
-';
-		
-		foreach($listDef["item"] as $field) {
-			$key = $field["field"];
-			$html .= "            <td class=\"tbl_col_".$key."\"><a href=\"#\" onClick=\"loadContent('".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}');\">{tmpl_var name=\"".$key."\"}</a></td>\r\n";
-		}
-		
-		$html .= "            <td class=\"tbl_col_buttons\">
-              <div class=\"buttons icons16\">    
-                <a class=\"icons16 icoDelete\" href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>";
-  $html .= '
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="'.(count($listDef["item"])+1).'"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
-';
-		
-		if($module == '') {
-			$filename = 'templates/'.$listDef["name"].'_list.htm';
-		} else {
-			$filename = '../'.$module.'/templates/'.$listDef["name"].'_list.htm';
-		}
-		
-		
-		// save template
-		if (!$handle = fopen($filename, 'w')) { 
-        	print "Cannot open file ($filename)"; 
-        	exit; 
-   		} 
- 
-   		if (!fwrite($handle, $html)) { 
-			print "Cannot write to file ($filename)"; 
-			exit; 
-		}
-		fclose($handle);
-		
-    }
-
-}
-
+<?php
+
+/*
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class listform_tpl_generator {
+	
+	function buildHTML($listDef,$module = '') {
+		
+		global $app;
+		
+		if($module == '') $module = $_SESSION["s"]["module"]["name"];
+
+		$lang = array();
+		$html = '<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_'.$listDef["name"].'">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="'."loadContent('".$module."/".$listDef["edit_file"]."');".'">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+';
+		
+		$lang["list_head_txt"] = $listDef["name"];
+		foreach($listDef["item"] as $field) {
+			$key = $field["field"];
+			$html .= "            <th class=\"tbl_col_".$key."\" scope=\"col\"><tmpl_var name=\"".$key."_txt\"></th>\r\n";
+			$lang[$key."_txt"] = $key;
+		}
+		
+		$html .= '            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+';
+  
+  		foreach($listDef["item"] as $field) {
+			$key = $field["field"];
+			if($field["formtype"] == 'SELECT') {
+				$html .= "            <td class=\"tbl_col_".$key."\"><select name=\"".$listDef["search_prefix"].$key."\" onChange=\"submitForm('pageForm','".$module."/".$listDef["file"]."');\">{tmpl_var name='".$listDef["search_prefix"].$key."'}</select></td>\r\n";
+			} else {
+				$html .= "            <td class=\"tbl_col_".$key."\"><input type=\"text\" name=\"".$listDef["search_prefix"].$key."\" value=\"{tmpl_var name='".$listDef["search_prefix"].$key."'}\" /></td>\r\n";
+			}
+		}
+		
+		$html .= '            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="'."submitForm('pageForm','".$module."/".$listDef["file"]."');".'"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name=\'__EVEN__\'}even<tmpl_else>uneven</tmpl_if>">
+';
+		
+		foreach($listDef["item"] as $field) {
+			$key = $field["field"];
+			$html .= "            <td class=\"tbl_col_".$key."\"><a href=\"#\" onClick=\"loadContent('".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}');\">{tmpl_var name=\"".$key."\"}</a></td>\r\n";
+		}
+		
+		$html .= "            <td class=\"tbl_col_buttons\">
+              <div class=\"buttons icons16\">    
+                <a class=\"icons16 icoDelete\" href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>";
+  $html .= '
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="'.(count($listDef["item"])+1).'"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
+';
+		
+		if($module == '') {
+			$filename = 'templates/'.$listDef["name"].'_list.htm';
+		} else {
+			$filename = '../'.$module.'/templates/'.$listDef["name"].'_list.htm';
+		}
+		
+		
+		// save template
+		if (!$handle = fopen($filename, 'w')) { 
+        	print "Cannot open file ($filename)"; 
+        	exit; 
+   		} 
+ 
+   		if (!fwrite($handle, $html)) { 
+			print "Cannot write to file ($filename)"; 
+			exit; 
+		}
+		fclose($handle);
+		
+    }
+
+}
+
 ?>
\ No newline at end of file
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index b7b378d..04104de 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -1232,6 +1232,30 @@
 			
 			return $check_passed;
 		}
+		
+		//* get the difference record of two arrays
+		function getDiffRecord($record_old,$record_new) {
+			
+			if(is_array($record_new) && count($record_new) > 0) {
+			foreach($record_new as $key => $val) {
+				if(@$record_old[$key] != $val) {
+					// Record has changed
+					$diffrec[$key] = array(	'old' => @$record_old[$key],
+											'new' => $val);
+					}
+				}
+			} elseif(is_array($record_old)) {
+				foreach($record_old as $key => $val) {
+					if($record_new[$key] != $val) {
+						// Record has changed
+						$diffrec[$key] = array(	'new' => $record_new[$key],
+												'old' => $val);
+						}
+					}
+				}
+			return $diffrec;
+		
+		}
 
 }
 
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 4a79254..6384d3c 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -44,7 +44,7 @@
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.0.9');
+define('ISPC_APP_VERSION', '3.0.1.4');
 
 
 //** Database
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
index 2fdb048..ad2a97b 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -21,4 +21,13 @@
 $wb['add_new_record_txt'] = 'Add new record';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['System'] = 'System';
+$wb['Client'] = 'Client';
+$wb['Email'] = 'Email';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
 ?>
diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng
index 3aad6e0..f2f2c61 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['conf_format_dateshort'] = 'd/m/Y';
-$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_datelong'] = 'l dS de F Y';
 $wb['conf_format_timeshort'] = 'H:i';
 $wb['conf_format_timelong'] = 'H:i:s';
 $wb['conf_format_datetime'] = 'd/m/Y H:i';
@@ -21,5 +21,14 @@
 $wb['add_new_record_txt'] = 'Adcionar novo registro';
 $wb['btn_save_txt'] = 'Salvar';
 $wb['btn_cancel_txt'] = 'Voltar';
+$wb['System'] = 'Sistema';
+$wb['Client'] = 'Cliente';
+$wb['Email'] = 'Correio';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Ferramentas';
+$wb['Help'] = 'Ajuda';
+$wb['toolsarea_head_txt'] = 'Ferramentas';
 ?>
 
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index 2aa35b6..6b660ff 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -21,4 +21,13 @@
 $wb['add_new_record_txt'] = 'Neuen Datensatz hinzufügen';
 $wb['btn_save_txt'] = 'Speichern';
 $wb['btn_cancel_txt'] = 'Abbrechen';
+$wb['System'] = 'System';
+$wb['Client'] = 'Client';
+$wb['Email'] = 'Email';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
 ?>
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index c94811e..eb58161 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -22,4 +22,13 @@
 $wb["add_new_record_txt"] = 'Add new record';
 $wb['btn_save_txt'] = "Save";
 $wb['btn_cancel_txt'] = "Back";
+$wb['System'] = 'System';
+$wb['Client'] = 'Client';
+$wb['Email'] = 'Email';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
 ?>
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
index ced7227..f6f64ac 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -21,4 +21,13 @@
 $wb['add_new_record_txt'] = 'Add new record';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['System'] = 'System';
+$wb['Client'] = 'Client';
+$wb['Email'] = 'Email';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
 ?>
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index dde8150..abdfa3d 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -21,4 +21,13 @@
 $wb['add_new_record_txt'] = 'Lisää uusi tietue';
 $wb['btn_save_txt'] = 'Tallenna';
 $wb['btn_cancel_txt'] = 'Keskeytä';
+$wb['System'] = 'System';
+$wb['Client'] = 'Client';
+$wb['Email'] = 'Email';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
 ?>
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
index 60f38b8..db0c35b 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -21,4 +21,13 @@
 $wb['add_new_record_txt'] = 'Add new record';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['System'] = 'System';
+$wb['Client'] = 'Client';
+$wb['Email'] = 'Email';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
 ?>
diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng
new file mode 100644
index 0000000..3cdd1bd
--- /dev/null
+++ b/interface/lib/lang/hu.lng
@@ -0,0 +1,25 @@
+<?php
+$wb['301'] = 'Ehhez a modulhoz nincs hozzáférése';
+$wb['302'] = 'Érvénytelen modul';
+$wb['1001'] = 'A felhasználónév és a jelszó nem lehet üres!';
+$wb['1002'] = 'A felhasználónév és/vagy a jelszó hibás!';
+$wb['1003'] = 'A felhasználó nem aktív.';
+$wb['delete_confirmation'] = 'Valóban törli a bejegyzést?';
+$wb['error_no_view_permission'] = 'Ehhez a bejegyzéshez nincs jogosultsága, vagy nem létezik.';
+$wb['error_no_delete_permission'] = 'Nincs joga a bejegyzést törölni!';
+$wb['conf_format_dateshort'] = 'Y.m.d';
+$wb['conf_format_datelong'] = 'Y. F. of l dS';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y.m.d H:i';
+$wb['page_txt'] = 'Oldal';
+$wb['page_of_txt'] = 'Összesen';
+$wb['page_next_txt'] = 'Tovább';
+$wb['page_back_txt'] = 'Vissza';
+$wb['delete_txt'] = 'Töröl';
+$wb['filter_txt'] = 'Szűrés';
+$wb['add_new_record_txt'] = 'Új bejegyzés';
+$wb['btn_save_txt'] = 'Mentés';
+$wb['btn_cancel_txt'] = 'Mégse';
+?>
+
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
index 404edb6..cf7324b 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -21,4 +21,13 @@
 $wb['add_new_record_txt'] = 'Aggiungi nuovo record';
 $wb['btn_save_txt'] = 'Salva';
 $wb['btn_cancel_txt'] = 'Indietro';
+$wb['System'] = 'System';
+$wb['Client'] = 'Client';
+$wb['Email'] = 'Email';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
 ?>
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index 0a1ec3d..4d18ef8 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['conf_format_dateshort'] = 'Y-m-d';
-$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_datelong'] = 'l d F Y';
 $wb['conf_format_timeshort'] = 'H:i';
 $wb['conf_format_timelong'] = 'H:i:s';
 $wb['conf_format_datetime'] = 'Y-m-d H:i';
@@ -12,13 +12,23 @@
 $wb['delete_confirmation'] = 'Wilt u dit record echt verwijderen?';
 $wb['error_no_view_permission'] = 'U heeft geen toestemming om dit record te bekijken of dit record bestaat niet!';
 $wb['error_no_delete_permission'] = 'U heeft geen toestemming om dit record te verwijderen!';
-$wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
-$wb['page_next_txt'] = 'Next';
-$wb['page_back_txt'] = 'Back';
-$wb['delete_txt'] = 'Delete';
-$wb['filter_txt'] = 'Filter';
-$wb['add_new_record_txt'] = 'Add new record';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['page_txt'] = 'Pagina';
+$wb['page_of_txt'] = 'van';
+$wb['page_next_txt'] = 'Volgende';
+$wb['page_back_txt'] = 'Vorige';
+$wb['delete_txt'] = 'Verwijderen';
+$wb['filter_txt'] = 'Filteren';
+$wb['add_new_record_txt'] = 'Toevoegen';
+$wb['btn_save_txt'] = 'Opslaan';
+$wb['btn_cancel_txt'] = 'Annuleren';
+$wb['System'] = 'Servers';
+$wb['Client'] = 'Klanten';
+$wb['Email'] = 'E-mail';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Websites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
 ?>
+
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
new file mode 100644
index 0000000..74dff0c
--- /dev/null
+++ b/interface/lib/lang/pl.lng
@@ -0,0 +1,33 @@
+<?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+$wb['301'] = 'Moduł nie jest dostępny dla aktualnego uzytkownika.';
+$wb['302'] = 'Moduł jest niepoprawny.';
+$wb['1001'] = 'Nazwa użytkownika i hasło nie może być puste !';
+$wb['1002'] = 'Nazwa użytkownika i/lub hasło nie są poprawne !';
+$wb['1003'] = 'Nazwa użytkownika nie jest aktywna!';
+$wb['delete_confirmation'] = 'Jesteś pewny, że chcesz usunąć ten wpis?';
+$wb['error_no_view_permission'] = 'Nie masz uprawnień do podglądu tego wpisu lub taki wpis nie istnieje!';
+$wb['error_no_delete_permission'] = 'Nie masz uprawnień do usunięcia tego wpisu!';
+$wb['page_txt'] = 'Strona';
+$wb['page_of_txt'] = 'z';
+$wb['page_next_txt'] = 'Następna';
+$wb['page_back_txt'] = 'Wróć';
+$wb['delete_txt'] = 'Usuń';
+$wb['filter_txt'] = 'Filtr';
+$wb['add_new_record_txt'] = 'Dodaj nowy wpis';
+$wb['btn_save_txt'] = 'Zapisz';
+$wb['btn_cancel_txt'] = 'Wróć';
+$wb['System'] = 'System';
+$wb['Client'] = 'Client';
+$wb['Email'] = 'Email';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
+?>
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index dc81b7d..7493dbe 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -21,4 +21,13 @@
 $wb['add_new_record_txt'] = 'Add new record';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['System'] = 'System';
+$wb['Client'] = 'Client';
+$wb['Email'] = 'Email';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
 ?>
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index 820dd8f..65a1c37 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -21,4 +21,13 @@
 $wb['add_new_record_txt'] = 'Add new record';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['System'] = 'System';
+$wb['Client'] = 'Client';
+$wb['Email'] = 'Email';
+$wb['Monitor'] = 'Monitor';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
+$wb['Tools'] = 'Tools';
+$wb['Help'] = 'Help';
+$wb['toolsarea_head_txt'] = 'Tools';
 ?>
diff --git a/interface/web/admin/language_edit.php b/interface/web/admin/language_edit.php
index f47b631..ce9f30c 100644
--- a/interface/web/admin/language_edit.php
+++ b/interface/web/admin/language_edit.php
@@ -77,7 +77,7 @@
 	$file_path = ISPC_LIB_PATH."/lang/$lang_file";
 } else {
 	include(ISPC_WEB_PATH."/$module/lib/lang/$lang_file");
-	$file_path = ISPC_LIB_PATH."/$module/lib/lang/$lang_file";
+	$file_path = ISPC_WEB_PATH."/$module/lib/lang/$lang_file";
 }
 $app->tpl->setVar("file_path", $file_path);
 
diff --git a/interface/web/admin/lib/lang/bg_firewall.lng b/interface/web/admin/lib/lang/bg_firewall.lng
index 67c31ca..e626345 100644
--- a/interface/web/admin/lib/lang/bg_firewall.lng
+++ b/interface/web/admin/lib/lang/bg_firewall.lng
@@ -6,4 +6,6 @@
 $wb['udp_port_help_txt'] = 'Separated by comma';
 $wb['active_txt'] = 'Active';
 $wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index f3a7a95..ed93388 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -44,4 +44,6 @@
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
 ?>
diff --git a/interface/web/admin/lib/lang/br.lng b/interface/web/admin/lib/lang/br.lng
index 6081ef2..53fc640 100644
--- a/interface/web/admin/lib/lang/br.lng
+++ b/interface/web/admin/lib/lang/br.lng
@@ -16,7 +16,7 @@
 $wb['System'] = 'Sistema';
 $wb['Add user'] = 'Adicionar Usuário';
 $wb['Edit user'] = 'Editar Usuário';
-$wb['CP Users'] = 'Usuários Visar';
+$wb['CP Users'] = 'Usuários';
 $wb['Add group'] = 'Adicionar Grupo';
 $wb['Edit group'] = 'Editar Grupo';
 $wb['Edit server'] = 'Editar Servidor';
diff --git a/interface/web/admin/lib/lang/br_firewall.lng b/interface/web/admin/lib/lang/br_firewall.lng
index 1f276e5..8bc8cdb 100644
--- a/interface/web/admin/lib/lang/br_firewall.lng
+++ b/interface/web/admin/lib/lang/br_firewall.lng
@@ -6,5 +6,7 @@
 $wb['udp_port_help_txt'] = 'Separado por vírgula';
 $wb['active_txt'] = 'Ativo';
 $wb['firewall_error_unique'] = 'Já existe uma regra de firewall para este servidor!';
+$wb['tcp_ports_error_regex'] = 'Caratere não permitido para definição de porta tcp. São permitidos somente números, : e ,.';
+$wb['udp_ports_error_regex'] = 'Caratere não permitido para definição de porta udp. São permitidos somente números, : e ,.';
 ?>
 
diff --git a/interface/web/admin/lib/lang/br_firewall_list.lng b/interface/web/admin/lib/lang/br_firewall_list.lng
index 143a966..c3429c7 100644
--- a/interface/web/admin/lib/lang/br_firewall_list.lng
+++ b/interface/web/admin/lib/lang/br_firewall_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Firewall';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["tcp_port_txt"] = 'Portas TCP abertas';
-$wb["udp_port_txt"] = 'Portas UDP abertas';
-$wb["add_new_record_txt"] = 'Adcionar registro de firewall';
+$wb['list_head_txt'] = 'Firewall';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['tcp_port_txt'] = 'Portas TCP abertas';
+$wb['udp_port_txt'] = 'Portas UDP abertas';
+$wb['add_new_record_txt'] = 'Adcionar registro de firewall';
 ?>
+
diff --git a/interface/web/admin/lib/lang/br_language_import.lng b/interface/web/admin/lib/lang/br_language_import.lng
index 71d0d5e..215ae64 100644
--- a/interface/web/admin/lib/lang/br_language_import.lng
+++ b/interface/web/admin/lib/lang/br_language_import.lng
@@ -1,7 +1,8 @@
 <?php
-$wb["list_head_txt"] = 'Importar arquivo de idioma';
-$wb["language_import_txt"] = 'Buscar arquivo de idioma';
+$wb['list_head_txt'] = 'Importar arquivo de idioma';
+$wb['language_import_txt'] = 'Buscar arquivo de idioma';
 $wb['btn_save_txt'] = 'Importar Arquivo de Idioma Selecionado';
-$wb["language_overwrite_txt"] = 'Sobre escrever o arquivo se existir.';
+$wb['language_overwrite_txt'] = 'Sobre escrever o arquivo se existir.';
 $wb['btn_cancel_txt'] = 'Voltar';
 ?>
+
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index 65b7b26..178f626 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -38,5 +38,13 @@
 $wb['gateway_error_wrong'] = 'Gateway inválido!';
 $wb['hostname_error_empty'] = 'Por favor, entre com o nome do Host.';
 $wb['nameservers_error_empty'] = 'Por favor, entre com  o Servidor DNS.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Cron de aplicações Jailkit em ambiente chroot';
+$wb['config_dir_txt'] = 'Diretório de configuração';
+$wb['init_script_txt'] = 'Cron init nome do script';
+$wb['crontab_dir_txt'] = 'Caminho para crontabs individuais';
+$wb['wget_txt'] = 'Caminho para o wget';
+$wb['web_user_txt'] = 'Usuário Apache';
+$wb['web_group_txt'] = 'Grupo Apache';
+$wb['security_level_txt'] = 'Nível de Segurança';
 ?>
 
diff --git a/interface/web/admin/lib/lang/br_software_repo_list.lng b/interface/web/admin/lib/lang/br_software_repo_list.lng
index 4352970..1b8d7eb 100644
--- a/interface/web/admin/lib/lang/br_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/br_software_repo_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'Repositório';
-$wb["active_txt"] = 'Ativo';
-$wb["repo_name_txt"] = 'Repositório';
-$wb["repo_url_txt"] = 'URL';
+$wb['list_head_txt'] = 'Repositório';
+$wb['active_txt'] = 'Ativo';
+$wb['repo_name_txt'] = 'Repositório';
+$wb['repo_url_txt'] = 'URL';
 ?>
+
diff --git a/interface/web/admin/lib/lang/br_users_list.lng b/interface/web/admin/lib/lang/br_users_list.lng
index 44e69fa..95224f7 100644
--- a/interface/web/admin/lib/lang/br_users_list.lng
+++ b/interface/web/admin/lib/lang/br_users_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Usuários';
-$wb["username_txt"] = 'Nome de Usuário';
-$wb["name_txt"] = 'Nome';
-$wb["vorname_txt"] = 'Sobrenome';
-$wb["ort_txt"] = 'cidade';
-$wb["add_new_record_txt"] = 'Adcionar novo usuário';
+$wb['list_head_txt'] = 'Usuários';
+$wb['username_txt'] = 'Nome de Usuário';
+$wb['name_txt'] = 'Nome';
+$wb['vorname_txt'] = 'Sobrenome';
+$wb['ort_txt'] = 'cidade';
+$wb['add_new_record_txt'] = 'Adcionar novo usuário';
 ?>
+
diff --git a/interface/web/admin/lib/lang/de_firewall.lng b/interface/web/admin/lib/lang/de_firewall.lng
index 44eff0c..0f58d7c 100644
--- a/interface/web/admin/lib/lang/de_firewall.lng
+++ b/interface/web/admin/lib/lang/de_firewall.lng
@@ -6,4 +6,6 @@
 $wb['udp_port_help_txt'] = 'Getrennt durch Beistrich';
 $wb['active_txt'] = 'Aktiv';
 $wb['firewall_error_unique'] = 'Es gibt bereits einen Firewalldatensatz für diesen Server.';
+$wb['tcp_ports_error_regex'] = 'Zeichen nicht erlaubt in TCP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.';
+$wb['udp_ports_error_regex'] = 'Zeichen nicht erlaubt in TCP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 756a3c9..2ed5c68 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -3,45 +3,47 @@
 $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
 $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
 $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
-$wb['website_path_txt'] = 'Website path';
-$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['website_path_txt'] = 'Website Pfad';
+$wb['website_symlinks_txt'] = 'Website Symlinks';
 $wb['vhost_conf_dir_txt'] = 'Vhost config dir';
 $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
 $wb['getmail_config_dir_txt'] = 'Getmail config dir';
-$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
-$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI Starter Pfad';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI Starter Script';
 $wb['fastcgi_alias_txt'] = 'FastCGI Alias';
-$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Pfad';
 $wb['fastcgi_children_txt'] = 'FastCGI Children';
 $wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
 $wb['fastcgi_bin_txt'] = 'FastCGI Bin';
-$wb['module_txt'] = 'Module';
-$wb['maildir_path_txt'] = 'Maildir Path';
-$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['module_txt'] = 'Modul';
+$wb['maildir_path_txt'] = 'Maildir Pfad';
+$wb['homedir_path_txt'] = 'Homedir Pfad';
 $wb['mailuser_uid_txt'] = 'Mailuser UID';
 $wb['mailuser_gid_txt'] = 'Mailuser GID';
 $wb['mailuser_name_txt'] = 'Mailuser Name';
-$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['mailuser_group_txt'] = 'Mailuser Gruppe';
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
-$wb['relayhost_password_txt'] = 'Relayhost Password';
-$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
-$wb['message_size_limit_txt'] = 'Message Size Limit';
-$wb['ip_address_txt'] = 'IP Address';
+$wb['relayhost_password_txt'] = 'Relayhost Passwort';
+$wb['mailbox_size_limit_txt'] = 'Mailbox Größen Limit';
+$wb['message_size_limit_txt'] = 'Message Größen Limit';
+$wb['ip_address_txt'] = 'IP Adresse';
 $wb['netmask_txt'] = 'Netmask';
 $wb['gateway_txt'] = 'Gateway';
 $wb['hostname_txt'] = 'Hostname';
-$wb['nameservers_txt'] = 'Nameservers';
-$wb['auto_network_configuration_txt'] = 'Network Configuration';
+$wb['nameservers_txt'] = 'Nameserver';
+$wb['auto_network_configuration_txt'] = 'Netzwerk Konfiguration';
 $wb['website_basedir_txt'] = 'Website basedir';
-$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
-$wb['netmask_error_wrong'] = 'Invalid Netmask format.';
-$wb['gateway_error_wrong'] = 'Invalid Gateway format.';
-$wb['hostname_error_empty'] = 'Hostname is empty.';
-$wb['nameservers_error_empty'] = 'Nameserver is empty.';
-$wb['config_dir_txt'] = 'Config directory';
+$wb['ip_address_error_wrong'] = 'Ungültiges IP Adressen Format.';
+$wb['netmask_error_wrong'] = 'Ungültiges Netmask Format.';
+$wb['gateway_error_wrong'] = 'Ungültiges Gateway Format.';
+$wb['hostname_error_empty'] = 'Hostname ist leer.';
+$wb['nameservers_error_empty'] = 'Nameserver ist leer.';
+$wb['config_dir_txt'] = 'Config Verzeichnis';
 $wb['init_script_txt'] = 'Cron init script name';
-$wb['crontab_dir_txt'] = 'Path for individual crontabs';
-$wb['wget_txt'] = 'Path to wget program';
+$wb['crontab_dir_txt'] = 'Pfad für individuelle Crontabs';
+$wb['wget_txt'] = 'Pfad zum wget Programm';
+$wb['web_user_txt'] = 'Apache User';
+$wb['web_group_txt'] = 'Apache Gruppe';
 $wb['security_level_txt'] = 'Security level';
 ?>
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 5483228..88197d4 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -1,13 +1,13 @@
 <?php
-$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
+$wb['warning'] = 'Bearbeiten Sie diese Werte sorgfältig! Entfernen Sie die Prefixe nicht auf Systemen mit mehr als einem Client.';
 $wb['dbname_prefix_txt'] = 'Datenbanknamen Prefix';
 $wb['dbuser_prefix_txt'] = 'Datenbankbenutzer Prefix';
 $wb['shelluser_prefix_txt'] = 'Shellbenutzer Prefix';
 $wb['ftpuser_prefix_txt'] = 'FTP Benutzer 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 zu Phpmyadmin in  der Datenbankliste';
+$wb['dbname_prefix_error_regex'] = 'Zeichen nicht erlaubt in Datenbanknamen Prefix.';
+$wb['dbuser_prefix_error_regex'] = 'Zeichen nicht erlaubt in Datenbankbenutzer Prefix.';
+$wb['ftpuser_prefix_error_regex'] = 'Zeichen nicht erlaubt in FTP Benutzer Prefix.';
+$wb['shelluser_prefix_error_regex'] = 'Zeichen nicht erlaubt in Shellbenutzer Prefix.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link zu phpMyAdmin in der Datenbankliste';
 $wb['mailboxlist_webmail_link_txt'] = 'Link zu Webmail in der Mailboxliste';
 ?>
diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng
index 5f70e79..b8b80fc 100644
--- a/interface/web/admin/lib/lang/de_users.lng
+++ b/interface/web/admin/lib/lang/de_users.lng
@@ -13,10 +13,10 @@
 $wb['unternehmen_txt'] = 'Unternehmen';
 $wb['strasse_txt'] = 'Strasse';
 $wb['ort_txt'] = 'Ort';
-$wb['plz_txt'] = 'Plz';
+$wb['plz_txt'] = 'PLZ';
 $wb['land_txt'] = 'Land';
 $wb['email_txt'] = 'Email';
-$wb['url_txt'] = 'Url';
+$wb['url_txt'] = 'URL';
 $wb['telefon_txt'] = 'Telefon';
 $wb['fax_txt'] = 'Fax';
 $wb['groups_txt'] = 'Gruppen';
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 47b2d70..f586b30 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -45,4 +45,5 @@
 $wb["wget_txt"] = 'Path to wget program';
 $wb["web_user_txt"] = 'Apache user';
 $wb["web_group_txt"] = 'Apache group';
+$wb["security_level_txt"] = 'Security level';
 ?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/es_firewall.lng b/interface/web/admin/lib/lang/es_firewall.lng
index 978c8fe..4b19e65 100644
--- a/interface/web/admin/lib/lang/es_firewall.lng
+++ b/interface/web/admin/lib/lang/es_firewall.lng
@@ -6,4 +6,6 @@
 $wb['udp_port_help_txt'] = 'Separados por coma';
 $wb['active_txt'] = 'Activar';
 $wb['firewall_error_unique'] = 'Ya hay un registro de cortafuegos en este servidor';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index d279768..e8b396b 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -44,4 +44,6 @@
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_firewall.lng b/interface/web/admin/lib/lang/fi_firewall.lng
index d47d21d..6eb44c1 100755
--- a/interface/web/admin/lib/lang/fi_firewall.lng
+++ b/interface/web/admin/lib/lang/fi_firewall.lng
@@ -6,4 +6,6 @@
 $wb['udp_port_help_txt'] = 'Pilkulla erotettu lista';
 $wb['active_txt'] = 'Käytössä';
 $wb['firewall_error_unique'] = 'Tällainen palomuurisäänto on jo tällä palvelimella.';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index ec4a7a7..e51d9dd 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -44,4 +44,6 @@
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_firewall.lng b/interface/web/admin/lib/lang/fr_firewall.lng
index 67c31ca..e626345 100644
--- a/interface/web/admin/lib/lang/fr_firewall.lng
+++ b/interface/web/admin/lib/lang/fr_firewall.lng
@@ -6,4 +6,6 @@
 $wb['udp_port_help_txt'] = 'Separated by comma';
 $wb['active_txt'] = 'Active';
 $wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index f3a7a95..ed93388 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -44,4 +44,6 @@
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
 ?>
diff --git a/interface/web/admin/lib/lang/hu.lng b/interface/web/admin/lib/lang/hu.lng
new file mode 100644
index 0000000..f6ce7fe
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu.lng
@@ -0,0 +1,35 @@
+<?php
+$wb['1001'] = 'Felhasználónév vagy Jelszó üres.';
+$wb['1002'] = 'Felhaszálónév vagy Jelszó hibás.';
+$wb['Firewall'] = 'Tűzfal';
+$wb['Groups'] = 'Csoprtok';
+$wb['groups_description'] = 'Rendszercsoport módosító oldal.';
+$wb['Server'] = 'Szerver';
+$wb['Services'] = 'Szolgáltatások';
+$wb['Config'] = 'Beállítások';
+$wb['Server Config'] = 'Szerver Beállítások';
+$wb['Mail'] = 'Mail';
+$wb['Getmail'] = 'Getmail';
+$wb['Web'] = 'Web';
+$wb['FastCGI'] = 'FastCGI';
+$wb['Jailkit'] = 'Jailkit';
+$wb['System'] = 'Rendszer';
+$wb['Add user'] = 'Felhasználót hozzáad';
+$wb['Edit user'] = 'Felhasználót szerkeszt';
+$wb['CP Users'] = 'Admin felület Felhasználók';
+$wb['Add group'] = 'Csoprtot hozzáad';
+$wb['Edit group'] = 'Csoportot szerkeszt';
+$wb['Edit server'] = 'Szervert módosít';
+$wb['Edit Server IP'] = 'Szerver IP módosítás';
+$wb['Servers'] = 'Szerverek';
+$wb['Sync. Now'] = 'Szinkr. Most';
+$wb['DB Sync.'] = 'DB Szinkr.';
+$wb['Languages'] = 'Nyelvek';
+$wb['New Language'] = 'Új Nyelv';
+$wb['Export'] = 'Export';
+$wb['Import'] = 'Import';
+$wb['Language Editor'] = 'Nyelv szerkesztő';
+$wb['Software'] = 'Program';
+$wb['Repositories'] = 'Repositories';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_datalog_list.lng b/interface/web/admin/lib/lang/hu_datalog_list.lng
new file mode 100644
index 0000000..f0fb1c8
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_datalog_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Jobqueue';
+$wb["tstamp_txt"] = 'Dátum';
+$wb["server_id_txt"] = 'Server';
+$wb["dbtable_txt"] = 'DB Table';
+$wb["action_txt"] = 'Művelet';
+$wb["status_txt"] = 'Állapot';
+?>
diff --git a/interface/web/admin/lib/lang/hu_dbsync.lng b/interface/web/admin/lib/lang/hu_dbsync.lng
new file mode 100644
index 0000000..4fcbf43
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_dbsync.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['jobname_txt'] = 'Név';
+$wb['jobname_err'] = 'A Név mező üres.';
+$wb['sync_interval_minutes_txt'] = 'Intervallum (perc)';
+$wb['db_type_txt'] = 'DB Tipus';
+$wb['db_host_txt'] = 'DB Állomás';
+$wb['db_name_txt'] = 'DB Név';
+$wb['db_username_txt'] = 'DB Felhasználó';
+$wb['db_password_txt'] = 'DB Jelszó';
+$wb['db_tables_txt'] = 'Táblák';
+$wb['empty_datalog_txt'] = 'Naplófájloat töröl szinkronizálás után.';
+$wb['sync_datalog_external_txt'] = 'Külső helyre naplóz.';
+$wb['active_txt'] = 'Aktív';
+$wb['btn_save_txt'] = 'Mentés';
+$wb['btn_cancel_txt'] = 'Mégse';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_dbsync_list.lng b/interface/web/admin/lib/lang/hu_dbsync_list.lng
new file mode 100644
index 0000000..28f0cc6
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_dbsync_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Adatbázis szinkronizálás';
+$wb['jobname_txt'] = 'Jobname';
+$wb['db_host_txt'] = 'DB Állomásnév';
+$wb['db_name_txt'] = 'DB neve';
+$wb['page_txt'] = 'OLdal';
+$wb['page_of_txt'] = 'Összesen';
+$wb['page_next_txt'] = 'Tovább';
+$wb['page_back_txt'] = 'Vissza';
+$wb['delete_txt'] = 'Töröl';
+$wb['filter_txt'] = 'Szűrés';
+$wb['add_new_record_txt'] = 'Új DB Szinkr.';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_filesync.lng b/interface/web/admin/lib/lang/hu_filesync.lng
new file mode 100644
index 0000000..5018cb4
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_filesync.lng
@@ -0,0 +1,13 @@
+<?php
+$wb['jobname_txt'] = 'Jobname';
+$wb['jobname_err'] = 'Jobname is empty.';
+$wb['sync_interval_minutes_txt'] = 'Intervall (Min.)';
+$wb['ftp_host_txt'] = 'FTP Host';
+$wb['ftp_path_txt'] = 'FTP Path';
+$wb['ftp_username_txt'] = 'FTP User';
+$wb['ftp_password_txt'] = 'FTP Password';
+$wb['local_path_txt'] = 'Local Path';
+$wb['wput_options_txt'] = 'Wput Options';
+$wb['active_txt'] = 'Aktív';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_filesync_list.lng b/interface/web/admin/lib/lang/hu_filesync_list.lng
new file mode 100644
index 0000000..a720274
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_filesync_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Fájl Szinkronizálás';
+$wb['jobname_txt'] = 'Munka neve';
+$wb['ftp_host_txt'] = 'FTP Szerver';
+$wb['local_path_txt'] = 'Helyi elérési út';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_firewall.lng b/interface/web/admin/lib/lang/hu_firewall.lng
new file mode 100644
index 0000000..7b741e5
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_firewall.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['tcp_port_txt'] = 'Open TCP ports';
+$wb['udp_port_txt'] = 'Open UDP ports';
+$wb['tcp_port_help_txt'] = 'Separated by comma';
+$wb['udp_port_help_txt'] = 'Separated by comma';
+$wb['active_txt'] = 'Active';
+$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_firewall_list.lng b/interface/web/admin/lib/lang/hu_firewall_list.lng
new file mode 100644
index 0000000..0b5bbbf
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_firewall_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Firewall';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['tcp_port_txt'] = 'Open TCP ports';
+$wb['udp_port_txt'] = 'Open UDP ports';
+$wb['add_new_record_txt'] = 'Add Firewall record';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_groups.lng b/interface/web/admin/lib/lang/hu_groups.lng
new file mode 100644
index 0000000..7829db2
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_groups.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['description_txt'] = 'Description';
+$wb['name_txt'] = 'Group';
+$wb['name_err'] = 'Group must be min 1, max 30 Chars.';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_groups_list.lng b/interface/web/admin/lib/lang/hu_groups_list.lng
new file mode 100644
index 0000000..693f332
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_groups_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Systemuser groups';
+$wb['description_txt'] = 'Description';
+$wb['name_txt'] = 'Group';
+$wb['add_new_record_txt'] = 'Add new Group';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_language_add.lng b/interface/web/admin/lib/lang/hu_language_add.lng
new file mode 100644
index 0000000..e947251
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_language_add.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Új nyelv';
+$wb['language_select_txt'] = 'Válasszony nyelvet';
+$wb['language_new_txt'] = 'Új nyelv';
+$wb['btn_save_txt'] = 'Új nyelv csomag összeállítás';
+$wb['btn_cancel_txt'] = 'Vissza';
+$wb['language_new_hint_txt'] = '2 karakteres ISO 639-1 nyelvi kód (Lásd http://hu.wikipedia.org/wiki/ISO_639-1)';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_language_complete.lng b/interface/web/admin/lib/lang/hu_language_complete.lng
new file mode 100644
index 0000000..3ffc7fb
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_language_complete.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
+$wb['language_select_txt'] = 'Select language';
+$wb['btn_save_txt'] = 'Merge files now';
+$wb['btn_cancel_txt'] = 'Back';
+$wb['list_desc_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_language_edit.lng b/interface/web/admin/lib/lang/hu_language_edit.lng
new file mode 100644
index 0000000..e5ecb2a
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_language_edit.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Nyelvi fájl szerkesztő';
+$wb['language_select_txt'] = 'Válasszon nyelvet';
+$wb['module_txt'] = 'Modul';
+$wb['lang_file_txt'] = 'Nyelvi fájl';
+$wb['btn_save_txt'] = 'Ment';
+$wb['btn_cancel_txt'] = 'Mégse';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_language_export.lng b/interface/web/admin/lib/lang/hu_language_export.lng
new file mode 100644
index 0000000..a2eb944
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_language_export.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Nyelvi fáljokat Exportál';
+$wb['language_select_txt'] = 'Válasszon nyelvet';
+$wb['btn_save_txt'] = 'Kiválasztott nyelv eportálása';
+$wb['btn_cancel_txt'] = 'Vissza';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_language_import.lng b/interface/web/admin/lib/lang/hu_language_import.lng
new file mode 100644
index 0000000..854b774
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_language_import.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Nyelvi fájlt Importál';
+$wb['language_import_txt'] = 'Válasszon nyelvi fájlt';
+$wb['btn_save_txt'] = 'A kiválasztott nyelv importálása';
+$wb['language_overwrite_txt'] = 'Létző fájlokat felülírja.';
+$wb['btn_cancel_txt'] = 'Vissza';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_language_list.lng b/interface/web/admin/lib/lang/hu_language_list.lng
new file mode 100644
index 0000000..b0cb478
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_language_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Nyelvi fájl szerkesztő';
+$wb['language_select_txt'] = 'Válasszon nyelvet';
+$wb['module_txt'] = 'Modul';
+$wb['lang_file_txt'] = 'Nyelvi fájl';
+$wb['lang_file_date_txt'] = 'Utolsó módosítás';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_server.lng b/interface/web/admin/lib/lang/hu_server.lng
new file mode 100644
index 0000000..67bcd8b
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_server.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['config_txt'] = 'beállítás';
+$wb['server_name_txt'] = 'Szervernév';
+$wb['mail_server_txt'] = 'Mailszerver';
+$wb['web_server_txt'] = 'Webszerver';
+$wb['dns_server_txt'] = 'DNS-Szerver';
+$wb['file_server_txt'] = 'Fájlszerver';
+$wb['db_server_txt'] = 'DB-Szerver';
+$wb['vserver_server_txt'] = 'VServer-Szerver';
+$wb['active_txt'] = 'Aktív';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
new file mode 100644
index 0000000..396a2f3
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -0,0 +1,42 @@
+<?php
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
+$wb['website_path_txt'] = 'Website path';
+$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Module';
+$wb['maildir_path_txt'] = 'Maildir Path';
+$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Mailuser Name';
+$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
+$wb['message_size_limit_txt'] = 'Message Size Limit';
+$wb['ip_address_txt'] = 'IP Address';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameservers';
+$wb['auto_network_configuration_txt'] = 'Network Configuration';
+$wb['website_basedir_txt'] = 'Website basedir';
+$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
+$wb['netmask_error_wrong'] = 'Invalid Netmask format.';
+$wb['gateway_error_wrong'] = 'Invalid Gateway format.';
+$wb['hostname_error_empty'] = 'Hostname is empty.';
+$wb['nameservers_error_empty'] = 'Nameserver is empty.';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_server_config_list.lng b/interface/web/admin/lib/lang/hu_server_config_list.lng
new file mode 100644
index 0000000..25592de
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_server_config_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Szerver beállítások';
+$wb['server_name_txt'] = 'Szerver';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_server_ip.lng b/interface/web/admin/lib/lang/hu_server_ip.lng
new file mode 100644
index 0000000..9d87439
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_server_ip.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['ip_address_txt'] = 'IP cím';
+$wb['virtualhost_txt'] = 'HTTP NameVirtualHost';
+$wb['ip_err'] = 'IP cím érvénytelen';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_server_ip_list.lng b/interface/web/admin/lib/lang/hu_server_ip_list.lng
new file mode 100644
index 0000000..5fd0b6f
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_server_ip_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'IP cím';
+$wb['server_id_txt'] = 'Szerver';
+$wb['ip_address_txt'] = 'IP cím';
+$wb['add_new_record_txt'] = 'Új IP cím';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_server_list.lng b/interface/web/admin/lib/lang/hu_server_list.lng
new file mode 100644
index 0000000..6fa2c1d
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_server_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Szerver';
+$wb['server_name_txt'] = 'Név';
+$wb['mail_server_txt'] = 'EMail';
+$wb['web_server_txt'] = 'Web';
+$wb['dns_server_txt'] = 'DNS';
+$wb['file_server_txt'] = 'Fájl';
+$wb['db_server_txt'] = 'DB';
+$wb['vserver_server_txt'] = 'VServer';
+$wb['add_new_record_txt'] = 'Új Szerver';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_software_package_list.lng b/interface/web/admin/lib/lang/hu_software_package_list.lng
new file mode 100644
index 0000000..d90082a
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_software_package_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Szoftvare csomag';
+$wb['installed_txt'] = 'Állapot';
+$wb['package_title_txt'] = 'Csomag';
+$wb['package_description_txt'] = 'Leírás';
+$wb['action_txt'] = 'Művelet';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_software_repo.lng b/interface/web/admin/lib/lang/hu_software_repo.lng
new file mode 100644
index 0000000..8a30bc1
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_software_repo.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['repo_name_txt'] = 'Repository';
+$wb['repo_url_txt'] = 'URL';
+$wb['repo_username_txt'] = 'User (optional)';
+$wb['repo_password_txt'] = 'Password (optional)';
+$wb['active_txt'] = 'Active';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_software_repo_list.lng b/interface/web/admin/lib/lang/hu_software_repo_list.lng
new file mode 100644
index 0000000..57e0bba
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_software_repo_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Repository';
+$wb['active_txt'] = 'Aktív';
+$wb['repo_name_txt'] = 'Repository';
+$wb['repo_url_txt'] = 'URL';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_software_update_list.lng b/interface/web/admin/lib/lang/hu_software_update_list.lng
new file mode 100644
index 0000000..5e88bbd
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_software_update_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Szoftvare frissítések';
+$wb['installed_txt'] = 'Művelet';
+$wb['update_title_txt'] = 'Frissítés';
+$wb['version_txt'] = 'Verzió';
+$wb['action_txt'] = 'Művelet';
+$wb['server_select_txt'] = 'Válasszon szervert';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_syslog_list.lng b/interface/web/admin/lib/lang/hu_syslog_list.lng
new file mode 100644
index 0000000..28a9d99
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_syslog_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'ISPConfig Napló';
+$wb["tstamp_txt"] = 'Dátum';
+$wb["server_id_txt"] = 'Szerver';
+$wb["loglevel_txt"] = 'Naplózás szintje';
+$wb["message_txt"] = 'Üzenet';
+?>
diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng
new file mode 100644
index 0000000..ec080ea
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_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';
+
+?>
diff --git a/interface/web/admin/lib/lang/hu_users.lng b/interface/web/admin/lib/lang/hu_users.lng
new file mode 100644
index 0000000..11f1ee3
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_users.lng
@@ -0,0 +1,29 @@
+<?php
+$wb['username_txt'] = 'Felhasználónév';
+$wb['username_err'] = 'Felhasználónév túl hosszú vagy érvénytelen karaktereket tartalmaz';
+$wb['username_empty'] = 'Felhasználónév üres.';
+$wb['username_unique'] = 'Ez a felhasználónév már foglalt.';
+$wb['passwort_txt'] = 'Jelszó';
+$wb['modules_txt'] = 'Modul';
+$wb['startmodule_txt'] = 'Kezdőmodul';
+$wb['app_theme_txt'] = 'Kinézet';
+$wb['typ_txt'] = 'Típus';
+$wb['active_txt'] = 'Aktív';
+$wb['language_txt'] = 'Nyelv';
+$wb['name_txt'] = 'Név';
+$wb['vorname_txt'] = 'Családinév';
+$wb['unternehmen_txt'] = 'Cég';
+$wb['strasse_txt'] = 'Utca';
+$wb['ort_txt'] = 'Város';
+$wb['plz_txt'] = 'Irányítószám';
+$wb['land_txt'] = 'Megye';
+$wb['email_txt'] = 'Email';
+$wb['url_txt'] = 'Url';
+$wb['telefon_txt'] = 'Telefon';
+$wb['fax_txt'] = 'Fax';
+$wb['groups_txt'] = 'Csoportok';
+$wb['default_group_txt'] = 'Alapértelemezett csoport';
+$wb['startmodule_err'] = 'Kezdő modul nincs engedélyezve.';
+$wb['password_strength_txt'] = 'Jelszó erősség';
+?>
+
diff --git a/interface/web/admin/lib/lang/hu_users_list.lng b/interface/web/admin/lib/lang/hu_users_list.lng
new file mode 100644
index 0000000..44b3850
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_users_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Felhasználók';
+$wb['username_txt'] = 'Felhasználónév';
+$wb['name_txt'] = 'Név';
+$wb['vorname_txt'] = 'Családi név';
+$wb['ort_txt'] = 'Város';
+$wb['add_new_record_txt'] = 'Új felhasználó';
+?>
+
diff --git a/interface/web/admin/lib/lang/it_firewall.lng b/interface/web/admin/lib/lang/it_firewall.lng
index 0218e67..c58341d 100644
--- a/interface/web/admin/lib/lang/it_firewall.lng
+++ b/interface/web/admin/lib/lang/it_firewall.lng
@@ -6,4 +6,6 @@
 $wb['udp_port_help_txt'] = 'Separate dalle virgola';
 $wb['active_txt'] = 'Attivo';
 $wb['firewall_error_unique'] = 'Cè già un record firewall per questo server.';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index ab6a29b..519029c 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -44,4 +44,6 @@
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
 ?>
diff --git a/interface/web/admin/lib/lang/nl.lng b/interface/web/admin/lib/lang/nl.lng
index 5aa3479..eda2508 100644
--- a/interface/web/admin/lib/lang/nl.lng
+++ b/interface/web/admin/lib/lang/nl.lng
@@ -4,7 +4,7 @@
 $wb['Firewall'] = 'Firewall';
 $wb['Groups'] = 'Groepen';
 $wb['groups_description'] = 'Formulier om systeemgebruikers en groepen te wijzigen.';
-$wb['Server'] = 'Server';
+$wb['Server'] = 'Services per server';
 $wb['Services'] = 'Services';
 $wb['Config'] = 'Configureer';
 $wb['Server Config'] = 'Server configuratie';
@@ -13,22 +13,23 @@
 $wb['Web'] = 'Web';
 $wb['FastCGI'] = 'FastCGI';
 $wb['Jailkit'] = 'Jailkit';
-$wb['System'] = 'Systeem';
+$wb['System'] = 'Services per server';
 $wb['Add user'] = 'Toevoegen gebruiker';
 $wb['Edit user'] = 'Wijzigen gebruiker';
 $wb['CP Users'] = 'CP Gebruikers';
 $wb['Add group'] = 'Toevoegen groep';
 $wb['Edit group'] = 'Wijzigen groep';
-$wb['Edit server'] = 'Wijzigen server';
-$wb['Edit Server IP'] = 'Wijzigen Server IP';
-$wb['Servers'] = 'Servers';
+$wb['Edit server'] = 'Services per server';
+$wb['Edit Server IP'] = 'Server IP-adressen';
+$wb['Servers'] = 'Server';
 $wb['Sync. Now'] = 'Sync. nu';
 $wb['DB Sync.'] = 'DB Sync.';
-$wb['Languages'] = 'Talen';
+$wb['Languages'] = 'Talen en taal-bestanden';
 $wb['New Language'] = 'Nieuwe taal';
-$wb['Export'] = 'Export';
-$wb['Import'] = 'Import';
-$wb['Language Editor'] = 'Taal editor';
+$wb['Export'] = 'Exporteren';
+$wb['Import'] = 'Importeren';
+$wb['Language Editor'] = 'Taalbestanden editor';
 $wb['Software'] = 'Software';
 $wb['Repositories'] = 'Repositories';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_firewall.lng b/interface/web/admin/lib/lang/nl_firewall.lng
index 6a8a53a..83cd0fe 100644
--- a/interface/web/admin/lib/lang/nl_firewall.lng
+++ b/interface/web/admin/lib/lang/nl_firewall.lng
@@ -4,6 +4,9 @@
 $wb['udp_port_txt'] = 'Open UDP poorten';
 $wb['tcp_port_help_txt'] = 'Gescheiden door komma';
 $wb['udp_port_help_txt'] = 'Gescheiden door komma';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['firewall_error_unique'] = 'Er bestaat al een firewall record voor deze server.';
+$wb['tcp_ports_error_regex'] = 'Karakter niet toegestaan in tcp poort toewijzing. Toegestane tekens zijn cijfers, : en ,';
+$wb['udp_ports_error_regex'] = 'Karakter niet toegestaan in udp poort toewijzing. Toegestane tekens zijn cijfers, : en ,';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_firewall_list.lng b/interface/web/admin/lib/lang/nl_firewall_list.lng
index 394d093..77c3f25 100644
--- a/interface/web/admin/lib/lang/nl_firewall_list.lng
+++ b/interface/web/admin/lib/lang/nl_firewall_list.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Firewall';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['tcp_port_txt'] = 'Open TCP poorten';
 $wb['udp_port_txt'] = 'Open UDP poorten';
-$wb['add_new_record_txt'] = 'Toevoegen Firewall record';
+$wb['add_new_record_txt'] = 'Firewall record toevoegen';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_groups.lng b/interface/web/admin/lib/lang/nl_groups.lng
index 2b31306..f844926 100644
--- a/interface/web/admin/lib/lang/nl_groups.lng
+++ b/interface/web/admin/lib/lang/nl_groups.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['description_txt'] = 'Omschrijving';
 $wb['name_txt'] = 'Groep';
-$wb['name_err'] = 'Groepsnaam moet min. 1 en max. 30 karakters bevatten.';
+$wb['name_err'] = 'Groepsnaam moet tussen 1 en 30 karakters bevatten.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_groups_list.lng b/interface/web/admin/lib/lang/nl_groups_list.lng
index 48817da..67bf67e 100644
--- a/interface/web/admin/lib/lang/nl_groups_list.lng
+++ b/interface/web/admin/lib/lang/nl_groups_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Systeemgebruiker groepen';
+$wb['list_head_txt'] = 'Gebruikersgroepen';
 $wb['description_txt'] = 'Omschrijving';
 $wb['name_txt'] = 'Groep';
-$wb['add_new_record_txt'] = 'Add new Group';
+$wb['add_new_record_txt'] = 'Nieuwe groep toevoegen';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_language_add.lng b/interface/web/admin/lib/lang/nl_language_add.lng
index 0c61917..f3676ca 100644
--- a/interface/web/admin/lib/lang/nl_language_add.lng
+++ b/interface/web/admin/lib/lang/nl_language_add.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Nieuwe taal toevoegen';
-$wb['language_select_txt'] = 'Selecteer taal basis';
+$wb['language_select_txt'] = 'Selecteer basis-teksten vanuit taal';
 $wb['language_new_txt'] = 'Nieuwe taal';
-$wb['btn_save_txt'] = 'Aanmaken nieuw taalbestand set';
+$wb['btn_save_txt'] = 'Aanmaken';
 $wb['btn_cancel_txt'] = 'Terug';
-$wb['language_new_hint_txt'] = '2 characters ISO 639-1 language-code (See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
+$wb['language_new_hint_txt'] = '2 tekens ISO 639-1 taal-code (Zie http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_language_complete.lng b/interface/web/admin/lib/lang/nl_language_complete.lng
index b5200ff..5c82cec 100644
--- a/interface/web/admin/lib/lang/nl_language_complete.lng
+++ b/interface/web/admin/lib/lang/nl_language_complete.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
-$wb['language_select_txt'] = 'Select language';
-$wb['btn_save_txt'] = 'Merge files now';
-$wb['btn_cancel_txt'] = 'Back';
-$wb['list_desc_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
+$wb['list_head_txt'] = 'Samenvoegen';
+$wb['language_select_txt'] = 'Selecteer taal';
+$wb['btn_save_txt'] = 'Bestanden nu samenvoegen';
+$wb['btn_cancel_txt'] = 'Terug';
+$wb['list_desc_txt'] = 'Laat ontbrekende teksten in de geselecteerde taal aanvullen vanuit de Engelstalige master.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_language_edit.lng b/interface/web/admin/lib/lang/nl_language_edit.lng
index b8fb635..597b9d2 100644
--- a/interface/web/admin/lib/lang/nl_language_edit.lng
+++ b/interface/web/admin/lib/lang/nl_language_edit.lng
@@ -3,6 +3,7 @@
 $wb['language_select_txt'] = 'Selecteer taal';
 $wb['module_txt'] = 'Module';
 $wb['lang_file_txt'] = 'Taalbestand';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['btn_save_txt'] = 'Opslaan';
+$wb['btn_cancel_txt'] = 'Terug';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_language_export.lng b/interface/web/admin/lib/lang/nl_language_export.lng
index 307997b..25e3442 100644
--- a/interface/web/admin/lib/lang/nl_language_export.lng
+++ b/interface/web/admin/lib/lang/nl_language_export.lng
@@ -1,6 +1,7 @@
 <?php
 $wb['list_head_txt'] = 'Exporteer taalbestanden';
 $wb['language_select_txt'] = 'Selecteer taal';
-$wb['btn_save_txt'] = 'Exporteer de geselecteerde set taalbestanden';
+$wb['btn_save_txt'] = 'Exporteren';
 $wb['btn_cancel_txt'] = 'Terug';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_language_import.lng b/interface/web/admin/lib/lang/nl_language_import.lng
index a14de56..a221d46 100644
--- a/interface/web/admin/lib/lang/nl_language_import.lng
+++ b/interface/web/admin/lib/lang/nl_language_import.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Import taalbestand';
+$wb['list_head_txt'] = 'Importeer taalbestand';
 $wb['language_import_txt'] = 'Selecteer taalbestand';
-$wb['btn_save_txt'] = 'Import het geselecteerde taalbestand';
-$wb['language_overwrite_txt'] = 'Overschrijf bestand, als het al bestaat.';
+$wb['btn_save_txt'] = 'Importeer het geselecteerde taalbestand';
+$wb['language_overwrite_txt'] = 'Overschrijven indien deze al bestaat?';
 $wb['btn_cancel_txt'] = 'Terug';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_language_list.lng b/interface/web/admin/lib/lang/nl_language_list.lng
index dc5843a..2459591 100644
--- a/interface/web/admin/lib/lang/nl_language_list.lng
+++ b/interface/web/admin/lib/lang/nl_language_list.lng
@@ -5,3 +5,4 @@
 $wb['lang_file_txt'] = 'Taalbestand';
 $wb['lang_file_date_txt'] = 'Laatste wijziging';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_server.lng b/interface/web/admin/lib/lang/nl_server.lng
index 0804ce3..872deb0 100644
--- a/interface/web/admin/lib/lang/nl_server.lng
+++ b/interface/web/admin/lib/lang/nl_server.lng
@@ -1,11 +1,12 @@
 <?php
-$wb['config_txt'] = 'config';
+$wb['config_txt'] = 'Configuratie details<br /><br />Wijzigen? Zie: Server configuratie';
 $wb['server_name_txt'] = 'Servernaam';
 $wb['mail_server_txt'] = 'Mailserver';
 $wb['web_server_txt'] = 'Webserver';
-$wb['dns_server_txt'] = 'DNS-Server';
+$wb['dns_server_txt'] = 'DNS server';
 $wb['file_server_txt'] = 'Fileserver';
-$wb['db_server_txt'] = 'DB-server';
+$wb['db_server_txt'] = 'Database server';
 $wb['vserver_server_txt'] = 'VServer-Server';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index fe73f16..605dc4d 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -12,7 +12,7 @@
 $wb['fastcgi_alias_txt'] = 'FastCGI Alias';
 $wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Pad';
 $wb['fastcgi_children_txt'] = 'FastCGI Children';
-$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. aanvragen';
 $wb['fastcgi_bin_txt'] = 'FastCGI Bin';
 $wb['module_txt'] = 'Module';
 $wb['maildir_path_txt'] = 'Maildir Pad';
@@ -22,26 +22,29 @@
 $wb['mailuser_name_txt'] = 'Mailuser Naam';
 $wb['mailuser_group_txt'] = 'Mailuser Groep';
 $wb['relayhost_txt'] = 'Relayhost';
-$wb['relayhost_user_txt'] = 'Relayhost Gebruiker';
-$wb['relayhost_password_txt'] = 'Relayhost Wachtoord';
-$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limiet';
-$wb['message_size_limit_txt'] = 'Message Size Limiet';
-$wb['ip_address_txt'] = 'IP Adres';
+$wb['relayhost_user_txt'] = 'Relayhost gebruiker';
+$wb['relayhost_password_txt'] = 'Relayhost wachtoord';
+$wb['mailbox_size_limit_txt'] = 'Schijfruimte limiet e-mailaccount';
+$wb['message_size_limit_txt'] = 'E-mail berichtgrootte limiet';
+$wb['ip_address_txt'] = 'IP-adres';
 $wb['netmask_txt'] = 'Netmask';
 $wb['gateway_txt'] = 'Gateway';
 $wb['hostname_txt'] = 'Hostnaam';
 $wb['nameservers_txt'] = 'Nameservers';
 $wb['auto_network_configuration_txt'] = 'Netwerk configuratie';
 $wb['website_basedir_txt'] = 'Website basedir';
-$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
-$wb['netmask_error_wrong'] = 'Invalid Netmask format.';
-$wb['gateway_error_wrong'] = 'Invalid Gateway format.';
-$wb['hostname_error_empty'] = 'Hostname is empty.';
-$wb['nameservers_error_empty'] = 'Nameserver is empty.';
-$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
-$wb['config_dir_txt'] = 'Config directory';
-$wb['init_script_txt'] = 'Cron init script name';
-$wb['crontab_dir_txt'] = 'Path for individual crontabs';
-$wb['wget_txt'] = 'Path to wget program';
-$wb['security_level_txt'] = 'Security level';
+$wb['ip_address_error_wrong'] = 'Ongeldige IP-adres indeling.';
+$wb['netmask_error_wrong'] = 'Ongeldige netmasker indeling.';
+$wb['gateway_error_wrong'] = 'Ongeldige gateway indeling.';
+$wb['hostname_error_empty'] = 'Hostnaam is leeg.';
+$wb['nameservers_error_empty'] = 'Nameserver is leeg.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applicaties';
+$wb['config_dir_txt'] = 'Configuratie directory';
+$wb['init_script_txt'] = 'Cron init script naam';
+$wb['crontab_dir_txt'] = 'Pad voor individuele crontabs';
+$wb['wget_txt'] = 'Pad naar wget';
+$wb['web_user_txt'] = 'Apache gebruiker';
+$wb['web_group_txt'] = 'Apache groep';
+$wb['security_level_txt'] = 'Beveiligingsniveau';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_server_config_list.lng b/interface/web/admin/lib/lang/nl_server_config_list.lng
index b984665..fd3f356 100644
--- a/interface/web/admin/lib/lang/nl_server_config_list.lng
+++ b/interface/web/admin/lib/lang/nl_server_config_list.lng
@@ -1,4 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Server Configuratie';
-$wb['server_name_txt'] = 'Server';
+$wb['list_head_txt'] = 'Server configuratie';
+$wb['server_name_txt'] = 'Servernaam';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_server_ip.lng b/interface/web/admin/lib/lang/nl_server_ip.lng
index a8716ea..fe25db7 100644
--- a/interface/web/admin/lib/lang/nl_server_ip.lng
+++ b/interface/web/admin/lib/lang/nl_server_ip.lng
@@ -1,6 +1,7 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP Adres';
-$wb['virtualhost_txt'] = 'HTTP NameVirtualHost';
-$wb['ip_err'] = 'IP adres ongeldig';
+$wb['ip_address_txt'] = 'IP-adres (ipv4)';
+$wb['virtualhost_txt'] = 'HTTP NameVirtualHost activeren?';
+$wb['ip_err'] = 'Opgegeven IP-adres is ongeldig';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_server_ip_list.lng b/interface/web/admin/lib/lang/nl_server_ip_list.lng
index 80d0577..ab73311 100644
--- a/interface/web/admin/lib/lang/nl_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/nl_server_ip_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'IP-adressen';
+$wb['list_head_txt'] = 'Server IP-adressen';
 $wb['server_id_txt'] = 'Server';
 $wb['ip_address_txt'] = 'IP-adres';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw IP-adres';
+$wb['add_new_record_txt'] = 'Nieuw IP-adres toevoegen';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_server_list.lng b/interface/web/admin/lib/lang/nl_server_list.lng
index c9b6108..51c192a 100644
--- a/interface/web/admin/lib/lang/nl_server_list.lng
+++ b/interface/web/admin/lib/lang/nl_server_list.lng
@@ -1,11 +1,12 @@
 <?php
-$wb['list_head_txt'] = 'Server';
-$wb['server_name_txt'] = 'Naam';
-$wb['mail_server_txt'] = 'Mail';
-$wb['web_server_txt'] = 'Web';
-$wb['dns_server_txt'] = 'DNS';
-$wb['file_server_txt'] = 'Bestand';
-$wb['db_server_txt'] = 'DB';
+$wb['list_head_txt'] = 'Services per server';
+$wb['server_name_txt'] = 'Servernaam';
+$wb['mail_server_txt'] = 'Mailserver';
+$wb['web_server_txt'] = 'Webserver';
+$wb['dns_server_txt'] = 'DNS server';
+$wb['file_server_txt'] = 'Fileserver';
+$wb['db_server_txt'] = 'Database server';
 $wb['vserver_server_txt'] = 'VServer';
-$wb['add_new_record_txt'] = 'Toevoegen nieuwe server';
+$wb['add_new_record_txt'] = 'Nieuwe server toevoegen';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_software_package_list.lng b/interface/web/admin/lib/lang/nl_software_package_list.lng
index 177e1b8..ebaac0f 100644
--- a/interface/web/admin/lib/lang/nl_software_package_list.lng
+++ b/interface/web/admin/lib/lang/nl_software_package_list.lng
@@ -5,3 +5,4 @@
 $wb['package_description_txt'] = 'Omschrijving';
 $wb['action_txt'] = 'Actie';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_software_repo.lng b/interface/web/admin/lib/lang/nl_software_repo.lng
index 693e7c7..d7a277f 100644
--- a/interface/web/admin/lib/lang/nl_software_repo.lng
+++ b/interface/web/admin/lib/lang/nl_software_repo.lng
@@ -1,7 +1,8 @@
 <?php
 $wb['repo_name_txt'] = 'Repository';
 $wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Geberuiker (optional)';
-$wb['repo_password_txt'] = 'Wachtwoord (optional)';
-$wb['active_txt'] = 'Actief';
+$wb['repo_username_txt'] = 'Gebruiker (optioneel)';
+$wb['repo_password_txt'] = 'Wachtwoord (optioneel)';
+$wb['active_txt'] = 'Actief?';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_software_repo_list.lng b/interface/web/admin/lib/lang/nl_software_repo_list.lng
index fc05fc2..3e59db6 100644
--- a/interface/web/admin/lib/lang/nl_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/nl_software_repo_list.lng
@@ -1,6 +1,7 @@
 <?php
 $wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['repo_name_txt'] = 'Repository';
 $wb['repo_url_txt'] = 'URL';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_software_update_list.lng b/interface/web/admin/lib/lang/nl_software_update_list.lng
index ebf4e6f..8a78254 100644
--- a/interface/web/admin/lib/lang/nl_software_update_list.lng
+++ b/interface/web/admin/lib/lang/nl_software_update_list.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Software updates';
-$wb['installed_txt'] = 'Action';
+$wb['installed_txt'] = 'Actie';
 $wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
-$wb['server_select_txt'] = 'Select server';
+$wb['version_txt'] = 'Versie';
+$wb['action_txt'] = 'Actie';
+$wb['server_select_txt'] = 'Selecteer server';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
index c38b6e1..5906e9a 100644
--- a/interface/web/admin/lib/lang/nl_system_config.lng
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -1,13 +1,14 @@
 <?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['warning'] = 'Let op bij het wijzigen van deze waarden. Verwijder de prefix niet op systemen met meer dan 1 klant.';
+$wb['dbname_prefix_txt'] = 'Databasenaam prefix';
+$wb['dbuser_prefix_txt'] = 'Gebruiker 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';
+$wb['ftpuser_prefix_txt'] = 'FTP gebruiker prefix';
+$wb['dbname_prefix_error_regex'] = 'Teken niet toegestaan in databasenaam';
+$wb['dbuser_prefix_error_regex'] = 'Teken niet toegestaan in gebruiker prefix';
+$wb['ftpuser_prefix_error_regex'] = 'Teken niet toegestaan in FTP gebruiker prefix';
+$wb['shelluser_prefix_error_regex'] = 'Teken niet toegestaan in Shell gebruiker prefix';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link naar phpMyAdmin';
+$wb['mailboxlist_webmail_link_txt'] = 'Link naar Webmail';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng
index 3e3a4a6..268a547 100644
--- a/interface/web/admin/lib/lang/nl_users.lng
+++ b/interface/web/admin/lib/lang/nl_users.lng
@@ -4,25 +4,26 @@
 $wb['username_empty'] = 'De gebruikersnaam is leeg.';
 $wb['username_unique'] = 'Er bestaat reeds een gebruiker met deze gebruikersnaam.';
 $wb['passwort_txt'] = 'Wachtwoord';
-$wb['modules_txt'] = 'Module';
+$wb['modules_txt'] = 'Beschikbare modulen';
 $wb['password_strength_txt'] = 'Wachtwoord sterkte';
-$wb['startmodule_txt'] = 'Startmodule';
-$wb['app_theme_txt'] = 'Ontwerp';
-$wb['typ_txt'] = 'Type';
-$wb['active_txt'] = 'Actief';
+$wb['startmodule_txt'] = 'Vervolgmodule na aanmelding';
+$wb['app_theme_txt'] = 'ISPconfig Thema';
+$wb['typ_txt'] = 'Type gebruiker';
+$wb['active_txt'] = 'Actief?';
 $wb['language_txt'] = 'Taal';
 $wb['name_txt'] = 'Naam';
 $wb['vorname_txt'] = 'Voornaam';
 $wb['unternehmen_txt'] = 'Bedrijf';
-$wb['strasse_txt'] = 'Straat';
-$wb['ort_txt'] = 'Plaatsnaam';
-$wb['plz_txt'] = 'ZIP';
+$wb['strasse_txt'] = 'Adres';
+$wb['ort_txt'] = 'Plaats';
+$wb['plz_txt'] = 'Postcode';
 $wb['land_txt'] = 'Land';
-$wb['email_txt'] = 'Email';
-$wb['url_txt'] = 'Url';
+$wb['email_txt'] = 'E-mail';
+$wb['url_txt'] = 'Website';
 $wb['telefon_txt'] = 'Telefoon';
 $wb['fax_txt'] = 'Fax';
-$wb['groups_txt'] = 'Groepen';
+$wb['groups_txt'] = 'Gebruiker is lid van groep';
 $wb['default_group_txt'] = 'Standaard groep';
-$wb['startmodule_err'] = 'Start module is not within modules.';
+$wb['startmodule_err'] = 'Module is niet binnen de lijst van beschikbare modulen.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/nl_users_list.lng b/interface/web/admin/lib/lang/nl_users_list.lng
index 07ec019..42a7ef4 100644
--- a/interface/web/admin/lib/lang/nl_users_list.lng
+++ b/interface/web/admin/lib/lang/nl_users_list.lng
@@ -3,6 +3,7 @@
 $wb['username_txt'] = 'Gebruikersnaam';
 $wb['name_txt'] = 'Achternaam';
 $wb['vorname_txt'] = 'Voornaam';
-$wb['ort_txt'] = 'Plaatsnaam';
-$wb['add_new_record_txt'] = 'Add new user';
+$wb['ort_txt'] = 'Plaats';
+$wb['add_new_record_txt'] = 'Nieuwe gebruiker toevoegen';
 ?>
+
diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng
new file mode 100644
index 0000000..d3b0c94
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl.lng
@@ -0,0 +1,34 @@
+<?php
+$wb['1001'] = 'Nazwa użytkownika lub hasło jest puste.';
+$wb['1002'] = 'Nazwa użytkownika lub hasło jest złe.';
+$wb['Firewall'] = 'Firewall';
+$wb['Groups'] = 'Grupy';
+$wb['groups_description'] = 'Formularz do edycji grup użytkowników w systemie.';
+$wb['Server'] = 'Serwer';
+$wb['Services'] = 'Serwisy';
+$wb['Config'] = 'Konfiguracja';
+$wb['Server Config'] = 'Konfiguracja serwera';
+$wb['Mail'] = 'Mail';
+$wb['Getmail'] = 'Getmail';
+$wb['Web'] = 'Web';
+$wb['FastCGI'] = 'FastCGI';
+$wb['Jailkit'] = 'Jailkit';
+$wb['System'] = 'System';
+$wb['Add user'] = 'Dodaj użytkownika';
+$wb['Edit user'] = 'Edytuj uzytkownika';
+$wb['CP Users'] = 'Użytkownicy';
+$wb['Add group'] = 'Dodaj grupę';
+$wb['Edit group'] = 'Edytuj grupę';
+$wb['Edit server'] = 'Edytuj serwer';
+$wb['Edit Server IP'] = 'Edytuj IP serwera';
+$wb['Servers'] = 'Serwery';
+$wb['Sync. Now'] = 'Synchronizuj teraz.';
+$wb['DB Sync.'] = 'Synchronizacja bazy danych.';
+$wb['Languages'] = 'Języki';
+$wb['New Language'] = 'Nowy język';
+$wb['Export'] = 'Export';
+$wb['Import'] = 'Import';
+$wb['Language Editor'] = 'Edytor języków';
+$wb['Software'] = 'Oprogramowanie';
+$wb['Repositories'] = 'Repozytoria';
+?>
diff --git a/interface/web/admin/lib/lang/pl_firewall.lng b/interface/web/admin/lib/lang/pl_firewall.lng
new file mode 100644
index 0000000..6628fd8
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_firewall.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['tcp_port_txt'] = 'Otwarty port TCP';
+$wb['udp_port_txt'] = 'Otwarty port UDP';
+$wb['tcp_port_help_txt'] = 'Odziel przecinkiem';
+$wb['udp_port_help_txt'] = 'Odziel przecinkiem';
+$wb['active_txt'] = 'Active';
+$wb['firewall_error_unique'] = 'Istnieje już wpis firewall-a dla tego serwera.';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
+?>
diff --git a/interface/web/admin/lib/lang/pl_firewall_list.lng b/interface/web/admin/lib/lang/pl_firewall_list.lng
new file mode 100644
index 0000000..f7e1640
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_firewall_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Firewall';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['tcp_port_txt'] = 'Otwarte porty TCP';
+$wb['udp_port_txt'] = 'Otwarte porty UDP';
+$wb['add_new_record_txt'] = 'Dodaj wpis Firewall-a';
+?>
diff --git a/interface/web/admin/lib/lang/pl_groups.lng b/interface/web/admin/lib/lang/pl_groups.lng
new file mode 100644
index 0000000..b3c8b9c
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_groups.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['description_txt'] = 'Opis';
+$wb['name_txt'] = 'Grupa';
+$wb['name_err'] = 'Nazwa grupy musi mieć od 1 do 30 znaków.';
+?>
diff --git a/interface/web/admin/lib/lang/pl_groups_list.lng b/interface/web/admin/lib/lang/pl_groups_list.lng
new file mode 100644
index 0000000..2470a03
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_groups_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Grupy użytkowników systemowych';
+$wb['description_txt'] = 'Opis';
+$wb['name_txt'] = 'Grupa';
+$wb['add_new_record_txt'] = 'Dodaj nową grupę';
+?>
diff --git a/interface/web/admin/lib/lang/pl_language_add.lng b/interface/web/admin/lib/lang/pl_language_add.lng
new file mode 100644
index 0000000..82e42ef
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_language_add.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Dodaj nowy język';
+$wb['language_select_txt'] = 'Wybierz domyślny język';
+$wb['language_new_txt'] = 'Nowy język';
+$wb['language_new_hint_txt'] = '2 znakowe kodowanie języka ISO 639-1 (Zobacz http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
+$wb['btn_save_txt'] = 'Utwórz nowy zbiór plików z językami';
+$wb['btn_cancel_txt'] = 'Wróć';
+?>
diff --git a/interface/web/admin/lib/lang/pl_language_complete.lng b/interface/web/admin/lib/lang/pl_language_complete.lng
new file mode 100644
index 0000000..0096c69
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_language_complete.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Połącz język';
+$wb['list_desc_txt'] = 'Połącz pliki wybranego języka z plikiami języka angielskiego. <br />Ta opcja dodaje do wybranego języka brakujące zmienne językowe z plików języka angielskiego.';
+$wb['language_select_txt'] = 'Wybierz język';
+$wb['btn_save_txt'] = 'Połącz pliki teraz';
+$wb['btn_cancel_txt'] = 'Wróć';
+?>
diff --git a/interface/web/admin/lib/lang/pl_language_edit.lng b/interface/web/admin/lib/lang/pl_language_edit.lng
new file mode 100644
index 0000000..3a5e706
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_language_edit.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Edytor plików języka';
+$wb['language_select_txt'] = 'Wybierz język';
+$wb['module_txt'] = 'Moduł';
+$wb['lang_file_txt'] = 'Plik języka';
+$wb['btn_save_txt'] = 'Zapisz';
+$wb['btn_cancel_txt'] = 'Wróć';
+?>
diff --git a/interface/web/admin/lib/lang/pl_language_export.lng b/interface/web/admin/lib/lang/pl_language_export.lng
new file mode 100644
index 0000000..82666fc
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_language_export.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Exportuj pliki języka';
+$wb['language_select_txt'] = 'Wybierz język';
+$wb['btn_save_txt'] = 'Exportuj pliki wybranego języka';
+$wb['btn_cancel_txt'] = 'Wróć';
+?>
diff --git a/interface/web/admin/lib/lang/pl_language_import.lng b/interface/web/admin/lib/lang/pl_language_import.lng
new file mode 100644
index 0000000..f3d631e
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_language_import.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Importuj plik języka';
+$wb['language_import_txt'] = 'Wybierz plik języka';
+$wb['btn_save_txt'] = 'Importuj wybrane pliki języka';
+$wb['language_overwrite_txt'] = 'Nadpisz plik jeśli istnieje.';
+$wb['btn_cancel_txt'] = 'Wróć';
+?>
diff --git a/interface/web/admin/lib/lang/pl_language_list.lng b/interface/web/admin/lib/lang/pl_language_list.lng
new file mode 100644
index 0000000..68f710b
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_language_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Edytor plików języka';
+$wb['language_select_txt'] = 'Wyberz język';
+$wb['module_txt'] = 'Moduł';
+$wb['lang_file_txt'] = 'Plik języka';
+$wb['lang_file_date_txt'] = 'Ostatnia modyfikacja';
+?>
diff --git a/interface/web/admin/lib/lang/pl_server.lng b/interface/web/admin/lib/lang/pl_server.lng
new file mode 100644
index 0000000..23d6043
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_server.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['config_txt'] = 'Konfiguracja';
+$wb['server_name_txt'] = 'Nazwa serwera';
+$wb['mail_server_txt'] = 'Serwer poczty E-Mail';
+$wb['web_server_txt'] = 'Serwer WWW';
+$wb['dns_server_txt'] = 'Serwer DNS';
+$wb['file_server_txt'] = 'Serwer plików';
+$wb['db_server_txt'] = 'Serwer bazy danych';
+$wb['vserver_server_txt'] = 'Witrualny serwer';
+$wb['active_txt'] = 'Aktywny';
+?>
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
new file mode 100644
index 0000000..eb57202
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -0,0 +1,49 @@
+<?php
+$wb['jailkit_chroot_home_txt'] = 'Adres root-a Jailkit';
+$wb['jailkit_chroot_app_sections_txt'] = 'Sekcje aplikacji root-a Jailkit';
+$wb['jailkit_chroot_app_programs_txt'] = 'Ścieżki aplikacji root-a Jailkit';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$wb['website_path_txt'] = 'Adres strony WWW';
+$wb['website_symlinks_txt'] = 'Symulowany link strony WWW';
+$wb['website_basedir_txt'] = 'Ścieżka bazowa strony WWW';
+$wb['vhost_conf_dir_txt'] = 'Ścieżka do konfiguracyji wirtualnego serwera';
+$wb['vhost_conf_enabled_dir_txt'] = 'Ścieżka do aktywnej konfiguracyji Vhost';
+$wb['getmail_config_dir_txt'] = 'Ścieżka do konfiguracyji Getmail';
+$wb['fastcgi_starter_path_txt'] = 'Adres startowy FastCGI';
+$wb['fastcgi_starter_script_txt'] = 'Startowy skrypt FastCGI';
+$wb['fastcgi_alias_txt'] = 'Alias FastCGI';
+$wb['fastcgi_phpini_path_txt'] = 'Ścieżka do php.ini FastCGI';
+$wb['fastcgi_children_txt'] = 'Ilość dzieci FastCGI';
+$wb['fastcgi_max_requests_txt'] = 'Maksymalna ilość zadań FastCGI';
+$wb['fastcgi_bin_txt'] = 'Kosz FastCGI';
+$wb['module_txt'] = 'Moduł';
+$wb['maildir_path_txt'] = 'Adres poczty e-mail';
+$wb['homedir_path_txt'] = 'Bazowy adres poczty e-mail';
+$wb['mailuser_uid_txt'] = 'UID użytkownika e-mail';
+$wb['mailuser_gid_txt'] = 'GID użytkownika e-mail';
+$wb['mailuser_name_txt'] = 'Nazwa użytkownika e-mail';
+$wb['mailuser_group_txt'] = 'Grupa użytkownika e-mail';
+$wb['relayhost_txt'] = 'Adres Relayhost';
+$wb['relayhost_user_txt'] = 'Użytkownik Relayhost';
+$wb['relayhost_password_txt'] = 'Hasło Relayhost';
+$wb['mailbox_size_limit_txt'] = 'Maksymalna wielkość skrzynki pocztowej';
+$wb['message_size_limit_txt'] = 'Maksymalna wielkość wiadomości';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['netmask_txt'] = 'Maska';
+$wb['gateway_txt'] = 'Bramka';
+$wb['hostname_txt'] = 'Nazwa';
+$wb['nameservers_txt'] = 'Nazwa serwera';
+$wb['auto_network_configuration_txt'] = 'Konfiguracja sieci';
+$wb['ip_address_error_wrong'] = 'Nieprawidłowy format adresu IP.';
+$wb['netmask_error_wrong'] = 'Nieprawidłowy format maski.';
+$wb['gateway_error_wrong'] = 'Nieprawidłowy format bramki.';
+$wb['hostname_error_empty'] = 'Nazwa jest pusta.';
+$wb['nameservers_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['config_dir_txt'] = 'Config directory';
+$wb['init_script_txt'] = 'Cron init script name';
+$wb['crontab_dir_txt'] = 'Path for individual crontabs';
+$wb['wget_txt'] = 'Path to wget program';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
+$wb['security_level_txt'] = 'Security level';
+?>
diff --git a/interface/web/admin/lib/lang/pl_server_config_list.lng b/interface/web/admin/lib/lang/pl_server_config_list.lng
new file mode 100644
index 0000000..f9e8dcf
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_server_config_list.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['list_head_txt'] = 'Konfiguracja serwera';
+$wb['server_name_txt'] = 'Serwer';
+?>
diff --git a/interface/web/admin/lib/lang/pl_server_ip.lng b/interface/web/admin/lib/lang/pl_server_ip.lng
new file mode 100644
index 0000000..c24d0a3
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_server_ip.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['virtualhost_txt'] = 'Nazwa wirtualnego hosta HTTP';
+$wb['ip_err'] = 'Adres IP jest niepoprawny';
+?>
diff --git a/interface/web/admin/lib/lang/pl_server_ip_list.lng b/interface/web/admin/lib/lang/pl_server_ip_list.lng
new file mode 100644
index 0000000..6ab81c1
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_server_ip_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Adresy IP';
+$wb['server_id_txt'] = 'Serwer';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['add_new_record_txt'] = 'Dodaj nowy adres IP';
+?>
diff --git a/interface/web/admin/lib/lang/pl_server_list.lng b/interface/web/admin/lib/lang/pl_server_list.lng
new file mode 100644
index 0000000..f61ba5f
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_server_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'Serwer';
+$wb['server_name_txt'] = 'Nazwa';
+$wb['mail_server_txt'] = 'E-mail';
+$wb['web_server_txt'] = 'WWW';
+$wb['dns_server_txt'] = 'DNS';
+$wb['file_server_txt'] = 'Plik';
+$wb['db_server_txt'] = 'Baza danych';
+$wb['vserver_server_txt'] = 'Wirtualny serwer';
+$wb['add_new_record_txt'] = 'Dodaj nowy serwer';
+?>
diff --git a/interface/web/admin/lib/lang/pl_software_package_list.lng b/interface/web/admin/lib/lang/pl_software_package_list.lng
new file mode 100644
index 0000000..9549333
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_software_package_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Paczki z oprogramowaniem';
+$wb['installed_txt'] = 'Status';
+$wb['package_title_txt'] = 'Paczka';
+$wb['package_description_txt'] = 'Opis';
+$wb['action_txt'] = 'Akcja';
+?>
diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng
new file mode 100644
index 0000000..d11a1b3
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_software_repo.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['repo_name_txt'] = 'Repozytorium';
+$wb['repo_url_txt'] = 'URL';
+$wb['repo_username_txt'] = 'Użytkownik (Opcjonalnie)';
+$wb['repo_password_txt'] = 'Hasło (Opcjonalnie)';
+$wb['active_txt'] = 'Aktywny';
+?>
diff --git a/interface/web/admin/lib/lang/pl_software_repo_list.lng b/interface/web/admin/lib/lang/pl_software_repo_list.lng
new file mode 100644
index 0000000..7ca6af9
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_software_repo_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Repozytoria';
+$wb['active_txt'] = 'Aktywny';
+$wb['repo_name_txt'] = 'Repozytoria';
+$wb['repo_url_txt'] = 'URL';
+?>
diff --git a/interface/web/admin/lib/lang/pl_software_update_list.lng b/interface/web/admin/lib/lang/pl_software_update_list.lng
new file mode 100644
index 0000000..e38bdf8
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_software_update_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Aktualizacje oprogramowania';
+$wb['server_select_txt'] = 'Wybierz serwer';
+$wb['installed_txt'] = 'Akcja';
+$wb['update_title_txt'] = 'Aktualizacja';
+$wb['version_txt'] = 'Wersja';
+$wb['action_txt'] = 'Akcja';
+?>
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
new file mode 100644
index 0000000..09a9ed0
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -0,0 +1,13 @@
+<?php
+$wb['warning'] = 'Edytuj te wartości ostrożnie! Nie usuwaj prefiksów w systemie w więcej niż jednym kliencie.';
+$wb['dbname_prefix_txt'] = 'Prefiks nazwy bazy danych';
+$wb['dbuser_prefix_txt'] = 'Prefiks użytkownika bazy danych';
+$wb['shelluser_prefix_txt'] = 'Prefiks użytkownika shell';
+$wb['ftpuser_prefix_txt'] = 'Prefiks uzytkownika FTP';
+$wb['dbname_prefix_error_regex'] = 'Znak nie jest dozwolony w prefiksie nazwy bazy danych.';
+$wb['dbuser_prefix_error_regex'] = 'Znak nie jest dozwolony w prefiksie nazwy użytkownika bazy danych.';
+$wb['ftpuser_prefix_error_regex'] = 'Znak nie jest dozwolony w prefiksie nazwy użytkownika ftp.';
+$wb['shelluser_prefix_error_regex'] = 'Znak nie jest dozwolony w prefiksie nazwy użytkownika shell.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Adres do phpMyAdmin-a w liście baz danych';
+$wb['mailboxlist_webmail_link_txt'] = 'Adres do poczty e-mail w liście skrzynek pocztowych';
+?>
diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng
new file mode 100644
index 0000000..3b2472d
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -0,0 +1,28 @@
+<?php
+$wb['username_txt'] = 'Nazwa użytkownika';
+$wb['username_err'] = 'Nazwa użytkownika jest za długa lub zawiera niedozwolone znaki.';
+$wb['username_empty'] = 'Nazwa użytkownika jest pusta.';
+$wb['username_unique'] = 'Istnieje już użytkownik o takiej nazwie.';
+$wb['passwort_txt'] = 'Hasło';
+$wb['password_strength_txt'] = 'Siła hasła';
+$wb['modules_txt'] = 'Moduł';
+$wb['startmodule_txt'] = 'Moduł startowy';
+$wb['app_theme_txt'] = 'Styl';
+$wb['typ_txt'] = 'Typ';
+$wb['active_txt'] = 'Aktywny';
+$wb['language_txt'] = 'Język';
+$wb['name_txt'] = 'Nazwa';
+$wb['vorname_txt'] = 'Imię';
+$wb['unternehmen_txt'] = 'Firma';
+$wb['strasse_txt'] = 'Ulica';
+$wb['ort_txt'] = 'Miasto';
+$wb['plz_txt'] = 'Kod pocztowy';
+$wb['land_txt'] = 'Państwowy';
+$wb['email_txt'] = 'E-mail';
+$wb['url_txt'] = 'Url';
+$wb['telefon_txt'] = 'Telefon';
+$wb['fax_txt'] = 'Fax';
+$wb['groups_txt'] = 'Groupy';
+$wb['default_group_txt'] = 'Domyślna grupa';
+$wb['startmodule_err'] = 'Modułu startowego nie ma wśród modułów.';
+?>
diff --git a/interface/web/admin/lib/lang/pl_users_list.lng b/interface/web/admin/lib/lang/pl_users_list.lng
new file mode 100644
index 0000000..355d89e
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_users_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Użytkownicy';
+$wb['username_txt'] = 'Nazwa użytkownika';
+$wb['name_txt'] = 'Nazwa';
+$wb['vorname_txt'] = 'Imię';
+$wb['ort_txt'] = 'Miasto';
+$wb['add_new_record_txt'] = 'Dodaj nowego użytkownika';
+?>
diff --git a/interface/web/admin/lib/lang/ru_firewall.lng b/interface/web/admin/lib/lang/ru_firewall.lng
index e190234..d146c40 100644
--- a/interface/web/admin/lib/lang/ru_firewall.lng
+++ b/interface/web/admin/lib/lang/ru_firewall.lng
@@ -6,4 +6,6 @@
 $wb['udp_port_help_txt'] = 'Перечислить через запятую';
 $wb['active_txt'] = 'Активный';
 $wb['firewall_error_unique'] = 'Уже есть записи firewall для этого сервера.';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index d84a211..1d9c96f 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -44,4 +44,6 @@
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
 ?>
diff --git a/interface/web/admin/lib/lang/se_firewall.lng b/interface/web/admin/lib/lang/se_firewall.lng
index 67c31ca..e626345 100644
--- a/interface/web/admin/lib/lang/se_firewall.lng
+++ b/interface/web/admin/lib/lang/se_firewall.lng
@@ -6,4 +6,6 @@
 $wb['udp_port_help_txt'] = 'Separated by comma';
 $wb['active_txt'] = 'Active';
 $wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index f3a7a95..ed93388 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -44,4 +44,6 @@
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
 ?>
diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm
index 909545e..3e48d5e 100644
--- a/interface/web/admin/templates/firewall_list.htm
+++ b/interface/web/admin/templates/firewall_list.htm
@@ -1,60 +1,60 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_firewall">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
-            <th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_tcp_port"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
-            <td class="tbl_col_udp_port"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_tcp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tcp_port"}</a></td>
-            <td class="tbl_col_udp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="udp_port"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_firewall">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
+            <th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_tcp_port"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
+            <td class="tbl_col_udp_port"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_tcp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tcp_port"}</a></td>
+            <td class="tbl_col_udp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="udp_port"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm
index f6a1b92..cc31de5 100644
--- a/interface/web/admin/templates/groups_list.htm
+++ b/interface/web/admin/templates/groups_list.htm
@@ -1,54 +1,54 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_groups">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
-            <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
-            <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
-            <td class="tbl_col_description"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_groups">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+            <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+            <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+            <td class="tbl_col_description"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index 06b12e0..1f5f51d 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -1,53 +1,53 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_server_ip">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','admin/server_ip_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_server_ip">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','admin/server_ip_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm
index 6fc1d08..104ea4f 100644
--- a/interface/web/admin/templates/software_repo_list.htm
+++ b/interface/web/admin/templates/software_repo_list.htm
@@ -1,56 +1,56 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_software_repo">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_repo_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_repo_name" scope="col"><tmpl_var name="repo_name_txt"></th>
-            <th class="tbl_col_repo_url" scope="col"><tmpl_var name="repo_url_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','admin/software_repo_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_repo_name"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
-            <td class="tbl_col_repo_url"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/software_repo_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_repo_name"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_name"}</a></td>
-            <td class="tbl_col_repo_url"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_url"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('admin/software_repo_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_software_repo">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_repo_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_repo_name" scope="col"><tmpl_var name="repo_name_txt"></th>
+            <th class="tbl_col_repo_url" scope="col"><tmpl_var name="repo_url_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','admin/software_repo_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_repo_name"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
+            <td class="tbl_col_repo_url"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/software_repo_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_repo_name"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_name"}</a></td>
+            <td class="tbl_col_repo_url"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_url"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/software_repo_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index 3407c9b..ee1686e 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_list_users">
 
   <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
       <div class="buttons">
         <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/users_edit.php');">
           <span>{tmpl_var name="add_new_record_txt"}</span>
diff --git a/interface/web/client/lib/lang/bg.lng b/interface/web/client/lib/lang/bg.lng
index d85e6f1..f16dcb9 100644
--- a/interface/web/client/lib/lang/bg.lng
+++ b/interface/web/client/lib/lang/bg.lng
@@ -6,4 +6,7 @@
 $wb['Edit Client'] = 'Редактиране на клиент';
 $wb['Clients'] = 'Клиенти';
 $wb['Edit Client-Templates'] = 'Edit Client-Templates';
+$wb['Add Reseller'] = 'Add Reseller';
+$wb['Edit Reseller'] = 'Edit Reseller';
+$wb['Resellers'] = 'Resellers';
 ?>
diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng
new file mode 100644
index 0000000..906fd44
--- /dev/null
+++ b/interface/web/client/lib/lang/bg_reseller.lng
@@ -0,0 +1,93 @@
+<?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["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_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["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["limit_cron_error_notint"] = 'The cron limit must be a number.';
+$wb["limit_cron_error_frequency"] = 'The cron frequency limit must be a number.';
+$wb["username_error_regex"] = 'The Username contains invalid chracaters.';
+$wb["template_master_txt"] = 'Master template';
+$wb["template_additional_txt"] = 'Addon template';
+$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
+$wb["web_php_options_txt"] = 'PHP Options';
+$wb["limit_client_error"] = 'The max. number of clients is reached.';
+$wb["limit_client_error_positive"] = 'The number of clients must be > 0';
+?>
diff --git a/interface/web/client/lib/lang/bg_resellers_list.lng b/interface/web/client/lib/lang/bg_resellers_list.lng
new file mode 100644
index 0000000..523a467
--- /dev/null
+++ b/interface/web/client/lib/lang/bg_resellers_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["list_head_txt"] = 'Resellers';
+$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';
+$wb["add_new_record_txt"] = 'Add new reseller';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/br.lng b/interface/web/client/lib/lang/br.lng
index 6aed105..bcc8202 100644
--- a/interface/web/client/lib/lang/br.lng
+++ b/interface/web/client/lib/lang/br.lng
@@ -6,5 +6,8 @@
 $wb['Edit Client'] = 'Editar Cliente';
 $wb['Clients'] = 'Clientes';
 $wb['Edit Client-Templates'] = 'Editar Gabaritos de Clientes';
+$wb['Add Reseller'] = 'Adcionar Revendedor';
+$wb['Edit Reseller'] = 'Editar Revendedor';
+$wb['Resellers'] = 'Revendedores';
 ?>
 
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index 5391c13..69d753a 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -23,7 +23,7 @@
 $wb['zip_txt'] = 'CEP';
 $wb['city_txt'] = 'Cidade';
 $wb['state_txt'] = 'Estado';
-$wb['country_txt'] = 'Pais';
+$wb['country_txt'] = 'País';
 $wb['telephone_txt'] = 'Telefone';
 $wb['mobile_txt'] = 'Celular';
 $wb['fax_txt'] = 'Fax';
@@ -81,5 +81,10 @@
 $wb['ssh_chroot_txt'] = 'Opções de SSH Chroot';
 $wb['web_php_options_txt'] = 'Opções do PHP';
 $wb['limit_client_error'] = 'O número máximo de clientes foi atingido.';
+$wb['limit_cron_txt'] = 'Número máximo de tarefas no cron.';
+$wb['limit_cron_type_txt'] = 'Máximo de tipos de tarefas no cron (em chroot e url completas)';
+$wb['limit_cron_frequency_txt'] = 'Intervalo mínimo entre as execuções';
+$wb['limit_cron_error_notint'] = 'O limite do cron deve ser um número.';
+$wb['limit_cron_error_frequency'] = 'O limite de frequência do cron deve ser um número.';
 ?>
 
diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng
index 45a3b3e..7ff1817 100644
--- a/interface/web/client/lib/lang/br_client_template.lng
+++ b/interface/web/client/lib/lang/br_client_template.lng
@@ -44,5 +44,10 @@
 $wb['limit_dns_zone_error_notint'] = 'O limite de zonas DNS deve ser um número';
 $wb['limit_database_error_notint'] = 'O limite dos bancos de dados deve ser um número';
 $wb['error_template_name_empty'] = 'Por favor insira o nome do gabarito';
+$wb['limit_cron_txt'] = 'Número máximo de tarefas no cron';
+$wb['limit_cron_type_txt'] = 'Máximo de tipos de tarefas no cron (em chroot e url completas)';
+$wb['limit_cron_frequency_txt'] = 'Intervalo mínimo entre as execuções';
+$wb['limit_cron_error_notint'] = 'O limite do cron deve ser um número.';
+$wb['limit_cron_error_frequency'] = 'O limite de frequência do cron deve ser um número.';
 ?>
 
diff --git a/interface/web/client/lib/lang/br_clients_list.lng b/interface/web/client/lib/lang/br_clients_list.lng
index db70b35..6ebc981 100644
--- a/interface/web/client/lib/lang/br_clients_list.lng
+++ b/interface/web/client/lib/lang/br_clients_list.lng
@@ -4,7 +4,7 @@
 $wb['company_name_txt'] = 'Empresa';
 $wb['contact_name_txt'] = 'Nome do contato';
 $wb['city_txt'] = 'Cidade';
-$wb['country_txt'] = 'Pais';
+$wb['country_txt'] = 'País';
 $wb['add_new_record_txt'] = 'Adcionar novo cliente';
 ?>
 
diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng
new file mode 100644
index 0000000..85d1c2e
--- /dev/null
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -0,0 +1,91 @@
+<?php
+$wb['limit_maildomain_txt'] = 'Número máximo de domínios de correio';
+$wb['limit_mailbox_txt'] = 'Número máximo de caixas de correio';
+$wb['limit_mailalias_txt'] = 'Número máximo de aliases de correio';
+$wb['limit_mailforward_txt'] = 'Número máximo de encaminhamentos de correio';
+$wb['limit_mailcatchall_txt'] = 'Número máximo de contas catchall';
+$wb['limit_mailrouting_txt'] = 'Número máximo de rotas de correio';
+$wb['limit_mailfilter_txt'] = 'Número máximo de filtros de correio';
+$wb['limit_fetchmail_txt'] = 'Número máximo de contas fetchmail ';
+$wb['limit_mailquota_txt'] = 'Quota de correio';
+$wb['limit_spamfilter_wblist_txt'] = 'Número máximo de filtros do spamfilter lista branca / negra';
+$wb['limit_spamfilter_user_txt'] = 'Número máximo de usuários de spamfilter';
+$wb['limit_spamfilter_policy_txt'] = 'Número máximo de políticas de spamfilter';
+$wb['default_mailserver_txt'] = 'Servidor de Correio Padrão';
+$wb['company_name_txt'] = 'Empresa';
+$wb['contact_name_txt'] = 'Contato';
+$wb['username_txt'] = 'Usuário';
+$wb['password_txt'] = 'Senha';
+$wb['password_strength_txt'] = 'Segurança de senha';
+$wb['language_txt'] = 'Idioma';
+$wb['usertheme_txt'] = 'Tema';
+$wb['street_txt'] = 'Rua';
+$wb['zip_txt'] = 'CEP';
+$wb['city_txt'] = 'Cidade';
+$wb['state_txt'] = 'Estado';
+$wb['country_txt'] = 'País';
+$wb['telephone_txt'] = 'Telefone';
+$wb['mobile_txt'] = 'Celular';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'Correio Eletrônico';
+$wb['internet_txt'] = 'Internet';
+$wb['icq_txt'] = 'MSN ou ICQ';
+$wb['notes_txt'] = 'Notas';
+$wb['company_txt'] = 'Empresa';
+$wb['title_txt'] = 'Título';
+$wb['firstname_txt'] = 'Nome';
+$wb['surname_txt'] = 'Sobrenome';
+$wb['limit_domain_txt'] = 'limite_domínio';
+$wb['limit_subdomain_txt'] = 'limite_subdomínio';
+$wb['limit_webquota_txt'] = 'limite_webquota';
+$wb['limit_database_txt'] = 'Número máximo de bancos de dados';
+$wb['limit_cron_txt'] = 'Número máximo de tarefas no cron';
+$wb['limit_cron_type_txt'] = 'Máximo de tipos de tarefas no cron (em chroot e url completas)';
+$wb['limit_cron_frequency_txt'] = 'Mínimo de tempo entre as execuções';
+$wb['ip_address_txt'] = 'endereço_ip';
+$wb['limit_client_error_notint'] = 'O limite de clientes para revenda deve ser um número.';
+$wb['firstname_error_empty'] = 'O nome está em branco.';
+$wb['contact_error_empty'] = 'Nome do contato está em branco.';
+$wb['default_webserver_txt'] = 'Servidor web padrão';
+$wb['limit_web_domain_txt'] = 'Máximo de domínios web';
+$wb['limit_web_aliasdomain_txt'] = 'Número máximo de alias web';
+$wb['limit_web_subdomain_txt'] = 'Número máximo de subdomínios';
+$wb['limit_ftp_user_txt'] = 'Max. number of FTP users';
+$wb['default_dnsserver_txt'] = 'Servidor DNS Padrão';
+$wb['limit_dns_zone_txt'] = 'Máximo de zonas DNS';
+$wb['limit_dns_record_txt'] = 'Máximo de registros DNS';
+$wb['limit_shell_user_txt'] = 'Número máximo de usuários de shell';
+$wb['limit_client_txt'] = 'Número máximo de clientes';
+$wb['username_error_empty'] = 'O nome do usuário está em branco.';
+$wb['username_error_unique'] = 'O nome de usuário deve ser único.';
+$wb['limit_maildomain_error_notint'] = 'O limite de domínios de correio deve ser um número.';
+$wb['limit_mailbox_error_notint'] = 'O limite de caixas de correio deve ser um número.';
+$wb['limit_mailalias_error_notint'] = 'O limite de aliases de correio deve ser um número.';
+$wb['limit_mailforward_error_notint'] = 'O limite de encaminhamentos de correio deve ser um número.';
+$wb['limit_mailcatchall_error_notint'] = 'O limite de contas catchall deve ser um número.';
+$wb['limit_mailrouting_error_notint'] = 'O limite de rotas de correio deve ser um número.';
+$wb['limit_mailfilter_error_notint'] = 'O filtro de correio deve ser um número.';
+$wb['limit_mailfetchmail_error_notint'] = 'O limite de fetchmail deve ser um número.';
+$wb['limit_mailquota_error_notint'] = 'O limite de quota de correio deve ser um número.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'O limite de lista branca / negra do spamfilter deve ser um número.';
+$wb['limit_spamfilter_user_error_notint'] = 'O limite de usuários de spamfilter deve ser um número.';
+$wb['limit_spamfilter_policy_error_notint'] = 'O limite de políticas de spamfilter deve ser um número.';
+$wb['limit_web_domain_error_notint'] = 'O limite de web sites deve ser um número.';
+$wb['limit_web_aliasdomain_error_notint'] = 'O limite de usuários de aliases de domínio deve ser um número.';
+$wb['limit_web_subdomain_error_notint'] = 'O limite de usuários de subdomínios web deve ser um número.';
+$wb['limit_ftp_user_error_notint'] = 'O limite de usuários de ftp deve ser um número.';
+$wb['limit_shell_user_error_notint'] = 'O limite de usuários de shell deve ser um número.';
+$wb['limit_dns_zone_error_notint'] = 'O limite de registros de dns deve ser um número.';
+$wb['default_dbserver_txt'] = 'Servidor de Banco de Dados Padrão';
+$wb['limit_database_error_notint'] = 'O limite de banco de dados deve ser um número.';
+$wb['limit_cron_error_notint'] = 'O limite do cron deve ser um número.';
+$wb['limit_cron_error_frequency'] = 'O limite de frequência no cron deve ser um número.';
+$wb['username_error_regex'] = 'O nome do usuário contém caracteres inválidos.';
+$wb['template_master_txt'] = 'Gabarito Mestre';
+$wb['template_additional_txt'] = 'Gabarito de Addon';
+$wb['ssh_chroot_txt'] = 'Opções do Chroot-SSH';
+$wb['web_php_options_txt'] = 'Opções do PHP';
+$wb['limit_client_error'] = 'O número máximo de clientes foi atingido.';
+$wb['limit_client_error_positive'] = 'O número de clientes precisa ser > 0';
+?>
+
diff --git a/interface/web/client/lib/lang/br_resellers_list.lng b/interface/web/client/lib/lang/br_resellers_list.lng
new file mode 100644
index 0000000..e8849fe
--- /dev/null
+++ b/interface/web/client/lib/lang/br_resellers_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Revendedores';
+$wb['client_id_txt'] = 'ID';
+$wb['company_name_txt'] = 'Empresa';
+$wb['contact_name_txt'] = 'Contato';
+$wb['city_txt'] = 'Cidade';
+$wb['country_txt'] = 'País';
+$wb['add_new_record_txt'] = 'Adcionar um novo revendedor';
+?>
+
diff --git a/interface/web/client/lib/lang/de.lng b/interface/web/client/lib/lang/de.lng
index b368867..0a4f978 100644
--- a/interface/web/client/lib/lang/de.lng
+++ b/interface/web/client/lib/lang/de.lng
@@ -6,4 +6,7 @@
 $wb['Edit Client'] = 'Kunde bearbeiten';
 $wb['Clients'] = 'Kunden';
 $wb['Edit Client-Templates'] = 'Kundenvorlagen bearbeiten';
+$wb['Add Reseller'] = 'Reseller hinzufügen';
+$wb['Edit Reseller'] = 'Reseller bearbeiten';
+$wb['Resellers'] = 'Reseller';
 ?>
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 2e3bf4c..34db3a8 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -3,21 +3,21 @@
 $wb['limit_mailbox_txt'] = 'Max. Anzahl an Mailboxen';
 $wb['limit_mailalias_txt'] = 'Max. Anzahl an Emailaliase';
 $wb['limit_mailforward_txt'] = 'Max. Anzahl an Email Weiterleitungen';
-$wb['limit_mailcatchall_txt'] = 'Max. Anzahl an Email catchall Kontos';
-$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mailcatchall_txt'] = 'Max. Anzahl an Email Catchall Konten';
+$wb['limit_mailrouting_txt'] = 'Max. Anzahl an Email Routen';
 $wb['limit_mailfilter_txt'] = 'Max. Anzahl an Email Filter';
-$wb['limit_fetchmail_txt'] = 'Max. Anzahl an Fetchmail Kontos';
+$wb['limit_fetchmail_txt'] = 'Max. Anzahl an Fetchmail Konten';
 $wb['limit_mailquota_txt'] = 'Mailbox Quota';
-$wb['limit_spamfilter_wblist_txt'] = 'Max. Anzahl an Spamfilter white / blacklist Filter';
+$wb['limit_spamfilter_wblist_txt'] = 'Max. Anzahl an Spamfilter White- / Blacklist Filter';
 $wb['limit_spamfilter_user_txt'] = 'Max. Anzahl an Spamfilter Benutzer';
-$wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter Richtlinien';
+$wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
 $wb['default_mailserver_txt'] = 'Standardmailserver';
 $wb['company_name_txt'] = 'Firmenname';
 $wb['contact_name_txt'] = 'Kontakt';
 $wb['username_txt'] = 'Benutzername';
 $wb['password_txt'] = 'Passwort';
 $wb['language_txt'] = 'Sprache';
-$wb['usertheme_txt'] = 'Theme';
+$wb['usertheme_txt'] = 'Thema';
 $wb['street_txt'] = 'Straße';
 $wb['zip_txt'] = 'PLZ';
 $wb['city_txt'] = 'Ort';
@@ -39,13 +39,13 @@
 $wb['limit_subdomain_txt'] = 'Max. Anzahl an Subdomains';
 $wb['limit_webquota_txt'] = 'Max. Webquota';
 $wb['limit_database_txt'] = 'Max. Anzahl an Datenbanken';
-$wb['limit_cron_txt'] = 'Max. Anzahl Cron Jobs';
-$wb['limit_cron_type_txt'] = 'Max. erlaubter Typ von Cron Jobs (chrooted und full erlauben auch url)';
-$wb['limit_cron_frequency_txt'] = 'Min. Abstand zwischen Ausf&uuml;hrungen';
+$wb['limit_cron_txt'] = 'Max. Anzahl an Cron Jobs';
+$wb['limit_cron_type_txt'] = 'Max. erlaubter Cron Job Typ (chrooted und full erlauben auch url)';
+$wb['limit_cron_frequency_txt'] = 'Min. Abstand zwischen Ausführungen';
 $wb['ip_address_txt'] = 'IP Adresse';
-$wb['limit_client_error_notint'] = 'The sub client limit must be a number.';
+$wb['limit_client_error_notint'] = 'Das Subkunden Limit muss eine Zahl sein.';
 $wb['firstname_error_empty'] = 'Vorname ist leer.';
-$wb['contact_error_empty'] = 'Kontakt ist leer';
+$wb['contact_error_empty'] = 'Kontakt ist leer.';
 $wb['default_webserver_txt'] = 'Standardwebserver';
 $wb['limit_web_domain_txt'] = 'Max. Anzahl an Webdomains';
 $wb['limit_web_aliasdomain_txt'] = 'Max. Anzahl an Webaliasdomains';
@@ -57,16 +57,16 @@
 $wb['limit_shell_user_txt'] = 'Max. Anzahl an Shell Benutzer';
 $wb['username_error_empty'] = 'Benutzername ist leer.';
 $wb['username_error_unique'] = 'Der Benutzername muss einzigartig sein.';
-$wb['limit_maildomain_error_notint'] = 'Das Email Limit muss eine Nummer sein.';
+$wb['limit_maildomain_error_notint'] = 'Das Email Domain Limit muss eine Nummer sein.';
 $wb['limit_mailbox_error_notint'] = 'Das Mailbox Limit muss eine Nummer sein.';
 $wb['limit_mailalias_error_notint'] = 'Das Emailalias Limit muss eine Nummer sein.';
 $wb['limit_mailforward_error_notint'] = 'Das Emailweiterleitung Limit muss eine Nummer sein.';
-$wb['limit_mailcatchall_error_notint'] = 'Das Email catchall Limit muss eine Nummer sein.';
-$wb['limit_mailrouting_error_notint'] = 'Das Email routing Limit muss eine Nummer sein.';
+$wb['limit_mailcatchall_error_notint'] = 'Das Email Catchall Limit muss eine Nummer sein.';
+$wb['limit_mailrouting_error_notint'] = 'Das Email Routing Limit muss eine Nummer sein.';
 $wb['limit_mailfilter_error_notint'] = 'Das Emailfilter Limit muss eine Nummer sein.';
-$wb['limit_mailfetchmail_error_notint'] = 'Das fetchmail Limit muss eine Nummer sein.';
+$wb['limit_mailfetchmail_error_notint'] = 'Das Fetchmail Limit muss eine Nummer sein.';
 $wb['limit_mailquota_error_notint'] = 'Das Emailquota Limit muss eine Nummer sein.';
-$wb['limit_spamfilter_wblist_error_notint'] = 'Das Spamfilter white / blacklist Limit muss eine Nummer sein.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'Das Spamfilter White- / Blacklist Limit muss eine Nummer sein.';
 $wb['limit_spamfilter_user_error_notint'] = 'Das Spamfilter Benutzer Limit muss eine Nummer sein.';
 $wb['limit_spamfilter_policy_error_notint'] = 'Das Spamfilter Richtlinien Limit muss eine Nummer sein.';
 $wb['limit_web_domain_error_notint'] = 'Das Webseiten Limit muss eine Nummer sein.';
@@ -81,9 +81,9 @@
 $wb['limit_cron_error_frequency'] = 'Das Cron Job Intervall-Limit muss eine Zahl sein.';
 $wb['username_error_regex'] = 'Der Benutzername enthält ungültige Zeichen.';
 $wb['password_strength_txt'] = 'Passwortkomplexität';
-$wb['template_master_txt'] = 'Master';
+$wb['template_master_txt'] = 'Mastervorlage';
 $wb['template_additional_txt'] = 'Addons';
 $wb['ssh_chroot_txt'] = 'SSH-Chroot Optionen';
 $wb['web_php_options_txt'] = 'PHP Optionen';
-$wb['limit_client_error'] = 'The max. number of clients is reached.';
+$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
 ?>
diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng
index 3efd721..03a5909 100644
--- a/interface/web/client/lib/lang/de_client_template.lng
+++ b/interface/web/client/lib/lang/de_client_template.lng
@@ -1,15 +1,15 @@
 <?php
-$wb['limit_client_error_notint'] = 'The sub client limit must be a number.';
+$wb['limit_client_error_notint'] = 'Das Subkunden Limit muss eine Zahl sein.';
 $wb['limit_maildomain_txt'] = 'Max. Anzahl an Emaildomains';
 $wb['limit_mailbox_txt'] = 'Max. Anzahl an Mailboxen';
 $wb['limit_mailalias_txt'] = 'Max. Anzahl an Emailaliasen';
 $wb['limit_mailforward_txt'] = 'Max. Anzahl an Emailweiterleitungen';
-$wb['limit_mailcatchall_txt'] = 'Max. Anzahl an Email catchall Kontos';
-$wb['limit_mailrouting_txt'] = 'Max. Anzahl Email routes';
+$wb['limit_mailcatchall_txt'] = 'Max. Anzahl an Email Catchall Kontos';
+$wb['limit_mailrouting_txt'] = 'Max. Anzahl Email Routen';
 $wb['limit_mailfilter_txt'] = 'Max. Anzahl an Emailfilter';
-$wb['limit_fetchmail_txt'] = 'Max. Anzahl an fetchmail Kontos';
+$wb['limit_fetchmail_txt'] = 'Max. Anzahl an Fetchmail Kontos';
 $wb['limit_mailquota_txt'] = 'Mailbox Quota';
-$wb['limit_spamfilter_wblist_txt'] = 'Max. Anzahl an Spamfilter white / blacklist Filter';
+$wb['limit_spamfilter_wblist_txt'] = 'Max. Anzahl an Spamfilter White- / Blacklist Filter';
 $wb['limit_spamfilter_user_txt'] = 'Max. Anzahl Spamfilter Benutzer';
 $wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
 $wb['limit_client_txt'] = 'Max. Anzahl an Kunden';
@@ -17,7 +17,7 @@
 $wb['limit_subdomain_txt'] = 'Max. Anzahl an Subdomains';
 $wb['limit_webquota_txt'] = 'Max. Webquota';
 $wb['limit_database_txt'] = 'Max. Anzahl an Datenbanken';
-$wb['limit_cron_txt'] = 'Max. Anzahl Cron Jobs';
+$wb['limit_cron_txt'] = 'Max. Anzahl an Cron Jobs';
 $wb['limit_cron_type_txt'] = 'Max. erlaubter Typ von Cron Jobs (chrooted und full erlauben auch url)';
 $wb['limit_cron_frequency_txt'] = 'Min. Abstand zwischen Ausf&uuml;hrungen';
 $wb['limit_web_domain_txt'] = 'Max. Anzahl an Web Domains';
@@ -31,12 +31,12 @@
 $wb['limit_mailbox_error_notint'] = 'Das Mailbox Limit muss eine Nummer sein.';
 $wb['limit_mailalias_error_notint'] = 'Das Emailalias Limit muss eine Nummer sein.';
 $wb['limit_mailforward_error_notint'] = 'Das Emailweiterleitung Limit muss eine Nummer sein.';
-$wb['limit_mailcatchall_error_notint'] = 'Das Email catchall Limit muss eine Nummer sein.';
-$wb['limit_mailrouting_error_notint'] = 'Das Email routing Limit muss eine Nummer sein.';
+$wb['limit_mailcatchall_error_notint'] = 'Das Email Catchall Limit muss eine Nummer sein.';
+$wb['limit_mailrouting_error_notint'] = 'Das Email Routing Limit muss eine Nummer sein.';
 $wb['limit_mailfilter_error_notint'] = 'Das Emailfilter Limit muss eine Nummer sein.';
 $wb['limit_mailfetchmail_error_notint'] = 'Das Fetchmail Limit muss eine Nummer sein.';
 $wb['limit_mailquota_error_notint'] = 'Das Emailquota Limit muss eine Nummer sein.';
-$wb['limit_spamfilter_wblist_error_notint'] = 'Das Spamfilter white / blacklist Limit muss eine Nummer sein.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'Das Spamfilter White- / Blacklist Limit muss eine Nummer sein.';
 $wb['limit_spamfilter_user_error_notint'] = 'Das Spamfilter Benutzer Limit muss eine Nummer sein.';
 $wb['limit_spamfilter_policy_error_notint'] = 'Das Spamfilter Richtlinien Limit muss eine Nummer sein.';
 $wb['limit_web_domain_error_notint'] = 'Das Webseiten Limit muss eine Nummer sein.';
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
new file mode 100644
index 0000000..6c3c31d
--- /dev/null
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -0,0 +1,90 @@
+<?php
+$wb['limit_maildomain_txt'] = 'Max. Anzahl an Email Domains';
+$wb['limit_mailbox_txt'] = 'Max. Anzahl an Mailboxen';
+$wb['limit_mailalias_txt'] = 'Max. Anzahl an Emailaliase';
+$wb['limit_mailforward_txt'] = 'Max. Anzahl an Email Weiterleitungen';
+$wb['limit_mailcatchall_txt'] = 'Max. Anzahl an Email Catchall Konten';
+$wb['limit_mailrouting_txt'] = 'Max. Anzahl an Email Routen';
+$wb['limit_mailfilter_txt'] = 'Max. Anzahl an Email Filter';
+$wb['limit_fetchmail_txt'] = 'Max. Anzahl an Fetchmail Konten';
+$wb['limit_mailquota_txt'] = 'Mailbox Quota';
+$wb['limit_spamfilter_wblist_txt'] = 'Max. Anzahl an Spamfilter White- / Blacklist Filter';
+$wb['limit_spamfilter_user_txt'] = 'Max. Anzahl an Spamfilter Benutzer';
+$wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
+$wb['default_mailserver_txt'] = 'Standardmailserver';
+$wb['company_name_txt'] = 'Firmenname';
+$wb['contact_name_txt'] = 'Kontakt';
+$wb['username_txt'] = 'Benutzername';
+$wb['password_txt'] = 'Passwort';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['language_txt'] = 'Sprache';
+$wb['usertheme_txt'] = 'Thema';
+$wb['street_txt'] = 'Straße';
+$wb['zip_txt'] = 'PLZ';
+$wb['city_txt'] = 'Ort';
+$wb['state_txt'] = 'Bundesland';
+$wb['country_txt'] = 'Staat';
+$wb['telephone_txt'] = 'Telefon';
+$wb['mobile_txt'] = 'Handy';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'Email';
+$wb['internet_txt'] = 'Internet';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Notizen';
+$wb['company_txt'] = 'Firma';
+$wb['title_txt'] = 'Titel';
+$wb['firstname_txt'] = 'Vorname';
+$wb['surname_txt'] = 'Nachname';
+$wb['limit_domain_txt'] = 'Max. Anzahl an Domains';
+$wb['limit_subdomain_txt'] = 'Max. Anzahl an Subdomains';
+$wb['limit_webquota_txt'] = 'Max. Webquota';
+$wb['limit_database_txt'] = 'Max. Anzahl an Datenbanken';
+$wb['limit_cron_txt'] = 'Max. Anzahl an Cron Jobs';
+$wb['limit_cron_type_txt'] = 'Max. erlaubter Cron Job Typ (chrooted und full erlauben auch url)';
+$wb['limit_cron_frequency_txt'] = 'Min. Abstand zwischen Ausführungen';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['limit_client_error_notint'] = 'Das Subkunden Limit muss eine Zahl sein.';
+$wb['firstname_error_empty'] = 'Vorname ist leer.';
+$wb['contact_error_empty'] = 'Kontakt ist leer.';
+$wb['default_webserver_txt'] = 'Standardwebserver';
+$wb['limit_web_domain_txt'] = 'Max. Anzahl an Webdomains';
+$wb['limit_web_aliasdomain_txt'] = 'Max. Anzahl an Webaliasdomains';
+$wb['limit_web_subdomain_txt'] = 'Max. Anzahl an Websubdomains';
+$wb['limit_ftp_user_txt'] = 'Max. Anzahl an FTP Benutzer';
+$wb['default_dnsserver_txt'] = 'Standard DNS Server';
+$wb['limit_dns_zone_txt'] = 'Max. Anzahl an DNS Zonen';
+$wb['limit_dns_record_txt'] = 'Max. Anzahl an DNS Einträge';
+$wb['limit_shell_user_txt'] = 'Max. Anzahl an Shell Benutzer';
+$wb['limit_client_txt'] = 'Max. Anzahl an Kunden';
+$wb['username_error_empty'] = 'Benutzername ist leer.';
+$wb['username_error_unique'] = 'Der Benutzername muss einzigartig sein.';
+$wb['limit_maildomain_error_notint'] = 'Das Email Domain Limit muss eine Nummer sein.';
+$wb['limit_mailbox_error_notint'] = 'Das Mailbox Limit muss eine Nummer sein.';
+$wb['limit_mailalias_error_notint'] = 'Das Emailalias Limit muss eine Nummer sein.';
+$wb['limit_mailforward_error_notint'] = 'Das Emailweiterleitung Limit muss eine Nummer sein.';
+$wb['limit_mailcatchall_error_notint'] = 'Das Email Catchall Limit muss eine Nummer sein.';
+$wb['limit_mailrouting_error_notint'] = 'Das Email Routing Limit muss eine Nummer sein.';
+$wb['limit_mailfilter_error_notint'] = 'Das Emailfilter Limit muss eine Nummer sein.';
+$wb['limit_mailfetchmail_error_notint'] = 'Das Fetchmail Limit muss eine Nummer sein.';
+$wb['limit_mailquota_error_notint'] = 'Das Emailquota Limit muss eine Nummer sein.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'Das Spamfilter White- / Blacklist Limit muss eine Nummer sein.';
+$wb['limit_spamfilter_user_error_notint'] = 'Das Spamfilter Benutzer Limit muss eine Nummer sein.';
+$wb['limit_spamfilter_policy_error_notint'] = 'Das Spamfilter Richtlinien Limit muss eine Nummer sein.';
+$wb['limit_web_domain_error_notint'] = 'Das Webseiten Limit muss eine Nummer sein.';
+$wb['limit_web_aliasdomain_error_notint'] = 'Das Webseite Aliasdomain Limit muss eine Nummer sein.';
+$wb['limit_web_subdomain_error_notint'] = 'Das Webseite Subdomain Limit muss eine Nummer sein.';
+$wb['limit_ftp_user_error_notint'] = 'Das FTP Benutzer Limit muss eine Nummer sein.';
+$wb['limit_shell_user_error_notint'] = 'Das Shell Benutzer Limit muss eine Nummer sein.';
+$wb['limit_dns_zone_error_notint'] = 'Das DNS Einträge Limit muss eine Nummer sein.';
+$wb['default_dbserver_txt'] = 'Standarddatenbankserver';
+$wb['limit_database_error_notint'] = 'Das Datenbank Limit muss eine Nummer sein.';
+$wb['limit_cron_error_notint'] = 'Das Cron Job Limit muss eine Zahl sein.';
+$wb['limit_cron_error_frequency'] = 'Das Cron Job Intervall-Limit muss eine Zahl sein.';
+$wb['username_error_regex'] = 'Der Benutzername enthält ungültige Zeichen.';
+$wb['template_master_txt'] = 'Mastervorlage';
+$wb['template_additional_txt'] = 'Addons';
+$wb['ssh_chroot_txt'] = 'SSH-Chroot Optionen';
+$wb['web_php_options_txt'] = 'PHP Optionen';
+$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
+$wb['limit_client_error_positive'] = 'Die Anzahl an Kunden muss > 0 sein';
+?>
diff --git a/interface/web/client/lib/lang/de_resellers_list.lng b/interface/web/client/lib/lang/de_resellers_list.lng
new file mode 100644
index 0000000..f6f736c
--- /dev/null
+++ b/interface/web/client/lib/lang/de_resellers_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Reseller';
+$wb['client_id_txt'] = 'ID';
+$wb['company_name_txt'] = 'Firmenname';
+$wb['contact_name_txt'] = 'Kontakt';
+$wb['city_txt'] = 'Ort';
+$wb['country_txt'] = 'Staat';
+$wb['add_new_record_txt'] = 'Neuen Reseller hinzufügen';
+?>
diff --git a/interface/web/client/lib/lang/es.lng b/interface/web/client/lib/lang/es.lng
index 95a0dc8..1bec133 100644
--- a/interface/web/client/lib/lang/es.lng
+++ b/interface/web/client/lib/lang/es.lng
@@ -6,4 +6,7 @@
 $wb['Edit Client'] = 'Editar cliente';
 $wb['Clients'] = 'Clientes';
 $wb['Edit Client-Templates'] = 'Edit Client-Templates';
+$wb['Add Reseller'] = 'Add Reseller';
+$wb['Edit Reseller'] = 'Edit Reseller';
+$wb['Resellers'] = 'Resellers';
 ?>
diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng
new file mode 100644
index 0000000..906fd44
--- /dev/null
+++ b/interface/web/client/lib/lang/es_reseller.lng
@@ -0,0 +1,93 @@
+<?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["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_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["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["limit_cron_error_notint"] = 'The cron limit must be a number.';
+$wb["limit_cron_error_frequency"] = 'The cron frequency limit must be a number.';
+$wb["username_error_regex"] = 'The Username contains invalid chracaters.';
+$wb["template_master_txt"] = 'Master template';
+$wb["template_additional_txt"] = 'Addon template';
+$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
+$wb["web_php_options_txt"] = 'PHP Options';
+$wb["limit_client_error"] = 'The max. number of clients is reached.';
+$wb["limit_client_error_positive"] = 'The number of clients must be > 0';
+?>
diff --git a/interface/web/client/lib/lang/es_resellers_list.lng b/interface/web/client/lib/lang/es_resellers_list.lng
new file mode 100644
index 0000000..523a467
--- /dev/null
+++ b/interface/web/client/lib/lang/es_resellers_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["list_head_txt"] = 'Resellers';
+$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';
+$wb["add_new_record_txt"] = 'Add new reseller';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/fi.lng b/interface/web/client/lib/lang/fi.lng
index a06bfe8..a653249 100755
--- a/interface/web/client/lib/lang/fi.lng
+++ b/interface/web/client/lib/lang/fi.lng
@@ -6,4 +6,7 @@
 $wb['Edit Client'] = 'Muokkaa asiakkaan tietoja';
 $wb['Clients'] = 'Asiakkaat';
 $wb['Edit Client-Templates'] = 'Muokkaa asiakasmalleja';
+$wb['Add Reseller'] = 'Add Reseller';
+$wb['Edit Reseller'] = 'Edit Reseller';
+$wb['Resellers'] = 'Resellers';
 ?>
diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng
new file mode 100644
index 0000000..906fd44
--- /dev/null
+++ b/interface/web/client/lib/lang/fi_reseller.lng
@@ -0,0 +1,93 @@
+<?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["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_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["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["limit_cron_error_notint"] = 'The cron limit must be a number.';
+$wb["limit_cron_error_frequency"] = 'The cron frequency limit must be a number.';
+$wb["username_error_regex"] = 'The Username contains invalid chracaters.';
+$wb["template_master_txt"] = 'Master template';
+$wb["template_additional_txt"] = 'Addon template';
+$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
+$wb["web_php_options_txt"] = 'PHP Options';
+$wb["limit_client_error"] = 'The max. number of clients is reached.';
+$wb["limit_client_error_positive"] = 'The number of clients must be > 0';
+?>
diff --git a/interface/web/client/lib/lang/fi_resellers_list.lng b/interface/web/client/lib/lang/fi_resellers_list.lng
new file mode 100644
index 0000000..523a467
--- /dev/null
+++ b/interface/web/client/lib/lang/fi_resellers_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["list_head_txt"] = 'Resellers';
+$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';
+$wb["add_new_record_txt"] = 'Add new reseller';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/fr.lng b/interface/web/client/lib/lang/fr.lng
index 6f28108..0d86355 100644
--- a/interface/web/client/lib/lang/fr.lng
+++ b/interface/web/client/lib/lang/fr.lng
@@ -6,4 +6,7 @@
 $wb['Edit Client'] = 'Edit Client';
 $wb['Clients'] = 'Clients';
 $wb['Edit Client-Templates'] = 'Edit Client-Templates';
+$wb['Add Reseller'] = 'Add Reseller';
+$wb['Edit Reseller'] = 'Edit Reseller';
+$wb['Resellers'] = 'Resellers';
 ?>
diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng
new file mode 100644
index 0000000..906fd44
--- /dev/null
+++ b/interface/web/client/lib/lang/fr_reseller.lng
@@ -0,0 +1,93 @@
+<?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["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_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["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["limit_cron_error_notint"] = 'The cron limit must be a number.';
+$wb["limit_cron_error_frequency"] = 'The cron frequency limit must be a number.';
+$wb["username_error_regex"] = 'The Username contains invalid chracaters.';
+$wb["template_master_txt"] = 'Master template';
+$wb["template_additional_txt"] = 'Addon template';
+$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
+$wb["web_php_options_txt"] = 'PHP Options';
+$wb["limit_client_error"] = 'The max. number of clients is reached.';
+$wb["limit_client_error_positive"] = 'The number of clients must be > 0';
+?>
diff --git a/interface/web/client/lib/lang/fr_resellers_list.lng b/interface/web/client/lib/lang/fr_resellers_list.lng
new file mode 100644
index 0000000..523a467
--- /dev/null
+++ b/interface/web/client/lib/lang/fr_resellers_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["list_head_txt"] = 'Resellers';
+$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';
+$wb["add_new_record_txt"] = 'Add new reseller';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/hu.lng b/interface/web/client/lib/lang/hu.lng
new file mode 100644
index 0000000..00dec3f
--- /dev/null
+++ b/interface/web/client/lib/lang/hu.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['Client'] = 'Ügyfél';
+$wb['Address'] = 'Cím';
+$wb['Limits'] = 'Korlátok';
+$wb['Add Client'] = 'Ügyfél hozzáadása';
+$wb['Edit Client'] = 'Ügyfél adatok szerkesztése';
+$wb['Clients'] = 'Ügyfelek';
+$wb['Edit Client-Templates'] = 'Edit Client-Templates';
+?>
+
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
new file mode 100644
index 0000000..01ba04a
--- /dev/null
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -0,0 +1,85 @@
+<?php
+$wb['limit_maildomain_txt'] = 'Maximálisan létrehozható email domainek száma';
+$wb['limit_mailbox_txt'] = 'Maximálisan létrehozható email fiókok száma';
+$wb['limit_mailalias_txt'] = 'Maximálisan létrehozható email alias-ok száma';
+$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 korlát';
+$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'] = 'Alap levelező szerver';
+$wb['company_name_txt'] = 'Szervezet neve';
+$wb['contact_name_txt'] = 'Kapcsolat tartó neve';
+$wb['username_txt'] = 'Felhasználói név';
+$wb['password_txt'] = 'Jelszó';
+$wb['language_txt'] = 'Nyelv';
+$wb['usertheme_txt'] = 'Kinézet';
+$wb['street_txt'] = 'Utca';
+$wb['zip_txt'] = 'Irányító szám';
+$wb['city_txt'] = 'Város';
+$wb['state_txt'] = 'State';
+$wb['country_txt'] = 'Ország';
+$wb['telephone_txt'] = 'Telefon';
+$wb['mobile_txt'] = 'Mobil telefon';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'Email';
+$wb['internet_txt'] = 'Internet';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Megjegyzés';
+$wb['company_txt'] = 'Szervezet';
+$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['password_strength_txt'] = 'Password strength';
+$wb['template_master_txt'] = 'Master template';
+$wb['template_additional_txt'] = 'Addon template';
+$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
+$wb['web_php_options_txt'] = 'PHP Options';
+$wb['limit_client_error'] = 'The max. number of clients is reached.';
+?>
+
diff --git a/interface/web/client/lib/lang/hu_client_list.lng b/interface/web/client/lib/lang/hu_client_list.lng
new file mode 100644
index 0000000..5046900
--- /dev/null
+++ b/interface/web/client/lib/lang/hu_client_list.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'Viszonteladó';
+$wb['client_id_txt'] = 'Azonosító';
+$wb['company_txt'] = 'Szervezet';
+$wb['firstname_txt'] = 'Vezetéknév';
+$wb['surname_txt'] = 'Kersztnév';
+$wb['city_txt'] = 'Város';
+$wb['page_txt'] = 'Oldal';
+$wb['page_of_txt'] = '';
+$wb['page_next_txt'] = 'Következő';
+$wb['page_back_txt'] = 'Vissza';
+$wb['delete_txt'] = 'Törlés';
+$wb['filter_txt'] = 'Szűrő';
+?>
+
diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng
new file mode 100644
index 0000000..b347d20
--- /dev/null
+++ b/interface/web/client/lib/lang/hu_client_template.lng
@@ -0,0 +1,50 @@
+<?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_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_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';
+?>
diff --git a/interface/web/client/lib/lang/hu_client_template_list.lng b/interface/web/client/lib/lang/hu_client_template_list.lng
new file mode 100644
index 0000000..01ed74a
--- /dev/null
+++ b/interface/web/client/lib/lang/hu_client_template_list.lng
@@ -0,0 +1,6 @@
+<?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/hu_clients_list.lng b/interface/web/client/lib/lang/hu_clients_list.lng
new file mode 100644
index 0000000..44f4e71
--- /dev/null
+++ b/interface/web/client/lib/lang/hu_clients_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Ügyfelek';
+$wb['client_id_txt'] = 'Azonosító';
+$wb['company_name_txt'] = 'Szervezet neve';
+$wb['contact_name_txt'] = 'Kapcsolattartó neve';
+$wb['city_txt'] = 'Város';
+$wb['country_txt'] = 'Ország';
+$wb['add_new_record_txt'] = 'Új ügyfél hozzáadása';
+?>
+
diff --git a/interface/web/client/lib/lang/hu_users_list.lng b/interface/web/client/lib/lang/hu_users_list.lng
new file mode 100644
index 0000000..01da63d
--- /dev/null
+++ b/interface/web/client/lib/lang/hu_users_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Felhasználók';
+$wb['username_txt'] = 'Felhasználó neve';
+$wb['name_txt'] = 'Neve';
+$wb['vorname_txt'] = 'Forename';
+$wb['ort_txt'] = 'Város';
+$wb['page_txt'] = 'Oldal';
+$wb['page_of_txt'] = '';
+$wb['page_next_txt'] = 'Következő';
+$wb['page_back_txt'] = 'Vissza';
+$wb['delete_txt'] = 'Törlés';
+$wb['filter_txt'] = 'Szűrő';
+?>
+
diff --git a/interface/web/client/lib/lang/it.lng b/interface/web/client/lib/lang/it.lng
index ca3b55a..228cd0c 100644
--- a/interface/web/client/lib/lang/it.lng
+++ b/interface/web/client/lib/lang/it.lng
@@ -6,4 +6,7 @@
 $wb['Edit Client'] = 'Modifica cliente';
 $wb['Clients'] = 'Clienti';
 $wb['Edit Client-Templates'] = 'Modifica modelli cliente';
+$wb['Add Reseller'] = 'Add Reseller';
+$wb['Edit Reseller'] = 'Edit Reseller';
+$wb['Resellers'] = 'Resellers';
 ?>
diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng
new file mode 100644
index 0000000..906fd44
--- /dev/null
+++ b/interface/web/client/lib/lang/it_reseller.lng
@@ -0,0 +1,93 @@
+<?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["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_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["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["limit_cron_error_notint"] = 'The cron limit must be a number.';
+$wb["limit_cron_error_frequency"] = 'The cron frequency limit must be a number.';
+$wb["username_error_regex"] = 'The Username contains invalid chracaters.';
+$wb["template_master_txt"] = 'Master template';
+$wb["template_additional_txt"] = 'Addon template';
+$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
+$wb["web_php_options_txt"] = 'PHP Options';
+$wb["limit_client_error"] = 'The max. number of clients is reached.';
+$wb["limit_client_error_positive"] = 'The number of clients must be > 0';
+?>
diff --git a/interface/web/client/lib/lang/it_resellers_list.lng b/interface/web/client/lib/lang/it_resellers_list.lng
new file mode 100644
index 0000000..523a467
--- /dev/null
+++ b/interface/web/client/lib/lang/it_resellers_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["list_head_txt"] = 'Resellers';
+$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';
+$wb["add_new_record_txt"] = 'Add new reseller';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/nl.lng b/interface/web/client/lib/lang/nl.lng
index 4ba5907..ef3ea1f 100644
--- a/interface/web/client/lib/lang/nl.lng
+++ b/interface/web/client/lib/lang/nl.lng
@@ -1,9 +1,13 @@
 <?php
 $wb['Client'] = 'Klant';
-$wb['Address'] = 'Adres';
+$wb['Address'] = 'Adresgegevens';
 $wb['Limits'] = 'Limieten';
 $wb['Add Client'] = 'Toevoegen klant';
 $wb['Edit Client'] = 'Wijzigen klant';
 $wb['Clients'] = 'Klanten';
 $wb['Edit Client-Templates'] = 'Wijzigen Klant-templates';
+$wb['Add Reseller'] = 'Reseller toevoegen';
+$wb['Edit Reseller'] = 'Reseller wijzigen';
+$wb['Resellers'] = 'Resellers';
 ?>
+
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index faa9073..1dde4e3 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -1,89 +1,90 @@
 <?php
-$wb['limit_maildomain_txt'] = 'Max. aantal email domeinen';
-$wb['limit_mailbox_txt'] = 'Max. aantal mailboxen';
-$wb['limit_mailalias_txt'] = 'Max. aantal email aliassen';
-$wb['limit_mailforward_txt'] = 'Max. aantal email forwarders';
-$wb['limit_mailcatchall_txt'] = 'Max. aantal email catchall accounts';
-$wb['limit_mailrouting_txt'] = 'Max. aantal email routes';
-$wb['limit_mailfilter_txt'] = 'Max. aantal email filters';
-$wb['limit_fetchmail_txt'] = 'Max. aantal fetchmail accounts';
-$wb['limit_mailquota_txt'] = 'Mailbox quota';
-$wb['limit_spamfilter_wblist_txt'] = 'Max. aantal spamfilter white / blacklist filters';
-$wb['limit_spamfilter_user_txt'] = 'Max. aantal spamfilter gebruikers';
-$wb['limit_spamfilter_policy_txt'] = 'Max. aantal spamfilter policys';
+$wb['limit_maildomain_txt'] = '# E-mail domeinen';
+$wb['limit_mailbox_txt'] = '# E-mailaccounts';
+$wb['limit_mailalias_txt'] = '# E-mail aliassen';
+$wb['limit_mailforward_txt'] = '# E-mail forwarders';
+$wb['limit_mailcatchall_txt'] = '# E-mail catch-all accounts';
+$wb['limit_mailrouting_txt'] = '# E-mail routes';
+$wb['limit_mailfilter_txt'] = '# E-mail filters';
+$wb['limit_fetchmail_txt'] = '# Fetchmail accounts';
+$wb['limit_mailquota_txt'] = 'Schijfruimte limiet e-mail';
+$wb['limit_spamfilter_wblist_txt'] = '# Spamfilter white-/blacklist filters';
+$wb['limit_spamfilter_user_txt'] = '# Spamfilter gebruikers';
+$wb['limit_spamfilter_policy_txt'] = '# Spamfilter policies';
 $wb['default_mailserver_txt'] = 'Standaard mailserver';
 $wb['company_name_txt'] = 'Bedrijfsnaam';
-$wb['contact_name_txt'] = 'Contact naam';
+$wb['contact_name_txt'] = 'Contactpersoon';
 $wb['username_txt'] = 'Gebruikersnaam';
 $wb['password_txt'] = 'Wachtwoord';
 $wb['password_strength_txt'] = 'Wachtwoord sterkte';
 $wb['language_txt'] = 'Taal';
-$wb['usertheme_txt'] = 'Thema';
+$wb['usertheme_txt'] = 'ISPconfig Thema';
 $wb['street_txt'] = 'Adres';
 $wb['zip_txt'] = 'Postcode';
-$wb['city_txt'] = 'Plaatsnaam';
+$wb['city_txt'] = 'Plaats';
 $wb['state_txt'] = 'Provincie';
 $wb['country_txt'] = 'Land';
 $wb['telephone_txt'] = 'Telefoon';
 $wb['mobile_txt'] = 'Mobiele telefoon';
 $wb['fax_txt'] = 'Fax';
-$wb['email_txt'] = 'Email';
-$wb['internet_txt'] = 'Internet';
+$wb['email_txt'] = 'E-mail';
+$wb['internet_txt'] = 'Website';
 $wb['icq_txt'] = 'ICQ';
 $wb['notes_txt'] = 'Opmerkingen';
 $wb['company_txt'] = 'Bedrijf';
 $wb['title_txt'] = 'Titel';
 $wb['firstname_txt'] = 'Voornaam';
 $wb['surname_txt'] = 'Achternaam';
-$wb['limit_client_txt'] = 'Max. aantal klanten';
-$wb['limit_domain_txt'] = 'limiet domein';
-$wb['limit_subdomain_txt'] = 'limiet subdomein';
-$wb['limit_webquota_txt'] = 'limiet webquota';
-$wb['limit_database_txt'] = 'Max. aantal databases';
-$wb['ip_address_txt'] = 'IP adres';
-$wb['limit_client_error_notint'] = 'De sub klant limiet moet een numerieke waarde zijn.';
+$wb['limit_client_txt'] = '# Klanten (als reseller)';
+$wb['limit_domain_txt'] = 'Limiet domein';
+$wb['limit_subdomain_txt'] = 'Limiet subdomein';
+$wb['limit_webquota_txt'] = 'Limiet webruimte';
+$wb['limit_database_txt'] = '# Databases';
+$wb['ip_address_txt'] = 'IP-adres';
+$wb['limit_client_error_notint'] = 'Het aantal aan te maken klanten moet een numerieke waarde zijn.';
 $wb['firstname_error_empty'] = 'Voornaam is leeg.';
-$wb['contact_error_empty'] = 'Contactnaam is leeg.';
-$wb['default_webserver_txt'] = 'Standaard Webserver';
-$wb['limit_web_domain_txt'] = 'Max. aantal web domeinen';
-$wb['limit_web_aliasdomain_txt'] = 'Max. aantal web aliasdomeinen';
-$wb['limit_web_subdomain_txt'] = 'Max. aantal web subdomeinen';
-$wb['limit_ftp_user_txt'] = 'Max. aantal FTP gebruikers';
-$wb['default_dnsserver_txt'] = 'Standaard DNS Server';
-$wb['limit_dns_zone_txt'] = 'Max. aantal DNS zones';
-$wb['limit_dns_record_txt'] = 'Max. aantal DNS records';
-$wb['limit_shell_user_txt'] = 'Max. aantal Shell gebruikers';
+$wb['contact_error_empty'] = 'Contactpersoon is leeg.';
+$wb['default_webserver_txt'] = 'Standaard webserver';
+$wb['limit_web_domain_txt'] = '# Websites';
+$wb['limit_web_aliasdomain_txt'] = '# Website domeinaliassen';
+$wb['limit_web_subdomain_txt'] = '# Website subdomeinen';
+$wb['limit_ftp_user_txt'] = '# FTP gebruikers';
+$wb['default_dnsserver_txt'] = 'Standaard DNS server';
+$wb['limit_dns_zone_txt'] = '# DNS zones';
+$wb['limit_dns_record_txt'] = '# DNS records';
+$wb['limit_shell_user_txt'] = '# Shell gebruikers';
 $wb['username_error_empty'] = 'Gebruikersnaam is leeg.';
 $wb['username_error_unique'] = 'De gebruikersnaam moet uniek zijn.';
-$wb['limit_maildomain_error_notint'] = 'De email domein limiet moet een nummerieke waarde zijn.';
-$wb['limit_mailbox_error_notint'] = 'De mailbox limiet moet een nummerieke waarde zijn.';
-$wb['limit_mailalias_error_notint'] = 'De email alias limiet moet een nummerieke waarde zijn.';
-$wb['limit_mailforward_error_notint'] = 'De email forward limit moet een nummerieke waarde zijn.';
-$wb['limit_mailcatchall_error_notint'] = 'De email catchall limiet moet een nummerieke waarde zijn.';
-$wb['limit_mailrouting_error_notint'] = 'De email routing limiet moet een nummerieke waarde zijn.';
-$wb['limit_mailfilter_error_notint'] = 'De email filter limiet moet een nummerieke waarde zijn.';
+$wb['limit_maildomain_error_notint'] = 'De e-mail domein limiet moet een nummerieke waarde zijn.';
+$wb['limit_mailbox_error_notint'] = 'De e-mailaccounts limiet moet een nummerieke waarde zijn.';
+$wb['limit_mailalias_error_notint'] = 'De e-mailalias limiet moet een nummerieke waarde zijn.';
+$wb['limit_mailforward_error_notint'] = 'De e-mail forward limit moet een nummerieke waarde zijn.';
+$wb['limit_mailcatchall_error_notint'] = 'De e-mail catch-all limiet moet een nummerieke waarde zijn.';
+$wb['limit_mailrouting_error_notint'] = 'De e-mail routing limiet moet een nummerieke waarde zijn.';
+$wb['limit_mailfilter_error_notint'] = 'De e-mail filter limiet moet een nummerieke waarde zijn.';
 $wb['limit_mailfetchmail_error_notint'] = 'De fetchmail limiet moet een nummerieke waarde zijn.';
-$wb['limit_mailquota_error_notint'] = 'De email quota limiet moet een nummerieke waarde zijn.';
+$wb['limit_mailquota_error_notint'] = 'De e-mail quota limiet moet een nummerieke waarde zijn.';
 $wb['limit_spamfilter_wblist_error_notint'] = 'De spamfilter white / blacklist limiet moet een nummerieke waarde zijn.';
 $wb['limit_spamfilter_user_error_notint'] = 'De spamfilter gebruiker limiet moet een nummerieke waarde zijn.';
 $wb['limit_spamfilter_policy_error_notint'] = 'De spamfilter policy limiet moet een nummerieke waarde zijn.';
 $wb['limit_web_domain_error_notint'] = 'De website limiet moet een nummerieke waarde zijn.';
-$wb['limit_web_aliasdomain_error_notint'] = 'De website alias domain limiet moet een nummerieke waarde zijn.';
+$wb['limit_web_aliasdomain_error_notint'] = 'De website alias domein limiet moet een nummerieke waarde zijn.';
 $wb['limit_web_subdomain_error_notint'] = 'De website subdomein limiet moet een nummerieke waarde zijn.';
-$wb['limit_ftp_user_error_notint'] = 'De ftp gebruiker limiet moet een nummerieke waarde zijn.';
-$wb['limit_shell_user_error_notint'] = 'De shell gebruiker limit moet een nummerieke waarde zijn.';
-$wb['limit_dns_zone_error_notint'] = 'De dns record limit moet een nummerieke waarde zijn.';
+$wb['limit_ftp_user_error_notint'] = 'De FTP gebruiker limiet moet een nummerieke waarde zijn.';
+$wb['limit_shell_user_error_notint'] = 'De Shell gebruiker limit moet een nummerieke waarde zijn.';
+$wb['limit_dns_zone_error_notint'] = 'De DNS record limit moet een nummerieke waarde zijn.';
 $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['template_master_txt'] = 'Master';
-$wb['template_additional_txt'] = 'Addon';
+$wb['template_master_txt'] = 'Master template';
+$wb['template_additional_txt'] = 'Uitbreidende templates';
 $wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
-$wb['web_php_options_txt'] = 'PHP Options';
-$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['limit_cron_error_notint'] = 'The cron limit must be a number.';
-$wb['limit_cron_error_frequency'] = 'The cron frequency limit must be a number.';
-$wb['limit_client_error'] = 'The max. number of clients is reached.';
+$wb['web_php_options_txt'] = 'PHP opties';
+$wb['limit_client_error'] = 'Het max. aantal aan te maken klanten is bereikt.';
+$wb['limit_cron_txt'] = '# Cron jobs';
+$wb['limit_cron_type_txt'] = '# Typen cron jobs (chrooted en full implies url)';
+$wb['limit_cron_frequency_txt'] = 'Minimale tijd tussen uitvoeringen';
+$wb['limit_cron_error_notint'] = 'Het max. aantal cron jobs moet een nummerieke waarde zijn.';
+$wb['limit_cron_error_frequency'] = 'De cron uitvoeringen limiet moet een nummerieke waarde zijn.';
 ?>
+
diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng
index 6098bec..44334f7 100644
--- a/interface/web/client/lib/lang/nl_client_template.lng
+++ b/interface/web/client/lib/lang/nl_client_template.lng
@@ -1,39 +1,39 @@
 <?php
-$wb['limit_client_error_notint'] = 'De sub client limiet moet een numerieke waarde zijn.';
-$wb['limit_maildomain_txt'] = 'Max. aantal aan email domains';
-$wb['limit_mailbox_txt'] = 'Max. aantal aan mailboxes';
-$wb['limit_mailalias_txt'] = 'Max. aantal aan email aliases';
-$wb['limit_mailforward_txt'] = 'Max. aantal aan email forwarders';
-$wb['limit_mailcatchall_txt'] = 'Max. aantal aan email catchall accounts';
-$wb['limit_mailrouting_txt'] = 'Max. aantal aan email routes';
-$wb['limit_mailfilter_txt'] = 'Max. aantal aan email filters';
-$wb['limit_fetchmail_txt'] = 'Max. aantal aan fetchmail accounts';
-$wb['limit_mailquota_txt'] = 'Mailbox quota';
-$wb['limit_spamfilter_wblist_txt'] = 'Max. aantal aan spamfilter white / blacklist filters';
-$wb['limit_spamfilter_user_txt'] = 'Max. aantal aan spamfilter users';
-$wb['limit_spamfilter_policy_txt'] = 'Max. aantal aan spamfilter policys';
-$wb['limit_client_txt'] = 'Max. aantal aan klanten';
-$wb['limit_domain_txt'] = 'domein-limiet';
-$wb['limit_subdomain_txt'] = 'subdomein-limiet';
-$wb['limit_webquota_txt'] = 'webquota-limiet';
-$wb['limit_database_txt'] = 'Max. aantal aan Databases.';
-$wb['limit_web_domain_txt'] = 'Max. aantal aan web domeinen';
-$wb['limit_web_aliasdomain_txt'] = 'Max. aantal aan web aliasdomeinen';
-$wb['limit_web_subdomain_txt'] = 'Max. aantal aan web subdomeinen';
-$wb['limit_ftp_user_txt'] = 'Max. aantal aan FTP gebruikers';
-$wb['limit_dns_zone_txt'] = 'Max. aantal aan DNS zones';
-$wb['limit_dns_record_txt'] = 'Max. aantal aan DNS records';
-$wb['limit_shell_user_txt'] = 'Max. aantal aan Shell gebruikers';
-$wb['limit_maildomain_error_notint'] = 'De email domein limiet moet een numerieke waarde zijn.';
-$wb['limit_mailbox_error_notint'] = 'De mailbox limiet moet een numerieke waarde zijn.';
-$wb['limit_mailalias_error_notint'] = 'De email alias limiet moet een numerieke waarde zijn.';
-$wb['limit_mailforward_error_notint'] = 'De email forward limiet moet een numerieke waarde zijn.';
-$wb['limit_mailcatchall_error_notint'] = 'De email catchall limiet moet een numerieke waarde zijn.';
-$wb['limit_mailrouting_error_notint'] = 'De email routing limiet moet een numerieke waarde zijn.';
-$wb['limit_mailfilter_error_notint'] = 'De email filter limiet moet een numerieke waarde zijn.';
+$wb['limit_client_error_notint'] = 'De sub-klant limiet moet een numerieke waarde zijn.';
+$wb['limit_maildomain_txt'] = '# E-mail domeinen';
+$wb['limit_mailbox_txt'] = '# E-mailaccounts';
+$wb['limit_mailalias_txt'] = '# E-mail aliases';
+$wb['limit_mailforward_txt'] = '# E-mail forwarders';
+$wb['limit_mailcatchall_txt'] = '# E-mail catch-all accounts';
+$wb['limit_mailrouting_txt'] = '# E-mail routes';
+$wb['limit_mailfilter_txt'] = '# E-mail filters';
+$wb['limit_fetchmail_txt'] = '# Fetchmail accounts';
+$wb['limit_mailquota_txt'] = 'Limiet schijfruimte e-mailaccounts';
+$wb['limit_spamfilter_wblist_txt'] = '# Spamfilter white-/blacklist filters';
+$wb['limit_spamfilter_user_txt'] = '# Spamfilter gebruikers';
+$wb['limit_spamfilter_policy_txt'] = '# Spamfilter policies';
+$wb['limit_client_txt'] = '# Sub-klanten';
+$wb['limit_domain_txt'] = '# Domeinnamen';
+$wb['limit_subdomain_txt'] = '# Subdomeinen';
+$wb['limit_webquota_txt'] = 'Limiet schijfruimte websites';
+$wb['limit_database_txt'] = '# Databases';
+$wb['limit_web_domain_txt'] = '# Website domeinen';
+$wb['limit_web_aliasdomain_txt'] = '# Website aliasdomeinen';
+$wb['limit_web_subdomain_txt'] = '# Website subdomeinen';
+$wb['limit_ftp_user_txt'] = '# FTP gebruikers';
+$wb['limit_dns_zone_txt'] = '# DNS zones';
+$wb['limit_dns_record_txt'] = '# DNS records';
+$wb['limit_shell_user_txt'] = '# Shell gebruikers';
+$wb['limit_maildomain_error_notint'] = 'De e-mail domein limiet moet een numerieke waarde zijn.';
+$wb['limit_mailbox_error_notint'] = 'De e-mailaccounts limiet moet een numerieke waarde zijn.';
+$wb['limit_mailalias_error_notint'] = 'De e-mail alias limiet moet een numerieke waarde zijn.';
+$wb['limit_mailforward_error_notint'] = 'De e-mail forward limiet moet een numerieke waarde zijn.';
+$wb['limit_mailcatchall_error_notint'] = 'De e-mail catchall limiet moet een numerieke waarde zijn.';
+$wb['limit_mailrouting_error_notint'] = 'De e-mail routing limiet moet een numerieke waarde zijn.';
+$wb['limit_mailfilter_error_notint'] = 'De e-mail filter limiet moet een numerieke waarde zijn.';
 $wb['limit_mailfetchmail_error_notint'] = 'De fetchmail limiet moet een numerieke waarde zijn.';
-$wb['limit_mailquota_error_notint'] = 'De email quota limiet moet een numerieke waarde zijn.';
-$wb['limit_spamfilter_wblist_error_notint'] = 'De spamfilter white / blacklist limiet moet een numerieke waarde zijn.';
+$wb['limit_mailquota_error_notint'] = 'De e-mail schijfruimte limiet moet een numerieke waarde zijn.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'De spamfilter white-/blacklist limiet moet een numerieke waarde zijn.';
 $wb['limit_spamfilter_user_error_notint'] = 'De spamfilter user limiet moet een numerieke waarde zijn.';
 $wb['limit_spamfilter_policy_error_notint'] = 'De spamfilter policy limiet moet een numerieke waarde zijn.';
 $wb['limit_web_domain_error_notint'] = 'De website limiet moet een numerieke waarde zijn.';
@@ -41,12 +41,13 @@
 $wb['limit_web_subdomain_error_notint'] = 'De website subdomain limiet moet een numerieke waarde zijn.';
 $wb['limit_ftp_user_error_notint'] = 'De ftp user limiet moet een numerieke waarde zijn.';
 $wb['limit_shell_user_error_notint'] = 'De shell user limiet moet een numerieke waarde zijn.';
-$wb['limit_dns_zone_error_notint'] = 'De dns record limiet moet een numerieke waarde zijn.';
+$wb['limit_dns_zone_error_notint'] = 'De DNS record limiet moet een numerieke waarde zijn.';
 $wb['limit_database_error_notint'] = 'De database limiet moet een numerieke waarde zijn.';
 $wb['error_template_name_empty'] = 'Voer a.u.b. de template naam in.';
-$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['limit_cron_error_notint'] = 'The cron limit must be a number.';
-$wb['limit_cron_error_frequency'] = 'The cron frequency limit must be a number.';
+$wb['limit_cron_txt'] = '# Cron jobs';
+$wb['limit_cron_type_txt'] = 'Toestaan van uit te voeren typen Cron-jobs';
+$wb['limit_cron_frequency_txt'] = 'Minimale tijd tussen uitvoeringen';
+$wb['limit_cron_error_notint'] = 'Cron limiet moet een geldig getal zijn.';
+$wb['limit_cron_error_frequency'] = 'Cron frequentie limiet moet een geldig getal zijn.';
 ?>
+
diff --git a/interface/web/client/lib/lang/nl_client_template_list.lng b/interface/web/client/lib/lang/nl_client_template_list.lng
index 333aeb5..da98d48 100644
--- a/interface/web/client/lib/lang/nl_client_template_list.lng
+++ b/interface/web/client/lib/lang/nl_client_template_list.lng
@@ -3,3 +3,4 @@
 $wb['template_type_txt'] = 'Type';
 $wb['template_name_txt'] = 'Template naam';
 ?>
+
diff --git a/interface/web/client/lib/lang/nl_clients_list.lng b/interface/web/client/lib/lang/nl_clients_list.lng
index 96d3c45..f4dff4c 100644
--- a/interface/web/client/lib/lang/nl_clients_list.lng
+++ b/interface/web/client/lib/lang/nl_clients_list.lng
@@ -1,9 +1,10 @@
 <?php
 $wb['list_head_txt'] = 'Klanten';
 $wb['company_name_txt'] = 'Bedrijfsnaam';
-$wb['contact_name_txt'] = 'Contactnaam';
-$wb['city_txt'] = 'Plaatsnaam';
+$wb['contact_name_txt'] = 'Contactpersoon';
+$wb['city_txt'] = 'Plaats';
 $wb['country_txt'] = 'Nederland';
 $wb['client_id_txt'] = 'ID';
-$wb['add_new_record_txt'] = 'Add new client';
+$wb['add_new_record_txt'] = 'Nieuwe klant toevoegen';
 ?>
+
diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng
new file mode 100644
index 0000000..8157e65
--- /dev/null
+++ b/interface/web/client/lib/lang/nl_reseller.lng
@@ -0,0 +1,91 @@
+<?php
+$wb['limit_maildomain_txt'] = '# E-mail domeinnamen';
+$wb['limit_mailbox_txt'] = '# E-mailaccounts';
+$wb['limit_mailalias_txt'] = '# E-mailaliases';
+$wb['limit_mailforward_txt'] = '# E-mailforwarders';
+$wb['limit_mailcatchall_txt'] = '# E-mail catch-all accounts';
+$wb['limit_mailrouting_txt'] = '# E-mail routes';
+$wb['limit_mailfilter_txt'] = '# E-mailfilters';
+$wb['limit_fetchmail_txt'] = '# E-mail fetchmail accounts';
+$wb['limit_mailquota_txt'] = 'E-mail Schijfruimte-limiet';
+$wb['limit_spamfilter_wblist_txt'] = '# Spamfilter white-/blacklist filters';
+$wb['limit_spamfilter_user_txt'] = '# Spamfilter gebruikers';
+$wb['limit_spamfilter_policy_txt'] = '# Spamfilter policies';
+$wb['default_mailserver_txt'] = 'Standaard mailserver';
+$wb['company_name_txt'] = 'Bedrijfsnaam';
+$wb['contact_name_txt'] = 'Contactpersoon';
+$wb['username_txt'] = 'Gebruikersnaam';
+$wb['password_txt'] = 'Wachtwoord';
+$wb['password_strength_txt'] = 'Wachtwoord sterkte';
+$wb['language_txt'] = 'Taal';
+$wb['usertheme_txt'] = 'ISPconfig Thema';
+$wb['street_txt'] = 'Adres';
+$wb['zip_txt'] = 'Postcode';
+$wb['city_txt'] = 'Plaats';
+$wb['state_txt'] = 'Provincie';
+$wb['country_txt'] = 'Land';
+$wb['telephone_txt'] = 'Telefoon';
+$wb['mobile_txt'] = 'Mobiele telefoon';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'E-mail';
+$wb['internet_txt'] = 'Website';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Opmerkingen';
+$wb['company_txt'] = 'Bedrijfsnaam';
+$wb['title_txt'] = 'Titel';
+$wb['firstname_txt'] = 'Voornaam';
+$wb['surname_txt'] = 'Achternaam';
+$wb['limit_domain_txt'] = 'Limiet domeinnamen';
+$wb['limit_subdomain_txt'] = 'Limiet subdomeinen';
+$wb['limit_webquota_txt'] = 'Website-schijfruimte limiet';
+$wb['limit_database_txt'] = '# Databases';
+$wb['limit_cron_txt'] = '# Cron jobs';
+$wb['limit_cron_type_txt'] = 'Toestaan van uit te voeren typen Cron-jobs';
+$wb['limit_cron_frequency_txt'] = 'Minimale tijd tussen verwerkingen';
+$wb['ip_address_txt'] = 'IP-adres';
+$wb['limit_client_error_notint'] = 'De sub-klant waarde moet nummeriek zijn.';
+$wb['firstname_error_empty'] = 'Voornaam is leeg.';
+$wb['contact_error_empty'] = 'Contactpersoon is leeg.';
+$wb['default_webserver_txt'] = 'Standaard webserver';
+$wb['limit_web_domain_txt'] = '# Website-domeinen';
+$wb['limit_web_aliasdomain_txt'] = '# Website domeinaliassen';
+$wb['limit_web_subdomain_txt'] = '# Website subdomeinen';
+$wb['limit_ftp_user_txt'] = '# FTP-gebruikers';
+$wb['default_dnsserver_txt'] = 'Standaard DNS server';
+$wb['limit_dns_zone_txt'] = '# DNS zones';
+$wb['limit_dns_record_txt'] = '# DNS zones';
+$wb['limit_shell_user_txt'] = '# Shell gebruikers';
+$wb['limit_client_txt'] = '# Klanten';
+$wb['username_error_empty'] = 'Gebruikersnaam is leeg.';
+$wb['username_error_unique'] = 'De gebruikersnaam moet uniek zijn.';
+$wb['limit_maildomain_error_notint'] = 'De e-mail domeinnamen limiet moet nummeriek zijn.';
+$wb['limit_mailbox_error_notint'] = 'E-mailaccounts limiet moet nummeriek zijn.';
+$wb['limit_mailalias_error_notint'] = 'E-mailaliassen limiet moet nummeriek zijn.';
+$wb['limit_mailforward_error_notint'] = 'E-mail forward limiet moet nummeriek zijn.';
+$wb['limit_mailcatchall_error_notint'] = 'E-mail catch-all limiet moet nummeriek zijn.';
+$wb['limit_mailrouting_error_notint'] = 'E-mail routing limiet moet nummeriek zijn.';
+$wb['limit_mailfilter_error_notint'] = 'E-mail filters limiet moet nummeriek zijn.';
+$wb['limit_mailfetchmail_error_notint'] = 'E-mail fetchmail account limiet moet nummeriek zijn.';
+$wb['limit_mailquota_error_notint'] = 'E-mail schijfruimte-limiet moet nummeriek zijn.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'Spamfilter white-/blacklist limiet moet nummeriek zijn.';
+$wb['limit_spamfilter_user_error_notint'] = 'Spamfilter gebruikers limiet moet nummeriek zijn.';
+$wb['limit_spamfilter_policy_error_notint'] = 'Spamfilter policy limiet moet nummeriek zijn.';
+$wb['limit_web_domain_error_notint'] = 'Websites limiet moet nummeriek zijn.';
+$wb['limit_web_aliasdomain_error_notint'] = 'Website domeinaliassen limiet moet nummeriek zijn.';
+$wb['limit_web_subdomain_error_notint'] = 'Website subdomein limiet moet nummeriek zijn.';
+$wb['limit_ftp_user_error_notint'] = 'FTP gebruikers limiet moet nummeriek zijn.';
+$wb['limit_shell_user_error_notint'] = 'Shell gebruikers limiet moet nummeriek zijn.';
+$wb['limit_dns_zone_error_notint'] = 'DNS zones limiet moet nummeriek zijn.';
+$wb['default_dbserver_txt'] = 'Standaard database server';
+$wb['limit_database_error_notint'] = 'Databases limiet moet nummeriek zijn.';
+$wb['limit_cron_error_notint'] = 'Cron limiet moet nummeriek zijn.';
+$wb['limit_cron_error_frequency'] = 'Cron frequentie limiet moet nummeriek zijn.';
+$wb['username_error_regex'] = 'Gebruikersnaam bevat ongeldige tekens.';
+$wb['template_master_txt'] = 'Master template';
+$wb['template_additional_txt'] = 'Uitbreiding template';
+$wb['ssh_chroot_txt'] = 'SSH-Chroot opties';
+$wb['web_php_options_txt'] = 'PHP opties';
+$wb['limit_client_error'] = 'Maximum aantal klanten is bereikt.';
+$wb['limit_client_error_positive'] = 'Het aantal klanten moet groter zijn dan 0.';
+?>
+
diff --git a/interface/web/client/lib/lang/nl_resellers_list.lng b/interface/web/client/lib/lang/nl_resellers_list.lng
new file mode 100644
index 0000000..0a7bf5c
--- /dev/null
+++ b/interface/web/client/lib/lang/nl_resellers_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Resellers';
+$wb['client_id_txt'] = 'ID';
+$wb['company_name_txt'] = 'Bedrijfsnaam';
+$wb['contact_name_txt'] = 'Contactpersoon';
+$wb['city_txt'] = 'Plaats';
+$wb['country_txt'] = 'Land';
+$wb['add_new_record_txt'] = 'Nieuwe reseller toevoegen';
+?>
+
diff --git a/interface/web/client/lib/lang/pl.lng b/interface/web/client/lib/lang/pl.lng
new file mode 100644
index 0000000..2c0324a
--- /dev/null
+++ b/interface/web/client/lib/lang/pl.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['Client'] = 'Klient';
+$wb['Address'] = 'Adres';
+$wb['Limits'] = 'Limity';
+$wb['Add Client'] = 'Dodaj klienta';
+$wb['Edit Client'] = 'Edytuj klienta';
+$wb['Clients'] = 'Klienci';
+$wb['Edit Client-Templates'] = 'Edytuj szablony klientów';
+$wb['Add Reseller'] = 'Add Reseller';
+$wb['Edit Reseller'] = 'Edit Reseller';
+$wb['Resellers'] = 'Resellers';
+?>
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
new file mode 100644
index 0000000..4d3746e
--- /dev/null
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -0,0 +1,89 @@
+<?php
+$wb['limit_maildomain_txt'] = 'Maksymalna ilość domen email';
+$wb['limit_mailbox_txt'] = 'Maksymalna ilość skrzynek pocztowych';
+$wb['limit_mailalias_txt'] = 'Maxymalna ilość aliasów e-mail';
+$wb['limit_mailforward_txt'] = 'Maksymalna ilość przekierowań e-mail';
+$wb['limit_mailcatchall_txt'] = 'Maksymalna ilość kont e-mail catchall';
+$wb['limit_mailrouting_txt'] = 'Maksymalna ilość ścieżek e-mail';
+$wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail';
+$wb['limit_fetchmail_txt'] = 'Maksymalna ilość kont z fetchmail';
+$wb['limit_mailquota_txt'] = 'Pojemność skrzynki';
+$wb['limit_spamfilter_wblist_txt'] = 'Maksymalna ilość filtrów spamu białej / czarnej listy';
+$wb['limit_spamfilter_user_txt'] = 'Maksymalna ilość filtrów spamu użytkowników';
+$wb['limit_spamfilter_policy_txt'] = 'Maksymalna ilość polityk filtrów spamu';
+$wb['default_mailserver_txt'] = 'Domyślny serwer e-mail';
+$wb['company_name_txt'] = 'Nazwa firmy';
+$wb['contact_name_txt'] = 'Nazwa kontaktu';
+$wb['username_txt'] = 'Nazwa użytkownika';
+$wb['password_txt'] = 'Hasło';
+$wb['password_strength_txt'] = 'Siła hasła';
+$wb['language_txt'] = 'Język';
+$wb['usertheme_txt'] = 'Styl';
+$wb['street_txt'] = 'Ulica';
+$wb['zip_txt'] = 'Kod pocztowy';
+$wb['city_txt'] = 'Miasto';
+$wb['state_txt'] = 'Województwo';
+$wb['country_txt'] = 'Państwo';
+$wb['telephone_txt'] = 'Telefon';
+$wb['mobile_txt'] = 'Komórka';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'E-mail';
+$wb['internet_txt'] = 'Strona www';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Notatki';
+$wb['company_txt'] = 'Firma';
+$wb['title_txt'] = 'Tytuł';
+$wb['firstname_txt'] = 'Imię';
+$wb['surname_txt'] = 'Nazwisko';
+$wb['limit_domain_txt'] = 'limit_domen';
+$wb['limit_subdomain_txt'] = 'limit_subdomen';
+$wb['limit_webquota_txt'] = 'limit_pojemnosci_www';
+$wb['limit_database_txt'] = 'Maksymalna ilość bazy danych';
+$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['ip_address_txt'] = 'adres_ip';
+$wb['limit_client_error_notint'] = 'Limit subklientów musi być liczbą.';
+$wb['firstname_error_empty'] = 'Imię jest puste.';
+$wb['contact_error_empty'] = 'Nazwa konatku jest pusta.';
+$wb['default_webserver_txt'] = 'Domyślny serwer WWW';
+$wb['limit_web_domain_txt'] = 'Maksymalna ilość domen WWW';
+$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość aliasów domen';
+$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen';
+$wb['limit_ftp_user_txt'] = 'Maksymalna ilość użytkowników FTP';
+$wb['default_dnsserver_txt'] = 'Domyślny serwer DNS';
+$wb['limit_dns_zone_txt'] = 'Maksymalna ilość stref DNS';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS';
+$wb['limit_shell_user_txt'] = 'Maksymalna ilość użytkowników shell';
+$wb['limit_client_txt'] = 'Maksymalna ilość klientów';
+$wb['username_error_empty'] = 'Nazwa uużytkownika jest pusta.';
+$wb['username_error_unique'] = 'Nazwa użytkownika musi być unikatowa.';
+$wb['limit_maildomain_error_notint'] = 'Limit domen musi być liczbą.';
+$wb['limit_mailbox_error_notint'] = 'Limit skrzynek pocztowych musi być liczbą.';
+$wb['limit_mailalias_error_notint'] = 'Limit aliasów e-mail musi być liczbą.';
+$wb['limit_mailforward_error_notint'] = 'Limit przekierowań musi być liczbą.';
+$wb['limit_mailcatchall_error_notint'] = 'Limit e-mail catchall musi być liczbą.';
+$wb['limit_mailrouting_error_notint'] = 'Limit ścieżek e-mail musi być liczbą.';
+$wb['limit_mailfilter_error_notint'] = 'Limit filtrów e-mail musi być liczbą.';
+$wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmail musi być liczbą.';
+$wb['limit_mailquota_error_notint'] = 'Limit pojemności skrzynki musi być liczbą.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'Limit filtrów spamu biała / czarna lista musi być liczbą.';
+$wb['limit_spamfilter_user_error_notint'] = 'Limit filtrów spamu użytkownika musi być liczbą.';
+$wb['limit_spamfilter_policy_error_notint'] = 'Limit polityk filtrów spamu musi być liczbą.';
+$wb['limit_web_domain_error_notint'] = 'Limit stron www musi być liczbą.';
+$wb['limit_web_aliasdomain_error_notint'] = 'Limit aliasów strony www musi być liczbą.';
+$wb['limit_web_subdomain_error_notint'] = 'Limit subdomen strony www musi być liczbą.';
+$wb['limit_ftp_user_error_notint'] = 'Limit użytkowników FTP musi być liczbą.';
+$wb['limit_shell_user_error_notint'] = 'Limit użytkowników shell musi być liczbą.';
+$wb['limit_dns_zone_error_notint'] = 'Limit wpisów DNS musi być liczbą.';
+$wb['default_dbserver_txt'] = 'Domyślny serwer bazy danych';
+$wb['limit_database_error_notint'] = 'Limit baz danych musi być liczbą.';
+$wb['limit_cron_error_notint'] = 'The cron limit must be a number.';
+$wb['limit_cron_error_frequency'] = 'The cron frequency limit must be a number.';
+$wb['username_error_regex'] = 'Nazwa użytkownika zawiera niedozwolone znaki.';
+$wb['template_master_txt'] = 'Główny szablon';
+$wb['template_additional_txt'] = 'Dodatkowy szablon';
+$wb['ssh_chroot_txt'] = 'Opcje SSH-root';
+$wb['web_php_options_txt'] = 'Opcje PHP';
+$wb['limit_client_error'] = 'Maksymalna liczba kientów została już osiągnięta.';
+?>
diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng
new file mode 100644
index 0000000..888d92c
--- /dev/null
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -0,0 +1,52 @@
+<?php
+$wb['limit_client_error_notint'] = 'Limit klientów musi być liczbą.';
+$wb['limit_maildomain_txt'] = 'Maksymalna ilość domen e-mail';
+$wb['limit_mailbox_txt'] = 'Maksymalna ilość skrzynek pocztowych';
+$wb['limit_mailalias_txt'] = 'Maksymalna ilość aliasów e-mail';
+$wb['limit_mailforward_txt'] = 'Maksymalna ilość przekierowań e-mail';
+$wb['limit_mailcatchall_txt'] = 'Maksymalna ilość kont e-mail catchall';
+$wb['limit_mailrouting_txt'] = 'Maksymalna ilość ścieżek e-mail';
+$wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail';
+$wb['limit_fetchmail_txt'] = 'Maksymalna ilość kont z fetchmail';
+$wb['limit_mailquota_txt'] = 'Pojemność skrzynki';
+$wb['limit_spamfilter_wblist_txt'] = 'Maksymalna ilość filtrów spamu białej / czarnej listy';
+$wb['limit_spamfilter_user_txt'] = 'Maksymalna ilość filtrów spamu użytkowników';
+$wb['limit_spamfilter_policy_txt'] = 'Maksymalna ilość polityk filtrów spamu';
+$wb['limit_domain_txt'] = 'limit_domen';
+$wb['limit_subdomain_txt'] = 'limit_subdomen';
+$wb['limit_webquota_txt'] = 'limit_pojemnosci_www';
+$wb['limit_database_txt'] = 'Maksymalna ilość baz danych';
+$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['limit_web_domain_txt'] = 'Maksymalna ilość domen';
+$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość domen';
+$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen';
+$wb['limit_ftp_user_txt'] = 'Maksymalna ilość uzytkowników FTP';
+$wb['limit_dns_zone_txt'] = 'Maksymalna ilość stref DNS';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS';
+$wb['limit_shell_user_txt'] = 'Maksymalna ilość użytkowników shell';
+$wb['limit_client_txt'] = 'Maksymalna ilość klientów';
+$wb['limit_maildomain_error_notint'] = 'Limit domen musi być liczbą.';
+$wb['limit_mailbox_error_notint'] = 'Limit skrzynek pocztowych musi być liczbą.';
+$wb['limit_mailalias_error_notint'] = 'Limit aliasów musi być liczbą.';
+$wb['limit_mailforward_error_notint'] = 'Limit przekierowań e-mail musi być liczbą.';
+$wb['limit_mailcatchall_error_notint'] = 'Limit e-mail catchall musi być liczbą.';
+$wb['limit_mailrouting_error_notint'] = 'Limit ścieżek e-mail musi być liczbą.';
+$wb['limit_mailfilter_error_notint'] = 'Limit filtrów e-mail musi być liczbą.';
+$wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmail musi być liczbą.';
+$wb['limit_mailquota_error_notint'] = 'Limit pojemności skrzynki musi być liczbą.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'Limit filtrów spamu biała / czarna lista musi być liczbą.';
+$wb['limit_spamfilter_user_error_notint'] = 'Limit filtrów spamu użytkownika musi być liczbą.';
+$wb['limit_spamfilter_policy_error_notint'] = 'Limit polityk filtrów spamu musi być liczbą.';
+$wb['limit_web_domain_error_notint'] = 'Limit stron www musi być liczbą.';
+$wb['limit_web_aliasdomain_error_notint'] = 'Limit aliasów strony www musi być liczbą.';
+$wb['limit_web_subdomain_error_notint'] = 'Limit subdomen strony www musi być liczbą.';
+$wb['limit_ftp_user_error_notint'] = 'Limit użytkowników FTP musi być liczbą.';
+$wb['limit_shell_user_error_notint'] = 'Limit użytkowników shell musi być liczbą.';
+$wb['limit_dns_zone_error_notint'] = 'Limit wpisów DNS musi być liczbą.';
+$wb['limit_database_error_notint'] = 'Limit baz danych musi być liczbą.';
+$wb['limit_cron_error_notint'] = 'The cron limit must be a number.';
+$wb['limit_cron_error_frequency'] = 'The cron frequency limit must be a number.';
+$wb['error_template_name_empty'] = 'Proszę wpisać nazwę szablonu';
+?>
diff --git a/interface/web/client/lib/lang/pl_client_template_list.lng b/interface/web/client/lib/lang/pl_client_template_list.lng
new file mode 100644
index 0000000..06a3976
--- /dev/null
+++ b/interface/web/client/lib/lang/pl_client_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Szablon klienta';
+$wb['template_type_txt'] = 'Typ';
+$wb['template_name_txt'] = 'Nazwa szablonu';
+?>
diff --git a/interface/web/client/lib/lang/pl_clients_list.lng b/interface/web/client/lib/lang/pl_clients_list.lng
new file mode 100644
index 0000000..86671ae
--- /dev/null
+++ b/interface/web/client/lib/lang/pl_clients_list.lng
@@ -0,0 +1,9 @@
+<?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';
+$wb["add_new_record_txt"] = 'Add new client';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
new file mode 100644
index 0000000..09b6699
--- /dev/null
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -0,0 +1,90 @@
+<?php
+$wb['limit_maildomain_txt'] = 'Maksymalna ilość domen e-mail';
+$wb['limit_mailbox_txt'] = 'Maksymalna ilość skrzynek pocztowych';
+$wb['limit_mailalias_txt'] = 'Maksymalna ilość aliasów e-mail';
+$wb['limit_mailforward_txt'] = 'Maksymalna ilość przekierowań e-mail';
+$wb['limit_mailcatchall_txt'] = 'Maksymalna ilość kont e-mail catchall';
+$wb['limit_mailrouting_txt'] = 'Maksymalna ilość ścieżek e-mail';
+$wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail';
+$wb['limit_fetchmail_txt'] = 'Maksymalna ilość kont fetchmail';
+$wb['limit_mailquota_txt'] = 'Limit skrzynki pocztowej';
+$wb['limit_spamfilter_wblist_txt'] = 'Maksymalna ilość filtrów spamu białej / czarnej listy';
+$wb['limit_spamfilter_user_txt'] = 'Maksymalna ilość użytkowników z filtrem spamu';
+$wb['limit_spamfilter_policy_txt'] = 'Maksymalna ilość polityk filtrów spamu';
+$wb['default_mailserver_txt'] = 'Domyślny serwer poczty';
+$wb['company_name_txt'] = 'Nazwa firmy';
+$wb['contact_name_txt'] = 'Nazwa kontaktu';
+$wb['username_txt'] = 'Nazwa użytkownika';
+$wb['password_txt'] = 'Hasło';
+$wb['password_strength_txt'] = 'Siła hasła';
+$wb['language_txt'] = 'Język';
+$wb['usertheme_txt'] = 'Szablon';
+$wb['street_txt'] = 'Ulica';
+$wb['zip_txt'] = 'Kod pocztowy';
+$wb['city_txt'] = 'Miasto';
+$wb['state_txt'] = 'Województwo';
+$wb['country_txt'] = 'Państwo';
+$wb['telephone_txt'] = 'Telefon';
+$wb['mobile_txt'] = 'Komórka';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'E-mail';
+$wb['internet_txt'] = 'Strona www';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Notatki';
+$wb['company_txt'] = 'Firma';
+$wb['title_txt'] = 'Tytuł';
+$wb['firstname_txt'] = 'Imię';
+$wb['surname_txt'] = 'Nazwisko';
+$wb['limit_domain_txt'] = 'limit_domen';
+$wb['limit_subdomain_txt'] = 'limit_subdomen';
+$wb['limit_webquota_txt'] = 'limit_pojemnosci_www';
+$wb['limit_database_txt'] = 'Maksymalna ilość bazy danych';
+$wb['limit_cron_txt'] = 'Maksymalna ilość zadań crone';
+$wb['limit_cron_type_txt'] = 'Maksymalna ilość typów zadań corne (zadania admina oraz sugerowane url)';
+$wb['limit_cron_frequency_txt'] = 'Minimalne odstępy między zadaniami';
+$wb['ip_address_txt'] = 'adres_ip';
+$wb['limit_client_error_notint'] = 'Ilość klientów musi być liczbą.';
+$wb['firstname_error_empty'] = 'Imię jest puste.';
+$wb['contact_error_empty'] = 'Nazwa kontaktu jest pusta.';
+$wb['default_webserver_txt'] = 'Domyślny serwer www';
+$wb['limit_web_domain_txt'] = 'Maksymalna ilość domen www';
+$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość aliasów';
+$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen';
+$wb['limit_ftp_user_txt'] = 'Maksymalna ilość użytkowników FTP';
+$wb['default_dnsserver_txt'] = 'Domyślny serwer DNS';
+$wb['limit_dns_zone_txt'] = 'Maksymalna ilość stref DNS';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS';
+$wb['limit_shell_user_txt'] = 'Maksymalna ilość użytkowników Shell';
+$wb['limit_client_txt'] = 'Maksymalna ilość klientów';
+$wb['username_error_empty'] = 'Nazwa użytkownika jest pusta.';
+$wb['username_error_unique'] = 'Nazwa użytkownika musi być unikatowa.';
+$wb['limit_maildomain_error_notint'] = 'Limit domen e-mail musi być liczbą.';
+$wb['limit_mailbox_error_notint'] = 'Limit skrzynek pocztowych musi być liczbą.';
+$wb['limit_mailalias_error_notint'] = 'Limit aliasów e-mail musi być liczbą.';
+$wb['limit_mailforward_error_notint'] = 'Limit przekierowań e-mail musi być liczbą.';
+$wb['limit_mailcatchall_error_notint'] = 'Limit kont e-mail catchall musi być liczbą.';
+$wb['limit_mailrouting_error_notint'] = 'Limit ścieżek e-mail musi być liczbą.';
+$wb['limit_mailfilter_error_notint'] = 'Limit filtrów e-mail musi być liczbą.';
+$wb['limit_mailfetchmail_error_notint'] = 'Limit kont fetchmail musi być liczbą.';
+$wb['limit_mailquota_error_notint'] = 'Limit pojemności konta e-mail musi być liczbą.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'Limit filtrów spamu białej / czarnej listy musi być liczbą.';
+$wb['limit_spamfilter_user_error_notint'] = 'Limit filtrów spamu użytkownika musi być liczbą';
+$wb['limit_spamfilter_policy_error_notint'] = 'Limit polityk filtrów spamu musi być liczbą.';
+$wb['limit_web_domain_error_notint'] = 'Limit stron www musi być liczbą.';
+$wb['limit_web_aliasdomain_error_notint'] = 'Limit aliasów musi być liczbą.';
+$wb['limit_web_subdomain_error_notint'] = 'Limit subdomen musi być liczbą.';
+$wb['limit_ftp_user_error_notint'] = 'Limit użytkowników ftp musi być liczbą.';
+$wb['limit_shell_user_error_notint'] = 'Limit użytkowników shell musi być liczbą.';
+$wb['limit_dns_zone_error_notint'] = 'Limit wpisów DNS musi być liczbą.';
+$wb['default_dbserver_txt'] = 'Domyślny serwer bazy danych';
+$wb['limit_database_error_notint'] = 'Limit baz danych musi być liczbą.';
+$wb['limit_cron_error_notint'] = 'Limit zadań crone musi być liczbą.';
+$wb['limit_cron_error_frequency'] = 'TLimit częstości zadań crone musi być liczbą.';
+$wb['username_error_regex'] = 'Nazwa użytkownika zawiera niedozwolone znaki.';
+$wb['template_master_txt'] = 'Głowny szablon';
+$wb['template_additional_txt'] = 'Dodatkowy szablon';
+$wb['ssh_chroot_txt'] = 'Opcje root-a SSH';
+$wb['web_php_options_txt'] = 'Opcje PHP';
+$wb['limit_client_error'] = 'Maksymalna ilość klientów została przekroczona.';
+$wb['limit_client_error_positive'] = 'Liczba klientów musi być > 0';
+?>
diff --git a/interface/web/client/lib/lang/pl_resellers_list.lng b/interface/web/client/lib/lang/pl_resellers_list.lng
new file mode 100644
index 0000000..51abc41
--- /dev/null
+++ b/interface/web/client/lib/lang/pl_resellers_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Reseller-y';
+$wb['client_id_txt'] = 'ID';
+$wb['company_name_txt'] = 'Nazwa firmy';
+$wb['contact_name_txt'] = 'Nazwa kontaktu';
+$wb['city_txt'] = 'Miasty';
+$wb['country_txt'] = 'Państwo';
+$wb['add_new_record_txt'] = 'Dodaj nowy reseller';
+?>
diff --git a/interface/web/client/lib/lang/ru.lng b/interface/web/client/lib/lang/ru.lng
index 6f28108..0d86355 100644
--- a/interface/web/client/lib/lang/ru.lng
+++ b/interface/web/client/lib/lang/ru.lng
@@ -6,4 +6,7 @@
 $wb['Edit Client'] = 'Edit Client';
 $wb['Clients'] = 'Clients';
 $wb['Edit Client-Templates'] = 'Edit Client-Templates';
+$wb['Add Reseller'] = 'Add Reseller';
+$wb['Edit Reseller'] = 'Edit Reseller';
+$wb['Resellers'] = 'Resellers';
 ?>
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
new file mode 100644
index 0000000..906fd44
--- /dev/null
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -0,0 +1,93 @@
+<?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["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_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["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["limit_cron_error_notint"] = 'The cron limit must be a number.';
+$wb["limit_cron_error_frequency"] = 'The cron frequency limit must be a number.';
+$wb["username_error_regex"] = 'The Username contains invalid chracaters.';
+$wb["template_master_txt"] = 'Master template';
+$wb["template_additional_txt"] = 'Addon template';
+$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
+$wb["web_php_options_txt"] = 'PHP Options';
+$wb["limit_client_error"] = 'The max. number of clients is reached.';
+$wb["limit_client_error_positive"] = 'The number of clients must be > 0';
+?>
diff --git a/interface/web/client/lib/lang/ru_resellers_list.lng b/interface/web/client/lib/lang/ru_resellers_list.lng
new file mode 100644
index 0000000..523a467
--- /dev/null
+++ b/interface/web/client/lib/lang/ru_resellers_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["list_head_txt"] = 'Resellers';
+$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';
+$wb["add_new_record_txt"] = 'Add new reseller';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/se.lng b/interface/web/client/lib/lang/se.lng
index 6f28108..0d86355 100644
--- a/interface/web/client/lib/lang/se.lng
+++ b/interface/web/client/lib/lang/se.lng
@@ -6,4 +6,7 @@
 $wb['Edit Client'] = 'Edit Client';
 $wb['Clients'] = 'Clients';
 $wb['Edit Client-Templates'] = 'Edit Client-Templates';
+$wb['Add Reseller'] = 'Add Reseller';
+$wb['Edit Reseller'] = 'Edit Reseller';
+$wb['Resellers'] = 'Resellers';
 ?>
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
new file mode 100644
index 0000000..906fd44
--- /dev/null
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -0,0 +1,93 @@
+<?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["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_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["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["limit_cron_error_notint"] = 'The cron limit must be a number.';
+$wb["limit_cron_error_frequency"] = 'The cron frequency limit must be a number.';
+$wb["username_error_regex"] = 'The Username contains invalid chracaters.';
+$wb["template_master_txt"] = 'Master template';
+$wb["template_additional_txt"] = 'Addon template';
+$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
+$wb["web_php_options_txt"] = 'PHP Options';
+$wb["limit_client_error"] = 'The max. number of clients is reached.';
+$wb["limit_client_error_positive"] = 'The number of clients must be > 0';
+?>
diff --git a/interface/web/client/lib/lang/se_resellers_list.lng b/interface/web/client/lib/lang/se_resellers_list.lng
new file mode 100644
index 0000000..523a467
--- /dev/null
+++ b/interface/web/client/lib/lang/se_resellers_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["list_head_txt"] = 'Resellers';
+$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';
+$wb["add_new_record_txt"] = 'Add new reseller';
+?>
\ No newline at end of file
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index ee5ab67..839627e 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -5,7 +5,7 @@
 
 <tmpl_if name="is_admin">
   <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
       <div class="buttons">
 				<button class="positive iconstxt icoAdd" type="button" value="Add additional template" onClick="addAdditionalTemplate();"><span>Add additional template</span></button>
 				<button class="negative iconstxt icoDelete" type="button" value="Delete additional template" onClick="delAdditionalTemplate();"><span>Delete additional template</span></button>
diff --git a/interface/web/client/templates/client_template_list.htm b/interface/web/client/templates/client_template_list.htm
index b2943d4..f59916a 100644
--- a/interface/web/client/templates/client_template_list.htm
+++ b/interface/web/client/templates/client_template_list.htm
@@ -1,53 +1,53 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_limit_template">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_template_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
-            <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
-            <th class="tbl_col_last" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-			<td class="tbl_col_template_type"><select name="search_template_type" onChange="submitForm('pageForm','client/client_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
-            <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_template_type"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
-            <td class="tbl_col_template_name"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">
-                <a class="icons16 icoDelete" href="javascript: del_record('client/client_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_limit_template">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_template_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
+            <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
+            <th class="tbl_col_last" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+			<td class="tbl_col_template_type"><select name="search_template_type" onChange="submitForm('pageForm','client/client_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
+            <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_template_type"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
+            <td class="tbl_col_template_name"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">
+                <a class="icons16 icoDelete" href="javascript: del_record('client/client_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
 </div>
\ No newline at end of file
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
index 534d586..2f081e7 100644
--- a/interface/web/client/templates/clients_list.htm
+++ b/interface/web/client/templates/clients_list.htm
@@ -1,62 +1,62 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_clients">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
-            <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
-            <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
-            <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
-            <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
-            <th class="tbl_col_country" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
-            <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td>
-            <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td>
-            <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
-            <td class="tbl_col_country"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
-            <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
-            <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
-            <td class="tbl_col_city"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
-            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_clients">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+            <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
+            <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
+            <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
+            <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
+            <th class="tbl_col_country" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+            <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td>
+            <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td>
+            <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
+            <td class="tbl_col_country"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+            <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
+            <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
+            <td class="tbl_col_city"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
+            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index c8dc083..d332663 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_list_clients">
 
   <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
       <div class="buttons">
         <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/reseller_edit.php');">
           <span>{tmpl_var name="add_new_record_txt"}</span>
diff --git a/interface/web/designer/lib/lang/br.lng b/interface/web/designer/lib/lang/br.lng
index 62a2de0..29f4a51 100644
--- a/interface/web/designer/lib/lang/br.lng
+++ b/interface/web/designer/lib/lang/br.lng
@@ -1,3 +1,3 @@
 <?php
-
 ?>
+
diff --git a/interface/web/designer/lib/lang/br_form_edit.lng b/interface/web/designer/lib/lang/br_form_edit.lng
index 89b84c1..afd97e0 100644
--- a/interface/web/designer/lib/lang/br_form_edit.lng
+++ b/interface/web/designer/lib/lang/br_form_edit.lng
@@ -1,26 +1,25 @@
 <?php
-$wb["name_txt"] = 'Nome do Formulário';
-$wb["title_txt"] = 'Título do Formulário';
-$wb["template_txt"] = 'Gabarito';
-$wb["navframe_txt"] = 'Frame de Navegação';
-$wb["startpage_txt"] = 'Página Inicial';
-$wb["tab_width_txt"] = 'Tamanho da aba';
-$wb["save_txt"] = 'Salvar';
-$wb["cancel_txt"] = 'Cancelar';
-$wb["header_txt"] = 'Propriedades do Formulário';
-$wb["description_txt"] = 'Descrição';
-$wb["action_txt"] = 'Ação (script)';
-$wb["db_table_txt"] = 'Tabela do DB';
-$wb["db_table_idx_txt"] = 'Indíce da tabela do DB';
-$wb["db_history_txt"] = 'Desfazer Log';
-$wb["tab_default_txt"] = 'Aba Padrão';
-$wb["list_default_txt"] = 'Exibir Padrão';
-$wb["tab_width_txt"] = 'Tamanho da aba';
-$wb["auth_txt"] = 'Permissões';
-$wb["auth_preset_userid_txt"] = 'Usuário(ID)';
-$wb["auth_preset_groupid_txt"] = 'Grupo(ID)';
-$wb["auth_preset_perm_user_txt"] = 'Perm. Usuário';
-$wb["auth_preset_perm_group_txt"] = 'Perm. Grupo';
-$wb["auth_preset_perm_other_txt"] = 'Perm. Outros';
-
+$wb['name_txt'] = 'Nome do Formulário';
+$wb['title_txt'] = 'Título do Formulário';
+$wb['template_txt'] = 'Gabarito';
+$wb['navframe_txt'] = 'Frame de Navegação';
+$wb['startpage_txt'] = 'Página Inicial';
+$wb['tab_width_txt'] = 'Tamanho da aba';
+$wb['save_txt'] = 'Salvar';
+$wb['cancel_txt'] = 'Cancelar';
+$wb['header_txt'] = 'Propriedades do Formulário';
+$wb['description_txt'] = 'Descrição';
+$wb['action_txt'] = 'Ação (script)';
+$wb['db_table_txt'] = 'Tabela do DB';
+$wb['db_table_idx_txt'] = 'Indíce da tabela do DB';
+$wb['db_history_txt'] = 'Desfazer Log';
+$wb['tab_default_txt'] = 'Aba Padrão';
+$wb['list_default_txt'] = 'Exibir Padrão';
+$wb['auth_txt'] = 'Permissões';
+$wb['auth_preset_userid_txt'] = 'Usuário(ID)';
+$wb['auth_preset_groupid_txt'] = 'Grupo(ID)';
+$wb['auth_preset_perm_user_txt'] = 'Perm. Usuário';
+$wb['auth_preset_perm_group_txt'] = 'Perm. Grupo';
+$wb['auth_preset_perm_other_txt'] = 'Perm. Outros';
 ?>
+
diff --git a/interface/web/designer/lib/lang/br_form_list.lng b/interface/web/designer/lib/lang/br_form_list.lng
index 2c6baa5..01d0f28 100644
--- a/interface/web/designer/lib/lang/br_form_list.lng
+++ b/interface/web/designer/lib/lang/br_form_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb["list_head_txt"] = 'Formulário de Backend';
-$wb["form_txt"] = 'Formulário';
-$wb["module_txt"] = 'Módulo';
-$wb["title_txt"] = 'Título';
-$wb["description_txt"] = 'Descrição';
+$wb['list_head_txt'] = 'Formulário de Backend';
+$wb['form_txt'] = 'Formulário';
+$wb['module_txt'] = 'Módulo';
+$wb['title_txt'] = 'Título';
+$wb['description_txt'] = 'Descrição';
 ?>
+
diff --git a/interface/web/designer/lib/lang/br_form_show.lng b/interface/web/designer/lib/lang/br_form_show.lng
index fe9cf14..32fede2 100644
--- a/interface/web/designer/lib/lang/br_form_show.lng
+++ b/interface/web/designer/lib/lang/br_form_show.lng
@@ -1,18 +1,19 @@
 <?php
-$wb["header_txt"] = 'Editor de Formulários';
-$wb["title_txt"] = 'Título do Formulário';
-$wb["name_txt"] = 'Nome do Formulário';
-$wb["delete_txt"] = 'Remover';
-$wb["properties_txt"] = 'Propriedades';
-$wb["new_tab_txt"] = 'Nova Aba';
-$wb["edit_txt"] = 'Editar';
-$wb["new_txt"] = 'Novo';
-$wb["up_txt"] = '^';
-$wb["down_txt"] = 'v';
-$wb["module_txt"] = 'Módulo';
-$wb["form_txt"] = 'Formulário';
-$wb["description_txt"] = 'Descrição';
-$wb["module_del_txt"] = "Remover o módulo e todos seus sub-diretórios?";
-$wb["menu_del_txt"] = "Remover o menu e todos os seus itens?";
-$wb["item_del_txt"] = "Remover o item de menu?";
+$wb['header_txt'] = 'Editor de Formulários';
+$wb['title_txt'] = 'Título do Formulário';
+$wb['name_txt'] = 'Nome do Formulário';
+$wb['delete_txt'] = 'Remover';
+$wb['properties_txt'] = 'Propriedades';
+$wb['new_tab_txt'] = 'Nova Aba';
+$wb['edit_txt'] = 'Editar';
+$wb['new_txt'] = 'Novo';
+$wb['up_txt'] = '^';
+$wb['down_txt'] = 'v';
+$wb['module_txt'] = 'Módulo';
+$wb['form_txt'] = 'Formulário';
+$wb['description_txt'] = 'Descrição';
+$wb['module_del_txt'] = 'Remover o módulo e todos seus sub-diretórios?';
+$wb['menu_del_txt'] = 'Remover o menu e todos os seus itens?';
+$wb['item_del_txt'] = 'Remover o item de menu?';
 ?>
+
diff --git a/interface/web/designer/lib/lang/br_module_edit.lng b/interface/web/designer/lib/lang/br_module_edit.lng
index de4ec59..e80d725 100644
--- a/interface/web/designer/lib/lang/br_module_edit.lng
+++ b/interface/web/designer/lib/lang/br_module_edit.lng
@@ -1,14 +1,14 @@
 <?php
-$wb["name_txt"] = 'Nome do Módulo';
-$wb["title_txt"] = 'Título do Módulo';
-$wb["template_txt"] = 'Arquivo de Gabarito';
-$wb["navframe_txt"] = 'Frame de Navegação';
-$wb["startpage_txt"] = 'Página Padrão';
-$wb["tab_width_txt"] = 'Tamanho da Aba';
-$wb["save_txt"] = 'Salvar';
-$wb["cancel_txt"] = 'Cancelar';
-$wb["header_txt"] = 'Propriedades do Módulo';
-$wb["description_txt"] = '
+$wb['name_txt'] = 'Nome do Módulo';
+$wb['title_txt'] = 'Título do Módulo';
+$wb['template_txt'] = 'Arquivo de Gabarito';
+$wb['navframe_txt'] = 'Frame de Navegação';
+$wb['startpage_txt'] = 'Página Padrão';
+$wb['tab_width_txt'] = 'Tamanho da Aba';
+$wb['save_txt'] = 'Salvar';
+$wb['cancel_txt'] = 'Cancelar';
+$wb['header_txt'] = 'Propriedades do Módulo';
+$wb['description_txt'] = '
 <b>Descrição</b>
 <br><br>
 <b>Nome do Módulo:</b> Nome do diretório do módulo. Somente números, letras e underscores são permitidos.<br>
@@ -17,7 +17,7 @@
 <b>Frame de Navegação:</b> Se modulo_tree.tpl.htm foi selecionado como arquivo de gabarito, insira aqui o caminho do script para o frame a esquerda.<br>
 <b>Página Padrão:</b> Esta página será exibida quando o módulo for aberto.<br>
 <b>Tamanho da Aba:</b> Tamanho das abas na navegação principal. Este campo fica em branco por padrão. Você pode informar valores absolutos em pixels (ex.: 20) ou valores relativos (ex.: 20%).<br>
-<b>Dica:</b> Todos os caminhos são relativos ao diretório "web".
+<b>Dica:</b> Todos os caminhos são relativos ao diretório web.
 ';
-
 ?>
+
diff --git a/interface/web/designer/lib/lang/br_module_list.lng b/interface/web/designer/lib/lang/br_module_list.lng
index fc33032..8b8f247 100644
--- a/interface/web/designer/lib/lang/br_module_list.lng
+++ b/interface/web/designer/lib/lang/br_module_list.lng
@@ -1,5 +1,6 @@
 <?php
-$wb["list_head_txt"] = 'Módulo do Backend';
-$wb["module_txt"] = 'Módulo';
-$wb["title_txt"] = 'Título';
+$wb['list_head_txt'] = 'Módulo do Backend';
+$wb['module_txt'] = 'Módulo';
+$wb['title_txt'] = 'Título';
 ?>
+
diff --git a/interface/web/designer/lib/lang/br_module_nav_edit.lng b/interface/web/designer/lib/lang/br_module_nav_edit.lng
index 6fa8819..b147dce 100644
--- a/interface/web/designer/lib/lang/br_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/br_module_nav_edit.lng
@@ -1,6 +1,7 @@
 <?php
-$wb["title_txt"] = 'Título';
-$wb["header_txt"] = 'Propriedades de Navegação';
-$wb["save_txt"] = 'Salvar';
-$wb["cancel_txt"] = 'Cancelar';
+$wb['title_txt'] = 'Título';
+$wb['header_txt'] = 'Propriedades de Navegação';
+$wb['save_txt'] = 'Salvar';
+$wb['cancel_txt'] = 'Cancelar';
 ?>
+
diff --git a/interface/web/designer/lib/lang/br_module_nav_item_edit.lng b/interface/web/designer/lib/lang/br_module_nav_item_edit.lng
index 9f790f0..0421cea 100644
--- a/interface/web/designer/lib/lang/br_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/br_module_nav_item_edit.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["title_txt"] = 'Título';
-$wb["target_txt"] = 'Target';
-$wb["link_txt"] = 'Link';
-$wb["header_txt"] = 'Propriedades de Navegação';
-$wb["save_txt"] = 'Salvar';
-$wb["cancel_txt"] = 'Cancelar';
+$wb['title_txt'] = 'Título';
+$wb['target_txt'] = 'Target';
+$wb['link_txt'] = 'Link';
+$wb['header_txt'] = 'Propriedades de Navegação';
+$wb['save_txt'] = 'Salvar';
+$wb['cancel_txt'] = 'Cancelar';
 ?>
+
diff --git a/interface/web/designer/lib/lang/br_module_show.lng b/interface/web/designer/lib/lang/br_module_show.lng
index 6054ce7..e5fffaf 100644
--- a/interface/web/designer/lib/lang/br_module_show.lng
+++ b/interface/web/designer/lib/lang/br_module_show.lng
@@ -1,17 +1,17 @@
 <?php
-$wb["header_txt"] = 'Editor de Menu';
-$wb["title_txt"] = 'Título';
-$wb["name_txt"] = 'Módulo';
-$wb["delete_txt"] = 'Remover';
-$wb["properties_txt"] = 'Propriedades';
-$wb["new_menu_txt"] = 'Novo Menu';
-$wb["edit_txt"] = 'Editar';
-$wb["delete_txt"] = 'Remover';
-$wb["new_txt"] = 'Novo';
-$wb["up_txt"] = 'Subir';
-$wb["down_txt"] = 'Descer';
-$wb["module_txt"] = 'Módulo';
+$wb['header_txt'] = 'Editor de Menu';
+$wb['title_txt'] = 'Título';
+$wb['name_txt'] = 'Módulo';
+$wb['delete_txt'] = 'Remover';
+$wb['properties_txt'] = 'Propriedades';
+$wb['new_menu_txt'] = 'Novo Menu';
+$wb['edit_txt'] = 'Editar';
+$wb['new_txt'] = 'Novo';
+$wb['up_txt'] = 'Subir';
+$wb['down_txt'] = 'Descer';
+$wb['module_txt'] = 'Módulo';
 $wb['module_del_txt'] = 'Deseja eliminar este módulo e todos os arquivos contidos no diretório?';
 $wb['menu_del_txt'] = 'Deseja apagar este menu e todos seus elementos?';
 $wb['item_del_txt'] = 'Deseja apagar este elemento do menu?';
 ?>
+
diff --git a/interface/web/designer/lib/lang/hu.lng b/interface/web/designer/lib/lang/hu.lng
new file mode 100644
index 0000000..29f4a51
--- /dev/null
+++ b/interface/web/designer/lib/lang/hu.lng
@@ -0,0 +1,3 @@
+<?php
+?>
+
diff --git a/interface/web/designer/lib/lang/hu_form_edit.lng b/interface/web/designer/lib/lang/hu_form_edit.lng
new file mode 100644
index 0000000..c5b5951
--- /dev/null
+++ b/interface/web/designer/lib/lang/hu_form_edit.lng
@@ -0,0 +1,25 @@
+<?php
+$wb['name_txt'] = 'Formname';
+$wb['title_txt'] = 'Formutitle';
+$wb['template_txt'] = 'Template';
+$wb['navframe_txt'] = 'NaviFrame';
+$wb['startpage_txt'] = 'Startpage';
+$wb['tab_width_txt'] = 'Tab width';
+$wb['save_txt'] = 'Save';
+$wb['cancel_txt'] = 'Cancel';
+$wb['header_txt'] = 'Form properties';
+$wb['description_txt'] = 'Description';
+$wb['action_txt'] = 'Action (script)';
+$wb['db_table_txt'] = 'DB Table';
+$wb['db_table_idx_txt'] = 'DB Table Index';
+$wb['db_history_txt'] = 'Undo Log';
+$wb['tab_default_txt'] = 'Default Tab';
+$wb['list_default_txt'] = 'Default Liste';
+$wb['auth_txt'] = 'Permissions';
+$wb['auth_preset_userid_txt'] = 'UserID';
+$wb['auth_preset_groupid_txt'] = 'GroupID';
+$wb['auth_preset_perm_user_txt'] = 'Perm. User';
+$wb['auth_preset_perm_group_txt'] = 'Perm. Group';
+$wb['auth_preset_perm_other_txt'] = 'Perm. Other';
+?>
+
diff --git a/interface/web/designer/lib/lang/hu_form_list.lng b/interface/web/designer/lib/lang/hu_form_list.lng
new file mode 100644
index 0000000..42ff3c9
--- /dev/null
+++ b/interface/web/designer/lib/lang/hu_form_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Backend Form';
+$wb['form_txt'] = 'Form';
+$wb['module_txt'] = 'Module';
+$wb['title_txt'] = 'Title';
+$wb['description_txt'] = 'Description';
+?>
+
diff --git a/interface/web/designer/lib/lang/hu_form_show.lng b/interface/web/designer/lib/lang/hu_form_show.lng
new file mode 100644
index 0000000..9386643
--- /dev/null
+++ b/interface/web/designer/lib/lang/hu_form_show.lng
@@ -0,0 +1,19 @@
+<?php
+$wb['header_txt'] = 'Formeditor';
+$wb['title_txt'] = 'Formtitle';
+$wb['name_txt'] = 'Formname';
+$wb['delete_txt'] = 'X';
+$wb['properties_txt'] = 'Properties';
+$wb['new_tab_txt'] = 'Tab new';
+$wb['edit_txt'] = 'Edit';
+$wb['new_txt'] = 'Neu';
+$wb['up_txt'] = '^';
+$wb['down_txt'] = 'v';
+$wb['module_txt'] = 'Module';
+$wb['form_txt'] = 'Form';
+$wb['description_txt'] = 'Description';
+$wb['module_del_txt'] = 'Delete the module and all subdirectories?';
+$wb['menu_del_txt'] = 'Delete menu with all menuitems?';
+$wb['item_del_txt'] = 'Delete menuitem?';
+?>
+
diff --git a/interface/web/designer/lib/lang/hu_module_edit.lng b/interface/web/designer/lib/lang/hu_module_edit.lng
new file mode 100644
index 0000000..494b752
--- /dev/null
+++ b/interface/web/designer/lib/lang/hu_module_edit.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['name_txt'] = 'Modulename';
+$wb['title_txt'] = 'Moduletitle';
+$wb['template_txt'] = 'Template file';
+$wb['navframe_txt'] = 'NaviFrame';
+$wb['startpage_txt'] = 'Default page';
+$wb['tab_width_txt'] = 'Tab width';
+$wb['save_txt'] = 'Save';
+$wb['cancel_txt'] = 'Cancel';
+$wb['header_txt'] = 'Module properties';
+$wb['description_txt'] = '
+<b>Description</b>
+<br><br>
+<b>Modulename:</b> Name of the module directory. Only numbers, chars and underscore allowed.<br>
+<b>Moduletitle:</b> Will be shown in the (upper) main navigation.<br>
+<b>Template file:</b> Template file of the module. Currently available: module.tpl.htm and module_tree.tpl.htm. Default is module.tpl.htm.<br>
+<b>NaviFrame:</b> If module_tree.tpl.htm selected as template file, enter here the path to the script file for the left frame.<br>
+<b>Default page:</b> These page will be shown when the module is opened.<br>
+<b>Tab width:</b> Width of the Tabs in the main navigation. The field is empty by default. You can enter values absolute in pixel (e.g 20) or relative (e.g 20%).<br>
+<b>Hint:</b> All paths are relative to the directory web.
+';
+?>
+
diff --git a/interface/web/designer/lib/lang/hu_module_list.lng b/interface/web/designer/lib/lang/hu_module_list.lng
new file mode 100644
index 0000000..ee261b2
--- /dev/null
+++ b/interface/web/designer/lib/lang/hu_module_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Backend Module';
+$wb['module_txt'] = 'Module';
+$wb['title_txt'] = 'Title';
+?>
+
diff --git a/interface/web/designer/lib/lang/hu_module_nav_edit.lng b/interface/web/designer/lib/lang/hu_module_nav_edit.lng
new file mode 100644
index 0000000..5ae3948
--- /dev/null
+++ b/interface/web/designer/lib/lang/hu_module_nav_edit.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['title_txt'] = 'Title';
+$wb['header_txt'] = 'Navi properties';
+$wb['save_txt'] = 'Save';
+$wb['cancel_txt'] = 'Cancel';
+?>
+
diff --git a/interface/web/designer/lib/lang/hu_module_nav_item_edit.lng b/interface/web/designer/lib/lang/hu_module_nav_item_edit.lng
new file mode 100644
index 0000000..2b036a0
--- /dev/null
+++ b/interface/web/designer/lib/lang/hu_module_nav_item_edit.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['title_txt'] = 'Title';
+$wb['target_txt'] = 'Target';
+$wb['link_txt'] = 'Link';
+$wb['header_txt'] = 'Navi properties';
+$wb['save_txt'] = 'Save';
+$wb['cancel_txt'] = 'Cancel';
+?>
+
diff --git a/interface/web/designer/lib/lang/hu_module_show.lng b/interface/web/designer/lib/lang/hu_module_show.lng
new file mode 100644
index 0000000..a2fe642
--- /dev/null
+++ b/interface/web/designer/lib/lang/hu_module_show.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['header_txt'] = 'Menu editor';
+$wb['title_txt'] = 'Title';
+$wb['name_txt'] = 'Module';
+$wb['delete_txt'] = 'Delete';
+$wb['properties_txt'] = 'Properties';
+$wb['new_menu_txt'] = 'Menu new';
+$wb['edit_txt'] = 'Edit';
+$wb['new_txt'] = 'New';
+$wb['up_txt'] = 'Up';
+$wb['down_txt'] = 'Down';
+$wb['module_txt'] = 'Module';
+$wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Dateien und Unterverzeichnisse l�schen?';
+$wb['menu_del_txt'] = 'Wollen Sie das Men� mit allen Untereintr�gen l�schen?';
+$wb['item_del_txt'] = 'Wollen Sie den Men�eintrag l�schen?';
+?>
+
diff --git a/interface/web/designer/lib/lang/nl.lng b/interface/web/designer/lib/lang/nl.lng
index acb6c35..29f4a51 100644
--- a/interface/web/designer/lib/lang/nl.lng
+++ b/interface/web/designer/lib/lang/nl.lng
@@ -1,2 +1,3 @@
 <?php
 ?>
+
diff --git a/interface/web/designer/lib/lang/nl_form_edit.lng b/interface/web/designer/lib/lang/nl_form_edit.lng
index bdc7642..2586134 100644
--- a/interface/web/designer/lib/lang/nl_form_edit.lng
+++ b/interface/web/designer/lib/lang/nl_form_edit.lng
@@ -22,3 +22,4 @@
 $wb['auth_preset_perm_group_txt'] = 'Perm. Groep';
 $wb['auth_preset_perm_other_txt'] = 'Perm. Overige';
 ?>
+
diff --git a/interface/web/designer/lib/lang/nl_form_list.lng b/interface/web/designer/lib/lang/nl_form_list.lng
index 2da9725..287ed93 100644
--- a/interface/web/designer/lib/lang/nl_form_list.lng
+++ b/interface/web/designer/lib/lang/nl_form_list.lng
@@ -5,3 +5,4 @@
 $wb['title_txt'] = 'Titel';
 $wb['description_txt'] = 'Omschrijving';
 ?>
+
diff --git a/interface/web/designer/lib/lang/nl_form_show.lng b/interface/web/designer/lib/lang/nl_form_show.lng
index 1c82ea1..81efec7 100644
--- a/interface/web/designer/lib/lang/nl_form_show.lng
+++ b/interface/web/designer/lib/lang/nl_form_show.lng
@@ -16,3 +16,4 @@
 $wb['menu_del_txt'] = 'Verwijder menu met alle menuitems?';
 $wb['item_del_txt'] = 'Verwijder menuitem?';
 ?>
+
diff --git a/interface/web/designer/lib/lang/nl_module_edit.lng b/interface/web/designer/lib/lang/nl_module_edit.lng
index f4234dc..36b637b 100644
--- a/interface/web/designer/lib/lang/nl_module_edit.lng
+++ b/interface/web/designer/lib/lang/nl_module_edit.lng
@@ -20,3 +20,4 @@
 <b>Hint:</b> Alle paden zijn relatief aan de directorie web.
 ';
 ?>
+
diff --git a/interface/web/designer/lib/lang/nl_module_list.lng b/interface/web/designer/lib/lang/nl_module_list.lng
index b07dd11..2f549b0 100644
--- a/interface/web/designer/lib/lang/nl_module_list.lng
+++ b/interface/web/designer/lib/lang/nl_module_list.lng
@@ -1,5 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'Backend Module';
+$wb['list_head_txt'] = 'Verwerkingsmodule';
 $wb['module_txt'] = 'Module';
 $wb['title_txt'] = 'Titel';
 ?>
+
diff --git a/interface/web/designer/lib/lang/nl_module_nav_edit.lng b/interface/web/designer/lib/lang/nl_module_nav_edit.lng
index 504b7f7..964378c 100644
--- a/interface/web/designer/lib/lang/nl_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/nl_module_nav_edit.lng
@@ -4,3 +4,4 @@
 $wb['save_txt'] = 'Opslaan';
 $wb['cancel_txt'] = 'Annuleren';
 ?>
+
diff --git a/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng b/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng
index 4c2bddd..788fb76 100644
--- a/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng
@@ -6,3 +6,4 @@
 $wb['save_txt'] = 'Opslaan';
 $wb['cancel_txt'] = 'Annuleren';
 ?>
+
diff --git a/interface/web/designer/lib/lang/nl_module_show.lng b/interface/web/designer/lib/lang/nl_module_show.lng
index 8f605e4..5b4c5ef 100644
--- a/interface/web/designer/lib/lang/nl_module_show.lng
+++ b/interface/web/designer/lib/lang/nl_module_show.lng
@@ -14,3 +14,4 @@
 $wb['menu_del_txt'] = 'Wilt u het menu en alle subitems verwijderen?';
 $wb['item_del_txt'] = 'Wilt u de menuitems verwijderen?';
 ?>
+
diff --git a/interface/web/designer/lib/lang/pl.lng b/interface/web/designer/lib/lang/pl.lng
new file mode 100644
index 0000000..acb6c35
--- /dev/null
+++ b/interface/web/designer/lib/lang/pl.lng
@@ -0,0 +1,2 @@
+<?php
+?>
diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng
new file mode 100644
index 0000000..ee4f4c4
--- /dev/null
+++ b/interface/web/designer/lib/lang/pl_form_edit.lng
@@ -0,0 +1,24 @@
+<?php
+$wb['name_txt'] = 'Nazwa formularza';
+$wb['title_txt'] = 'Tytuł formularza';
+$wb['template_txt'] = 'Szablon';
+$wb['navframe_txt'] = 'Ramka nawigacyjna';
+$wb['startpage_txt'] = 'Strona startowa';
+$wb['tab_width_txt'] = 'Szerokość zakładki';
+$wb['save_txt'] = 'Zapisz';
+$wb['cancel_txt'] = 'Anuluj';
+$wb['header_txt'] = 'Parametry formularza';
+$wb['description_txt'] = 'Opis';
+$wb['action_txt'] = 'Akcja (skrypt)';
+$wb['db_table_txt'] = 'DB Tabela';
+$wb['db_table_idx_txt'] = 'DB Indeks tabeli';
+$wb['db_history_txt'] = 'Cofnij Log';
+$wb['tab_default_txt'] = 'Domyślna zakładka';
+$wb['list_default_txt'] = 'Domyślna lista';
+$wb['auth_txt'] = 'Dostęp';
+$wb['auth_preset_userid_txt'] = 'ID Użytkownika';
+$wb['auth_preset_groupid_txt'] = 'ID Grupy';
+$wb['auth_preset_perm_user_txt'] = 'Stały użytkownik';
+$wb['auth_preset_perm_group_txt'] = 'Stała grupa';
+$wb['auth_preset_perm_other_txt'] = 'Stała inna';
+?>
diff --git a/interface/web/designer/lib/lang/pl_form_list.lng b/interface/web/designer/lib/lang/pl_form_list.lng
new file mode 100644
index 0000000..ac85722
--- /dev/null
+++ b/interface/web/designer/lib/lang/pl_form_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Tylny formularz';
+$wb['form_txt'] = 'Formularz';
+$wb['module_txt'] = 'Moduł';
+$wb['title_txt'] = 'Tytuł';
+$wb['description_txt'] = 'Opis';
+?>
diff --git a/interface/web/designer/lib/lang/pl_form_show.lng b/interface/web/designer/lib/lang/pl_form_show.lng
new file mode 100644
index 0000000..db62af1
--- /dev/null
+++ b/interface/web/designer/lib/lang/pl_form_show.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['header_txt'] = 'Edytor formularza';
+$wb['title_txt'] = 'Tytuł formularza';
+$wb['name_txt'] = 'Nazwa formularza';
+$wb['delete_txt'] = 'Usuń';
+$wb['properties_txt'] = 'Preferencje';
+$wb['new_tab_txt'] = 'Nowa zakładka';
+$wb['edit_txt'] = 'Edytuj';
+$wb['new_txt'] = 'Nowy';
+$wb['up_txt'] = '^';
+$wb['down_txt'] = 'v';
+$wb['module_txt'] = 'Moduł';
+$wb['form_txt'] = 'Formularz';
+$wb['description_txt'] = 'Opis';
+$wb['module_del_txt'] = 'Usunąć moduł i wszystkie podkatalogi?';
+$wb['menu_del_txt'] = 'Usunąć menu i wszystkie jego elementy?';
+$wb['item_del_txt'] = 'Usunąc element menu?';
+?>
diff --git a/interface/web/designer/lib/lang/pl_module_edit.lng b/interface/web/designer/lib/lang/pl_module_edit.lng
new file mode 100644
index 0000000..691e550
--- /dev/null
+++ b/interface/web/designer/lib/lang/pl_module_edit.lng
@@ -0,0 +1,22 @@
+<?php
+$wb['name_txt'] = 'Nazwa modułu';
+$wb['title_txt'] = 'Tytuł modułu';
+$wb['template_txt'] = 'Plik szablonu';
+$wb['navframe_txt'] = 'Ramka nawigacyjna';
+$wb['startpage_txt'] = 'Strona domyślna';
+$wb['tab_width_txt'] = 'Szerokość zakładki';
+$wb['save_txt'] = 'Zapisz';
+$wb['cancel_txt'] = 'Anuluj';
+$wb['header_txt'] = 'Parametry modułu';
+$wb['description_txt'] = '
+<b>Opis</b>
+<br><br>
+<b>Nazwa modułu:</b> Nazwa katalogu z modułem. Tylko liczby, litery (bez polskich) i podkreślenie są dozwolone.<br>
+<b>Tytuł modułu:</b> Będzie wyświetlaby w głównym menu nawigacyjnym.<br>
+<b>Plik szablonu:</b> Plik szablonu modułu. Aktualnie dostępne: module.tpl.htm oraz module_tree.tpl.htm. Domyślnie jest module.tpl.htm.<br>
+<b>Ramka nawigacyjna:</b> Jeśli module_tree.tpl.htm wybrano jako plik szablonu, wpisz tutaj ścieżkę do pliku ze skryptem dla lewej ramki.<br>
+<b>Strona domyślna:</b> Ta strona będzie otwierana na początku podczas otwarcia modułu.<br>
+<b>Szerokość zakładki:</b> Szerokość zakładek w głownym menu nawigacyjnym. To pole jest domyślnie puste. Możesz podać wartość w pikselach (np.: 20) lub procentach (np.: 20%).<br>
+<b>Podpowiedź:</b> Wszystkie ścieżki są względne według strony www..
+';
+?>
diff --git a/interface/web/designer/lib/lang/pl_module_list.lng b/interface/web/designer/lib/lang/pl_module_list.lng
new file mode 100644
index 0000000..308d1c6
--- /dev/null
+++ b/interface/web/designer/lib/lang/pl_module_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Nazwa modułu';
+$wb['module_txt'] = 'Moduł';
+$wb['title_txt'] = 'Tytuł';
+?>
diff --git a/interface/web/designer/lib/lang/pl_module_nav_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_edit.lng
new file mode 100644
index 0000000..5ace229
--- /dev/null
+++ b/interface/web/designer/lib/lang/pl_module_nav_edit.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['title_txt'] = 'Tytuł';
+$wb['header_txt'] = 'Paramtery nawigacyjne';
+$wb['save_txt'] = 'Zapisz';
+$wb['cancel_txt'] = 'Usuń';
+?>
diff --git a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
new file mode 100644
index 0000000..779b3b4
--- /dev/null
+++ b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['title_txt'] = 'Tytuł';
+$wb['target_txt'] = 'Cel';
+$wb['link_txt'] = 'Adres';
+$wb['header_txt'] = 'Parametry nawigacyjne';
+$wb['save_txt'] = 'Zapisz';
+$wb['cancel_txt'] = 'Usuń';
+?>
diff --git a/interface/web/designer/lib/lang/pl_module_show.lng b/interface/web/designer/lib/lang/pl_module_show.lng
new file mode 100644
index 0000000..9b98c49
--- /dev/null
+++ b/interface/web/designer/lib/lang/pl_module_show.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['header_txt'] = 'Edytor menu';
+$wb['title_txt'] = 'Tytuł';
+$wb['name_txt'] = 'Moduł';
+$wb['delete_txt'] = 'Usuń';
+$wb['properties_txt'] = 'Parametry';
+$wb['new_menu_txt'] = 'Nowe menu';
+$wb['edit_txt'] = 'Edytuj';
+$wb['new_txt'] = 'Nowy';
+$wb['up_txt'] = 'W górę';
+$wb['down_txt'] = 'W dół';
+$wb['module_txt'] = 'Moduł';
+$wb['module_del_txt'] = 'Czy na pewno chcesz usunąć moduł wraz z wszystkimi plikami i wpisami w bazie danych?';
+$wb['menu_del_txt'] = 'Czy na pewno chcesz usunąć menu z wszystkimi wpisami?';
+$wb['item_del_txt'] = 'Czy na pewno chcesz usunąć wpis w menu?';
+?>
diff --git a/interface/web/dns/dns_a_edit.php b/interface/web/dns/dns_a_edit.php
index 431b4ac..d1bc853 100644
--- a/interface/web/dns/dns_a_edit.php
+++ b/interface/web/dns/dns_a_edit.php
@@ -97,7 +97,7 @@
 		} // end if user is not admin
 		
 		//* Check for duplicates where IP and hostname are the same
-		$tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_rr WHERE zone = '".$this->dataRecord["zone"]."' and data = '".$this->dataRecord["data"]."' and id != ".$this->id);
+		$tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_rr WHERE type = 'A' AND name = '".$this->dataRecord["name"]."' AND zone = '".$this->dataRecord["zone"]."' and data = '".$this->dataRecord["data"]."' and id != ".$this->id);
 		if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("data_error_duplicate")."<br>";
 		unset($tmp);
 		
diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php
index 3f120db..877bf98 100644
--- a/interface/web/dns/dns_soa_edit.php
+++ b/interface/web/dns/dns_soa_edit.php
@@ -139,6 +139,7 @@
 		$soa = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = ".$this->id);
 		$this->dataRecord["serial"] = $app->validate_dns->increase_serial($soa["serial"]);
 		
+		
 		//* Check if soa, ns and mbox have a dot at the end
 		if(strlen($this->dataRecord["origin"]) > 0 && substr($this->dataRecord["origin"],-1,1) != '.') $this->dataRecord["origin"] .= '.';
 		if(strlen($this->dataRecord["ns"]) > 0 && substr($this->dataRecord["ns"],-1,1) != '.') $this->dataRecord["ns"] .= '.';
@@ -169,6 +170,7 @@
 			// And we want to update all rr records too, that belong to this record
 			$app->db->query("UPDATE dns_rr SET sys_groupid = $client_group_id WHERE zone = ".$this->id);
 		}
+
 	}
 	
 	function onAfterUpdate() {
@@ -196,7 +198,6 @@
 				$app->db->query("UPDATE dns_soa SET sys_userid = ".$tmp["userid"]." WHERE id = ".$this->id);
 				$app->db->query("UPDATE dns_rr SET sys_userid = ".$tmp["userid"]." WHERE zone = ".$this->id);
 			}
-			
 		}
 		
 	}
diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php
index 1b083dc..61d6bb6 100644
--- a/interface/web/dns/dns_wizard.php
+++ b/interface/web/dns/dns_wizard.php
@@ -137,16 +137,26 @@
 	if(isset($_POST['ns2']) && $_POST['ns2'] == '') $error .= $app->lng('error_ns2_empty').'<br />';
 	if(isset($_POST['email']) && $_POST['email'] == '') $error .= $app->lng('error_email_empty').'<br />';
 	
+	// make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it
+	if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($_POST['client_group_id'])) {
+		$sys_groupid = intval($_POST['client_group_id']);
+	} elseif($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($_POST['client_group_id'])) {
+		$sys_groupid = intval($_POST['client_group_id']);
+	} else {
+		$sys_groupid = $_SESSION["s"]["user"]["default_group"];
+	}
+	
 	$tform_def_file = "form/dns_soa.tform.php";
 	$app->uses('tform');
 	$app->tform->loadFormDef($tform_def_file);
 	
-	
-	if(!$app->tform->checkClientLimit('limit_dns_zone')) {
-		$error .= $app->tform->wordbook["limit_dns_zone_txt"];
-	}
-	if(!$app->tform->checkResellerLimit('limit_dns_zone')) {
-		$error .= $app->tform->wordbook["limit_dns_zone_txt"];
+	if($_SESSION['s']['user']['typ'] != 'admin') {
+		if(!$app->tform->checkClientLimit('limit_dns_zone')) {
+			$error .= $app->tform->wordbook["limit_dns_zone_txt"];
+		}
+		if(!$app->tform->checkResellerLimit('limit_dns_zone')) {
+			$error .= $app->tform->wordbook["limit_dns_zone_txt"];
+		}
 	}
 	
 	
diff --git a/interface/web/dns/lib/lang/br.lng b/interface/web/dns/lib/lang/br.lng
index e166b4d..88ac863 100644
--- a/interface/web/dns/lib/lang/br.lng
+++ b/interface/web/dns/lib/lang/br.lng
@@ -1,5 +1,4 @@
 <?php
-
 $wb['DNS'] = 'DNS';
 $wb['Zones'] = 'Zonas';
 $wb['DNS A'] = 'DNS A';
@@ -15,5 +14,5 @@
 $wb['DNS SRV'] = 'SRV DNS';
 $wb['DNS TXT Record'] = 'Registro TXT DNS';
 $wb['DNS TXT'] = 'TXT DNS';
-
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_a.lng b/interface/web/dns/lib/lang/br_dns_a.lng
index 68af3ba..41fb94a 100644
--- a/interface/web/dns/lib/lang/br_dns_a.lng
+++ b/interface/web/dns/lib/lang/br_dns_a.lng
@@ -1,15 +1,17 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'tipo';
-$wb["data_txt"] = 'Endereço-IP';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_record_txt"] = 'O número máximo de zonas DNS para sua conta foi atingido.';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["name_error_empty"] = 'Hostname em branco.';
-$wb["name_error_regex"] = 'Hostname tem um formato inválido.';
-$wb["data_error_empty"] = 'Endereço-IP em branco';
-$wb["data_error_regex"] = 'Endereço-IP formato inválido';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Endereço-IP';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de zonas DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'Hostname em branco.';
+$wb['name_error_regex'] = 'Hostname tem um formato inválido.';
+$wb['data_error_empty'] = 'Endereço-IP em branco';
+$wb['data_error_regex'] = 'Endereço-IP formato inválido';
+$wb['data_error_duplicate'] = 'Registro-A duplicado';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_a_list.lng b/interface/web/dns/lib/lang/br_dns_a_list.lng
index 760c4a5..8436bae 100644
--- a/interface/web/dns/lib/lang/br_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/br_dns_a_list.lng
@@ -1,14 +1,15 @@
 <?php
-$wb["list_head_txt"] = 'Registro (A)';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Nome';
-$wb["data_txt"] = 'Data';
-$wb["aux_txt"] = 'Prioridade';
-$wb["type_txt"] = 'Tipo';
-$wb["add_new_record_txt"] = 'Adcionar um novo registro DNS (A)';
-$wb["page_txt"] = 'Página';
-$wb["page_of_txt"] = 'de';
+$wb['list_head_txt'] = 'Registro (A)';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Nome';
+$wb['data_txt'] = 'Data';
+$wb['aux_txt'] = 'Prioridade';
+$wb['type_txt'] = 'Tipo';
+$wb['add_new_record_txt'] = 'Adcionar um novo registro DNS (A)';
+$wb['page_txt'] = 'Página';
+$wb['page_of_txt'] = 'de';
 $wb['delete_confirmation'] = 'Tem certeza que deseja remover este registro?';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_aaaa.lng b/interface/web/dns/lib/lang/br_dns_aaaa.lng
index c56d558..d93d266 100644
--- a/interface/web/dns/lib/lang/br_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/br_dns_aaaa.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb["zone_txt"] = 'Zone';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'type';
-$wb["data_txt"] = 'IPv6-Address';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
-$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
-$wb["name_error_empty"] = 'The hostname is empty.';
-$wb["name_error_regex"] = 'The hostname has the wrong format.';
-$wb["data_error_empty"] = 'IP-Address empty';
-$wb["data_error_regex"] = 'IP-Address format invalid';
-?>
\ No newline at end of file
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Endereço-IPv6';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de zonas DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'O Hostname está em branco.';
+$wb['name_error_regex'] = 'O Hostname está com formato inválido.';
+$wb['data_error_empty'] = 'Endereço-IP em branco';
+$wb['data_error_regex'] = 'Endereço-IP com formato inválido';
+?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_alias.lng b/interface/web/dns/lib/lang/br_dns_alias.lng
index 6e9e78b..5b60d3a 100644
--- a/interface/web/dns/lib/lang/br_dns_alias.lng
+++ b/interface/web/dns/lib/lang/br_dns_alias.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'tipo';
-$wb["data_txt"] = 'Hostname Alvo';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_record_txt"] = 'O número máximo de registros DNS para sua conta foi atingido.';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["name_error_empty"] = 'Hostname está em branco.';
-$wb["name_error_regex"] = 'O hostname está em um formato inválido.';
-$wb["data_error_empty"] = 'Hostname de destino está em branco';
-$wb["data_error_regex"] = 'O hostname de destino está em um formato inválido.';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Hostname Alvo';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de registros DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'Hostname está em branco.';
+$wb['name_error_regex'] = 'O hostname está em um formato inválido.';
+$wb['data_error_empty'] = 'Hostname de destino está em branco';
+$wb['data_error_regex'] = 'O hostname de destino está em um formato inválido.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_cname.lng b/interface/web/dns/lib/lang/br_dns_cname.lng
index 1bb0074..9a72ba8 100644
--- a/interface/web/dns/lib/lang/br_dns_cname.lng
+++ b/interface/web/dns/lib/lang/br_dns_cname.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'tipo';
-$wb["data_txt"] = 'Hostname de Destino';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_record_txt"] = 'O número máximo de registros DNS para sua conta foi atingido.';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["name_error_empty"] = 'Hostname está em branco.';
-$wb["name_error_regex"] = 'O hostname está em um formato inválido.';
-$wb["data_error_empty"] = 'Hostname de destino está em branco';
-$wb["data_error_regex"] = 'O hostname de destino está em um formato inválido.';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Hostname de Destino';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de registros DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'Hostname está em branco.';
+$wb['name_error_regex'] = 'O hostname está em um formato inválido.';
+$wb['data_error_empty'] = 'Hostname de destino está em branco';
+$wb['data_error_regex'] = 'O hostname de destino está em um formato inválido.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_hinfo.lng b/interface/web/dns/lib/lang/br_dns_hinfo.lng
index 1e08214..2fe82da 100644
--- a/interface/web/dns/lib/lang/br_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/br_dns_hinfo.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'tipo';
-$wb["data_txt"] = 'Informações do Host';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_record_txt"] = 'O número máximo de zonas DNS para sua conta foi atingido.';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["name_error_empty"] = 'Hostname em branco.';
-$wb["name_error_regex"] = 'Hostname tem um formato inválido.';
-$wb["data_error_empty"] = 'Endereço-IP em branco';
-$wb["data_error_regex"] = 'Endereço-IP formato inválido';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Informações do Host';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de zonas DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'Hostname em branco.';
+$wb['name_error_regex'] = 'Hostname tem um formato inválido.';
+$wb['data_error_empty'] = 'Endereço-IP em branco';
+$wb['data_error_regex'] = 'Endereço-IP formato inválido';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_mx.lng b/interface/web/dns/lib/lang/br_dns_mx.lng
index 7f2cb4e..966eb04 100644
--- a/interface/web/dns/lib/lang/br_dns_mx.lng
+++ b/interface/web/dns/lib/lang/br_dns_mx.lng
@@ -1,16 +1,17 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'tipo';
-$wb["data_txt"] = 'Hostname do servidor de correio';
-$wb["aux_txt"] = 'Prioridade';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_record_txt"] = 'O número máximo de zonas DNS para sua conta foi atingido.';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["name_error_empty"] = 'Hostname em branco.';
-$wb["name_error_regex"] = 'Hostname tem um formato inválido.';
-$wb["data_error_empty"] = 'Hostname do servidor de correio em branco';
-$wb["data_error_regex"] = 'Hostname do servidor de correio formato inválido';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Hostname do servidor de correio';
+$wb['aux_txt'] = 'Prioridade';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de zonas DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'Hostname em branco.';
+$wb['name_error_regex'] = 'Hostname tem um formato inválido.';
+$wb['data_error_empty'] = 'Hostname do servidor de correio em branco';
+$wb['data_error_regex'] = 'Hostname do servidor de correio formato inválido';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_ns.lng b/interface/web/dns/lib/lang/br_dns_ns.lng
index 3632e47..f2caae1 100644
--- a/interface/web/dns/lib/lang/br_dns_ns.lng
+++ b/interface/web/dns/lib/lang/br_dns_ns.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Zona';
-$wb["type_txt"] = 'tipo';
-$wb["data_txt"] = 'Hostname Servidor de Nomes';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_record_txt"] = 'O número máximo de zonas DNS para sua conta foi atingido.';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["name_error_empty"] = 'A zona está em branco.';
-$wb["name_error_regex"] = 'A zona está com formato inválido.';
-$wb["data_error_empty"] = 'Servidor de nomes em branco';
-$wb["data_error_regex"] = 'Servidor de nomes com formato inválido';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Zona';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Hostname Servidor de Nomes';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de zonas DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'A zona está em branco.';
+$wb['name_error_regex'] = 'A zona está com formato inválido.';
+$wb['data_error_empty'] = 'Servidor de nomes em branco';
+$wb['data_error_regex'] = 'Servidor de nomes com formato inválido';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_ptr.lng b/interface/web/dns/lib/lang/br_dns_ptr.lng
index 7311624..a4fdfc1 100644
--- a/interface/web/dns/lib/lang/br_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/br_dns_ptr.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Nnome';
-$wb["type_txt"] = 'tipo';
-$wb["data_txt"] = 'Hostname Canônico';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_record_txt"] = 'O número máximo de zonas DNS para sua conta foi atingido.';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["name_error_empty"] = 'Hostname em branco.';
-$wb["name_error_regex"] = 'Hostname tem um formato inválido.';
-$wb["data_error_empty"] = 'Endereço-IP em branco';
-$wb["data_error_regex"] = 'Endereço-IP formato inválido';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Nnome';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Hostname Canônico';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de zonas DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'Hostname em branco.';
+$wb['name_error_regex'] = 'Hostname tem um formato inválido.';
+$wb['data_error_empty'] = 'Endereço-IP em branco';
+$wb['data_error_regex'] = 'Endereço-IP formato inválido';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_rp.lng b/interface/web/dns/lib/lang/br_dns_rp.lng
index b20aa21..fcf021e 100644
--- a/interface/web/dns/lib/lang/br_dns_rp.lng
+++ b/interface/web/dns/lib/lang/br_dns_rp.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'tipo';
-$wb["data_txt"] = 'Pessoa Responsável';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_record_txt"] = 'O número máximo de zonas DNS para sua conta foi atingido.';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["name_error_empty"] = 'O Hostname está em branco.';
-$wb["name_error_regex"] = 'O Hostname está com formato inválido.';
-$wb["data_error_empty"] = 'Pessoa responsável em branco';
-$wb["data_error_regex"] = 'Pessoa responsável formato inválido';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Pessoa Responsável';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de zonas DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'O Hostname está em branco.';
+$wb['name_error_regex'] = 'O Hostname está com formato inválido.';
+$wb['data_error_empty'] = 'Pessoa responsável em branco';
+$wb['data_error_regex'] = 'Pessoa responsável formato inválido';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_soa.lng b/interface/web/dns/lib/lang/br_dns_soa.lng
index 673cf4c..089dae6 100644
--- a/interface/web/dns/lib/lang/br_dns_soa.lng
+++ b/interface/web/dns/lib/lang/br_dns_soa.lng
@@ -1,24 +1,25 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["origin_txt"] = 'Zona (SOA)';
-$wb["ns_txt"] = 'NS';
-$wb["mbox_txt"] = 'Correio';
-$wb["serial_txt"] = 'Serial';
-$wb["refresh_txt"] = 'Refresh';
-$wb["retry_txt"] = 'Retry';
-$wb["expire_txt"] = 'Expire';
-$wb["minimum_txt"] = 'Minimum';
-$wb["ttl_txt"] = 'TTL';
-$wb["xfer_txt"] = 'Permitir transferências de zona para <br />estes IPs (lista separada por ponto e vírgula)';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_zone_txt"] = 'O número máximo de zonas DNS para sua conta foi atingido.';
-$wb["client_txt"] = 'Cliente';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["server_id_error_empty"] = 'Servidor não selecionado';
-$wb["origin_error_empty"] = 'Zona vazia.';
-$wb["origin_error_unique"] = 'Este registro já existe nesta zona.';
-$wb["origin_error_regex"] = 'Formato de zona inválido.';
-$wb["ns_error_regex"] = 'NS tem um formato inválido.';
-$wb["mbox_error_empty"] = 'Correio está em branco.';
-$wb["mbox_error_regex"] = 'Correio com formato inválido.';
+$wb['server_id_txt'] = 'Servidor';
+$wb['origin_txt'] = 'Zona (SOA)';
+$wb['ns_txt'] = 'NS';
+$wb['mbox_txt'] = 'Correio';
+$wb['serial_txt'] = 'Serial';
+$wb['refresh_txt'] = 'Refresh';
+$wb['retry_txt'] = 'Retry';
+$wb['expire_txt'] = 'Expire';
+$wb['minimum_txt'] = 'Minimum';
+$wb['ttl_txt'] = 'TTL';
+$wb['xfer_txt'] = 'Permitir transferências de zona para <br />estes IPs (lista separada por ponto e vírgula)';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_zone_txt'] = 'O número máximo de zonas DNS para sua conta foi atingido.';
+$wb['client_txt'] = 'Cliente';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['server_id_error_empty'] = 'Servidor não selecionado';
+$wb['origin_error_empty'] = 'Zona vazia.';
+$wb['origin_error_unique'] = 'Este registro já existe nesta zona.';
+$wb['origin_error_regex'] = 'Formato de zona inválido.';
+$wb['ns_error_regex'] = 'NS tem um formato inválido.';
+$wb['mbox_error_empty'] = 'Correio está em branco.';
+$wb['mbox_error_regex'] = 'Correio com formato inválido.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_soa_list.lng b/interface/web/dns/lib/lang/br_dns_soa_list.lng
index 94577f3..0533882 100644
--- a/interface/web/dns/lib/lang/br_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/br_dns_soa_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["list_head_txt"] = 'Zonas DNS';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["origin_txt"] = 'Zona';
-$wb["ns_txt"] = 'NS';
-$wb["mbox_txt"] = 'Correio';
-$wb["add_new_record_txt"] = 'Adcionar uma nova zona dns (SOA)';
+$wb['list_head_txt'] = 'Zonas DNS';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['origin_txt'] = 'Zona';
+$wb['ns_txt'] = 'NS';
+$wb['mbox_txt'] = 'Correio';
+$wb['add_new_record_txt'] = 'Adcionar uma nova zona dns (SOA)';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_srv.lng b/interface/web/dns/lib/lang/br_dns_srv.lng
index 06610c8..3f657c5 100644
--- a/interface/web/dns/lib/lang/br_dns_srv.lng
+++ b/interface/web/dns/lib/lang/br_dns_srv.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'tipo';
-$wb["data_txt"] = 'Registro do Servidor';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_record_txt"] = 'O número máximo de zonas DNS para sua conta foi atingido.';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["name_error_empty"] = 'O Hostname está em branco.';
-$wb["name_error_regex"] = 'O Hostname está com formato inválido.';
-$wb["data_error_empty"] = 'Registro do Servidor em branco';
-$wb["data_error_regex"] = 'Registro do Servidor com formato inválido';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Registro do Servidor';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de zonas DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'O Hostname está em branco.';
+$wb['name_error_regex'] = 'O Hostname está com formato inválido.';
+$wb['data_error_empty'] = 'Registro do Servidor em branco';
+$wb['data_error_regex'] = 'Registro do Servidor com formato inválido';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_template.lng b/interface/web/dns/lib/lang/br_dns_template.lng
index 92c62d3..c4810ec 100644
--- a/interface/web/dns/lib/lang/br_dns_template.lng
+++ b/interface/web/dns/lib/lang/br_dns_template.lng
@@ -1,6 +1,7 @@
 <?php
-$wb["name_txt"] = 'Nome';
-$wb["fields_txt"] = 'Campos';
-$wb["template_txt"] = 'Gabarito';
-$wb["visible_txt"] = 'Visível';
+$wb['name_txt'] = 'Nome';
+$wb['fields_txt'] = 'Campos';
+$wb['template_txt'] = 'Gabarito';
+$wb['visible_txt'] = 'Visível';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_template_list.lng b/interface/web/dns/lib/lang/br_dns_template_list.lng
index 8fefc2e..ae5bc25 100644
--- a/interface/web/dns/lib/lang/br_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/br_dns_template_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'Assistente de Gabaritos DNS';
-$wb["visible_txt"] = 'Visível';
-$wb["name_txt"] = 'Nome';
-$wb["add_new_record_txt"] = 'Adcionar novo registro';
+$wb['list_head_txt'] = 'Assistente de Gabaritos DNS';
+$wb['visible_txt'] = 'Visível';
+$wb['name_txt'] = 'Nome';
+$wb['add_new_record_txt'] = 'Adcionar novo registro';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_txt.lng b/interface/web/dns/lib/lang/br_dns_txt.lng
index 5fda9f2..664fd2f 100644
--- a/interface/web/dns/lib/lang/br_dns_txt.lng
+++ b/interface/web/dns/lib/lang/br_dns_txt.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["zone_txt"] = 'Zona';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'tipo';
-$wb["data_txt"] = 'Text';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_dns_record_txt"] = 'O número máximo de zonas DNS para sua conta foi atingido.';
-$wb["no_zone_perm"] = 'Você não tem permição para adcionar registros a está zona DNS.';
-$wb["name_error_empty"] = 'Hostname em branco.';
-$wb["name_error_regex"] = 'Hostname tem um formato inválido.';
-$wb["data_error_empty"] = 'Endereço-IP em branco';
-$wb["data_error_regex"] = 'Endereço-IP formato inválido';
+$wb['server_id_txt'] = 'Servidor';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Text';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_dns_record_txt'] = 'O número máximo de zonas DNS para sua conta foi atingido.';
+$wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está zona DNS.';
+$wb['name_error_empty'] = 'Hostname em branco.';
+$wb['name_error_regex'] = 'Hostname tem um formato inválido.';
+$wb['data_error_empty'] = 'Endereço-IP em branco';
+$wb['data_error_regex'] = 'Endereço-IP formato inválido';
 ?>
+
diff --git a/interface/web/dns/lib/lang/br_dns_wizard.lng b/interface/web/dns/lib/lang/br_dns_wizard.lng
index 5d33da9..2d72f0b 100644
--- a/interface/web/dns/lib/lang/br_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/br_dns_wizard.lng
@@ -1,16 +1,26 @@
 <?php
-
 $wb['template_id_txt'] = 'Gabarito';
 $wb['server_id_txt'] = 'Servidor';
 $wb['client_txt'] = 'Cliente';
-$wb["btn_save_txt"] = 'Criar Registro DNS';
-$wb["btn_cancel_txt"] = 'Cancelar';
+$wb['btn_save_txt'] = 'Criar Registro DNS';
+$wb['btn_cancel_txt'] = 'Cancelar';
 $wb['domain_txt'] = 'Domínio';
 $wb['email_txt'] = 'Correio';
 $wb['ns1_txt'] = 'NS 1';
 $wb['ns2_txt'] = 'NS 2';
 $wb['ip_txt'] = 'Endereço IP';
-
 $wb['error_origin_empty'] = 'Origem em branco.';
-
+$wb['error_ns_empty'] = 'NS vazio.';
+$wb['error_mbox_empty'] = 'Mbox vazia.';
+$wb['error_refresh_empty'] = 'Refresh vazio.';
+$wb['error_retry_empty'] = 'Retry vazio.';
+$wb['error_expire_empty'] = 'Expire vazio.';
+$wb['error_minimum_empty'] = 'Minimum vazio.';
+$wb['error_ttl_empty'] = 'TTL vazio.';
+$wb['error_domain_empty'] = 'Domínio vazio';
+$wb['error_ip_empty'] = 'IP vazio.';
+$wb['error_ns1_empty'] = 'NS1 vazio.';
+$wb['error_ns2_empty'] = 'NS2 vazio.';
+$wb['error_email_empty'] = 'Correio vazio.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/de_dns_a.lng b/interface/web/dns/lib/lang/de_dns_a.lng
index 1f1bd19..ea6d021 100644
--- a/interface/web/dns/lib/lang/de_dns_a.lng
+++ b/interface/web/dns/lib/lang/de_dns_a.lng
@@ -6,11 +6,11 @@
 $wb['data_txt'] = 'IP Adresse';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktiv';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
 $wb['name_error_empty'] = 'Der Hostname ist leer.';
 $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
 $wb['data_error_empty'] = 'IP Adresse ist leer';
 $wb['data_error_regex'] = 'Format der IP Adresse ist ungültig';
-$wb['data_error_duplicate'] = 'Duplicate A-Record';
+$wb['data_error_duplicate'] = 'Doppelter A-Eintrag';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_a_list.lng b/interface/web/dns/lib/lang/de_dns_a_list.lng
index 87c9cd8..0481c2b 100644
--- a/interface/web/dns/lib/lang/de_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_a_list.lng
@@ -1,14 +1,14 @@
 <?php
-$wb['list_head_txt'] = 'A-Record';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'A-Eintrag';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Name';
-$wb['data_txt'] = 'Data';
-$wb['aux_txt'] = 'Priority';
-$wb['type_txt'] = 'Type';
-$wb['add_new_record_txt'] = 'Add new DNS A-Record';
-$wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
-$wb['delete_confirmation'] = 'Do you really want to delete this record?';
+$wb['data_txt'] = 'Daten';
+$wb['aux_txt'] = 'Priorität';
+$wb['type_txt'] = 'Typ';
+$wb['add_new_record_txt'] = 'Neuen DNS A-Eintrag hinzufügen';
+$wb['page_txt'] = 'Seite';
+$wb['page_of_txt'] = 'von';
+$wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_aaaa.lng b/interface/web/dns/lib/lang/de_dns_aaaa.lng
index 31ef0da..768e670 100644
--- a/interface/web/dns/lib/lang/de_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/de_dns_aaaa.lng
@@ -2,14 +2,14 @@
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'IPv6-Address';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'IPv6-Adresse';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The hostname is empty.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'IP-Address empty';
-$wb['data_error_regex'] = 'IP-Address format invalid';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
+$wb['name_error_empty'] = 'Der Hostname ist leer.';
+$wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
+$wb['data_error_empty'] = 'IP-Adresse leer';
+$wb['data_error_regex'] = 'IP-Adresse Format ungültig';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_alias.lng b/interface/web/dns/lib/lang/de_dns_alias.lng
index 827e5a8..9475644 100644
--- a/interface/web/dns/lib/lang/de_dns_alias.lng
+++ b/interface/web/dns/lib/lang/de_dns_alias.lng
@@ -2,14 +2,14 @@
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Target Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Ziel Hostname';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The hostname is empty.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'Target hostname empty';
-$wb['data_error_regex'] = 'Target hostname format invalid';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
+$wb['name_error_empty'] = 'Der Hostname ist leer.';
+$wb['name_error_regex'] = 'Der Hostname hat ein falsches Format.';
+$wb['data_error_empty'] = 'Ziel Hostname leer';
+$wb['data_error_regex'] = 'Ziel Hostname Format ungültig';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_cname.lng b/interface/web/dns/lib/lang/de_dns_cname.lng
index 827e5a8..4c3d5a0 100644
--- a/interface/web/dns/lib/lang/de_dns_cname.lng
+++ b/interface/web/dns/lib/lang/de_dns_cname.lng
@@ -2,14 +2,14 @@
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Target Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Ziel Hostname';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The hostname is empty.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'Target hostname empty';
-$wb['data_error_regex'] = 'Target hostname format invalid';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
+$wb['name_error_empty'] = 'Der Hostname ist leer.';
+$wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
+$wb['data_error_empty'] = 'Ziel Hostname leer';
+$wb['data_error_regex'] = 'Ziel Hostname Format ungültig';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_hinfo.lng b/interface/web/dns/lib/lang/de_dns_hinfo.lng
index 0d90bcf..245480f 100644
--- a/interface/web/dns/lib/lang/de_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/de_dns_hinfo.lng
@@ -2,14 +2,14 @@
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
+$wb['type_txt'] = 'Typ';
 $wb['data_txt'] = 'Host Information';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The hostname is empty.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'Host information empty';
-$wb['data_error_regex'] = 'Host Information format invalid';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
+$wb['name_error_empty'] = 'Der Hostname ist leer.';
+$wb['name_error_regex'] = 'Der Hostname hat ein falsches Format.';
+$wb['data_error_empty'] = 'Host Information ist leer';
+$wb['data_error_regex'] = 'Host Information Format ist ungültig';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_mx.lng b/interface/web/dns/lib/lang/de_dns_mx.lng
index 648827f..ab21cc4 100644
--- a/interface/web/dns/lib/lang/de_dns_mx.lng
+++ b/interface/web/dns/lib/lang/de_dns_mx.lng
@@ -2,15 +2,15 @@
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Mailserver hostname';
-$wb['aux_txt'] = 'Priority';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Mailserver Hostname';
+$wb['aux_txt'] = 'Priorität';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The hostname is empty.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'Mailserver hostname empty';
-$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
+$wb['name_error_empty'] = 'Der Hostname ist leer.';
+$wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
+$wb['data_error_empty'] = 'Mailserver Hostname leer';
+$wb['data_error_regex'] = 'Mailserver Hostname Format ungültig';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_ns.lng b/interface/web/dns/lib/lang/de_dns_ns.lng
index fd4becc..845da9d 100644
--- a/interface/web/dns/lib/lang/de_dns_ns.lng
+++ b/interface/web/dns/lib/lang/de_dns_ns.lng
@@ -7,7 +7,7 @@
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktiv';
 $wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
 $wb['name_error_empty'] = 'Die Zone ist leer.';
 $wb['name_error_regex'] = 'Die Zone hat ein falsches Format';
 $wb['data_error_empty'] = 'Nameserver ist leer';
diff --git a/interface/web/dns/lib/lang/de_dns_ptr.lng b/interface/web/dns/lib/lang/de_dns_ptr.lng
index c026384..78b289f 100644
--- a/interface/web/dns/lib/lang/de_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/de_dns_ptr.lng
@@ -2,14 +2,14 @@
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Name';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Canonical Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Kanonischer Hostname';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The name is empty.';
-$wb['name_error_regex'] = 'The name has the wrong format.';
-$wb['data_error_empty'] = 'Canonical hostname empty';
-$wb['data_error_regex'] = 'Canonical hostname format invalid';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
+$wb['name_error_empty'] = 'Der Name ist leer.';
+$wb['name_error_regex'] = 'Der Name hat das falsche Format.';
+$wb['data_error_empty'] = 'Kanonischer Hostname leer';
+$wb['data_error_regex'] = 'Kanonischer Hostname Format ungültig';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_rp.lng b/interface/web/dns/lib/lang/de_dns_rp.lng
index c1e43f1..86f3fc0 100644
--- a/interface/web/dns/lib/lang/de_dns_rp.lng
+++ b/interface/web/dns/lib/lang/de_dns_rp.lng
@@ -2,14 +2,14 @@
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Typ';
 $wb['data_txt'] = 'Kontaktperson';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktiv';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The hostname is empty.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'Responsible person field empty';
-$wb['data_error_regex'] = 'Responsible person field format invalid';
+$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
+$wb['name_error_empty'] = 'Der Hostname ist leer.';
+$wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
+$wb['data_error_empty'] = 'Kontaktperson Feld leer';
+$wb['data_error_regex'] = 'Kontaktperson Format ungültig';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng
index 89aa7a1..16b7f5e 100644
--- a/interface/web/dns/lib/lang/de_dns_soa.lng
+++ b/interface/web/dns/lib/lang/de_dns_soa.lng
@@ -3,22 +3,22 @@
 $wb['origin_txt'] = 'Zone (SOA)';
 $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
-$wb['serial_txt'] = 'Serial';
+$wb['serial_txt'] = 'Seriennummer';
 $wb['refresh_txt'] = 'Refresh';
 $wb['retry_txt'] = 'Retry';
 $wb['expire_txt'] = 'Expire';
 $wb['minimum_txt'] = 'Minimum';
 $wb['ttl_txt'] = 'TTL';
-$wb['xfer_txt'] = 'Allow zone transfers to <br />these IPs (comma separated list)';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_zone_txt'] = 'The max. number of DNS zones for your account is reached.';
-$wb['client_txt'] = 'Client';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['server_id_error_empty'] = 'No server selected';
-$wb['origin_error_empty'] = 'Zone empty.';
-$wb['origin_error_unique'] = 'There is already a record for this zone.';
-$wb['origin_error_regex'] = 'Zone has a invalid format.';
-$wb['ns_error_regex'] = 'NS has a invalid format.';
-$wb['mbox_error_empty'] = 'Email is empty.';
-$wb['mbox_error_regex'] = 'Email format invalid.';
+$wb['xfer_txt'] = 'Zonentransfer zu diesen IPs erlauben (mit Beistrich getrennte Liste)';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_dns_zone_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['client_txt'] = 'Kunde';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
+$wb['server_id_error_empty'] = 'Kein Server ausgewählt';
+$wb['origin_error_empty'] = 'Zone leer.';
+$wb['origin_error_unique'] = 'Es existiert bereits ein Eintrag für diese Zone.';
+$wb['origin_error_regex'] = 'Zone hat ein ungültiges Format.';
+$wb['ns_error_regex'] = 'NS hat ein ungültiges Format.';
+$wb['mbox_error_empty'] = 'Email ist leer.';
+$wb['mbox_error_regex'] = 'Email Format ungültig.';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_soa_list.lng b/interface/web/dns/lib/lang/de_dns_soa_list.lng
index 42bb329..92f098c 100644
--- a/interface/web/dns/lib/lang/de_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_soa_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'DNS Zones';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'DNS Zonen';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
 $wb['origin_txt'] = 'Zone';
 $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Add new DNS Zone (SOA)';
+$wb['add_new_record_txt'] = 'Neue DNS Zone (SOA) hinzufügen';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_srv.lng b/interface/web/dns/lib/lang/de_dns_srv.lng
index b42dd5b..2ce5968 100644
--- a/interface/web/dns/lib/lang/de_dns_srv.lng
+++ b/interface/web/dns/lib/lang/de_dns_srv.lng
@@ -6,10 +6,10 @@
 $wb['data_txt'] = 'Servereintrag';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktiv';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
 $wb['name_error_empty'] = 'Der Hostname ist leer.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
 $wb['data_error_empty'] = 'Servereintrag ist leer';
-$wb['data_error_regex'] = 'Server record format invalid';
+$wb['data_error_regex'] = 'Servereintrag Format ungültig';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_template_list.lng b/interface/web/dns/lib/lang/de_dns_template_list.lng
index 8d9d730..45f0c5c 100644
--- a/interface/web/dns/lib/lang/de_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_template_list.lng
@@ -1,6 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'DNS Wizard Template';
-$wb['visible_txt'] = 'Visible';
+$wb['list_head_txt'] = 'DNS Wizard Vorlage';
+$wb['visible_txt'] = 'Sichtbar';
 $wb['name_txt'] = 'Name';
-$wb['add_new_record_txt'] = 'Add new record';
+$wb['add_new_record_txt'] = 'Neuen Eintrag hinzufügen';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_txt.lng b/interface/web/dns/lib/lang/de_dns_txt.lng
index f39da52..182e994 100644
--- a/interface/web/dns/lib/lang/de_dns_txt.lng
+++ b/interface/web/dns/lib/lang/de_dns_txt.lng
@@ -6,8 +6,8 @@
 $wb['data_txt'] = 'Text';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktiv';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für ihr Konto wurde erreicht.';
+$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
 $wb['name_error_empty'] = 'Der Hostname ist leer.';
 $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
 $wb['data_error_empty'] = 'Text ist leer';
diff --git a/interface/web/dns/lib/lang/de_dns_wizard.lng b/interface/web/dns/lib/lang/de_dns_wizard.lng
index 2853c02..b2eb9a0 100644
--- a/interface/web/dns/lib/lang/de_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/de_dns_wizard.lng
@@ -1,25 +1,25 @@
 <?php
-$wb['template_id_txt'] = 'Template';
+$wb['template_id_txt'] = 'Vorlage';
 $wb['server_id_txt'] = 'Server';
-$wb['client_txt'] = 'Client';
-$wb['btn_save_txt'] = 'Create DNS Record';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['client_txt'] = 'Kunde';
+$wb['btn_save_txt'] = 'DNS Eintrag hinzufügen';
+$wb['btn_cancel_txt'] = 'Abbrechen';
 $wb['domain_txt'] = 'Domain';
 $wb['email_txt'] = 'Email';
 $wb['ns1_txt'] = 'NS 1';
 $wb['ns2_txt'] = 'NS 2';
-$wb['ip_txt'] = 'IP Address';
-$wb['error_origin_empty'] = 'Origin empty.';
-$wb['error_ns_empty'] = 'NS empty.';
-$wb['error_mbox_empty'] = 'Mbox empty.';
-$wb['error_refresh_empty'] = 'Refresh empty.';
-$wb['error_retry_empty'] = 'Retry empty.';
-$wb['error_expire_empty'] = 'Expire empty.';
-$wb['error_minimum_empty'] = 'Minimum empty.';
-$wb['error_ttl_empty'] = 'TTL empty.';
-$wb['error_domain_empty'] = 'Domain empty';
-$wb['error_ip_empty'] = 'IP empty.';
-$wb['error_ns1_empty'] = 'NS1 empty.';
-$wb['error_ns2_empty'] = 'NS2 empty.';
-$wb['error_email_empty'] = 'EMail empty.';
+$wb['ip_txt'] = 'IP Adresse';
+$wb['error_origin_empty'] = 'Origin leer.';
+$wb['error_ns_empty'] = 'NS leer.';
+$wb['error_mbox_empty'] = 'Mbox leer.';
+$wb['error_refresh_empty'] = 'Refresh leer.';
+$wb['error_retry_empty'] = 'Retry leer.';
+$wb['error_expire_empty'] = 'Expire leer.';
+$wb['error_minimum_empty'] = 'Minimum leer.';
+$wb['error_ttl_empty'] = 'TTL leer.';
+$wb['error_domain_empty'] = 'Domain leer';
+$wb['error_ip_empty'] = 'IP leer.';
+$wb['error_ns1_empty'] = 'NS1 leer.';
+$wb['error_ns2_empty'] = 'NS2 leer.';
+$wb['error_email_empty'] = 'EMail leer.';
 ?>
diff --git a/interface/web/dns/lib/lang/es_dns_aaaa.lng b/interface/web/dns/lib/lang/es_dns_aaaa.lng
index c56d558..31ef0da 100644
--- a/interface/web/dns/lib/lang/es_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/es_dns_aaaa.lng
@@ -1,15 +1,15 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb["zone_txt"] = 'Zone';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'type';
-$wb["data_txt"] = 'IPv6-Address';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
-$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
-$wb["name_error_empty"] = 'The hostname is empty.';
-$wb["name_error_regex"] = 'The hostname has the wrong format.';
-$wb["data_error_empty"] = 'IP-Address empty';
-$wb["data_error_regex"] = 'IP-Address format invalid';
-?>
\ No newline at end of file
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'IPv6-Address';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'IP-Address empty';
+$wb['data_error_regex'] = 'IP-Address format invalid';
+?>
diff --git a/interface/web/dns/lib/lang/fi_dns_aaaa.lng b/interface/web/dns/lib/lang/fi_dns_aaaa.lng
index c56d558..31ef0da 100644
--- a/interface/web/dns/lib/lang/fi_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/fi_dns_aaaa.lng
@@ -1,15 +1,15 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb["zone_txt"] = 'Zone';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'type';
-$wb["data_txt"] = 'IPv6-Address';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
-$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
-$wb["name_error_empty"] = 'The hostname is empty.';
-$wb["name_error_regex"] = 'The hostname has the wrong format.';
-$wb["data_error_empty"] = 'IP-Address empty';
-$wb["data_error_regex"] = 'IP-Address format invalid';
-?>
\ No newline at end of file
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'IPv6-Address';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'IP-Address empty';
+$wb['data_error_regex'] = 'IP-Address format invalid';
+?>
diff --git a/interface/web/dns/lib/lang/hu.lng b/interface/web/dns/lib/lang/hu.lng
new file mode 100644
index 0000000..8424ced
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['DNS'] = 'DNS';
+$wb['Zones'] = 'Zones';
+$wb['DNS A'] = 'DNS A';
+$wb['DNS ALIAS'] = 'DNS ALIAS';
+$wb['DNS CNAME'] = 'DNS CNAME';
+$wb['DNS hinfo'] = 'DNS hinfo';
+$wb['DNS mx'] = 'DNS mx';
+$wb['DNS ns'] = 'DNS ns';
+$wb['DNS ptr'] = 'DNS ptr';
+$wb['DNS RP'] = 'DNS RP';
+$wb['DNS Zone'] = 'DNS Zone';
+$wb['Records'] = 'Records';
+$wb['DNS SRV'] = 'DNS SRV';
+$wb['DNS TXT Record'] = 'DNS TXT Record';
+$wb['DNS TXT'] = 'DNS TXT';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_a.lng b/interface/web/dns/lib/lang/hu_dns_a.lng
new file mode 100644
index 0000000..c473a2f
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_a.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'IP-Address';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'IP-Address empty';
+$wb['data_error_regex'] = 'IP-Address format invalid';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_a_list.lng b/interface/web/dns/lib/lang/hu_dns_a_list.lng
new file mode 100644
index 0000000..5340918
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_a_list.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'A-Record';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Name';
+$wb['data_txt'] = 'Data';
+$wb['aux_txt'] = 'Priority';
+$wb['type_txt'] = 'Type';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['add_new_record_txt'] = 'Add new DNS A-Record';
+$wb['delete_confirmation'] = 'Do you really want to delete this record?';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_aaaa.lng b/interface/web/dns/lib/lang/hu_dns_aaaa.lng
new file mode 100644
index 0000000..927cb86
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_aaaa.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'IPv6-Address';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
+$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
+$wb["name_error_empty"] = 'The hostname is empty.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'IP-Address empty';
+$wb["data_error_regex"] = 'IP-Address format invalid';
+?>
diff --git a/interface/web/dns/lib/lang/hu_dns_alias.lng b/interface/web/dns/lib/lang/hu_dns_alias.lng
new file mode 100644
index 0000000..60339b0
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_alias.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Target Hostname';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Target hostname empty';
+$wb['data_error_regex'] = 'Target hostname format invalid';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_cname.lng b/interface/web/dns/lib/lang/hu_dns_cname.lng
new file mode 100644
index 0000000..60339b0
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_cname.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Target Hostname';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Target hostname empty';
+$wb['data_error_regex'] = 'Target hostname format invalid';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_hinfo.lng b/interface/web/dns/lib/lang/hu_dns_hinfo.lng
new file mode 100644
index 0000000..9e8d62b
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_hinfo.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Host Information';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Host information empty';
+$wb['data_error_regex'] = 'Host Information format invalid';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_mx.lng b/interface/web/dns/lib/lang/hu_dns_mx.lng
new file mode 100644
index 0000000..aa62833
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_mx.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Mailserver hostname';
+$wb['aux_txt'] = 'Priority';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Mailserver hostname empty';
+$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_ns.lng b/interface/web/dns/lib/lang/hu_dns_ns.lng
new file mode 100644
index 0000000..6546354
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_ns.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Zone';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Nameserver Hostname';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The zone is empty.';
+$wb['name_error_regex'] = 'The zone has the wrong format.';
+$wb['data_error_empty'] = 'Nameserver empty';
+$wb['data_error_regex'] = 'Nameserver format invalid';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_ptr.lng b/interface/web/dns/lib/lang/hu_dns_ptr.lng
new file mode 100644
index 0000000..8a0dc59
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_ptr.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Name';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Canonical Hostname';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The name is empty.';
+$wb['name_error_regex'] = 'The name has the wrong format.';
+$wb['data_error_empty'] = 'Canonical hostname empty';
+$wb['data_error_regex'] = 'Canonical hostname format invalid';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_rp.lng b/interface/web/dns/lib/lang/hu_dns_rp.lng
new file mode 100644
index 0000000..0597dde
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_rp.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Responsible Person';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Responsible person field empty';
+$wb['data_error_regex'] = 'Responsible person field format invalid';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_soa.lng b/interface/web/dns/lib/lang/hu_dns_soa.lng
new file mode 100644
index 0000000..fe66d0c
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_soa.lng
@@ -0,0 +1,25 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['origin_txt'] = 'Zone (SOA)';
+$wb['ns_txt'] = 'NS';
+$wb['mbox_txt'] = 'Email';
+$wb['serial_txt'] = 'Serial';
+$wb['refresh_txt'] = 'Refresh';
+$wb['retry_txt'] = 'Retry';
+$wb['expire_txt'] = 'Expire';
+$wb['minimum_txt'] = 'Minimum';
+$wb['ttl_txt'] = 'TTL';
+$wb['xfer_txt'] = 'Allow zone transfers to <br />these IPs (comma separated list)';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_zone_txt'] = 'The max. number of DNS zones for your account is reached.';
+$wb['client_txt'] = 'Client';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['server_id_error_empty'] = 'No server selected';
+$wb['origin_error_empty'] = 'Zone empty.';
+$wb['origin_error_unique'] = 'There is already a record for this zone.';
+$wb['origin_error_regex'] = 'Zone has a invalid format.';
+$wb['ns_error_regex'] = 'NS has a invalid format.';
+$wb['mbox_error_empty'] = 'Email is empty.';
+$wb['mbox_error_regex'] = 'Email format invalid.';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_soa_list.lng b/interface/web/dns/lib/lang/hu_dns_soa_list.lng
new file mode 100644
index 0000000..ab58b70
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_soa_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'DNS Zones';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['origin_txt'] = 'Zone';
+$wb['ns_txt'] = 'NS';
+$wb['mbox_txt'] = 'Email';
+$wb['add_new_record_txt'] = 'Add new DNS Zone (SOA)';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_srv.lng b/interface/web/dns/lib/lang/hu_dns_srv.lng
new file mode 100644
index 0000000..0310bb8
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_srv.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Server Record';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Server record empty';
+$wb['data_error_regex'] = 'Server record format invalid';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_template.lng b/interface/web/dns/lib/lang/hu_dns_template.lng
new file mode 100644
index 0000000..89002b7
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_template.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["name_txt"] = 'Name';
+$wb["fields_txt"] = 'Fields';
+$wb["template_txt"] = 'Template';
+$wb["visible_txt"] = 'Visible';
+?>
diff --git a/interface/web/dns/lib/lang/hu_dns_template_list.lng b/interface/web/dns/lib/lang/hu_dns_template_list.lng
new file mode 100644
index 0000000..fc17d5f
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_template_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'DNS Wizard Template';
+$wb["visible_txt"] = 'Visible';
+$wb["name_txt"] = 'Name';
+$wb["add_new_record_txt"] = 'Add new record';
+?>
diff --git a/interface/web/dns/lib/lang/hu_dns_txt.lng b/interface/web/dns/lib/lang/hu_dns_txt.lng
new file mode 100644
index 0000000..19e9e07
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_txt.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Text';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$wb['data_error_regex'] = 'Text format invalid';
+?>
+
diff --git a/interface/web/dns/lib/lang/hu_dns_wizard.lng b/interface/web/dns/lib/lang/hu_dns_wizard.lng
new file mode 100644
index 0000000..2973865
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_wizard.lng
@@ -0,0 +1,27 @@
+<?php
+
+$wb['template_id_txt'] = 'Template';
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Create DNS Record';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['email_txt'] = 'Email';
+$wb['ns1_txt'] = 'NS 1';
+$wb['ns2_txt'] = 'NS 2';
+$wb['ip_txt'] = 'IP Address';
+$wb['error_origin_empty'] = 'Origin empty.';
+$wb['error_ns_empty'] = 'NS empty.';
+$wb['error_mbox_empty'] = 'Mbox empty.';
+$wb['error_refresh_empty'] = 'Refresh empty.';
+$wb['error_retry_empty'] = 'Retry empty.';
+$wb['error_expire_empty'] = 'Expire empty.';
+$wb['error_minimum_empty'] = 'Minimum empty.';
+$wb['error_ttl_empty'] = 'TTL empty.';
+$wb['error_domain_empty'] = 'Domain empty';
+$wb['error_ip_empty'] = 'IP empty.';
+$wb['error_ns1_empty'] = 'NS1 empty.';
+$wb['error_ns2_empty'] = 'NS2 empty.';
+$wb['error_email_empty'] = 'EMail empty.';
+
+?>
diff --git a/interface/web/dns/lib/lang/it_dns_aaaa.lng b/interface/web/dns/lib/lang/it_dns_aaaa.lng
index c56d558..31ef0da 100644
--- a/interface/web/dns/lib/lang/it_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/it_dns_aaaa.lng
@@ -1,15 +1,15 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb["zone_txt"] = 'Zone';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'type';
-$wb["data_txt"] = 'IPv6-Address';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
-$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
-$wb["name_error_empty"] = 'The hostname is empty.';
-$wb["name_error_regex"] = 'The hostname has the wrong format.';
-$wb["data_error_empty"] = 'IP-Address empty';
-$wb["data_error_regex"] = 'IP-Address format invalid';
-?>
\ No newline at end of file
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'IPv6-Address';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'IP-Address empty';
+$wb['data_error_regex'] = 'IP-Address format invalid';
+?>
diff --git a/interface/web/dns/lib/lang/nl.lng b/interface/web/dns/lib/lang/nl.lng
index 8ff3656..386d01c 100644
--- a/interface/web/dns/lib/lang/nl.lng
+++ b/interface/web/dns/lib/lang/nl.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['DNS'] = 'DNS';
-$wb['Zones'] = 'Zones';
+$wb['Zones'] = 'DNS zones';
 $wb['DNS A'] = 'DNS A';
 $wb['DNS ALIAS'] = 'DNS ALIAS';
 $wb['DNS CNAME'] = 'DNS CNAME';
@@ -9,9 +9,10 @@
 $wb['DNS ns'] = 'DNS ns';
 $wb['DNS ptr'] = 'DNS ptr';
 $wb['DNS RP'] = 'DNS RP';
-$wb['DNS Zone'] = 'DNS Zone';
+$wb['DNS Zone'] = 'DNS zone';
 $wb['Records'] = 'Records';
 $wb['DNS SRV'] = 'DNS SRV';
-$wb['DNS TXT Record'] = 'DNS TXT Record';
+$wb['DNS TXT Record'] = 'DNS TXT record';
 $wb['DNS TXT'] = 'DNS TXT';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_a.lng b/interface/web/dns/lib/lang/nl_dns_a.lng
index cb9ea8f..0c05786 100644
--- a/interface/web/dns/lib/lang/nl_dns_a.lng
+++ b/interface/web/dns/lib/lang/nl_dns_a.lng
@@ -3,14 +3,15 @@
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Hostnaam';
 $wb['type_txt'] = 'type';
-$wb['data_txt'] = 'IP-Adres';
+$wb['data_txt'] = 'IPv4 adres';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_record_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
 $wb['no_zone_perm'] = 'U heeft geen toestemming om een record aan deze DNS zone toe te voegen.';
 $wb['name_error_empty'] = 'De hostnaam is leeg.';
-$wb['name_error_regex'] = 'De hostname has the wrong format.';
-$wb['data_error_empty'] = 'IP-Adres is leeg.';
-$wb['data_error_regex'] = 'IP-Adres formaat ongeldig.';
-$wb['data_error_duplicate'] = 'Duplicate A-Record';
+$wb['name_error_regex'] = 'De hostnaam heeft een onjuiste indeling.';
+$wb['data_error_empty'] = 'IP-adres is leeg.';
+$wb['data_error_regex'] = 'IP-adres indeling ongeldig.';
+$wb['data_error_duplicate'] = 'Dit A-record bestaat al.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_a_list.lng b/interface/web/dns/lib/lang/nl_dns_a_list.lng
index d3f03a1..bde046f 100644
--- a/interface/web/dns/lib/lang/nl_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/nl_dns_a_list.lng
@@ -1,14 +1,15 @@
 <?php
 $wb['list_head_txt'] = 'A-Record';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Naam';
 $wb['data_txt'] = 'Data';
 $wb['aux_txt'] = 'Prioriteit';
 $wb['type_txt'] = 'Type';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw DNS A-Record';
-$wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
-$wb['delete_confirmation'] = 'Do you really want to delete this record?';
+$wb['add_new_record_txt'] = 'Nieuw DNS A-Record toevoegen';
+$wb['page_txt'] = 'Pagina';
+$wb['page_of_txt'] = 'van';
+$wb['delete_confirmation'] = 'Weet u zeker dat u dit record wilt verwijderen?';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_aaaa.lng b/interface/web/dns/lib/lang/nl_dns_aaaa.lng
index c56d558..417018e 100644
--- a/interface/web/dns/lib/lang/nl_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/nl_dns_aaaa.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb["zone_txt"] = 'Zone';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'type';
-$wb["data_txt"] = 'IPv6-Address';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
-$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
-$wb["name_error_empty"] = 'The hostname is empty.';
-$wb["name_error_regex"] = 'The hostname has the wrong format.';
-$wb["data_error_empty"] = 'IP-Address empty';
-$wb["data_error_regex"] = 'IP-Address format invalid';
-?>
\ No newline at end of file
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostnaam';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'IPv6 adres';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'Max. aantal DNS records is bereikt.';
+$wb['no_zone_perm'] = 'U heeft geen toegang om DNS records aan deze zone toe te voegen.';
+$wb['name_error_empty'] = 'De hostnaam is leeg.';
+$wb['name_error_regex'] = 'De hostnaam heeft een verkeerde indeling.';
+$wb['data_error_empty'] = 'IP-adres is leeg.';
+$wb['data_error_regex'] = 'IP-adres heeft geen juiste indeling.';
+?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_alias.lng b/interface/web/dns/lib/lang/nl_dns_alias.lng
index 2f2be30..c337cd2 100644
--- a/interface/web/dns/lib/lang/nl_dns_alias.lng
+++ b/interface/web/dns/lib/lang/nl_dns_alias.lng
@@ -5,11 +5,12 @@
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Doel Hostnaam';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_record_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['no_zone_perm'] = 'U heeft geen toegang om een record in deze zone aan te maken.';
 $wb['name_error_empty'] = 'De hostnaam is leeg.';
-$wb['name_error_regex'] = 'De hostnaam heeft het verkeerde formaat.';
+$wb['name_error_regex'] = 'De hostnaam heeft een verkeerde indeling.';
 $wb['data_error_empty'] = 'Doel hostnaam is leeg';
-$wb['data_error_regex'] = 'Doel hostnaam formaat ongeldig';
+$wb['data_error_regex'] = 'Doel hostnaam indeling is ongeldig.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_cname.lng b/interface/web/dns/lib/lang/nl_dns_cname.lng
index 832c73b..eb467db 100644
--- a/interface/web/dns/lib/lang/nl_dns_cname.lng
+++ b/interface/web/dns/lib/lang/nl_dns_cname.lng
@@ -3,9 +3,9 @@
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Hostnaam';
 $wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Target Hostnaam';
+$wb['data_txt'] = 'Doel hostnaam';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_record_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
 $wb['no_zone_perm'] = 'U heeft geen toestemming om een record aan deze DNS zone toe te voegen.';
 $wb['name_error_empty'] = 'De hostnaam is leeg.';
@@ -13,3 +13,4 @@
 $wb['data_error_empty'] = 'Doel hostnaam is leeg.';
 $wb['data_error_regex'] = 'Doel hostnaam formaat ongeldig.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_hinfo.lng b/interface/web/dns/lib/lang/nl_dns_hinfo.lng
index 235dac3..cf1e9e8 100644
--- a/interface/web/dns/lib/lang/nl_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/nl_dns_hinfo.lng
@@ -5,11 +5,12 @@
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Host Informatie';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_record_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
 $wb['no_zone_perm'] = 'U heeft geen toestemming om een record aan deze DNS zone toe te voegen.';
 $wb['name_error_empty'] = 'De hostnaam is leeg.';
-$wb['name_error_regex'] = 'De hostnaam heeft het verkeerde formaat.';
+$wb['name_error_regex'] = 'De hostnaam heeft het verkeerde indeling.';
 $wb['data_error_empty'] = 'Host informatie is leeg.';
-$wb['data_error_regex'] = 'Host Informatie formaat ongeldig.';
+$wb['data_error_regex'] = 'Host Informatie indeling is ongeldig.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_mx.lng b/interface/web/dns/lib/lang/nl_dns_mx.lng
index 0f0bb85..73f977e 100644
--- a/interface/web/dns/lib/lang/nl_dns_mx.lng
+++ b/interface/web/dns/lib/lang/nl_dns_mx.lng
@@ -6,11 +6,12 @@
 $wb['data_txt'] = 'Mailserver hostnaam';
 $wb['aux_txt'] = 'Prioriteit';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_record_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
 $wb['no_zone_perm'] = 'U heeft geen toestemming om een record aan deze DNS zone toe te voegen.';
 $wb['name_error_empty'] = 'De hostnaam is leeg.';
-$wb['name_error_regex'] = 'De hostnaam heeft het verkeerde formaat.';
-$wb['data_error_empty'] = 'Mailserver hostnaam is leeg';
-$wb['data_error_regex'] = 'Mailserver hostnaam formaat ongeldig';
+$wb['name_error_regex'] = 'De hostnaam heeft een ongeldige indeling.';
+$wb['data_error_empty'] = 'Mailserver hostnaam is leeg.';
+$wb['data_error_regex'] = 'Mailserver hostnaam indeling is ongeldig.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_ns.lng b/interface/web/dns/lib/lang/nl_dns_ns.lng
index c75a3d3..b9a2cab 100644
--- a/interface/web/dns/lib/lang/nl_dns_ns.lng
+++ b/interface/web/dns/lib/lang/nl_dns_ns.lng
@@ -5,7 +5,7 @@
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Nameserver Hostnaam';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_record_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
 $wb['no_zone_perm'] = 'U heeft geen toestemming om een record aan deze DNS zone toe te voegen.';
 $wb['name_error_empty'] = 'De zone is leeg.';
@@ -13,3 +13,4 @@
 $wb['data_error_empty'] = 'Nameserver is leeg.';
 $wb['data_error_regex'] = 'Nameserver formaat ongeldig.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_ptr.lng b/interface/web/dns/lib/lang/nl_dns_ptr.lng
index 4d4127b..3f40afb 100644
--- a/interface/web/dns/lib/lang/nl_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/nl_dns_ptr.lng
@@ -5,7 +5,7 @@
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Canonical Hostnaam';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_record_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
 $wb['no_zone_perm'] = 'U heeft geen toestemming om een record aan deze DNS zone toe te voegen.';
 $wb['name_error_empty'] = 'The naam is leeg.';
@@ -13,3 +13,4 @@
 $wb['data_error_empty'] = 'Canonical hostnaam is leeg.';
 $wb['data_error_regex'] = 'Canonical hostnaam formaat ongeldig.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_rp.lng b/interface/web/dns/lib/lang/nl_dns_rp.lng
index 281135c..b1ba6b8 100644
--- a/interface/web/dns/lib/lang/nl_dns_rp.lng
+++ b/interface/web/dns/lib/lang/nl_dns_rp.lng
@@ -5,11 +5,12 @@
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Verantwoordelijke persoon';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_record_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
 $wb['no_zone_perm'] = 'U heeft geen toestemming om een record aan deze DNS zone toe te voegen.';
-$wb['name_error_empty'] = 'The hostnaam is leeg.';
-$wb['name_error_regex'] = 'The hostnaam heeft het verkeerde formaat.';
+$wb['name_error_empty'] = 'De hostnaam is leeg.';
+$wb['name_error_regex'] = 'De hostnaam heeft een ongeldige indeling.';
 $wb['data_error_empty'] = 'Verantwoordelijke persoon veld is leeg.';
-$wb['data_error_regex'] = 'Verantwoordelijke persoon veld formaat ongeldig.';
+$wb['data_error_regex'] = 'Verantwoordelijke persoon veld indeling is ongeldig.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_soa.lng b/interface/web/dns/lib/lang/nl_dns_soa.lng
index e9938bb..9fc1894 100644
--- a/interface/web/dns/lib/lang/nl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/nl_dns_soa.lng
@@ -1,24 +1,25 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'Zone (SOA)';
-$wb['ns_txt'] = 'NS';
-$wb['mbox_txt'] = 'Email';
-$wb['serial_txt'] = 'Periodiek';
-$wb['refresh_txt'] = 'Verversen';
-$wb['retry_txt'] = 'Opnieuw';
-$wb['expire_txt'] = 'Verloop';
-$wb['minimum_txt'] = 'Minimum';
+$wb['origin_txt'] = 'DNS zone';
+$wb['ns_txt'] = 'Primaire nameserver';
+$wb['mbox_txt'] = 'E-mailadres zone-verantwoordelijke';
+$wb['serial_txt'] = 'Versienummer zonefile';
+$wb['refresh_txt'] = 'Sl. NS: Vernieuw zone na';
+$wb['retry_txt'] = 'Pr. NS: Bij fout, refresh na';
+$wb['expire_txt'] = 'Slave NS: Zone verloopt na';
+$wb['minimum_txt'] = 'TTL minimum';
 $wb['ttl_txt'] = 'TTL';
-$wb['xfer_txt'] = 'Xfer (IP)';
-$wb['active_txt'] = 'Actief';
+$wb['xfer_txt'] = 'Toegestane IP-adressen voor zone-transfer';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_zone_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
 $wb['client_txt'] = 'Klant';
 $wb['no_zone_perm'] = 'U heeft geen toestemming om een record aan deze DNS zone toe te voegen.';
-$wb['server_id_error_empty'] = 'Geen server selecteerd';
-$wb['origin_error_empty'] = 'Zone is leeg.';
+$wb['server_id_error_empty'] = 'Geen server geselecteerd.';
+$wb['origin_error_empty'] = 'DNS zone is leeg.';
 $wb['origin_error_unique'] = 'Er bestaat al een record voor deze zone.';
-$wb['origin_error_regex'] = 'Zone heeft een ongeldig formaat.';
-$wb['ns_error_regex'] = 'NS heeft een ongeldig formaat.';
-$wb['mbox_error_empty'] = 'Email is leeg.';
-$wb['mbox_error_regex'] = 'Email formaat ongeldig.';
+$wb['origin_error_regex'] = 'DNS zone heeft een ongeldige indeling.';
+$wb['ns_error_regex'] = 'Nameserver heeft een ongeldige indeling.';
+$wb['mbox_error_empty'] = 'E-mailadres is leeg.';
+$wb['mbox_error_regex'] = 'De indeling van het e-mailadres is ongeldig.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_soa_list.lng b/interface/web/dns/lib/lang/nl_dns_soa_list.lng
index 801db91..14a828d 100644
--- a/interface/web/dns/lib/lang/nl_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/nl_dns_soa_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'DNS Zones';
-$wb['active_txt'] = 'Actief';
+$wb['list_head_txt'] = 'DNS zones';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'Zone';
-$wb['ns_txt'] = 'NS';
-$wb['mbox_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw DNS Zone (SOA)';
+$wb['origin_txt'] = 'DNS zone';
+$wb['ns_txt'] = 'Primaire nameserver';
+$wb['mbox_txt'] = 'E-mailadres zone-verantwoordelijke';
+$wb['add_new_record_txt'] = 'Nieuwe DNS zone toevoegen';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_srv.lng b/interface/web/dns/lib/lang/nl_dns_srv.lng
index 3bff9ed..9b7f77e 100644
--- a/interface/web/dns/lib/lang/nl_dns_srv.lng
+++ b/interface/web/dns/lib/lang/nl_dns_srv.lng
@@ -5,11 +5,12 @@
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Server Record';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_record_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
 $wb['no_zone_perm'] = 'U heeft geen toestemming om een record aan deze DNS zone toe te voegen.';
 $wb['name_error_empty'] = 'The hostnaam is leeg.';
-$wb['name_error_regex'] = 'The hostnaam heeft het verkeerde formaat.';
-$wb['data_error_empty'] = 'Server record is leeg';
-$wb['data_error_regex'] = 'Server record formaat ongeldig';
+$wb['name_error_regex'] = 'De hostnaam heeft een verkeerde indeling.';
+$wb['data_error_empty'] = 'Server record is leeg.';
+$wb['data_error_regex'] = 'Server record indeling is ongeldig.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_template.lng b/interface/web/dns/lib/lang/nl_dns_template.lng
index 3a09e3b..9a53251 100644
--- a/interface/web/dns/lib/lang/nl_dns_template.lng
+++ b/interface/web/dns/lib/lang/nl_dns_template.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['name_txt'] = 'Name';
-$wb['fields_txt'] = 'Fields';
-$wb['template_txt'] = 'Template';
-$wb['visible_txt'] = 'Visible';
+$wb['name_txt'] = 'Naam template';
+$wb['fields_txt'] = 'Toon velden';
+$wb['template_txt'] = 'Template-data';
+$wb['visible_txt'] = 'Zichtbaar?';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_template_list.lng b/interface/web/dns/lib/lang/nl_dns_template_list.lng
index 6c8a120..01df08f 100644
--- a/interface/web/dns/lib/lang/nl_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/nl_dns_template_list.lng
@@ -2,5 +2,6 @@
 $wb['list_head_txt'] = 'DNS wizard template';
 $wb['visible_txt'] = 'Zichtbaar';
 $wb['name_txt'] = 'Naam';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw record';
+$wb['add_new_record_txt'] = 'Nieuw record toevoegen';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_txt.lng b/interface/web/dns/lib/lang/nl_dns_txt.lng
index ddec4fc..b0b4c5e 100644
--- a/interface/web/dns/lib/lang/nl_dns_txt.lng
+++ b/interface/web/dns/lib/lang/nl_dns_txt.lng
@@ -5,11 +5,12 @@
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Text';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_dns_record_txt'] = 'Het max. aantal aan DNS records voor uw account is bereikt.';
 $wb['no_zone_perm'] = 'U heeft geen toestemming om een record aan deze DNS zone toe te voegen.';
-$wb['name_error_empty'] = 'The hostnaam is leeg.';
-$wb['name_error_regex'] = 'The hostnaam has the wrong format.';
+$wb['name_error_empty'] = 'De hostnaam is leeg.';
+$wb['name_error_regex'] = 'De hostnaam heeft een ongeldige indeling.';
 $wb['data_error_empty'] = 'Tekst is leeg.';
-$wb['data_error_regex'] = 'Tekst formaat ongeldig.';
+$wb['data_error_regex'] = 'Tekst indeling is ongeldig.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/nl_dns_wizard.lng b/interface/web/dns/lib/lang/nl_dns_wizard.lng
index 2853c02..9c021b7 100644
--- a/interface/web/dns/lib/lang/nl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/nl_dns_wizard.lng
@@ -1,25 +1,26 @@
 <?php
 $wb['template_id_txt'] = 'Template';
 $wb['server_id_txt'] = 'Server';
-$wb['client_txt'] = 'Client';
-$wb['btn_save_txt'] = 'Create DNS Record';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['domain_txt'] = 'Domain';
-$wb['email_txt'] = 'Email';
-$wb['ns1_txt'] = 'NS 1';
-$wb['ns2_txt'] = 'NS 2';
-$wb['ip_txt'] = 'IP Address';
-$wb['error_origin_empty'] = 'Origin empty.';
-$wb['error_ns_empty'] = 'NS empty.';
-$wb['error_mbox_empty'] = 'Mbox empty.';
-$wb['error_refresh_empty'] = 'Refresh empty.';
-$wb['error_retry_empty'] = 'Retry empty.';
-$wb['error_expire_empty'] = 'Expire empty.';
-$wb['error_minimum_empty'] = 'Minimum empty.';
-$wb['error_ttl_empty'] = 'TTL empty.';
-$wb['error_domain_empty'] = 'Domain empty';
-$wb['error_ip_empty'] = 'IP empty.';
-$wb['error_ns1_empty'] = 'NS1 empty.';
-$wb['error_ns2_empty'] = 'NS2 empty.';
-$wb['error_email_empty'] = 'EMail empty.';
+$wb['client_txt'] = 'Klant';
+$wb['btn_save_txt'] = 'DNS zone toevoegen';
+$wb['btn_cancel_txt'] = 'Annuleren';
+$wb['domain_txt'] = 'Domeinnaam';
+$wb['email_txt'] = 'E-mail';
+$wb['ns1_txt'] = 'Nameserver 1';
+$wb['ns2_txt'] = 'Nameserver 2';
+$wb['ip_txt'] = 'IP-adres';
+$wb['error_origin_empty'] = 'Afkomst leeg.';
+$wb['error_ns_empty'] = 'Primaire nameserver is leeg.';
+$wb['error_mbox_empty'] = 'E-mailadres zone-verantwoordelijke is leeg.';
+$wb['error_refresh_empty'] = 'Vernieuw-tijd is leeg.';
+$wb['error_retry_empty'] = 'Refresh-tijd is leeg.';
+$wb['error_expire_empty'] = 'Verloop-tijd is leeg.';
+$wb['error_minimum_empty'] = 'TTL Minimum is leeg.';
+$wb['error_ttl_empty'] = 'TTL is leeg.';
+$wb['error_domain_empty'] = 'Domeinnaam is leeg.';
+$wb['error_ip_empty'] = 'IP-adres is leeg.';
+$wb['error_ns1_empty'] = 'Nameserver 1 is leeg.';
+$wb['error_ns2_empty'] = 'Nameserver 2 is leeg.';
+$wb['error_email_empty'] = 'E-mail is leeg.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng
new file mode 100644
index 0000000..de0d46d
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['DNS'] = 'DNS';
+$wb['Zones'] = 'Strefy';
+$wb['DNS A'] = 'DNS A';
+$wb['DNS ALIAS'] = 'Alias DNS';
+$wb['DNS CNAME'] = 'DNS CNAME';
+$wb['DNS hinfo'] = 'DNS hinfo';
+$wb['DNS mx'] = 'DNS mx';
+$wb['DNS ns'] = 'DNS ns';
+$wb['DNS ptr'] = 'DNS ptr';
+$wb['DNS RP'] = 'DNS RP';
+$wb['DNS Zone'] = 'Strefa DNS';
+$wb['Records'] = 'Wpisy';
+$wb['DNS SRV'] = 'DNS SRV';
+$wb['DNS TXT Record'] = 'Wpis DNS TXT';
+$wb['DNS TXT'] = 'DNS TXT';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_a.lng b/interface/web/dns/lib/lang/pl_dns_a.lng
new file mode 100644
index 0000000..5742c40
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_a.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Nazwa serwera';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Adres - IP';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis DNS dla tej strefy.';
+$wb['name_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.';
+$wb['data_error_empty'] = 'Adres IP jest pusty';
+$wb['data_error_regex'] = 'Adres IP ma niepoprawny format';
+$wb['data_error_duplicate'] = 'Duplicate A-Record';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_a_list.lng b/interface/web/dns/lib/lang/pl_dns_a_list.lng
new file mode 100644
index 0000000..3d0db05
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_a_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'A-Wpis';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Nazwa';
+$wb['data_txt'] = 'Data';
+$wb['aux_txt'] = 'Priorytet';
+$wb['type_txt'] = 'Typ';
+$wb['add_new_record_txt'] = 'Dodaj nowy A-Wpis DNS';
+$wb['page_txt'] = 'Strona';
+$wb['page_of_txt'] = 'z';
+$wb['delete_confirmation'] = 'Jesteś pewny, że chcesz usunąć ten wpis?';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_aaaa.lng b/interface/web/dns/lib/lang/pl_dns_aaaa.lng
new file mode 100644
index 0000000..983fae1
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_aaaa.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Nazwa serwera';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Adres IPv6';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis w tej strefie DNS.';
+$wb['name_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.';
+$wb['data_error_empty'] = 'Adres IP jest pusty';
+$wb['data_error_regex'] = 'Adres IP ma niepoprawny format';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_alias.lng b/interface/web/dns/lib/lang/pl_dns_alias.lng
new file mode 100644
index 0000000..a950805
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_alias.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Nazwa serwera';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Docelowa nazwa serwera';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktywne';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis dla tej strefy DNS.';
+$wb['name_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
+$wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta.';
+$wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format.';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_cname.lng b/interface/web/dns/lib/lang/pl_dns_cname.lng
new file mode 100644
index 0000000..92cb4ac
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_cname.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Nazwa serwera';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Docelowa nazwa serwera';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktywne';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis w tej strefie DNS.';
+$wb['name_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.';
+$wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta';
+$wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_hinfo.lng b/interface/web/dns/lib/lang/pl_dns_hinfo.lng
new file mode 100644
index 0000000..53b6da2
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_hinfo.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Nazwa serwera';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Informacje o serwerze';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis do tej strefy DNS.';
+$wb['name_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.';
+$wb['data_error_empty'] = 'Informacje o serwerze są puste';
+$wb['data_error_regex'] = 'Informacje o serwerze mają niepoprawny format';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_mx.lng b/interface/web/dns/lib/lang/pl_dns_mx.lng
new file mode 100644
index 0000000..f8a6c0f
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_mx.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Nazwa serwera';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Nazwa serwera poczty e-mail';
+$wb['aux_txt'] = 'Priorytet';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis do tej strefy DNS.';
+$wb['name_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
+$wb['data_error_empty'] = 'Nazwa serwera poczty e-mail jest pusta.';
+$wb['data_error_regex'] = 'Nazwa serwera poczty e-mail ma niepoprawny format.';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_ns.lng b/interface/web/dns/lib/lang/pl_dns_ns.lng
new file mode 100644
index 0000000..18d7efd
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_ns.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Strefa';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Nazwa serwera';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktywne';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis do tej strefy DNS.';
+$wb['name_error_empty'] = 'Strefa jest pusta.';
+$wb['name_error_regex'] = 'Strefa ma zły format.';
+$wb['data_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['data_error_regex'] = 'Nazwa serwera ma zły format.';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_ptr.lng b/interface/web/dns/lib/lang/pl_dns_ptr.lng
new file mode 100644
index 0000000..eae3981
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_ptr.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Nazwa';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Standardowa nazwa serwera';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis do tej strefy DNS.';
+$wb['name_error_empty'] = 'Nazwa jest pusta.';
+$wb['name_error_regex'] = 'Nazwa ma zły format.';
+$wb['data_error_empty'] = 'Standardowa nazwa serwera jest pusta';
+$wb['data_error_regex'] = 'Standardowa nazwa serwera ma zły format';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_rp.lng b/interface/web/dns/lib/lang/pl_dns_rp.lng
new file mode 100644
index 0000000..d38efd1
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_rp.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Responsible Person';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Responsible person field empty';
+$wb['data_error_regex'] = 'Responsible person field format invalid';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng
new file mode 100644
index 0000000..ce00327
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_soa.lng
@@ -0,0 +1,24 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['origin_txt'] = 'Strefa (SOA)';
+$wb['ns_txt'] = 'NS';
+$wb['mbox_txt'] = 'E-mail';
+$wb['serial_txt'] = 'Klucz';
+$wb['refresh_txt'] = 'Odśwież';
+$wb['retry_txt'] = 'Ponów';
+$wb['expire_txt'] = 'Wygasł';
+$wb['minimum_txt'] = 'Minimum';
+$wb['ttl_txt'] = 'TTL';
+$wb['xfer_txt'] = 'Zezwól na przeniesienie stref do <br />tych adresów IP (adresy rozdzielaj przecinkiem)';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_dns_zone_txt'] = 'Maksymalna ilość stref DNS dla Twojego konta została przekroczona.';
+$wb['client_txt'] = 'Klient';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis dla tej strefy DNS.';
+$wb['server_id_error_empty'] = 'Nie wybrano serwera';
+$wb['origin_error_empty'] = 'Strefa jest pusta.';
+$wb['origin_error_unique'] = 'Istnieje już wpis dla tej strefy.';
+$wb['origin_error_regex'] = 'Strefa ma niepoprawny format.';
+$wb['ns_error_regex'] = 'NS ma niepoprawny format.';
+$wb['mbox_error_empty'] = 'E-mail jest pusty.';
+$wb['mbox_error_regex'] = 'E-mail ma niepoprawny format.';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_soa_list.lng b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
new file mode 100644
index 0000000..126209e
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Strefy DNS';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['origin_txt'] = 'Strefa';
+$wb['ns_txt'] = 'NS';
+$wb['mbox_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Dodaj nową stefę DNS (SOA)';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_srv.lng b/interface/web/dns/lib/lang/pl_dns_srv.lng
new file mode 100644
index 0000000..80661b5
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_srv.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Nazwa serwera';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Wpis serwera';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis dla tej strefy DNS.';
+$wb['name_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
+$wb['data_error_empty'] = 'Wpis serwera jest pusty';
+$wb['data_error_regex'] = 'Wpis serwera ma niepoprawny format';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_template.lng b/interface/web/dns/lib/lang/pl_dns_template.lng
new file mode 100644
index 0000000..f3e7563
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_template.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['name_txt'] = 'Nazwa';
+$wb['fields_txt'] = 'Pola';
+$wb['template_txt'] = 'Szablon';
+$wb['visible_txt'] = 'Widoczność';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_template_list.lng b/interface/web/dns/lib/lang/pl_dns_template_list.lng
new file mode 100644
index 0000000..7deac3b
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_template_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Instalator szablonów DNS';
+$wb['visible_txt'] = 'Widoczność';
+$wb['name_txt'] = 'Nazwa';
+$wb['add_new_record_txt'] = 'Dodaj nowy wpis';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_txt.lng b/interface/web/dns/lib/lang/pl_dns_txt.lng
new file mode 100644
index 0000000..628d5c0
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_txt.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['zone_txt'] = 'Strefa';
+$wb['name_txt'] = 'Nazwa serwera';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Tekst';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
+$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis dla tej strefy DNS.';
+$wb['name_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
+$wb['data_error_empty'] = 'Tekst jest pusty';
+$wb['data_error_regex'] = 'Tekst ma zły format';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_wizard.lng b/interface/web/dns/lib/lang/pl_dns_wizard.lng
new file mode 100644
index 0000000..f2da42a
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng
@@ -0,0 +1,25 @@
+<?php
+$wb['template_id_txt'] = 'Szablon';
+$wb['server_id_txt'] = 'Serwer';
+$wb['client_txt'] = 'Klient';
+$wb['btn_save_txt'] = 'Stwórz wpid DNS';
+$wb['btn_cancel_txt'] = 'Anuluj';
+$wb['domain_txt'] = 'Domena';
+$wb['email_txt'] = 'E-mail';
+$wb['ns1_txt'] = 'NS 1';
+$wb['ns2_txt'] = 'NS 2';
+$wb['ip_txt'] = 'Adres IP';
+$wb['error_origin_empty'] = 'Źródło jest puste.';
+$wb['error_ns_empty'] = 'NS jest pusty.';
+$wb['error_mbox_empty'] = 'Mbox jest pusty.';
+$wb['error_refresh_empty'] = 'Odśwież jest puste.';
+$wb['error_retry_empty'] = 'Ponów jest puste.';
+$wb['error_expire_empty'] = 'Wygasł jest puste.';
+$wb['error_minimum_empty'] = 'Minimum jest puste.';
+$wb['error_ttl_empty'] = 'TTL jest puste.';
+$wb['error_domain_empty'] = 'Domena jest pusta';
+$wb['error_ip_empty'] = 'IP jest puste.';
+$wb['error_ns1_empty'] = 'NS1 jest puste.';
+$wb['error_ns2_empty'] = 'NS2 jest puste.';
+$wb['error_email_empty'] = 'E-mail jest pusty.';
+?>
diff --git a/interface/web/dns/lib/lang/ru_dns_aaaa.lng b/interface/web/dns/lib/lang/ru_dns_aaaa.lng
index c56d558..31ef0da 100644
--- a/interface/web/dns/lib/lang/ru_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/ru_dns_aaaa.lng
@@ -1,15 +1,15 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb["zone_txt"] = 'Zone';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'type';
-$wb["data_txt"] = 'IPv6-Address';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
-$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
-$wb["name_error_empty"] = 'The hostname is empty.';
-$wb["name_error_regex"] = 'The hostname has the wrong format.';
-$wb["data_error_empty"] = 'IP-Address empty';
-$wb["data_error_regex"] = 'IP-Address format invalid';
-?>
\ No newline at end of file
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'IPv6-Address';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'IP-Address empty';
+$wb['data_error_regex'] = 'IP-Address format invalid';
+?>
diff --git a/interface/web/dns/lib/lang/se_dns_aaaa.lng b/interface/web/dns/lib/lang/se_dns_aaaa.lng
index c56d558..31ef0da 100644
--- a/interface/web/dns/lib/lang/se_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/se_dns_aaaa.lng
@@ -1,15 +1,15 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb["zone_txt"] = 'Zone';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'type';
-$wb["data_txt"] = 'IPv6-Address';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
-$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
-$wb["name_error_empty"] = 'The hostname is empty.';
-$wb["name_error_regex"] = 'The hostname has the wrong format.';
-$wb["data_error_empty"] = 'IP-Address empty';
-$wb["data_error_regex"] = 'IP-Address format invalid';
-?>
\ No newline at end of file
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'IPv6-Address';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+$wb['name_error_empty'] = 'The hostname is empty.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'IP-Address empty';
+$wb['data_error_regex'] = 'IP-Address format invalid';
+?>
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index 6069c7b..96922c5 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -1,5 +1,5 @@
   <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
       <div class="buttons">
         <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');">
           <span>A</span>
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm
index 14c4903..c2ebfd8 100644
--- a/interface/web/dns/templates/dns_soa_list.htm
+++ b/interface/web/dns/templates/dns_soa_list.htm
@@ -1,62 +1,62 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_dns_soa">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
-            <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
-            <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
-            <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
-            <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
-            <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
-            <td class="tbl_col_mbox"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_dns_soa">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
+            <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
+            <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
+            <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
+            <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
+            <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
+            <td class="tbl_col_mbox"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/dns/templates/dns_template_list.htm b/interface/web/dns/templates/dns_template_list.htm
index 83b38bc..91a62f5 100644
--- a/interface/web/dns/templates/dns_template_list.htm
+++ b/interface/web/dns/templates/dns_template_list.htm
@@ -1,53 +1,53 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_dns_template">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_template_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_visible" scope="col"><tmpl_var name="visible_txt"></th>
-            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_visible"><select name="search_visible" onChange="submitForm('pageForm','dns/dns_template_list.php');">{tmpl_var name='search_visible'}</select></td>
-            <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_visible"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="visible"}</a></td>
-            <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_dns_template">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_template_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_visible" scope="col"><tmpl_var name="visible_txt"></th>
+            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_visible"><select name="search_visible" onChange="submitForm('pageForm','dns/dns_template_list.php');">{tmpl_var name='search_visible'}</select></td>
+            <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_visible"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="visible"}</a></td>
+            <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/help/lib/lang/hu.lng b/interface/web/help/lib/lang/hu.lng
new file mode 100644
index 0000000..2d757cb
--- /dev/null
+++ b/interface/web/help/lib/lang/hu.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['Support Message'] = 'Support üzenet';
+$wb['Message'] = 'Üzenet';
+$wb['Send message'] = 'Üzenet küldés';
+$wb['View messages'] = 'Üzeneteket megnéz';
+$wb['Support'] = 'Support';
+?>
+
diff --git a/interface/web/help/lib/lang/hu_support_message.lng b/interface/web/help/lib/lang/hu_support_message.lng
new file mode 100644
index 0000000..1315d24
--- /dev/null
+++ b/interface/web/help/lib/lang/hu_support_message.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['recipient_id_txt'] = 'Címzett azonosító';
+$wb['sender_id_txt'] = 'Küldő azonosító';
+$wb['subject_txt'] = 'Tárgy';
+$wb['message_txt'] = 'Üzenet';
+$wb['tstamp_txt'] = 'Időbélyeg';
+?>
+
diff --git a/interface/web/help/lib/lang/hu_support_message_list.lng b/interface/web/help/lib/lang/hu_support_message_list.lng
new file mode 100644
index 0000000..16ab46f
--- /dev/null
+++ b/interface/web/help/lib/lang/hu_support_message_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Szupport Üzenetek';
+$wb['sender_id_txt'] = 'Küldő';
+$wb['subject_txt'] = 'Tárgy';
+$wb['add_new_record_txt'] = 'Új szupport üzenet';
+?>
+
diff --git a/interface/web/help/lib/lang/nl.lng b/interface/web/help/lib/lang/nl.lng
index 996198a..cd938ba 100644
--- a/interface/web/help/lib/lang/nl.lng
+++ b/interface/web/help/lib/lang/nl.lng
@@ -5,3 +5,4 @@
 $wb['View messages'] = 'Bekijk berichten';
 $wb['Support'] = 'Support';
 ?>
+
diff --git a/interface/web/help/lib/lang/nl_support_message.lng b/interface/web/help/lib/lang/nl_support_message.lng
index 4eec574..2cbc11c 100644
--- a/interface/web/help/lib/lang/nl_support_message.lng
+++ b/interface/web/help/lib/lang/nl_support_message.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['recipient_id_txt'] = 'Ontvanger ID';
-$wb['sender_id_txt'] = 'Afzender ID';
+$wb['recipient_id_txt'] = 'Versturen aan';
+$wb['sender_id_txt'] = 'Afzender';
 $wb['subject_txt'] = 'Onderwerp';
 $wb['message_txt'] = 'Bericht';
-$wb['tstamp_txt'] = 'Tijdstempel';
+$wb['tstamp_txt'] = 'Datum en tijd';
 ?>
+
diff --git a/interface/web/help/lib/lang/nl_support_message_list.lng b/interface/web/help/lib/lang/nl_support_message_list.lng
index eb2de74..7e39754 100644
--- a/interface/web/help/lib/lang/nl_support_message_list.lng
+++ b/interface/web/help/lib/lang/nl_support_message_list.lng
@@ -2,5 +2,6 @@
 $wb['list_head_txt'] = 'Support berichten';
 $wb['sender_id_txt'] = 'Afzender';
 $wb['subject_txt'] = 'Onderwerp';
-$wb['add_new_record_txt'] = 'Aanmaken nieuw support bericht';
+$wb['add_new_record_txt'] = 'Nieuw support bericht aanmaken';
 ?>
+
diff --git a/interface/web/help/lib/lang/pl.lng b/interface/web/help/lib/lang/pl.lng
new file mode 100644
index 0000000..b45521b
--- /dev/null
+++ b/interface/web/help/lib/lang/pl.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['Support Message'] = 'Wiadomość pomocy';
+$wb['Message'] = 'Wiadomość';
+$wb['Send message'] = 'Wyślij wiadomość';
+$wb['View messages'] = 'Pokaż wiadomość';
+$wb['Support'] = 'Pomoc';
+?>
diff --git a/interface/web/help/lib/lang/pl_support_message.lng b/interface/web/help/lib/lang/pl_support_message.lng
new file mode 100644
index 0000000..b21539a
--- /dev/null
+++ b/interface/web/help/lib/lang/pl_support_message.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['recipient_id_txt'] = 'ID odbiorcy';
+$wb['sender_id_txt'] = 'ID nadawcy';
+$wb['subject_txt'] = 'Temat';
+$wb['message_txt'] = 'Wiadomość';
+$wb['tstamp_txt'] = 'Kalendarz';
+?>
diff --git a/interface/web/help/lib/lang/pl_support_message_list.lng b/interface/web/help/lib/lang/pl_support_message_list.lng
new file mode 100644
index 0000000..4b87a82
--- /dev/null
+++ b/interface/web/help/lib/lang/pl_support_message_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Wiadomość pomocy';
+$wb['sender_id_txt'] = 'Nadawca';
+$wb['subject_txt'] = 'Temat';
+$wb['add_new_record_txt'] = 'Dodaj nową wiadomość pomocy';
+?>
diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm
index 524766c..0bced24 100644
--- a/interface/web/help/templates/support_message_list.htm
+++ b/interface/web/help/templates/support_message_list.htm
@@ -1,53 +1,53 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_support_message">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('help/support_message_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_sender_id" scope="col"><tmpl_var name="sender_id_txt"></th>
-            <th class="tbl_col_subject" scope="col"><tmpl_var name="subject_txt"></th>
-            <th class="tbl_col_subject" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_sender_id"><select name="search_sender_id" onChange="submitForm('pageForm','help/support_message_list.php');">{tmpl_var name='search_sender_id'}</select></td>
-            <td class="tbl_col_subject"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','help/support_message_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_sender_id"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sender_id"}</a></td>
-            <td class="tbl_col_subject"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="subject"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('help/support_message_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_support_message">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('help/support_message_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_sender_id" scope="col"><tmpl_var name="sender_id_txt"></th>
+            <th class="tbl_col_subject" scope="col"><tmpl_var name="subject_txt"></th>
+            <th class="tbl_col_subject" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_sender_id"><select name="search_sender_id" onChange="submitForm('pageForm','help/support_message_list.php');">{tmpl_var name='search_sender_id'}</select></td>
+            <td class="tbl_col_subject"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','help/support_message_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_sender_id"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sender_id"}</a></td>
+            <td class="tbl_col_subject"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="subject"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('help/support_message_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index bea09ab..92eb747 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -1,475 +1,498 @@
-<?php
-	session_start();
-	include('../../lib/config.inc.php');
-	include_once(ISPC_ROOT_PATH.'/web/strengthmeter/lib/lang/'.$_SESSION['s']['language'].'_strengthmeter.lng');
-?>
-
-redirect = '';
-
-function loadContentRefresh(pagename) {
-	var pageContentCallbackRefresh = {
-		success: function(o) {
-			document.getElementById('pageContent').innerHTML = o.responseText;
-		},
-		failure: function(o) {
-			alert('Ajax Request was not successful.'+pagename);
-		}
-	}
-	
-  if(document.getElementById('refreshinterval').value > 0) {
-  	var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename+"&refresh="+document.getElementById('refreshinterval').value, pageContentCallbackRefresh);
-  	setTimeout( "loadContentRefresh('"+pagename+"&refresh="+document.getElementById('refreshinterval').value+"')", document.getElementById('refreshinterval').value*1000 );
-  }
-}
-
-function capp(module) {
-	var cappCallback = {
-		success: function(o) {
-			if(o.responseText != '') {
-				if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
-					var parts = o.responseText.split(':');
-					loadContent(parts[1]);
-				} else {
-					alert(o.responseText);
-				}
-			}
-			loadMenus();
-		},
-		failure: function(o) {
-			alert('Ajax Request was not successful.');
-		}
-	}
-	var submitFormObj = YAHOO.util.Connect.asyncRequest('GET', 'capp.php?mod='+module, cappCallback);
-}
-
-function submitLoginForm(formname) {
-	
-	var submitFormCallback = {
-		success: function(o) {
-			if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
-				var parts = o.responseText.split(':');
-				//alert(parts[1]);
-				loadContent(parts[1]);
-				//redirect = parts[1];
-				//window.setTimeout('loadContent(redirect)', 1000);
-			} else if (o.responseText.indexOf('LOGIN_REDIRECT:') > -1) {
-				// Go to the login page
-				document.location.href = 'index.php';
-			} else {
-				document.getElementById('pageContent').innerHTML = o.responseText;
-			}
-			loadMenus();
-		},
-		failure: function(o) {
-			alert('Ajax Request was not successful.');
-		}
-	}
-	
-    //* Validate form. TODO: username and password with strip();
-    var frm = document.getElementById(formname);
-    var userNameObj = frm.username;
-    if(userNameObj.value == ''){
-        userNameObj.focus();
-        return;
-    }
-    var passwordObj = frm.passwort;
-    if(passwordObj.value == ''){
-        passwordObj.focus();
-        return;
-    }   
-	YAHOO.util.Connect.setForm(formname);
-	var submitFormObj = YAHOO.util.Connect.asyncRequest('POST', 'content.php', submitFormCallback);
-	/*
-	if(redirect != '') {
-		loadContent(redirect);
-		redirect = '';
-	}
-	*/
-}
-
-function submitForm(formname,target) {
-	
-	var submitFormCallback = {
-		success: function(o) {
-			if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
-				var parts = o.responseText.split(':');
-				//alert(parts[1]);
-				loadContent(parts[1]);
-				//redirect = parts[1];
-				//window.setTimeout('loadContent(redirect)', 1000);
-			} else {
-				document.getElementById('pageContent').innerHTML = o.responseText;
-			}
-		},
-		failure: function(o) {
-			var parts = o.responseText.split(':');
-			alert('Ajax Request was not successful. '+parts[1]);
-		}
-	}
-	
-	YAHOO.util.Connect.setForm(formname);
-	var submitFormObj = YAHOO.util.Connect.asyncRequest('POST', target, submitFormCallback);
-	/*
-	if(redirect != '') {
-		loadContent(redirect);
-		redirect = '';
-	}
-	*/
-}
-
-function submitUploadForm(formname,target) {
-	
-	var submitFormCallback = {
-		success: function(o) {
-			if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
-				var parts = o.responseText.split(':');
-				//alert(parts[1]);
-				loadContent(parts[1]);
-				//redirect = parts[1];
-				//window.setTimeout('loadContent(redirect)', 1000);
-			} else {
-				document.getElementById('pageContent').innerHTML = o.responseText;
-			}
-		},
-		upload: function(o) {
-        	if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
-				var parts = o.responseText.split(':');
-				//alert(parts[1]);
-				loadContent(parts[1]);
-				//redirect = parts[1];
-				//window.setTimeout('loadContent(redirect)', 1000);
-			} else {
-				document.getElementById('pageContent').innerHTML = o.responseText;
-			}
-        },
-		failure: function(o) {
-			alert('Ajax Request was not successful. 1');
-		}
-	}
-	
-	YAHOO.util.Connect.setForm(formname,true);
-	var submitFormObj = YAHOO.util.Connect.asyncRequest('POST', target, submitFormCallback);
-	/*
-	if(redirect != '') {
-		loadContent(redirect);
-		redirect = '';
-	}
-	*/
-}
-
-function loadContent(pagename) {
-	var pageContentCallback2 = {
-		success: function(o) {
-			if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
-				var parts = o.responseText.split(':');
-				loadContent(parts[1]);
-			} else if (o.responseText.indexOf('URL_REDIRECT:') > -1) {
-				var newUrl= o.responseText.substr(o.responseText.indexOf('URL_REDIRECT:') + "URL_REDIRECT:".length);
-				document.location.href = newUrl;
-			} else {
-				document.getElementById('pageContent').innerHTML = o.responseText;
-			}
-		},
-		failure: function(o) {
-			alert('Ajax Request was not successful.');
-		}
-	}
-	
-
-  var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, pageContentCallback2);
-}
-
-
-function loadInitContent() {
-
-  var pageContentCallback = {
-		success: function(o) {
-			if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
-				var parts = o.responseText.split(":");
-				loadContent(parts[1]);
-			} else {
-				document.getElementById('pageContent').innerHTML = o.responseText;
-			}
-			
-			/*
-			var items = document.getElementsByTagName('input');
-			for(i=0;i<items.length;i++) {
-				//var oButton = new YAHOO.widget.Button(items[i].id);
-				if(items[i].type == 'button') {
-					//alert(items[i].id);
-					var oButton = new YAHOO.widget.Button(items[i].id);
-					oButton.addListener("click",submitLoginForm);
-				}
-			}
-			//var oButton = new YAHOO.widget.Button("submit");
-			*/
-		},
-		failure: function(o) {
-			alert('Ajax Request was not successful.');
-		}
-	}
-	
-  var pageContentObject = YAHOO.util.Connect.asyncRequest('GET', 'content.php?s_mod=login&s_pg=index', pageContentCallback);
-  
-  loadMenus();
-  keepalive();
-  setTimeout("setFocus()",1000);
-
-}
-
-function setFocus() {
-/*
-	var flag=false;
-		for(z=0;z<document.forms.length;z++) {
-			var form = document.forms[z];
-			var elements = form.elements;
-			for (var i=0;i<elements.length;i++) {
-				var element = elements[i];
-				if(element.type == 'text' &&
-					!element.readOnly &&
-					!element.disabled) {
-						element.focus();
-						flag=true;
-						break;
-					}
-			}
-			if(flag)break;
-		}
-*/
-  document.pageForm.username.focus();
-}
-
-
-function loadMenus() {
-	
-	var sideNavCallback = {
-		success: function(o) {
-			document.getElementById('sideNav').innerHTML = o.responseText;
-		},
-		failure: function(o) {
-			alert('Ajax Request was not successful.');
-		}
-	}
-	
-  var sideNavObject = YAHOO.util.Connect.asyncRequest('GET', 'nav.php?nav=side', sideNavCallback);
-	
-	var topNavCallback = {
-		success: function(o) {
-			document.getElementById('topNav').innerHTML = o.responseText;
-		},
-		failure: function(o) {
-			alert('Ajax Request was not successful.');
-		}
-	}
-	
-  var topNavObject = YAHOO.util.Connect.asyncRequest('GET', 'nav.php?nav=top', topNavCallback);
-
-}
-
-function changeTab(tab,target) {
-	//document.forms[0].next_tab.value = tab;
-	document.pageForm.next_tab.value = tab;
-	submitForm('pageForm',target);
-}
-
-
-
-function reportError(request)
-	{
-		alert('Sorry. There was an error.');
-	}
-	
-function del_record(link,confirmation) {
-  if(window.confirm(confirmation)) {
-          loadContent(link);
-  }
-}
-
-function loadContentInto(elementid,pagename) {
-	var itemContentCallback = {
-		success: function(o) {
-			document.getElementById(elementid).innerHTML = o.responseText;
-		},
-		failure: function(o) {
-			alert('Ajax Request was not successful.');
-		}
-	}
-	
-
-  var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);
-}
-
-function keepalive() {
-	var pageContentCallbackKeepalive = {
-		success: function(o) {
-			setTimeout( keepalive, 1000000 );
-		},
-		failure: function(o) {
-			alert('Sorry. There was an error.');
-		}
-	}
-	
-  	var pageContentObject3 = YAHOO.util.Connect.asyncRequest('GET', 'keepalive.php', pageContentCallbackKeepalive);
-  	//setTimeout( keepalive, 1000000 );
-}
-
-
-
-var pass_minimum_length = 5;
-var pass_messages = new Array();
-
-var pass_message = new Array();
-pass_message['text'] = "<?php echo $wb['password_strength_0_txt']?>";
-pass_message['color'] = "#d0d0d0";
-pass_messages[0] = pass_message;
-
-var pass_message = new Array();
-pass_message['text'] = "<?php echo $wb['password_strength_1_txt']?>";
-pass_message['color'] = "red";
-pass_messages[1] = pass_message;
-
-var pass_message = new Array();
-pass_message['text'] = "<?php echo $wb['password_strength_2_txt']?>";
-pass_message['color'] = "yellow";
-pass_messages[2] = pass_message;
-
-var pass_message = new Array();
-pass_message['text'] = "<?php echo $wb['password_strength_3_txt']?>";
-pass_message['color'] = "#00ff00";
-pass_messages[3] = pass_message;
-
-var pass_message = new Array();
-pass_message['text'] = "<?php echo $wb['password_strength_4_txt']?>";
-pass_message['color'] = "green";
-pass_messages[4] = pass_message;
-
-var pass_message = new Array();
-pass_message['text'] = "<?php echo $wb['password_strength_5_txt']?>";
-pass_message['color'] = "green";
-pass_messages[5] = pass_message;
-
-function pass_check(password) {
-	var length = password.length;
-	var points = 0;
-	if (length < pass_minimum_length) {
-		pass_result(0);
-		return;
-	}
-	
-	if (length < 5) {
-		pass_result(1);
-		return;
-	}
-	
-	if (pass_contains(password, "ABCDEFGHIJKLNMOPQRSTUVWXYZ")) {
-		points += 1;
-	}
-	
-	if (pass_contains(password, "0123456789")) {
-		points += 1;
-	}
-	
-	if (pass_contains(password, "`~!@#$%^&*()_+|\=-[]}{';:/?.>,<\" ")) {
-		points += 1;
-	}
-	
-	if (points == 0) {
-		if (length >= 5 && length <=6) {
-			pass_result(1);
-		} else if (length >= 7 && length <=8) {
-			pass_result(2);
-		} else {
-			pass_result(3);
-		}
-	} else if (points == 1) {
-		if (length >= 5 && length <=6) {
-			pass_result(2);
-		} else if (length >= 7 && length <=10) {
-			pass_result(3);
-		} else {
-			pass_result(4);
-		}
-	} else if (points == 2) {
-		if (length >= 5 && length <=8) {
-			pass_result(3);
-		} else if (length >= 9 && length <=10) {
-			pass_result(4);
-		} else {
-			pass_result(5);
-		}
-	} else if (points == 3) {
-		if (length >= 5 && length <=6) {
-			pass_result(3);
-		} else if (length >= 7 && length <=8) {
-			pass_result(4);
-		} else {
-			pass_result(5);
-		}
-	} else if (points >= 4) {
-		if (length >= 5 && length <=6) {
-			pass_result(4);
-		} else {
-			pass_result(5);
-		}
-	}
-}
-
-
-
-function pass_result(points, message) {
-	if (points == 0) {
-		width = 10;
-	} else {
-		width = points*20;
-	}
-	document.getElementById("passBar").innerHTML = '<div style="float:left; height: 10px; padding:0px; background-color: ' + pass_messages[points]['color'] + '; width: ' + width + 'px;" />';
-	document.getElementById("passText").innerHTML = pass_messages[points]['text'];
-}
-function pass_contains(pass, check) {
-	for (i = 0; i < pass.length; i++) {
-		if (check.indexOf(pass.charAt(i)) > -1) {
-			return true;
-		}
-	}
-	return false;
-}
-
-function addAdditionalTemplate(){
-	var tpl_add = document.getElementById('template_additional').value;
-	if(tpl_add != '') {
-	  var tpl_list = document.getElementById('template_additional_list').innerHTML;
-	  var addTemplate = document.getElementById('tpl_add_select').value.split('|',2);
-	  var addTplId = addTemplate[0];
-	  var addTplText = addTemplate[1];
-	  var newVal = tpl_add + '/' + addTplId + '/';
-	  newVal = newVal.replace('//', '/');
-	  var newList = tpl_list + '<br>' + addTplText;
-	  newList = newList.replace('<br><br>', '<br>');
-	  document.getElementById('template_additional').value = newVal;
-	  document.getElementById('template_additional_list').innerHTML = newList;
-	  alert('additional template ' + addTplText + ' added to customer');
-	} else {
-	  alert('no additional template selcted');
-	}
-}
-
-function delAdditionalTemplate(){
-	var tpl_add = document.getElementById('template_additional').value;
-	if(tpl_add != '') {
-		var tpl_list = document.getElementById('template_additional_list').innerHTML;
-		var addTemplate = document.getElementById('tpl_add_select').value.split('|',2);
-		var addTplId = addTemplate[0];
-		var addTplText = addTemplate[1];
-		var newVal = tpl_add;
-		newVal = newVal.replace(addTplId, '');
-		newVal = newVal.replace('//', '/');
-		var newList = tpl_list.replace(addTplText, '');
-		newList = newList.replace('<br><br>', '<br>');
-		document.getElementById('template_additional').value = newVal;
-		document.getElementById('template_additional_list').innerHTML = newList;
-		alert('additional template ' + addTplText + ' deleted from customer');
-  } else {
-  	alert('no additional template selcted');
-  }
-  
-}
+<?php
+	session_start();
+	include('../../lib/config.inc.php');
+	include_once(ISPC_ROOT_PATH.'/web/strengthmeter/lib/lang/'.$_SESSION['s']['language'].'_strengthmeter.lng');
+?>
+
+redirect = '';
+
+function loadContentRefresh(pagename) {
+	var pageContentCallbackRefresh = {
+		success: function(o) {
+			document.getElementById('pageContent').innerHTML = o.responseText;
+		},
+		failure: function(o) {
+			alert('Ajax Request was not successful.'+pagename);
+		}
+	}
+	
+  if(document.getElementById('refreshinterval').value > 0) {
+  	var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename+"&refresh="+document.getElementById('refreshinterval').value, pageContentCallbackRefresh);
+  	setTimeout( "loadContentRefresh('"+pagename+"&refresh="+document.getElementById('refreshinterval').value+"')", document.getElementById('refreshinterval').value*1000 );
+  }
+}
+
+function capp(module) {
+	var cappCallback = {
+		success: function(o) {
+			if(o.responseText != '') {
+				if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+					var parts = o.responseText.split(':');
+					loadContent(parts[1]);
+				} else {
+					alert(o.responseText);
+				}
+			}
+			loadMenus();
+		},
+		failure: function(o) {
+			alert('Ajax Request was not successful.');
+		}
+	}
+	var submitFormObj = YAHOO.util.Connect.asyncRequest('GET', 'capp.php?mod='+module, cappCallback);
+}
+
+function submitLoginForm(formname) {
+	
+	var submitFormCallback = {
+		success: function(o) {
+			if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+				var parts = o.responseText.split(':');
+				//alert(parts[1]);
+				loadContent(parts[1]);
+				//redirect = parts[1];
+				//window.setTimeout('loadContent(redirect)', 1000);
+			} else if (o.responseText.indexOf('LOGIN_REDIRECT:') > -1) {
+				// Go to the login page
+				document.location.href = 'index.php';
+			} else {
+				document.getElementById('pageContent').innerHTML = o.responseText;
+			}
+			loadMenus();
+		},
+		failure: function(o) {
+			alert('Ajax Request was not successful.');
+		}
+	}
+	
+    //* Validate form. TODO: username and password with strip();
+    var frm = document.getElementById(formname);
+    var userNameObj = frm.username;
+    if(userNameObj.value == ''){
+        userNameObj.focus();
+        return;
+    }
+    var passwordObj = frm.passwort;
+    if(passwordObj.value == ''){
+        passwordObj.focus();
+        return;
+    }   
+	YAHOO.util.Connect.setForm(formname);
+	var submitFormObj = YAHOO.util.Connect.asyncRequest('POST', 'content.php', submitFormCallback);
+	/*
+	if(redirect != '') {
+		loadContent(redirect);
+		redirect = '';
+	}
+	*/
+	document.getElementById('footer').innerHTML = 'Powered by <a href="http://www.ispconfig.org" target="_blank">ISPConfig <?php echo ISPC_APP_VERSION ?></a>';
+}
+
+function submitForm(formname,target) {
+	
+	var submitFormCallback = {
+		success: function(o) {
+			if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+				var parts = o.responseText.split(':');
+				//alert(parts[1]);
+				loadContent(parts[1]);
+				//redirect = parts[1];
+				//window.setTimeout('loadContent(redirect)', 1000);
+			} else {
+				document.getElementById('pageContent').innerHTML = o.responseText;
+			}
+		},
+		failure: function(o) {
+			var parts = o.responseText.split(':');
+			alert('Ajax Request was not successful. '+parts[1]);
+		}
+	}
+	
+	YAHOO.util.Connect.setForm(formname);
+	var submitFormObj = YAHOO.util.Connect.asyncRequest('POST', target, submitFormCallback);
+	/*
+	if(redirect != '') {
+		loadContent(redirect);
+		redirect = '';
+	}
+	*/
+}
+
+function submitUploadForm(formname,target) {
+	
+	var submitFormCallback = {
+		success: function(o) {
+			if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+				var parts = o.responseText.split(':');
+				//alert(parts[1]);
+				loadContent(parts[1]);
+				//redirect = parts[1];
+				//window.setTimeout('loadContent(redirect)', 1000);
+			} else {
+				document.getElementById('pageContent').innerHTML = o.responseText;
+			}
+		},
+		upload: function(o) {
+        	if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+				var parts = o.responseText.split(':');
+				//alert(parts[1]);
+				loadContent(parts[1]);
+				//redirect = parts[1];
+				//window.setTimeout('loadContent(redirect)', 1000);
+			} else {
+				document.getElementById('pageContent').innerHTML = o.responseText;
+			}
+        },
+		failure: function(o) {
+			alert('Ajax Request was not successful. 1');
+		}
+	}
+	
+	YAHOO.util.Connect.setForm(formname,true);
+	var submitFormObj = YAHOO.util.Connect.asyncRequest('POST', target, submitFormCallback);
+	/*
+	if(redirect != '') {
+		loadContent(redirect);
+		redirect = '';
+	}
+	*/
+}
+
+function loadContent(pagename) {
+	var pageContentCallback2 = {
+		success: function(o) {
+			if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+				var parts = o.responseText.split(':');
+				loadContent(parts[1]);
+			} else if (o.responseText.indexOf('URL_REDIRECT:') > -1) {
+				var newUrl= o.responseText.substr(o.responseText.indexOf('URL_REDIRECT:') + "URL_REDIRECT:".length);
+				document.location.href = newUrl;
+			} else {
+				document.getElementById('pageContent').innerHTML = o.responseText;
+			}
+		},
+		failure: function(o) {
+			alert('Ajax Request was not successful.');
+		}
+	}
+	
+
+  var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, pageContentCallback2);
+}
+
+
+function loadInitContent() {
+
+  var pageContentCallback = {
+		success: function(o) {
+			if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+				var parts = o.responseText.split(":");
+				loadContent(parts[1]);
+			} else {
+				document.getElementById('pageContent').innerHTML = o.responseText;
+			}
+			
+			/*
+			var items = document.getElementsByTagName('input');
+			for(i=0;i<items.length;i++) {
+				//var oButton = new YAHOO.widget.Button(items[i].id);
+				if(items[i].type == 'button') {
+					//alert(items[i].id);
+					var oButton = new YAHOO.widget.Button(items[i].id);
+					oButton.addListener("click",submitLoginForm);
+				}
+			}
+			//var oButton = new YAHOO.widget.Button("submit");
+			*/
+		},
+		failure: function(o) {
+			alert('Ajax Request was not successful.');
+		}
+	}
+	
+  var pageContentObject = YAHOO.util.Connect.asyncRequest('GET', 'content.php?s_mod=login&s_pg=index', pageContentCallback);
+  
+  loadMenus();
+  keepalive();
+  setTimeout("setFocus()",1000);
+
+}
+
+function setFocus() {
+/*
+	var flag=false;
+		for(z=0;z<document.forms.length;z++) {
+			var form = document.forms[z];
+			var elements = form.elements;
+			for (var i=0;i<elements.length;i++) {
+				var element = elements[i];
+				if(element.type == 'text' &&
+					!element.readOnly &&
+					!element.disabled) {
+						element.focus();
+						flag=true;
+						break;
+					}
+			}
+			if(flag)break;
+		}
+*/
+  document.pageForm.username.focus();
+}
+
+
+function loadMenus() {
+	
+	var sideNavCallback = {
+		success: function(o) {
+			document.getElementById('sideNav').innerHTML = o.responseText;
+		},
+		failure: function(o) {
+			alert('Ajax Request was not successful.');
+		}
+	}
+	
+  var sideNavObject = YAHOO.util.Connect.asyncRequest('GET', 'nav.php?nav=side', sideNavCallback);
+	
+	var topNavCallback = {
+		success: function(o) {
+			document.getElementById('topNav').innerHTML = o.responseText;
+		},
+		failure: function(o) {
+			alert('Ajax Request was not successful.');
+		}
+	}
+	
+  var topNavObject = YAHOO.util.Connect.asyncRequest('GET', 'nav.php?nav=top', topNavCallback);
+
+}
+
+function changeTab(tab,target) {
+	//document.forms[0].next_tab.value = tab;
+	document.pageForm.next_tab.value = tab;
+	submitForm('pageForm',target);
+}
+
+
+
+function reportError(request)
+	{
+		alert('Sorry. There was an error.');
+	}
+	
+function del_record(link,confirmation) {
+  if(window.confirm(confirmation)) {
+          loadContent(link);
+  }
+}
+
+function loadContentInto(elementid,pagename) {
+	var itemContentCallback = {
+		success: function(o) {
+			document.getElementById(elementid).innerHTML = o.responseText;
+		},
+		failure: function(o) {
+			alert('Ajax Request was not successful.');
+		}
+	}
+	
+
+  var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);
+}
+
+function loadOptionInto(elementid,pagename) {
+	var itemContentCallback = {
+		success: function(o) {
+			var teste = o.responseText;
+			var elemente = teste.split('#');
+			el=document.getElementById(elementid);
+			el.innerHTML='';
+			for (var i = 0; i < elemente.length; ++i){
+
+				var foo2 = document.createElement("option");
+				foo2.appendChild(document.createTextNode(elemente[i]));
+				foo2.value=elemente[i];
+				el.appendChild(foo2);
+			}
+		},
+		failure: function(o) {
+		alert('Ajax Request was not successful.');
+		}
+	}
+	var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);
+}
+
+function keepalive() {
+	var pageContentCallbackKeepalive = {
+		success: function(o) {
+			setTimeout( keepalive, 1000000 );
+		},
+		failure: function(o) {
+			alert('Sorry. There was an error.');
+		}
+	}
+	
+  	var pageContentObject3 = YAHOO.util.Connect.asyncRequest('GET', 'keepalive.php', pageContentCallbackKeepalive);
+  	//setTimeout( keepalive, 1000000 );
+}
+
+
+
+var pass_minimum_length = 5;
+var pass_messages = new Array();
+
+var pass_message = new Array();
+pass_message['text'] = "<?php echo $wb['password_strength_0_txt']?>";
+pass_message['color'] = "#d0d0d0";
+pass_messages[0] = pass_message;
+
+var pass_message = new Array();
+pass_message['text'] = "<?php echo $wb['password_strength_1_txt']?>";
+pass_message['color'] = "red";
+pass_messages[1] = pass_message;
+
+var pass_message = new Array();
+pass_message['text'] = "<?php echo $wb['password_strength_2_txt']?>";
+pass_message['color'] = "yellow";
+pass_messages[2] = pass_message;
+
+var pass_message = new Array();
+pass_message['text'] = "<?php echo $wb['password_strength_3_txt']?>";
+pass_message['color'] = "#00ff00";
+pass_messages[3] = pass_message;
+
+var pass_message = new Array();
+pass_message['text'] = "<?php echo $wb['password_strength_4_txt']?>";
+pass_message['color'] = "green";
+pass_messages[4] = pass_message;
+
+var pass_message = new Array();
+pass_message['text'] = "<?php echo $wb['password_strength_5_txt']?>";
+pass_message['color'] = "green";
+pass_messages[5] = pass_message;
+
+function pass_check(password) {
+	var length = password.length;
+	var points = 0;
+	if (length < pass_minimum_length) {
+		pass_result(0);
+		return;
+	}
+	
+	if (length < 5) {
+		pass_result(1);
+		return;
+	}
+	
+	if (pass_contains(password, "ABCDEFGHIJKLNMOPQRSTUVWXYZ")) {
+		points += 1;
+	}
+	
+	if (pass_contains(password, "0123456789")) {
+		points += 1;
+	}
+	
+	if (pass_contains(password, "`~!@#$%^&*()_+|\=-[]}{';:/?.>,<\" ")) {
+		points += 1;
+	}
+	
+	if (points == 0) {
+		if (length >= 5 && length <=6) {
+			pass_result(1);
+		} else if (length >= 7 && length <=8) {
+			pass_result(2);
+		} else {
+			pass_result(3);
+		}
+	} else if (points == 1) {
+		if (length >= 5 && length <=6) {
+			pass_result(2);
+		} else if (length >= 7 && length <=10) {
+			pass_result(3);
+		} else {
+			pass_result(4);
+		}
+	} else if (points == 2) {
+		if (length >= 5 && length <=8) {
+			pass_result(3);
+		} else if (length >= 9 && length <=10) {
+			pass_result(4);
+		} else {
+			pass_result(5);
+		}
+	} else if (points == 3) {
+		if (length >= 5 && length <=6) {
+			pass_result(3);
+		} else if (length >= 7 && length <=8) {
+			pass_result(4);
+		} else {
+			pass_result(5);
+		}
+	} else if (points >= 4) {
+		if (length >= 5 && length <=6) {
+			pass_result(4);
+		} else {
+			pass_result(5);
+		}
+	}
+}
+
+
+
+function pass_result(points, message) {
+	if (points == 0) {
+		width = 10;
+	} else {
+		width = points*20;
+	}
+	document.getElementById("passBar").innerHTML = '<div style="float:left; height: 10px; padding:0px; background-color: ' + pass_messages[points]['color'] + '; width: ' + width + 'px;" />';
+	document.getElementById("passText").innerHTML = pass_messages[points]['text'];
+}
+function pass_contains(pass, check) {
+	for (i = 0; i < pass.length; i++) {
+		if (check.indexOf(pass.charAt(i)) > -1) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function addAdditionalTemplate(){
+	var tpl_add = document.getElementById('template_additional').value;
+	if(tpl_add != '') {
+	  var tpl_list = document.getElementById('template_additional_list').innerHTML;
+	  var addTemplate = document.getElementById('tpl_add_select').value.split('|',2);
+	  var addTplId = addTemplate[0];
+	  var addTplText = addTemplate[1];
+	  var newVal = tpl_add + '/' + addTplId + '/';
+	  newVal = newVal.replace('//', '/');
+	  var newList = tpl_list + '<br>' + addTplText;
+	  newList = newList.replace('<br><br>', '<br>');
+	  document.getElementById('template_additional').value = newVal;
+	  document.getElementById('template_additional_list').innerHTML = newList;
+	  alert('additional template ' + addTplText + ' added to customer');
+	} else {
+	  alert('no additional template selcted');
+	}
+}
+
+function delAdditionalTemplate(){
+	var tpl_add = document.getElementById('template_additional').value;
+	if(tpl_add != '') {
+		var tpl_list = document.getElementById('template_additional_list').innerHTML;
+		var addTemplate = document.getElementById('tpl_add_select').value.split('|',2);
+		var addTplId = addTemplate[0];
+		var addTplText = addTemplate[1];
+		var newVal = tpl_add;
+		newVal = newVal.replace(addTplId, '');
+		newVal = newVal.replace('//', '/');
+		var newList = tpl_list.replace(addTplText, '');
+		newList = newList.replace('<br><br>', '<br>');
+		document.getElementById('template_additional').value = newVal;
+		document.getElementById('template_additional_list').innerHTML = newList;
+		alert('additional template ' + addTplText + ' deleted from customer');
+  } else {
+  	alert('no additional template selcted');
+  }
+  
+}
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 77fdf49..2f841a6 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -1,194 +1,199 @@
-<?php
-
-/*
-Copyright (c) 2005, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-//
-
-class login_index {
-
-	public $status = '';
-	private $target = '';
-	private $app;
-	private $conf;
-	
-	public function render() {
-		
-		global $app, $conf;
-		
-		/* Redirect to page, if login form was NOT send */
-		if(count($_POST) == 0) {
-			if(isset($_SESSION['s']['user']) && is_array($_SESSION['s']['user']) && is_array($_SESSION['s']['module'])) {
-				die('HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage']);
-			}
-		}
-		
-		$app->uses('tpl');
-		$app->tpl->newTemplate('form.tpl.htm');
-	    
-	    $error = '';    
-	
-	
-		//* Login Form was send
-		if(count($_POST) > 0) {
-			
-			//** Check variables
-			if(!preg_match("/^[\w\.\-\_]{1,64}$/", $_POST['username'])) $error = $app->lng('user_regex_error');
-			if(!preg_match("/^.{1,64}$/i", $_POST['passwort'])) $error = $app->lng('pw_error_length');
-			
-	        //** iporting variables
-	        $ip 	  = $app->db->quote(ip2long($_SERVER['REMOTE_ADDR']));
-	        $username = $app->db->quote($_POST['username']);
-	        $passwort = $app->db->quote($_POST['passwort']);
-			$loginAs  = false;
-	
-	        if($username != '' && $passwort != '' && $error == '') {
-				/*
-				 *  Check, if there is a "login as" instead of a "normal" login
-				 */
-				if (isset($_SESSION['s']['user']) && $_SESSION['s']['user']['active'] == 1){
-					/*
-					 * only the admin can "login as" so if the user is NOT a admin, we
-					 * open the startpage (after killing the old session), so the user
-					 * is logout and has to start again!
-					 */
-					if ($_SESSION['s']['user']['typ'] != 'admin') {
-						/*
-						 * The actual user is NOT a admin, but maybe the admin
-						 * has logged in as "normal" user bevore...
-						 */
-						if (isset($_SESSION['s_old'])&& ($_SESSION['s_old']['user']['typ'] == 'admin')){
-							/* The "old" user is admin, so everything is ok */
-						}
-						else {
-							die("You don't have the right to 'login as'!");
-						}
-					}
-					$loginAs = true;
-				}
-				else {
-					/* normal login */
-					$loginAs = false;
-				}
-
-	        	//* Check if there are already wrong logins
-	        	$sql = "SELECT * FROM `attempts_login` WHERE `ip`= '{$ip}' AND  `login_time` > (NOW() - INTERVAL 1 MINUTE) LIMIT 1";
-	        	$alreadyfailed = $app->db->queryOneRecord($sql);
-	        	//* login to much wrong
-	        	if($alreadyfailed['times'] > 5) {
-	        		$error = $app->lng(1004);
-	        	} else {
-					if ($loginAs){
-			        	$sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and PASSWORT = '". $passwort. "'";
-						$user = $app->db->queryOneRecord($sql);
-					} else {
-			        	$sql = "SELECT * FROM sys_user WHERE USERNAME = '$username'";
-						$user = $app->db->queryOneRecord($sql);
-						if($user && $user['active'] == 1) {
-							$saved_password = stripslashes($user['passwort']);
-							if(substr($saved_password,0,3) == '$1$') {
-								//* The password is crypt-md5 encrypted
-								$salt = '$1$'.substr($saved_password,3,8).'$';
-								if(crypt($passwort,$salt) != $saved_password) {
-									$user = false;
-								}
-							} else {
-								//* The password is md5 encrypted
-								if(md5($passwort) != $saved_password) {
-									$user = false;
-								}
-							}
-						} else {
-							$user = false;
-						}
-					}
-		            
-		            if($user) {
-		                if($user['active'] == 1) {
-		                	// User login right, so attempts can be deleted
-		                	$sql = "DELETE FROM `attempts_login` WHERE `ip`='{$ip}'";
-		                	$app->db->query($sql);
-		                	$user = $app->db->toLower($user);
-							if ($loginAs) $oldSession = $_SESSION['s'];
-		                    $_SESSION = array();
-							if ($loginAs) $_SESSION['s_old'] = $oldSession; // keep the way back!
-		                    $_SESSION['s']['user'] = $user;
-		                    $_SESSION['s']['user']['theme'] = isset($user['app_theme']) ? $user['app_theme'] : 'default';
-		                    $_SESSION['s']['language'] = $user['language'];
-							$_SESSION["s"]['theme'] = $_SESSION['s']['user']['theme'];
-										
-							if(is_file($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {
-								include_once($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php');
-								$_SESSION['s']['module'] = $module;
-							}
-							echo 'HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage'];
-										
-		                   	exit;
-		             	} else {
-		                	$error = $app->lng(1003);
-		                }
-		        	} else {
-		        		if(!$alreadyfailed['times'] )
-		        		{
-		        			//* user login the first time wrong
-		        			$sql = "INSERT INTO `attempts_login` (`ip`, `times`, `login_time`) VALUES ('{$ip}', 1, NOW())";
-		        			$app->db->query($sql);
-		        		} elseif($alreadyfailed['times'] >= 1) {
-		        			//* update times wrong
-		        			$sql = "UPDATE `attempts_login` SET `times`=`times`+1, `login_time`=NOW() WHERE `login_time` >= '{$time}' LIMIT 1";
-		        			$app->db->query($sql);
-		        		}
-		            	//* Incorrect login - Username and password incorrect
-		                $error = $app->lng(1002);
-		                if($app->db->errorMessage != '') $error .= '<br />'.$app->db->errorMessage != '';
-		           	}
-	        	}
-	      	} else {
-	       		//* Username or password empty
-	            if($error == '') $error = $app->lng(1001);
-	        }
-		}
-		if($error != ''){
-	  		$error = '<div class="box box_error"><h1>Error</h1>'.$error.'</div>';
-		}
-	
-	
-	
-		$app->tpl->setVar('error', $error);
-		$app->tpl->setInclude('content_tpl','login/templates/index.htm');
-		$app->tpl_defaults();
-		
-		$this->status = 'OK';
-		
-		return $app->tpl->grab();
-		
-	} // << end function
-
-} // << end class
-
+<?php
+
+/*
+Copyright (c) 2005, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+//
+
+class login_index {
+
+	public $status = '';
+	private $target = '';
+	private $app;
+	private $conf;
+	
+	public function render() {
+		
+		global $app, $conf;
+		
+		/* Redirect to page, if login form was NOT send */
+		if(count($_POST) == 0) {
+			if(isset($_SESSION['s']['user']) && is_array($_SESSION['s']['user']) && is_array($_SESSION['s']['module'])) {
+				die('HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage']);
+			}
+		}
+		
+		$app->uses('tpl');
+		$app->tpl->newTemplate('form.tpl.htm');
+	    
+	    $error = '';
+		
+		$app->load_language_file('web/login/lib/lang/'.$conf["language"].'.lng');
+	
+	
+		//* Login Form was send
+		if(count($_POST) > 0) {
+			
+			//** Check variables
+			if(!preg_match("/^[\w\.\-\_]{1,64}$/", $_POST['username'])) $error = $app->lng('user_regex_error');
+			if(!preg_match("/^.{1,64}$/i", $_POST['passwort'])) $error = $app->lng('pw_error_length');
+			
+	        //** iporting variables
+	        $ip 	  = $app->db->quote(ip2long($_SERVER['REMOTE_ADDR']));
+	        $username = $app->db->quote($_POST['username']);
+	        $passwort = $app->db->quote($_POST['passwort']);
+			$loginAs  = false;
+	
+	        if($username != '' && $passwort != '' && $error == '') {
+				/*
+				 *  Check, if there is a "login as" instead of a "normal" login
+				 */
+				if (isset($_SESSION['s']['user']) && $_SESSION['s']['user']['active'] == 1){
+					/*
+					 * only the admin can "login as" so if the user is NOT a admin, we
+					 * open the startpage (after killing the old session), so the user
+					 * is logout and has to start again!
+					 */
+					if ($_SESSION['s']['user']['typ'] != 'admin') {
+						/*
+						 * The actual user is NOT a admin, but maybe the admin
+						 * has logged in as "normal" user bevore...
+						 */
+						if (isset($_SESSION['s_old'])&& ($_SESSION['s_old']['user']['typ'] == 'admin')){
+							/* The "old" user is admin, so everything is ok */
+						}
+						else {
+							die("You don't have the right to 'login as'!");
+						}
+					}
+					$loginAs = true;
+				}
+				else {
+					/* normal login */
+					$loginAs = false;
+				}
+
+	        	//* Check if there are already wrong logins
+	        	$sql = "SELECT * FROM `attempts_login` WHERE `ip`= '{$ip}' AND  `login_time` > (NOW() - INTERVAL 1 MINUTE) LIMIT 1";
+	        	$alreadyfailed = $app->db->queryOneRecord($sql);
+	        	//* login to much wrong
+	        	if($alreadyfailed['times'] > 5) {
+	        		$error = $app->lng('error_user_too_many_logins');
+	        	} else {
+					if ($loginAs){
+			        	$sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and PASSWORT = '". $passwort. "'";
+						$user = $app->db->queryOneRecord($sql);
+					} else {
+			        	$sql = "SELECT * FROM sys_user WHERE USERNAME = '$username'";
+						$user = $app->db->queryOneRecord($sql);
+						if($user && $user['active'] == 1) {
+							$saved_password = stripslashes($user['passwort']);
+							if(substr($saved_password,0,3) == '$1$') {
+								//* The password is crypt-md5 encrypted
+								$salt = '$1$'.substr($saved_password,3,8).'$';
+								if(crypt($passwort,$salt) != $saved_password) {
+									$user = false;
+								}
+							} else {
+								//* The password is md5 encrypted
+								if(md5($passwort) != $saved_password) {
+									$user = false;
+								}
+							}
+						} else {
+							$user = false;
+						}
+					}
+		            
+		            if($user) {
+		                if($user['active'] == 1) {
+		                	// User login right, so attempts can be deleted
+		                	$sql = "DELETE FROM `attempts_login` WHERE `ip`='{$ip}'";
+		                	$app->db->query($sql);
+		                	$user = $app->db->toLower($user);
+							if ($loginAs) $oldSession = $_SESSION['s'];
+		                    $_SESSION = array();
+							if ($loginAs) $_SESSION['s_old'] = $oldSession; // keep the way back!
+		                    $_SESSION['s']['user'] = $user;
+		                    $_SESSION['s']['user']['theme'] = isset($user['app_theme']) ? $user['app_theme'] : 'default';
+		                    $_SESSION['s']['language'] = $user['language'];
+							$_SESSION["s"]['theme'] = $_SESSION['s']['user']['theme'];
+										
+							if(is_file($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {
+								include_once($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php');
+								$_SESSION['s']['module'] = $module;
+							}
+							echo 'HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage'];
+										
+		                   	exit;
+		             	} else {
+		                	$error = $app->lng('error_user_blocked');
+		                }
+		        	} else {
+		        		if(!$alreadyfailed['times'] )
+		        		{
+		        			//* user login the first time wrong
+		        			$sql = "INSERT INTO `attempts_login` (`ip`, `times`, `login_time`) VALUES ('{$ip}', 1, NOW())";
+		        			$app->db->query($sql);
+		        		} elseif($alreadyfailed['times'] >= 1) {
+		        			//* update times wrong
+		        			$sql = "UPDATE `attempts_login` SET `times`=`times`+1, `login_time`=NOW() WHERE `login_time` >= '{$time}' LIMIT 1";
+		        			$app->db->query($sql);
+		        		}
+		            	//* Incorrect login - Username and password incorrect
+		                $error = $app->lng('error_user_password_incorrect');
+		                if($app->db->errorMessage != '') $error .= '<br />'.$app->db->errorMessage != '';
+		           	}
+	        	}
+	      	} else {
+	       		//* Username or password empty
+	            if($error == '') $error = $app->lng('error_user_password_empty');
+	        }
+		}
+		if($error != ''){
+	  		$error = '<div class="box box_error"><h1>Error</h1>'.$error.'</div>';
+		}
+	
+	
+	
+		$app->tpl->setVar('error', $error);
+		$app->tpl->setVar('username_txt', $app->lng('username_txt'));
+		$app->tpl->setVar('password_txt', $app->lng('password_txt'));
+		$app->tpl->setVar('login_button_txt', $app->lng('login_button_txt'));
+		$app->tpl->setInclude('content_tpl','login/templates/index.htm');
+		$app->tpl_defaults();
+		
+		$this->status = 'OK';
+		
+		return $app->tpl->grab();
+		
+	} // << end function
+
+} // << end class
+
 ?>
\ No newline at end of file
diff --git a/interface/web/login/lib/lang/bg.lng b/interface/web/login/lib/lang/bg.lng
index 1b7971b..9a91034 100644
--- a/interface/web/login/lib/lang/bg.lng
+++ b/interface/web/login/lib/lang/bg.lng
@@ -1,8 +1,4 @@
 <?php
-$wb['1001'] = 'Празно потребителско име или парола.';
-$wb['1002'] = 'Грешно потребителско име или парола.';
-$wb['1003'] = 'Потребителят е блокиран.';
-$wb['1004'] = 'Прекалено много грешни опити за вход. Опитайте отново след 15 минути.';
 $wb['pass_reset_txt'] = 'Нова парола ще бъде генерирана и изпратена на електронната ви поща, ако адресът съвпада с въведения в потребителския ви профил.';
 $wb['pw_reset'] = 'Новата ви парола беше изпратена на електронната ви поща.';
 $wb['pw_error'] = 'Греяно потребителското име или електронна поща.';
@@ -11,4 +7,11 @@
 $wb['pw_reset_mail_title'] = 'Нова парола за вашия ISPConfig 3 контролен панел';
 $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
 $wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['error_user_password_empty'] = 'Username or Password empty.';
+$wb['error_user_password_incorrect'] = 'Username or Password wrong.';
+$wb['error_user_blocked'] = 'User is blocked.';
+$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['login_button_txt'] = 'Login';
 ?>
diff --git a/interface/web/login/lib/lang/br.lng b/interface/web/login/lib/lang/br.lng
index 01d32b2..a1eac0c 100644
--- a/interface/web/login/lib/lang/br.lng
+++ b/interface/web/login/lib/lang/br.lng
@@ -1,8 +1,4 @@
 <?php
-$wb['1001'] = 'Nome de usuário ou senha em branco.';
-$wb['1002'] = 'Nome de usuário ou senha inválido.';
-$wb['1003'] = 'O usuário está bloqueado!';
-$wb['1004'] = 'Várias tentativas sem sucesso de login. Por favor tente novamente daqui a 15 minutos.';
 $wb['pass_reset_txt'] = 'Uma nova senha foi gerada e será enviada para você via correio eletrônico cadastrado no sistema.';
 $wb['pw_reset'] = 'Senha restabelecida! Será enviada para você via correio eletrônico cadastrado no sistema.';
 $wb['pw_error'] = 'Nome de usuário ou correio eletrônico não coincidem.';
@@ -11,5 +7,12 @@
 $wb['pw_reset_mail_title'] = 'Sua senha do painel de controle foi restabelecida.';
 $wb['user_regex_error'] = 'O nome de usuário contém mais de 64 caracteres ou contém caracteres inválidos.';
 $wb['pw_error_length'] = 'Tamanho da senha não pode ser maior do que 64 caracteres.';
+$wb['error_user_password_empty'] = 'Usuário ou Senha em branco.';
+$wb['error_user_password_incorrect'] = 'Usuário ou Senha incorretos.';
+$wb['error_user_blocked'] = 'O usuário está bloqueado.';
+$wb['error_user_too_many_logins'] = 'Várias tentativas de logins incorretas, faça uma nova tentativa dentro de 15 minutos.';
+$wb['username_txt'] = 'Usuário';
+$wb['password_txt'] = 'Senha';
+$wb['login_button_txt'] = 'Login';
 ?>
 
diff --git a/interface/web/login/lib/lang/de.lng b/interface/web/login/lib/lang/de.lng
index 56a6900..fb0f19e 100644
--- a/interface/web/login/lib/lang/de.lng
+++ b/interface/web/login/lib/lang/de.lng
@@ -1,14 +1,17 @@
 <?php
-$wb['1001'] = 'Benutzername oder Passwort leer.';
-$wb['1002'] = 'Benutzername oder Passwort falsch.';
-$wb['1003'] = 'Benutzer ist blockiert.';
-$wb['1004'] = 'Zu viel fehlgeschlagene Anmeldeversuche. Bitte versuchen sie es in 15 Minuten noch einmal.';
 $wb['pass_reset_txt'] = 'Ein neues Passwort wird generiert und an die Emailadresse, die in ihren Benutzereinstellungen hinterlegt ist and send to your email address if the email address entered above matches the email addres';
 $wb['pw_reset'] = 'Das Passwort wurde zurückgesetzt und wird per Email an sie geschickt.';
 $wb['pw_error'] = 'Benutzername oder Emailadresse stimmen nicht überein.';
 $wb['pw_error_noinput'] = 'Bitte geben sie ihr Emailadresse und Benutzernamen ein.';
-$wb['pw_reset_mail_msg'] = 'The password to your ISPConfig 3 control panel account has been reset. The new password is: ';
+$wb['pw_reset_mail_msg'] = 'Das Passwort für ihr ISPConfig 3 Controlpanel Konto wurde zurückgesetzt. Das neue Passwort ist: ';
 $wb['pw_reset_mail_title'] = 'ISPConfig 3 Controlpanel Passwort wurde zurückgesetzt.';
-$wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
-$wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['user_regex_error'] = 'Benutzername beinhaltet nicht erlaubte Zeichen oder ist länger als 64 Zeichen.';
+$wb['pw_error_length'] = 'Die Passwortlänge ist > 64 Zeichen.';
+$wb['error_user_password_empty'] = 'Username or Password empty.';
+$wb['error_user_password_incorrect'] = 'Username or Password wrong.';
+$wb['error_user_blocked'] = 'User is blocked.';
+$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['login_button_txt'] = 'Login';
 ?>
diff --git a/interface/web/login/lib/lang/en.lng b/interface/web/login/lib/lang/en.lng
index 9f93331..d5bcbdc 100644
--- a/interface/web/login/lib/lang/en.lng
+++ b/interface/web/login/lib/lang/en.lng
@@ -1,18 +1,22 @@
-<?php
-
-$wb[1001]	= "Username or Password empty.";
-$wb[1002]	= "Username or Password wrong.";
-$wb[1003]	= "User is blocked.";
-$wb[1004]	= "To many wrong login's, Please retry it after 15 minutes";
-$wb['pass_reset_txt'] = 'A new password will be generated and send to your email address if the email address entered below matches the email address in your client settings.';
-$wb['pw_reset'] = 'The password has been reset and send to your email address.';
-$wb['pw_error'] = 'Username or email address does not match.';
-$wb['pw_error_noinput'] = 'Please enter email address and username.';
-
-$wb['pw_reset_mail_msg'] = 'The password to your ISPConfig 3 control panel account has been reset. The new password is: ';
-$wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset.';
-
-$wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
-$wb['pw_error_length'] = 'The password length is > 64 characters.';
-
+<?php
+
+$wb['error_user_password_empty']	= "Username or Password empty.";
+$wb['error_user_password_incorrect']	= "Username or Password wrong.";
+$wb['error_user_blocked']	= "User is blocked.";
+$wb['error_user_too_many_logins']	= "To many wrong login's, Please retry it after 15 minutes";
+$wb['pass_reset_txt'] = 'A new password will be generated and send to your email address if the email address entered below matches the email address in your client settings.';
+$wb['pw_reset'] = 'The password has been reset and send to your email address.';
+$wb['pw_error'] = 'Username or email address does not match.';
+$wb['pw_error_noinput'] = 'Please enter email address and username.';
+
+$wb['pw_reset_mail_msg'] = 'The password to your ISPConfig 3 control panel account has been reset. The new password is: ';
+$wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset.';
+
+$wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
+$wb['pw_error_length'] = 'The password length is > 64 characters.';
+
+$wb['username_txt']	= "Username";
+$wb['password_txt']	= "Password";
+$wb['login_button_txt']	= "Login";
+
 ?>
\ No newline at end of file
diff --git a/interface/web/login/lib/lang/es.lng b/interface/web/login/lib/lang/es.lng
index 5782b21..feeb815 100644
--- a/interface/web/login/lib/lang/es.lng
+++ b/interface/web/login/lib/lang/es.lng
@@ -1,8 +1,4 @@
 <?php
-$wb['1001'] = 'Usuario o contraseña vacíos.';
-$wb['1002'] = 'Usuario o contraseña incorrectos.';
-$wb['1003'] = 'El usuario está bloqueado';
-$wb['1004'] = 'Demasiados intentos erroneos, por favor, inténtelo dentro de 15 minutos.';
 $wb['pass_reset_txt'] = 'Se generará una nueva contraseña que se le enviará a la cuenta de correo que tiene configurada.';
 $wb['pw_reset'] = 'La contraseña ha sido reseteada y enviada a su cuenta de correo.';
 $wb['pw_error'] = 'El usuario o la cuenta de correo no coinciden.';
@@ -11,4 +7,11 @@
 $wb['pw_reset_mail_title'] = 'La contraseña del panel de control ISPConfig 3 ha sido reseteada.';
 $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
 $wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['error_user_password_empty'] = 'Username or Password empty.';
+$wb['error_user_password_incorrect'] = 'Username or Password wrong.';
+$wb['error_user_blocked'] = 'User is blocked.';
+$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['login_button_txt'] = 'Login';
 ?>
diff --git a/interface/web/login/lib/lang/fi.lng b/interface/web/login/lib/lang/fi.lng
index 06fc088..d5c0a1c 100755
--- a/interface/web/login/lib/lang/fi.lng
+++ b/interface/web/login/lib/lang/fi.lng
@@ -1,8 +1,4 @@
 <?php
-$wb['1001'] = 'Käyttäjätunnus tai salasana tyhjä.';
-$wb['1002'] = 'Käyttäjätunnus tai salasana väärin.';
-$wb['1003'] = 'Käyttäjätunnus on lukittu';
-$wb['1004'] = 'Liian monta kirjautumisyritystä, yritä uudestaan 15 minuutin kuluttua';
 $wb['pass_reset_txt'] = 'Uusi salasana luodaan ja lähetetään asiakastiedoissasi olevaan sähköpostiosoitteeseen.';
 $wb['pw_reset'] = 'Salasana on vaihdettu ja lähetetty sähköpostiisi.';
 $wb['pw_error'] = 'Käyttäjätunnusta tai sähköpostiosoitetta ei löydy.';
@@ -11,4 +7,11 @@
 $wb['pw_reset_mail_title'] = 'ISPConfi3 Hallintapaneelin salasana on vaihdettu.';
 $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
 $wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['error_user_password_empty'] = 'Username or Password empty.';
+$wb['error_user_password_incorrect'] = 'Username or Password wrong.';
+$wb['error_user_blocked'] = 'User is blocked.';
+$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['login_button_txt'] = 'Login';
 ?>
diff --git a/interface/web/login/lib/lang/fr.lng b/interface/web/login/lib/lang/fr.lng
index 7791bd4..24fbbe1 100644
--- a/interface/web/login/lib/lang/fr.lng
+++ b/interface/web/login/lib/lang/fr.lng
@@ -1,8 +1,4 @@
 <?php
-$wb['1001'] = 'Nom dutilisateur ou mot de passe vide.';
-$wb['1002'] = 'Nom dutilisateur ou mot de passe faux.';
-$wb['1003'] = 'Utilisateur bloqu�.';
-$wb['1004'] = 'To many wrong logins, Please retry it after 15 minutes';
 $wb['pass_reset_txt'] = 'A new password will be generated and send to your email address if the email address entered below matches the email address in your client settings.';
 $wb['pw_reset'] = 'The password has been reset and send to your email address.';
 $wb['pw_error'] = 'Username or email address does not match.';
@@ -11,4 +7,11 @@
 $wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset.';
 $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
 $wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['error_user_password_empty'] = 'Username or Password empty.';
+$wb['error_user_password_incorrect'] = 'Username or Password wrong.';
+$wb['error_user_blocked'] = 'User is blocked.';
+$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['login_button_txt'] = 'Login';
 ?>
diff --git a/interface/web/login/lib/lang/hu.lng b/interface/web/login/lib/lang/hu.lng
new file mode 100644
index 0000000..7e93f9b
--- /dev/null
+++ b/interface/web/login/lib/lang/hu.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['1001'] = 'Felhasználónév vagy jelszó mező üres.';
+$wb['1002'] = 'Felhasználónév vagy jelszó hibás';
+$wb['1003'] = 'Felhasználó blokkolt.';
+$wb['1004'] = 'Túl sok hibás bejelentkezés, Kérem próbálja 15 perc múlva';
+$wb['pass_reset_txt'] = 'Új jelszót generáltunk és email címére elküldjük, amennyiben a lent beírt email cím megegyezik a nyilvántartásban szereplő címmel.';
+$wb['pw_reset'] = 'Jelszavát reseteltük és elküldtük email címére.';
+$wb['pw_error'] = 'Felhasználónév vagy email cím nem egyezik.';
+$wb['pw_error_noinput'] = 'Kérem üsse be email címét és felahsználónevét.';
+$wb['pw_reset_mail_msg'] = 'The password to your ISPConfig 3 control panel hozzáfárás módosítva. Az új jelszó: ';
+$wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel jelszó módosítva.';
+$wb['user_regex_error'] = 'Felhasználónév érvénytelen karaktereket tartalmaz, vagy több mint 64 karakter';
+$wb['pw_error_length'] = 'A jelszó kevesebb legyen mint 64 karakter';
+?>
+
diff --git a/interface/web/login/lib/lang/it.lng b/interface/web/login/lib/lang/it.lng
index 3ca4305..23940d3 100644
--- a/interface/web/login/lib/lang/it.lng
+++ b/interface/web/login/lib/lang/it.lng
@@ -1,8 +1,4 @@
 <?php
-$wb['1001'] = 'Nome utente o Password vuoti.';
-$wb['1002'] = 'Nome utente o Password errati.';
-$wb['1003'] = 'Utente bloccato.';
-$wb['1004'] = 'Troppi tentativi di login errati, Riprova tra 15 minuti';
 $wb['pass_reset_txt'] = 'Una nuova password sarà generata e spedita alla tua email se l`email inserita corrisponde a quella delle impostazioni dell`utente.';
 $wb['pw_reset'] = 'La password è stata reimpostata e spedita al tuo indirizzo mail.';
 $wb['pw_error'] = 'Nome utente o email non corrispondenti.';
@@ -11,4 +7,11 @@
 $wb['pw_reset_mail_title'] = 'Password del pannello di controllo ISPConfig 3 reimpostata.';
 $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
 $wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['error_user_password_empty'] = 'Username or Password empty.';
+$wb['error_user_password_incorrect'] = 'Username or Password wrong.';
+$wb['error_user_blocked'] = 'User is blocked.';
+$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['login_button_txt'] = 'Login';
 ?>
diff --git a/interface/web/login/lib/lang/nl.lng b/interface/web/login/lib/lang/nl.lng
index f8eb3cd..7877698 100644
--- a/interface/web/login/lib/lang/nl.lng
+++ b/interface/web/login/lib/lang/nl.lng
@@ -1,14 +1,18 @@
 <?php
-$wb['1001'] = 'Gebruikersnaam of wachtwoord is leeg.';
-$wb['1002'] = 'Gebruikersnaam of wachtwoord ongeldig.';
-$wb['1003'] = 'Gebruiker is geblokkeerd.';
-$wb['1004'] = 'Teveel ongeldige login pogingen, Probeer het na 15 minuten opnieuw.';
-$wb['pass_reset_txt'] = 'Een nieuw wachtwoord zal worden gegenereerd en na het hierboven ingevulde Emailadres worden gestuurd, op voorwaarde dat het Emailadres overeenkomt met het Emailadres in uw klanten-settings';
-$wb['pw_reset'] = 'Het wachtwoord is gereset en is verzonden aan uw Emailadres.';
-$wb['pw_error'] = 'Gebruikersnaam of Emailadres komen niet overeen.';
-$wb['pw_error_noinput'] = 'Voer a.u.b. uw Emailadres en gebruikersnaam in.';
+$wb['pass_reset_txt'] = 'Een nieuw wachtwoord zal worden gegenereerd en na het hierboven ingevulde Emailadres worden gestuurd, op voorwaarde dat het Emailadres overeenkomt met het e-mailadres in uw klanten-settings';
+$wb['pw_reset'] = 'Het wachtwoord is gereset en is verzonden aan uw e-mailadres.';
+$wb['pw_error'] = 'Gebruikersnaam of e-mailadres komen niet overeen.';
+$wb['pw_error_noinput'] = 'Voer a.u.b. uw e-mailadres en gebruikersnaam in.';
 $wb['pw_reset_mail_msg'] = 'Het wachtwoord dat toegang biedt tot ISPConfig 3 is gereset. Het nieuwe wachtwoord is: ';
 $wb['pw_reset_mail_title'] = 'Het wachtwoord dat toegang biedt tot ISPConfig 3 is gereset.';
-$wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
-$wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['user_regex_error'] = 'Gebruikersnaam bevat ongeldige tekens, of is langer dan 64 karakters.';
+$wb['pw_error_length'] = 'Wachtwoord-lengte is groter dan 64 karakters.';
+$wb['error_user_password_empty'] = 'Gebruikersnaam of wachtwoord is leeg.';
+$wb['error_user_password_incorrect'] = 'Gebruikersnaam of wachtwoord is niet juist.';
+$wb['error_user_blocked'] = 'Gebruiker is geblokkeerd.';
+$wb['error_user_too_many_logins'] = 'Teveel onjuiste inlog-pogingen. Probeer over 15 minuten opnieuw in te loggen.';
+$wb['username_txt'] = 'Gebruikersnaam';
+$wb['password_txt'] = 'Wachtwoord';
+$wb['login_button_txt'] = 'Inloggen';
 ?>
+
diff --git a/interface/web/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng
new file mode 100644
index 0000000..52f31b6
--- /dev/null
+++ b/interface/web/login/lib/lang/pl.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['pass_reset_txt'] = 'Nowe hasło zostanie wygenerowane i wysłane na Twój adres e-mail, jeśli podany adres e-mail będzie pasował do tego w ustawieniach Twojego profilu.';
+$wb['pw_reset'] = 'Nowe hasło zostało wygenerowane i wysłane na Twój adres e-mail.';
+$wb['pw_error'] = 'Nazwa użytkownika lub e-mail nie pasują do siebie.';
+$wb['pw_error_noinput'] = 'Podaj nazwę użytkownika i adres e-mail.';
+$wb['pw_reset_mail_msg'] = 'Hasło do Twojego panelu w ISPConfig 3 zostało z resetowane. Twoje nowe hasło to: ';
+$wb['pw_reset_mail_title'] = 'Hasło do paneli w ISPConfig 3 zostało z resetowane.';
+$wb['user_regex_error'] = 'Nazwa użytkownika zawiera niedozwolone znaki lub jest dłuższa niż 64 znaki.';
+$wb['pw_error_length'] = 'Dłogość hasła jest > 64 znaki.';
+$wb['error_user_password_empty'] = 'Username or Password empty.';
+$wb['error_user_password_incorrect'] = 'Username or Password wrong.';
+$wb['error_user_blocked'] = 'User is blocked.';
+$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['login_button_txt'] = 'Login';
+?>
diff --git a/interface/web/login/lib/lang/ru.lng b/interface/web/login/lib/lang/ru.lng
index 4c96e74..24fbbe1 100644
--- a/interface/web/login/lib/lang/ru.lng
+++ b/interface/web/login/lib/lang/ru.lng
@@ -1,8 +1,4 @@
 <?php
-$wb['1001'] = 'Имя пользователя или пароль пусты.';
-$wb['1002'] = 'Имя пользователя или пароль неправильны.';
-$wb['1003'] = 'Пользователь заблокирован.';
-$wb['1004'] = 'Слишком много попыток, Пожалуйста повторите через 15 минут';
 $wb['pass_reset_txt'] = 'A new password will be generated and send to your email address if the email address entered below matches the email address in your client settings.';
 $wb['pw_reset'] = 'The password has been reset and send to your email address.';
 $wb['pw_error'] = 'Username or email address does not match.';
@@ -11,4 +7,11 @@
 $wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset.';
 $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
 $wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['error_user_password_empty'] = 'Username or Password empty.';
+$wb['error_user_password_incorrect'] = 'Username or Password wrong.';
+$wb['error_user_blocked'] = 'User is blocked.';
+$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['login_button_txt'] = 'Login';
 ?>
diff --git a/interface/web/login/lib/lang/se.lng b/interface/web/login/lib/lang/se.lng
index 2b1a23a..24fbbe1 100644
--- a/interface/web/login/lib/lang/se.lng
+++ b/interface/web/login/lib/lang/se.lng
@@ -1,8 +1,4 @@
 <?php
-$wb['1001'] = 'Anv�ndarnamn eller L�senord �r tomt.';
-$wb['1002'] = 'Felaktigt Anv�ndarnamn eller L�senord.';
-$wb['1003'] = 'Anv�ndaren �r sp�rrad.';
-$wb['1004'] = 'To many wrong logins, Please retry it after 15 minutes';
 $wb['pass_reset_txt'] = 'A new password will be generated and send to your email address if the email address entered below matches the email address in your client settings.';
 $wb['pw_reset'] = 'The password has been reset and send to your email address.';
 $wb['pw_error'] = 'Username or email address does not match.';
@@ -11,4 +7,11 @@
 $wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset.';
 $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
 $wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['error_user_password_empty'] = 'Username or Password empty.';
+$wb['error_user_password_incorrect'] = 'Username or Password wrong.';
+$wb['error_user_blocked'] = 'User is blocked.';
+$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['login_button_txt'] = 'Login';
 ?>
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index d08148d..0581b93 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -13,11 +13,11 @@
   <div class="pnl_formsarea">
     <fieldset class="inlineLabels"><legend>Login</legend>
       <div class="ctrlHolder">
-      	<label for="username">Username</label>
+      	<label for="username">{tmpl_var name='username_txt'}</label>
         <input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput"  onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
 			</div>
       <div class="ctrlHolder">
-      	<label for="passwort">Password</label>
+      	<label for="passwort">{tmpl_var name='password_txt'}</label>
         <input name="passwort" id="passwort" value="" size="30" maxlength="255" type="password" class="textInput"  onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
 			</div>			
     </fieldset>
@@ -26,7 +26,7 @@
     <input type="hidden" name="s_pg" value="index" />
     
     <div class="buttonHolder buttons">
-			<button class="positive iconstxt icoKey" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitLoginForm('pageForm');"><span>Login</span></button>
+			<button class="positive iconstxt icoKey" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitLoginForm('pageForm');"><span>{tmpl_var name='login_button_txt'}</span></button>
     </div>
   </div>
   
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index be3f675..773afa7 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -93,8 +93,11 @@
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'ISINT',
 														'errmsg'=> 'quota_error_isint'),
+										1 => array (	'type'	=> 'REGEX',
+														'regex' => '/^(-1)|([1-9][0-9]*)$/',
+														'errmsg'=> 'quota_error_value'),
 									),
-			'default'	=> '0',
+			'default'	=> '-1',
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/mail/lib/lang/br.lng b/interface/web/mail/lib/lang/br.lng
index 899ef0f..3e3a7b0 100644
--- a/interface/web/mail/lib/lang/br.lng
+++ b/interface/web/mail/lib/lang/br.lng
@@ -9,7 +9,7 @@
 $wb['Email Catchall'] = 'Correio Catchall';
 $wb['Email Forward'] = 'Encaminhamento de Correio';
 $wb['Get Email'] = 'Get Email';
-$wb['Spamfilter'] = 'Filtro de Spam';
+$wb['Spamfilter'] = 'Filtro Spam';
 $wb['Email Routing'] = 'Rota de Correio';
 $wb['Email transport'] = 'Transporte de Correio';
 $wb['Mailbox'] = 'Caixa de Correio';
@@ -20,7 +20,6 @@
 $wb['Email Whitelist'] = 'Lista Branca de Correio';
 $wb['Whitelist'] = 'Lista Branca';
 $wb['Spamfilter blacklist'] = 'Filtro Spam (Lista Negra)';
-$wb['Blacklist'] = 'Lista Negra';
 $wb['Spamfilter Config'] = 'Configuração do Filtro Spam';
 $wb['Server'] = 'Servidor';
 $wb['Spamfilter policy'] = 'Políticas de Filtro Spam';
@@ -31,13 +30,11 @@
 $wb['Spamfilter users'] = 'Usuários de Filtro Spam';
 $wb['Users'] = 'Usuários';
 $wb['Spamfilter Whitelist'] = 'Filtro Spam Lista Branca';
-$wb['Whitelist'] = 'Lista Branca';
 $wb['Email'] = 'Correio';
 $wb['Email Mailbox'] = 'Caixa de Correio';
 $wb['Email Accounts'] = 'Contas de Correio';
 $wb['User / Domain'] = 'Usuário / Domínio';
 $wb['Server Settings'] = 'Configurações do Servidor';
-$wb['Spamfilter'] = 'Filtro Spam';
 $wb['Fetchmail'] = 'Fetchmail';
 $wb['Mailbox traffic'] = 'Tráfego de Correio';
 $wb['Statistics'] = 'Estatísticas';
@@ -45,5 +42,5 @@
 $wb['Postfix Blacklist'] = 'Postfix (Lista Negra)';
 $wb['Content Filter'] = 'Filtros de Conteúdo';
 $wb['Global Filters'] = 'Filtros Globais';
-
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_alias.lng b/interface/web/mail/lib/lang/br_mail_alias.lng
index e8e38a7..8e65298 100644
--- a/interface/web/mail/lib/lang/br_mail_alias.lng
+++ b/interface/web/mail/lib/lang/br_mail_alias.lng
@@ -1,10 +1,12 @@
 <?php
-$wb["email_txt"] = 'Correio';
-$wb["destination_txt"] = 'Destino';
-$wb["active_txt"] = 'Ativo';
-$wb["email_error_isemail"] = 'Endereço de correio inválido.';
-$wb["email_error_unique"] = 'Endereço de correio duplicado.';
-$wb["no_domain_perm"] = "Você não tem permissão para este domínio.";
-$wb["destination_error_isemail"] = 'Endereço de destino inválido';
-$wb["limit_mailalias_txt"] = 'O número máximo de aliases para sua conta foi atingido.';
+$wb['email_txt'] = 'Correio';
+$wb['destination_txt'] = 'Destino';
+$wb['active_txt'] = 'Ativo';
+$wb['email_error_isemail'] = 'Endereço de correio inválido.';
+$wb['email_error_unique'] = 'Endereço de correio duplicado.';
+$wb['no_domain_perm'] = 'Você não tem permissão para este domínio.';
+$wb['destination_error_isemail'] = 'Endereço de destino inválido';
+$wb['limit_mailalias_txt'] = 'O número máximo de aliases para sua conta foi atingido.';
+$wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endereço.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_alias_list.lng b/interface/web/mail/lib/lang/br_mail_alias_list.lng
index f4a916f..9f508c9 100644
--- a/interface/web/mail/lib/lang/br_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_alias_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Email Alias';
-$wb["active_txt"] = 'Active';
-$wb["source_txt"] = 'source';
-$wb["destination_txt"] = 'Destination';
-$wb["email_txt"] = 'Email';
-$wb["add_new_record_txt"] = 'Add new Email alias';
+$wb['list_head_txt'] = 'Email Alias';
+$wb['active_txt'] = 'Active';
+$wb['source_txt'] = 'source';
+$wb['destination_txt'] = 'Destination';
+$wb['email_txt'] = 'Email';
+$wb['add_new_record_txt'] = 'Add new Email alias';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_blacklist.lng b/interface/web/mail/lib/lang/br_mail_blacklist.lng
index 465fc02..c1113d4 100644
--- a/interface/web/mail/lib/lang/br_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/br_mail_blacklist.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["source_txt"] = 'Endereço Lista Negra';
-$wb["recipient_txt"] = 'Recipiente';
-$wb["active_txt"] = 'Ativo';
-$wb["source_error_notempty"] = 'Endereço em branco.';
-$wb["type_txt"] = 'Tipo';
-$wb["limit_mailfilter_txt"] = 'O número máximo de filtros de correio para sua conta foi atingido..';
+$wb['server_id_txt'] = 'Servidor';
+$wb['source_txt'] = 'Endereço Lista Negra';
+$wb['recipient_txt'] = 'Recipiente';
+$wb['active_txt'] = 'Ativo';
+$wb['source_error_notempty'] = 'Endereço em branco.';
+$wb['type_txt'] = 'Tipo';
+$wb['limit_mailfilter_txt'] = 'O número máximo de filtros de correio para sua conta foi atingido..';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_blacklist_list.lng b/interface/web/mail/lib/lang/br_mail_blacklist_list.lng
index d31ef50..d953286 100644
--- a/interface/web/mail/lib/lang/br_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_blacklist_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb["list_head_txt"] = 'Correio Lista Negra';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["source_txt"] = 'Correio na lista negra';
-$wb["type_txt"] = 'Tipo';
-$wb["recipient_txt"] = 'Recipiente';
-$wb["add_new_record_txt"] = 'Adcionar novo registro a lista';
-$wb["access_txt"] = 'acesso';
+$wb['list_head_txt'] = 'Correio Lista Negra';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['source_txt'] = 'Correio na lista negra';
+$wb['type_txt'] = 'Tipo';
+$wb['recipient_txt'] = 'Recipiente';
+$wb['add_new_record_txt'] = 'Adcionar novo registro a lista';
+$wb['access_txt'] = 'acesso';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_content_filter.lng b/interface/web/mail/lib/lang/br_mail_content_filter.lng
index d3ae62b..d328098 100644
--- a/interface/web/mail/lib/lang/br_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/br_mail_content_filter.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["type_txt"] = 'Filtro';
-$wb["pattern_txt"] = 'Padrão de Expressão Regular.';
-$wb["data_txt"] = 'Data';
-$wb["action_txt"] = 'Ação';
-$wb["active_txt"] = 'Ativo';
-$wb["pattern_error_empty"] = 'Padrão em branco';
+$wb['server_id_txt'] = 'Servidor';
+$wb['type_txt'] = 'Filtro';
+$wb['pattern_txt'] = 'Padrão de Expressão Regular.';
+$wb['data_txt'] = 'Data';
+$wb['action_txt'] = 'Ação';
+$wb['active_txt'] = 'Ativo';
+$wb['pattern_error_empty'] = 'Padrão em branco';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_content_filter_list.lng b/interface/web/mail/lib/lang/br_mail_content_filter_list.lng
index 0de79ec..5cff970 100644
--- a/interface/web/mail/lib/lang/br_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_content_filter_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Cabeçalhos Postfix e Body Checks';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["pattern_txt"] = 'Padrão';
-$wb["action_txt"] = 'Ação';
-$wb["add_new_record_txt"] = 'Adcionar um novo filtro de conteúdo';
+$wb['list_head_txt'] = 'Cabeçalhos Postfix e Body Checks';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['pattern_txt'] = 'Padrão';
+$wb['action_txt'] = 'Ação';
+$wb['add_new_record_txt'] = 'Adcionar um novo filtro de conteúdo';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_domain_catchall.lng b/interface/web/mail/lib/lang/br_mail_domain_catchall.lng
index 6311a0d..e3ab3b1 100644
--- a/interface/web/mail/lib/lang/br_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain_catchall.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["domain_txt"] = 'Domínio';
-$wb["destination_txt"] = 'Destino';
-$wb["active_txt"] = 'Ativo';
-$wb["domain_error_unique"] = "Já existe um registro de Catchall para este domínio.";
-$wb["no_domain_perm"] = "Você não tem permissão para este domínio.";
-$wb["domain_error_regex"] = 'O nome do domínio contém caracteres inválidos';
-$wb["limit_mailcatchall_txt"] = 'O número máximo de catchall para este domínio foi atingido.';
+$wb['domain_txt'] = 'Domínio';
+$wb['destination_txt'] = 'Destino';
+$wb['active_txt'] = 'Ativo';
+$wb['domain_error_unique'] = 'Já existe um registro de Catchall para este domínio.';
+$wb['no_domain_perm'] = 'Você não tem permissão para este domínio.';
+$wb['domain_error_regex'] = 'O nome do domínio contém caracteres inválidos';
+$wb['limit_mailcatchall_txt'] = 'O número máximo de catchall para este domínio foi atingido.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/br_mail_domain_catchall_list.lng
index 40fd05c..b856152 100644
--- a/interface/web/mail/lib/lang/br_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain_catchall_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["list_head_txt"] = 'Catchall de Correio';
-$wb["active_txt"] = 'Ativo';
-$wb["source_txt"] = 'origem';
-$wb["destination_txt"] = 'Endereço de destino';
-$wb["server_id_txt"] = 'Servidor';
-$wb["domain_txt"] = 'Domínio';
-$wb["add_new_record_txt"] = 'Adcionar novo Catchall';
+$wb['list_head_txt'] = 'Catchall de Correio';
+$wb['active_txt'] = 'Ativo';
+$wb['source_txt'] = 'origem';
+$wb['destination_txt'] = 'Endereço de destino';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['add_new_record_txt'] = 'Adcionar novo Catchall';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_domain_list.lng b/interface/web/mail/lib/lang/br_mail_domain_list.lng
index e08daf1..f679387 100644
--- a/interface/web/mail/lib/lang/br_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb["list_head_txt"] = 'Domínio de Correio';
-$wb["server_id_txt"] = 'Servidor';
-$wb["domain_txt"] = 'Domínio';
-$wb["add_new_record_txt"] = 'Adcionar novo domínio';
-$wb["active_txt"] = 'Ativo';
+$wb['list_head_txt'] = 'Domínio de Correio';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['add_new_record_txt'] = 'Adcionar novo domínio';
+$wb['active_txt'] = 'Ativo';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_forward.lng b/interface/web/mail/lib/lang/br_mail_forward.lng
index 6c40c1f..34f25cc 100644
--- a/interface/web/mail/lib/lang/br_mail_forward.lng
+++ b/interface/web/mail/lib/lang/br_mail_forward.lng
@@ -1,6 +1,8 @@
 <?php
-$wb["email_txt"] = 'Correio';
-$wb["destination_txt"] = 'Correio de Destino';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_mailforward_txt"] = 'O número máximo de encaminhamentos para sua conta foi atingido.';
+$wb['email_txt'] = 'Correio';
+$wb['destination_txt'] = 'Correio de Destino';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_mailforward_txt'] = 'O número máximo de encaminhamentos para sua conta foi atingido.';
+$wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endereço.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_forward_list.lng b/interface/web/mail/lib/lang/br_mail_forward_list.lng
index 8bf63fe..73ba4dd 100644
--- a/interface/web/mail/lib/lang/br_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_forward_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Encaminhamento de Correio';
-$wb["active_txt"] = 'Ativo';
-$wb["source_txt"] = 'origem';
-$wb["destination_txt"] = 'Destino';
-$wb["email_txt"] = 'Correio';
-$wb["add_new_record_txt"] = 'Adcionar novo encaminhamento';
+$wb['list_head_txt'] = 'Encaminhamento de Correio';
+$wb['active_txt'] = 'Ativo';
+$wb['source_txt'] = 'origem';
+$wb['destination_txt'] = 'Destino';
+$wb['email_txt'] = 'Correio';
+$wb['add_new_record_txt'] = 'Adcionar novo encaminhamento';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_get.lng b/interface/web/mail/lib/lang/br_mail_get.lng
index cb2b0ca..c47427b 100644
--- a/interface/web/mail/lib/lang/br_mail_get.lng
+++ b/interface/web/mail/lib/lang/br_mail_get.lng
@@ -1,15 +1,16 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["type_txt"] = 'Tipo';
-$wb["source_server_txt"] = 'Servidor Pop3/Imap';
-$wb["source_username_txt"] = 'Usuário';
-$wb["source_password_txt"] = 'Senha';
-$wb["source_delete_txt"] = 'Remover mensagens da origem após o recebimento';
-$wb["destination_txt"] = 'Destino';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_fetchmail_txt"] = 'O número máximo de Fetchmail para sua conta foi atingido.';
-$wb["source_server_error_isempty"] = 'Servidor em branco.';
-$wb["source_username_error_isempty"] = 'Usuário em branco.';
-$wb["source_password_error_isempty"] = 'Senha em branco.';
-$wb["destination_error_isemail"] = 'Destino não selecionado.';
+$wb['server_id_txt'] = 'Servidor';
+$wb['type_txt'] = 'Tipo';
+$wb['source_server_txt'] = 'Servidor Pop3/Imap';
+$wb['source_username_txt'] = 'Usuário';
+$wb['source_password_txt'] = 'Senha';
+$wb['source_delete_txt'] = 'Remover mensagens da origem após o recebimento';
+$wb['destination_txt'] = 'Destino';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_fetchmail_txt'] = 'O número máximo de Fetchmail para sua conta foi atingido.';
+$wb['source_server_error_isempty'] = 'Servidor em branco.';
+$wb['source_username_error_isempty'] = 'Usuário em branco.';
+$wb['source_password_error_isempty'] = 'Senha em branco.';
+$wb['destination_error_isemail'] = 'Destino não selecionado.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_get_list.lng b/interface/web/mail/lib/lang/br_mail_get_list.lng
index 5634723..d5b1802 100644
--- a/interface/web/mail/lib/lang/br_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_get_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["list_head_txt"] = 'Fetch de mensagens de um servidor POP3 / IMAP';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["source_server_txt"] = 'Servidor Externo';
-$wb["source_username_txt"] = 'Usuário';
-$wb["destination_txt"] = 'Destino';
-$wb["add_new_record_txt"] = 'Adcionar nova Conta';
+$wb['list_head_txt'] = 'Fetch de mensagens de um servidor POP3 / IMAP';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['source_server_txt'] = 'Servidor Externo';
+$wb['source_username_txt'] = 'Usuário';
+$wb['destination_txt'] = 'Destino';
+$wb['add_new_record_txt'] = 'Adcionar nova Conta';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_spamfilter.lng b/interface/web/mail/lib/lang/br_mail_spamfilter.lng
index e4b6c81..f85244b 100644
--- a/interface/web/mail/lib/lang/br_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/br_mail_spamfilter.lng
@@ -1,17 +1,18 @@
 <?php
-$wb["email_txt"] = 'Email';
-$wb["spam_rewrite_score_int_txt"] = 'Pontução de Rewrite';
-$wb["spam_redirect_score_int_txt"] = 'Pontuação de Redirecionamento';
-$wb["spam_delete_score_int_txt"] = 'Remover Pontuação';
-$wb["spam_rewrite_subject_txt"] = 'Re-escrever assunto';
-$wb["spam_redirect_maildir_txt"] = 'Redirecionar Caixa de Correio';
-$wb["active_txt"] = 'Active';
-$wb["spam_rewrite_txt"] = 'Re-escrever assunto da mensagem depois desta pontuação.';
-$wb["spam_redirect_txt"] = 'Redirecione esta mensagem depois desta pontuação para esta caixa postal';
-$wb["spam_delete_txt"] = 'Remover esta mensagem depois desta pontuação.';
-$wb["disable_txt"] = 'Dica: Para desativar uma opção de filtro, configure a pontuação como 0.00.';
-$wb["email_error_isemail"] = 'Endereço de correio inválido.';
-$wb["email_error_unique"] = 'Já existem registros de spamfilter para esta caixa de correio.';
-$wb["spam_redirect_maildir_purge_txt"] = 'Remover Maildir depois';
-$wb["days_txt"] = 'Dias.';
+$wb['email_txt'] = 'Email';
+$wb['spam_rewrite_score_int_txt'] = 'Pontução de Rewrite';
+$wb['spam_redirect_score_int_txt'] = 'Pontuação de Redirecionamento';
+$wb['spam_delete_score_int_txt'] = 'Remover Pontuação';
+$wb['spam_rewrite_subject_txt'] = 'Re-escrever assunto';
+$wb['spam_redirect_maildir_txt'] = 'Redirecionar Caixa de Correio';
+$wb['active_txt'] = 'Active';
+$wb['spam_rewrite_txt'] = 'Re-escrever assunto da mensagem depois desta pontuação.';
+$wb['spam_redirect_txt'] = 'Redirecione esta mensagem depois desta pontuação para esta caixa postal';
+$wb['spam_delete_txt'] = 'Remover esta mensagem depois desta pontuação.';
+$wb['disable_txt'] = 'Dica: Para desativar uma opção de filtro, configure a pontuação como 0.00.';
+$wb['email_error_isemail'] = 'Endereço de correio inválido.';
+$wb['email_error_unique'] = 'Já existem registros de spamfilter para esta caixa de correio.';
+$wb['spam_redirect_maildir_purge_txt'] = 'Remover Maildir depois';
+$wb['days_txt'] = 'Dias.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_transport.lng b/interface/web/mail/lib/lang/br_mail_transport.lng
index b4394c6..96ed4ec 100644
--- a/interface/web/mail/lib/lang/br_mail_transport.lng
+++ b/interface/web/mail/lib/lang/br_mail_transport.lng
@@ -1,10 +1,11 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["domain_txt"] = 'Domínio';
-$wb["destination_txt"] = 'Destino';
-$wb["type_txt"] = 'Tipo';
-$wb["mx_txt"] = 'Sem MX lookup';
-$wb["sort_order_txt"] = 'Ordenar por';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_mailrouting_txt"] = 'O número máximo de rotas para sua conta foi atingido.';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['destination_txt'] = 'Destino';
+$wb['type_txt'] = 'Tipo';
+$wb['mx_txt'] = 'Sem MX lookup';
+$wb['sort_order_txt'] = 'Ordenar por';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_mailrouting_txt'] = 'O número máximo de rotas para sua conta foi atingido.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_transport_list.lng b/interface/web/mail/lib/lang/br_mail_transport_list.lng
index 88acaee..20bae01 100644
--- a/interface/web/mail/lib/lang/br_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_transport_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["list_head_txt"] = 'Rota Avançada de Correio';
-$wb["active_txt"] = 'Ativa';
-$wb["server_id_txt"] = 'Servidor';
-$wb["domain_txt"] = 'Domínio';
-$wb["transport_txt"] = 'Transporte';
-$wb["sort_order_txt"] = 'Ordenar por';
-$wb["add_new_record_txt"] = 'Adcionar um novo transporte';
+$wb['list_head_txt'] = 'Rota Avançada de Correio';
+$wb['active_txt'] = 'Ativa';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['transport_txt'] = 'Transporte';
+$wb['sort_order_txt'] = 'Ordenar por';
+$wb['add_new_record_txt'] = 'Adcionar um novo transporte';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng
index 1ba5162..d53be10 100644
--- a/interface/web/mail/lib/lang/br_mail_user.lng
+++ b/interface/web/mail/lib/lang/br_mail_user.lng
@@ -1,31 +1,32 @@
 <?php
-$wb["custom_mailfilter_txt"] = 'Formula de filtro de correio';
-$wb["email_txt"] = 'Correio';
-$wb["cryptpwd_txt"] = 'Senha';
-$wb["password_strength_txt"] = 'Tamanho da Senha';
-$wb["active_txt"] = 'Ativo';
-$wb["email_error_isemail"] = 'Endereço de Correio Inválido.';
-$wb["email_error_unique"] = 'Endereço de Correio Duplicado.';
-$wb["autoresponder_text_txt"] = 'Texto';
-$wb["autoresponder_txt"] = 'Autoresponder';
-$wb["no_domain_perm"] = 'Sem permissão para este domínio.';
-$wb["error_no_pwd"] = 'Senha em branco.';
-$wb["quota_error_isint"] = 'O tamanho da caixa de correio deve ser um número.';
-$wb["quota_txt"] = 'Quota';
-$wb["server_id_txt"] = 'Aerver_id';
-$wb["password_txt"] = 'Senha';
-$wb["maildir_txt"] = 'Maildir';
-$wb["postfix_txt"] = 'Habilitar Recebimento';
-$wb["access_txt"] = 'Habilitar Acesso';
-$wb["policy_txt"] = 'Spamfilter';
-$wb["no_policy"] = '- desativado -';
-$wb["limit_mailbox_txt"] = 'O número máximo de caixas de correio para sua conta foi atingido.';
-$wb["limit_mailquota_txt"] = 'O espaço em disco disponível para criação de contas foi atingido.';
-$wb["welcome_mail_fromname_txt"] = 'ISPConfig3';
-$wb["welcome_mail_fromemail_txt"] = "webmaster@localhost.tld";
-$wb["welcome_mail_subject"] = 'Parabéns sua conta de correio foi criada.';
-$wb["welcome_mail_message"] = "Parabéns sua conta de correio foi criada. Att. Seu webmaster.";
-$wb["disableimap_txt"] = 'Desativar IMAP';
-$wb["disablepop3_txt"] = 'Disativar POP3';
+$wb['custom_mailfilter_txt'] = 'Formula de filtro de correio';
+$wb['email_txt'] = 'Correio';
+$wb['cryptpwd_txt'] = 'Senha';
+$wb['password_strength_txt'] = 'Tamanho da Senha';
+$wb['active_txt'] = 'Ativo';
+$wb['email_error_isemail'] = 'Endereço de Correio Inválido.';
+$wb['email_error_unique'] = 'Endereço de Correio Duplicado.';
+$wb['autoresponder_text_txt'] = 'Texto';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['no_domain_perm'] = 'Sem permissão para este domínio.';
+$wb['error_no_pwd'] = 'Senha em branco.';
+$wb['quota_error_isint'] = 'O tamanho da caixa de correio deve ser um número.';
+$wb['quota_txt'] = 'Cota';
+$wb['server_id_txt'] = 'Aerver_id';
+$wb['password_txt'] = 'Senha';
+$wb['maildir_txt'] = 'Maildir';
+$wb['postfix_txt'] = 'Habilitar Recebimento';
+$wb['access_txt'] = 'Habilitar Acesso';
+$wb['policy_txt'] = 'Spamfilter';
+$wb['no_policy'] = '- desativado -';
+$wb['limit_mailbox_txt'] = 'O número máximo de caixas de correio para sua conta foi atingido.';
+$wb['limit_mailquota_txt'] = 'O espaço em disco disponível para criação de contas foi atingido.';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
+$wb['welcome_mail_subject'] = 'Parabéns sua conta de correio foi criada.';
+$wb['welcome_mail_message'] = 'Parabéns sua conta de correio foi criada. Att. Seu webmaster.';
+$wb['disableimap_txt'] = 'Desativar IMAP';
+$wb['disablepop3_txt'] = 'Disativar POP3';
+$wb['duplicate_alias_or_forward_txt'] = 'Já existe um aliase o encaminhamento com este endereço de correio.';
 ?>
 
diff --git a/interface/web/mail/lib/lang/br_mail_user_filter.lng b/interface/web/mail/lib/lang/br_mail_user_filter.lng
index 4ab4489..bfd04d0 100644
--- a/interface/web/mail/lib/lang/br_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/br_mail_user_filter.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["rulename_txt"] = 'Nome';
-$wb["action_txt"] = 'Ação';
-$wb["target_txt"] = 'Pasta';
-$wb["active_txt"] = 'Ativo';
-$wb["rulename_error_empty"] = 'Nome está em branco.';
-$wb["searchterm_is_empty"] = 'Termo de busca em branco.';
-$wb["source_txt"] = 'Origem';
+$wb['rulename_txt'] = 'Nome';
+$wb['action_txt'] = 'Ação';
+$wb['target_txt'] = 'Pasta';
+$wb['active_txt'] = 'Ativo';
+$wb['rulename_error_empty'] = 'Nome está em branco.';
+$wb['searchterm_is_empty'] = 'Termo de busca em branco.';
+$wb['source_txt'] = 'Origem';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_user_filter_list.lng b/interface/web/mail/lib/lang/br_mail_user_filter_list.lng
index 0d21666..62c4d8f 100644
--- a/interface/web/mail/lib/lang/br_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_user_filter_list.lng
@@ -1,6 +1,8 @@
 <?php
-$wb["rulename_txt"] = 'Nome';
-$wb["add_new_record_txt"] = 'Adcionar novo filtro';
-$wb["page_txt"] = 'Página';
-$wb["page_of_txt"] = 'de';
+$wb['rulename_txt'] = 'Nome';
+$wb['add_new_record_txt'] = 'Adcionar novo filtro';
+$wb['page_txt'] = 'Página';
+$wb['page_of_txt'] = 'de';
+$wb['delete_confirmation'] = 'Está certo que quer remover este mailfilter?';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_user_list.lng b/interface/web/mail/lib/lang/br_mail_user_list.lng
index a8a495a..f6d1b41 100644
--- a/interface/web/mail/lib/lang/br_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_user_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'Caixa de Correio';
-$wb["email_txt"] = 'Correio';
-$wb["autoresponder_txt"] = 'Autoresponder';
-$wb["add_new_record_txt"] = 'Adcionar nova caixa de correio';
+$wb['list_head_txt'] = 'Caixa de Correio';
+$wb['email_txt'] = 'Correio';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['add_new_record_txt'] = 'Adcionar nova caixa de correio';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_user_stats_list.lng b/interface/web/mail/lib/lang/br_mail_user_stats_list.lng
index ba41259..bb8a6a4 100644
--- a/interface/web/mail/lib/lang/br_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_user_stats_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Tráfego de Correio';
-$wb["email_txt"] = 'Correio';
-$wb["this_month_txt"] = 'Este Mês';
-$wb["last_month_txt"] = 'Último Mês';
-$wb["this_year_txt"] = 'Este Ano';
-$wb["last_year_txt"] = 'Último Ano';
+$wb['list_head_txt'] = 'Tráfego de Correio';
+$wb['email_txt'] = 'Correio';
+$wb['this_month_txt'] = 'Este Mês';
+$wb['last_month_txt'] = 'Último Mês';
+$wb['this_year_txt'] = 'Este Ano';
+$wb['last_year_txt'] = 'Último Ano';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_whitelist.lng b/interface/web/mail/lib/lang/br_mail_whitelist.lng
index 12ffb66..3df3e36 100644
--- a/interface/web/mail/lib/lang/br_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/br_mail_whitelist.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["source_txt"] = 'Endereço Lista Branca';
-$wb["recipient_txt"] = 'Recipiente';
-$wb["active_txt"] = 'Activo';
-$wb["source_error_notempty"] = 'Endereço em Branco.';
-$wb["type_txt"] = 'Tipo';
-$wb["limit_mailfilter_txt"] = 'O número máximo de filtros para sua conta foi atingido.';
+$wb['server_id_txt'] = 'Servidor';
+$wb['source_txt'] = 'Endereço Lista Branca';
+$wb['recipient_txt'] = 'Recipiente';
+$wb['active_txt'] = 'Activo';
+$wb['source_error_notempty'] = 'Endereço em Branco.';
+$wb['type_txt'] = 'Tipo';
+$wb['limit_mailfilter_txt'] = 'O número máximo de filtros para sua conta foi atingido.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_mail_whitelist_list.lng b/interface/web/mail/lib/lang/br_mail_whitelist_list.lng
index fce3148..b5fc640 100644
--- a/interface/web/mail/lib/lang/br_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_whitelist_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb["list_head_txt"] = 'Correio Lista Branca';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["source_txt"] = 'Endereços na Lista Branca';
-$wb["type_txt"] = 'Tipo';
-$wb["recipient_txt"] = 'Recipiente';
-$wb["add_new_record_txt"] = 'Adcionar um novo registro a lista';
-$wb["access_txt"] = 'acesso';
+$wb['list_head_txt'] = 'Correio Lista Branca';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['source_txt'] = 'Endereços na Lista Branca';
+$wb['type_txt'] = 'Tipo';
+$wb['recipient_txt'] = 'Recipiente';
+$wb['add_new_record_txt'] = 'Adcionar um novo registro a lista';
+$wb['access_txt'] = 'acesso';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/br_spamfilter_blacklist.lng
index 23ac482..3da9b50 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_blacklist.lng
@@ -1,8 +1,10 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["wb_txt"] = 'wb';
-$wb["rid_txt"] = 'Usuário';
-$wb["email_txt"] = 'Email';
-$wb["priority_txt"] = 'Prioridade';
-$wb["active_txt"] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Usuário';
+$wb['email_txt'] = 'Email';
+$wb['priority_txt'] = 'Prioridade';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_spamfilter_wblist_txt'] = 'O número máximo de registros de lista negra /  branca foi atingido para esta conta.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/br_spamfilter_blacklist_list.lng
index 8ff80e1..bc114d0 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_blacklist_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["list_head_txt"] = 'Spamfilter Lista Negra';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["priority_txt"] = 'Prioridade';
-$wb["rid_txt"] = 'Usuário';
-$wb["email_txt"] = 'Correio na Lista Negra';
-$wb["add_new_record_txt"] = 'Adcionar novo registro a lista';
+$wb['list_head_txt'] = 'Spamfilter Lista Negra';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['priority_txt'] = 'Prioridade';
+$wb['rid_txt'] = 'Usuário';
+$wb['email_txt'] = 'Correio na Lista Negra';
+$wb['add_new_record_txt'] = 'Adcionar novo registro a lista';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_spamfilter_config_list.lng b/interface/web/mail/lib/lang/br_spamfilter_config_list.lng
index c23fcf9..9857bc7 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_config_list.lng
@@ -1,5 +1,6 @@
 <?php
-$wb["list_head_txt"] = 'Configurações do Servidor';
-$wb["server_name_txt"] = 'Servidor';
-$wb["server_id_txt"] = 'id_servidor';
+$wb['list_head_txt'] = 'Configurações do Servidor';
+$wb['server_name_txt'] = 'Servidor';
+$wb['server_id_txt'] = 'id_servidor';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_spamfilter_policy.lng b/interface/web/mail/lib/lang/br_spamfilter_policy.lng
index bd809bd..ee0074c 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_policy.lng
@@ -1,38 +1,39 @@
 <?php
-$wb["policy_name_txt"] = 'Nome da Regra';
-$wb["virus_lover_txt"] = 'Virusl lover';
-$wb["spam_lover_txt"] = 'SPAM lover';
-$wb["banned_files_lover_txt"] = 'Banned files lover';
-$wb["bad_header_lover_txt"] = 'Bad header lover';
-$wb["bypass_virus_checks_txt"] = 'Bypass virus checks';
-$wb["bypass_banned_checks_txt"] = 'Bypass banned checks';
-$wb["bypass_header_checks_txt"] = 'Bypass header checks';
-$wb["virus_quarantine_to_txt"] = 'Forward virus to email';
-$wb["spam_quarantine_to_txt"] = 'Forward spam to email';
-$wb["banned_quarantine_to_txt"] = 'Forward banned to email';
-$wb["bad_header_quarantine_to_txt"] = 'Forward bad header to email';
-$wb["clean_quarantine_to_txt"] = 'Forward clean to email';
-$wb["other_quarantine_to_txt"] = 'Forward other to email';
-$wb["spam_tag_level_txt"] = 'SPAM tag level';
-$wb["spam_tag2_level_txt"] = 'SPAM tag2 level';
-$wb["spam_kill_level_txt"] = 'SPAM kill level';
-$wb["spam_dsn_cutoff_level_txt"] = 'SPAM dsn cutoff level';
-$wb["spam_quarantine_cutoff_level_txt"] = 'SPAM quarantine cutoff level';
-$wb["spam_modifies_subj_txt"] = 'SPAM modifies subject';
-$wb["spam_subject_tag_txt"] = 'SPAM subject tag';
-$wb["spam_subject_tag2_txt"] = 'SPAM subject tag2';
-$wb["addr_extension_virus_txt"] = 'Addr. extension virus';
-$wb["addr_extension_spam_txt"] = 'Addr. extension SPAM';
-$wb["addr_extension_banned_txt"] = 'Addr. extension banned';
-$wb["addr_extension_bad_header_txt"] = 'Addr extension bad header';
-$wb["warnvirusrecip_txt"] = 'Warn virus recip.';
-$wb["warnbannedrecip_txt"] = 'Warn banned recip.';
-$wb["warnbadhrecip_txt"] = 'Warn bad header recip.';
-$wb["newvirus_admin_txt"] = 'Newvirus admin';
-$wb["virus_admin_txt"] = 'Virus admin';
-$wb["banned_admin_txt"] = 'Banned admin';
-$wb["bad_header_admin_txt"] = 'Bad header admin';
-$wb["spam_admin_txt"] = 'SPAM admin';
-$wb["message_size_limit_txt"] = 'Message size limit';
-$wb["banned_rulenames_txt"] = 'Banned rulenames';
+$wb['policy_name_txt'] = 'Nome da Regra';
+$wb['virus_lover_txt'] = 'Permitir Vírus';
+$wb['spam_lover_txt'] = 'Permitir SPAM';
+$wb['banned_files_lover_txt'] = 'Permitir Arquivos Banidos';
+$wb['bad_header_lover_txt'] = 'Permitir Bad header';
+$wb['bypass_virus_checks_txt'] = 'Bypassar checagem de vírus';
+$wb['bypass_banned_checks_txt'] = 'Bypassar checagem de banimento';
+$wb['bypass_header_checks_txt'] = 'Bypassar checagem de header';
+$wb['virus_quarantine_to_txt'] = 'Encaminhar o vírus para o correio';
+$wb['spam_quarantine_to_txt'] = 'Encaminhar o spam para o correio';
+$wb['banned_quarantine_to_txt'] = 'Encaminhar banimento para o correio';
+$wb['bad_header_quarantine_to_txt'] = 'Encaminhar bad header para o correio';
+$wb['clean_quarantine_to_txt'] = 'Encaminhamento limpo para o correio';
+$wb['other_quarantine_to_txt'] = 'Encaminhar para outro correio';
+$wb['spam_tag_level_txt'] = 'Nível 1 de marcação de SPAM';
+$wb['spam_tag2_level_txt'] = 'Nível 1 de marcação de SPAM';
+$wb['spam_kill_level_txt'] = 'Nível kill de SPAM';
+$wb['spam_dsn_cutoff_level_txt'] = 'Nível de corte de dns SPAM';
+$wb['spam_quarantine_cutoff_level_txt'] = 'Nível de corte de quarentena SPAM';
+$wb['spam_modifies_subj_txt'] = 'Modificar assunto de mensagem com SPAM';
+$wb['spam_subject_tag_txt'] = 'Marcação de assunto SPAM 1';
+$wb['spam_subject_tag2_txt'] = 'Marcação de assunto SPAM 1';
+$wb['addr_extension_virus_txt'] = 'Addr. extensão de virus';
+$wb['addr_extension_spam_txt'] = 'Addr. extensão de SPAM';
+$wb['addr_extension_banned_txt'] = 'Addr. extensão de banimento';
+$wb['addr_extension_bad_header_txt'] = 'Addr extensão de bad header';
+$wb['warnvirusrecip_txt'] = 'Aviso de recipiente de vírus.';
+$wb['warnbannedrecip_txt'] = 'Aviso de recipiente de banimento.';
+$wb['warnbadhrecip_txt'] = 'Aviso de recipiente de bad header.';
+$wb['newvirus_admin_txt'] = 'Administrador Novo vírus';
+$wb['virus_admin_txt'] = 'Administrador Vírus';
+$wb['banned_admin_txt'] = 'Administrador de banimento';
+$wb['bad_header_admin_txt'] = 'Administrador de Bad header';
+$wb['spam_admin_txt'] = 'Administrador SPAM';
+$wb['message_size_limit_txt'] = 'Tamanho limite da mensagem';
+$wb['banned_rulenames_txt'] = 'Regras de Banimento';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/br_spamfilter_policy_list.lng
index 2bc05dc..772bfe2 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_policy_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["list_head_txt"] = 'Políticas de Spam';
-$wb["policy_name_txt"] = 'Nome';
-$wb["virus_lover_txt"] = 'Virus lover';
-$wb["spam_lover_txt"] = 'Spam lover';
-$wb["banned_files_lover_txt"] = 'Banned Files lover';
-$wb["bad_header_lover_txt"] = 'Bad Header lover';
-$wb["add_new_record_txt"] = 'Adcionar Registro';
+$wb['list_head_txt'] = 'Políticas de Spam';
+$wb['policy_name_txt'] = 'Nome';
+$wb['virus_lover_txt'] = 'Permitir Virus';
+$wb['spam_lover_txt'] = 'Permitir Spam';
+$wb['banned_files_lover_txt'] = 'Permitir Arquivos Banidos';
+$wb['bad_header_lover_txt'] = 'Permitir Bad Header';
+$wb['add_new_record_txt'] = 'Adcionar Registro';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_spamfilter_users.lng b/interface/web/mail/lib/lang/br_spamfilter_users.lng
index 058c4f6..aa8eea9 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_users.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["priority_txt"] = 'Prioridade';
-$wb["policy_id_txt"] = 'Política';
-$wb["email_txt"] = 'Correio (Padrão)';
-$wb["fullname_txt"] = 'Nome';
-$wb["local_txt"] = 'Local';
+$wb['server_id_txt'] = 'Servidor';
+$wb['priority_txt'] = 'Prioridade';
+$wb['policy_id_txt'] = 'Política';
+$wb['email_txt'] = 'Correio (Padrão)';
+$wb['fullname_txt'] = 'Nome';
+$wb['local_txt'] = 'Local';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_spamfilter_users_list.lng b/interface/web/mail/lib/lang/br_spamfilter_users_list.lng
index e17627e..227b460 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_users_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb["list_head_txt"] = 'Filtro Anti-Spam Usuários';
-$wb["local_txt"] = 'Local';
-$wb["server_id_txt"] = 'Servidor';
-$wb["priority_txt"] = 'Prioridade';
-$wb["policy_id_txt"] = 'Políticas';
-$wb["fullname_txt"] = 'Nome';
-$wb["email_txt"] = 'Email';
-$wb["add_new_record_txt"] = 'Adcionar Usuário';
+$wb['list_head_txt'] = 'Filtro Anti-Spam Usuários';
+$wb['local_txt'] = 'Local';
+$wb['server_id_txt'] = 'Servidor';
+$wb['priority_txt'] = 'Prioridade';
+$wb['policy_id_txt'] = 'Políticas';
+$wb['fullname_txt'] = 'Nome';
+$wb['email_txt'] = 'Email';
+$wb['add_new_record_txt'] = 'Adcionar Usuário';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/br_spamfilter_whitelist.lng
index cbae9db..08c9dcb 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_whitelist.lng
@@ -1,8 +1,10 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb["wb_txt"] = 'wb';
-$wb["rid_txt"] = 'User';
-$wb["email_txt"] = 'Email';
-$wb["priority_txt"] = 'Priority';
-$wb["active_txt"] = 'Active';
+$wb['server_id_txt'] = 'Servidor';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Usuário';
+$wb['email_txt'] = 'Correio Eletrônico';
+$wb['priority_txt'] = 'Prioridade';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_spamfilter_wblist_txt'] = 'O número máximo de registros da lista branca / negra foi atingido para esta conta.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/br_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/br_spamfilter_whitelist_list.lng
index d751df9..e213816 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_whitelist_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb["list_head_txt"] = 'Spamfilter Lista Branca';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["priority_txt"] = 'Prioridade';
-$wb["rid_txt"] = 'Usuário';
-$wb["email_txt"] = 'Correio na lista branca';
-$wb["add_new_record_txt"] = 'Adcionar um novo correio';
+$wb['list_head_txt'] = 'Spamfilter Lista Branca';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['priority_txt'] = 'Prioridade';
+$wb['rid_txt'] = 'Usuário';
+$wb['email_txt'] = 'Correio na lista branca';
+$wb['add_new_record_txt'] = 'Adcionar um novo correio';
 ?>
+
diff --git a/interface/web/mail/lib/lang/de.lng b/interface/web/mail/lib/lang/de.lng
index 05d7127..0cda918 100644
--- a/interface/web/mail/lib/lang/de.lng
+++ b/interface/web/mail/lib/lang/de.lng
@@ -11,7 +11,7 @@
 $wb['Get Email'] = 'Get Email';
 $wb['Spamfilter'] = 'Spamfilter';
 $wb['Email Routing'] = 'Email Routing';
-$wb['Email transport'] = 'Email transport';
+$wb['Email transport'] = 'Email Transport';
 $wb['Mailbox'] = 'Mailbox';
 $wb['Autoresponder'] = 'Autoresponder';
 $wb['Mail Filter'] = 'Mail Filter';
diff --git a/interface/web/mail/lib/lang/de_mail_alias.lng b/interface/web/mail/lib/lang/de_mail_alias.lng
index 66718ad..f9112df 100644
--- a/interface/web/mail/lib/lang/de_mail_alias.lng
+++ b/interface/web/mail/lib/lang/de_mail_alias.lng
@@ -6,6 +6,6 @@
 $wb['email_error_unique'] = 'Doppelte Emailadresse.';
 $wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
 $wb['destination_error_isemail'] = 'Ziel Emailadresse ist ungültig.';
-$wb['limit_mailalias_txt'] = 'The max. number of email aliases for your account is reached.';
-$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
+$wb['limit_mailalias_txt'] = 'Die maximale Anzahl an Email Aliases für ihr Konto wurde erreicht.';
+$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eine Mailbox mit dieser Email Adresse';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_alias_list.lng b/interface/web/mail/lib/lang/de_mail_alias_list.lng
index 51e729d..f249060 100644
--- a/interface/web/mail/lib/lang/de_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_alias_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Emailverknüpfung';
+$wb['list_head_txt'] = 'Email Alias';
 $wb['active_txt'] = 'Aktiv';
 $wb['source_txt'] = 'Quelle';
 $wb['destination_txt'] = 'Ziel';
 $wb['email_txt'] = 'Emailadresse';
-$wb['add_new_record_txt'] = 'Neue Emailverknüpfung hinzufügen';
+$wb['add_new_record_txt'] = 'Neuen Email Alias hinzufügen';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_blacklist.lng b/interface/web/mail/lib/lang/de_mail_blacklist.lng
index 9c76880..75b20e2 100644
--- a/interface/web/mail/lib/lang/de_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/de_mail_blacklist.lng
@@ -5,5 +5,5 @@
 $wb['active_txt'] = 'Aktiv';
 $wb['source_error_notempty'] = 'Adresse ist leer.';
 $wb['type_txt'] = 'Typ';
-$wb['limit_mailfilter_txt'] = 'Die max. Anzahl an Emailfilter für ihren Account wurde erreicht.';
+$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an Emailfilter für ihr Konto wurde erreicht.';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng
index 2451cdc..e1cf325 100644
--- a/interface/web/mail/lib/lang/de_mail_domain.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain.lng
@@ -7,7 +7,7 @@
 $wb['domain_error_unique'] = 'Doppelte Domain.';
 $wb['domain_error_regex'] = 'Ungültiger Domainname.';
 $wb['client_txt'] = 'Kunde';
-$wb['limit_maildomain_txt'] = 'Die max. Anzahl an Emaildomains für ihr Konto wurde erreicht.';
+$wb['limit_maildomain_txt'] = 'Die maximale Anzahl an Emaildomains für ihr Konto wurde erreicht.';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- nicht aktiviert -';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
index da4ad06..d67fa10 100644
--- a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
@@ -5,5 +5,5 @@
 $wb['domain_error_unique'] = 'Es besteht bereits ein Catchall Eintrag für diese Domain.';
 $wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
 $wb['domain_error_regex'] = 'Ungültiger Domainname oder ungültige Zeichen im Domainnamen.';
-$wb['limit_mailcatchall_txt'] = 'Die max. Anzahl an Catchall Einträgen für ihren Account wurde erreicht.';
+$wb['limit_mailcatchall_txt'] = 'Die maximale Anzahl an Catchall Einträgen für ihr Konto wurde erreicht.';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_forward.lng b/interface/web/mail/lib/lang/de_mail_forward.lng
index c376920..7fcf306 100644
--- a/interface/web/mail/lib/lang/de_mail_forward.lng
+++ b/interface/web/mail/lib/lang/de_mail_forward.lng
@@ -2,6 +2,6 @@
 $wb['email_txt'] = 'Emailadresse';
 $wb['destination_txt'] = 'Ziel Emailadresse';
 $wb['active_txt'] = 'Aktiv';
-$wb['limit_mailforward_txt'] = 'Die max. Anzahl an Emailweiterleitungen für ihren Account wurde erreicht.';
-$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
+$wb['limit_mailforward_txt'] = 'Die maximale Anzahl an Emailweiterleitungen für ihr Konto wurde erreicht.';
+$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eine Mailbox mit dieser Email Adresse';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_get.lng b/interface/web/mail/lib/lang/de_mail_get.lng
index 1ed6b5d..c72f4ab 100644
--- a/interface/web/mail/lib/lang/de_mail_get.lng
+++ b/interface/web/mail/lib/lang/de_mail_get.lng
@@ -7,9 +7,9 @@
 $wb['source_delete_txt'] = 'Mails nach Empfang löschen';
 $wb['destination_txt'] = 'Ziel';
 $wb['active_txt'] = 'Aktiv';
-$wb['limit_fetchmail_txt'] = 'Die max. Anzahl an Fetchmail Einträgen für ihren Account wurde erreicht.';
+$wb['limit_fetchmail_txt'] = 'Die maximale Anzahl an Fetchmail Einträgen für ihr Konto wurde erreicht.';
 $wb['source_server_error_isempty'] = 'Server ist leer.';
 $wb['source_username_error_isempty'] = 'Benutzername ist leer.';
 $wb['source_password_error_isempty'] = 'Passwort ist leer.';
-$wb['destination_error_isemail'] = 'Keine Destination gewählt.';
+$wb['destination_error_isemail'] = 'Kein Ziel gewählt.';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_spamfilter.lng b/interface/web/mail/lib/lang/de_mail_spamfilter.lng
index e0a2a2f..d411cb1 100644
--- a/interface/web/mail/lib/lang/de_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/de_mail_spamfilter.lng
@@ -1,17 +1,17 @@
 <?php
 $wb['email_txt'] = 'Email';
-$wb['spam_rewrite_score_int_txt'] = 'Rewrite score';
-$wb['spam_redirect_score_int_txt'] = 'Redirect score';
-$wb['spam_delete_score_int_txt'] = 'Delete score';
-$wb['spam_rewrite_subject_txt'] = 'Rewrite subject';
-$wb['spam_redirect_maildir_txt'] = 'Redirect mailbox';
-$wb['active_txt'] = 'Active';
-$wb['spam_rewrite_txt'] = 'Rewrite email subject above this score.';
-$wb['spam_redirect_txt'] = 'Redirect email above this score to the selected mailbox.';
-$wb['spam_delete_txt'] = 'Delete email above this score.';
-$wb['disable_txt'] = 'Hint: To disable a filtering option, set the score to 0.00.';
-$wb['email_error_isemail'] = 'Email address is invalid.';
-$wb['email_error_unique'] = 'There is already an spamfilter record for this email address.';
-$wb['spam_redirect_maildir_purge_txt'] = 'Purge Maildir after';
-$wb['days_txt'] = 'Days.';
+$wb['spam_rewrite_score_int_txt'] = 'Rewrite Bewertung';
+$wb['spam_redirect_score_int_txt'] = 'Redirect Bewertung';
+$wb['spam_delete_score_int_txt'] = 'Delete Bewertung';
+$wb['spam_rewrite_subject_txt'] = 'Rewrite Betreff';
+$wb['spam_redirect_maildir_txt'] = 'Redirect Mailbox';
+$wb['active_txt'] = 'Aktiv';
+$wb['spam_rewrite_txt'] = 'Schreibe Email Betreff über dieser Bewertung um.';
+$wb['spam_redirect_txt'] = 'Leite Emails über dieser Bewertung zur ausgewählten Mailbox weiter.';
+$wb['spam_delete_txt'] = 'Lösche Emails über dieser Bewertung.';
+$wb['disable_txt'] = 'Hint: Um eine Filteroption zu deaktivieren, müssen Sie die Bewertung auf 0.00 setzen.';
+$wb['email_error_isemail'] = 'Email Adresse ist ungültig.';
+$wb['email_error_unique'] = 'Es existiert bereits ein Spamfilter Eintrag für diese Email Adresse.';
+$wb['spam_redirect_maildir_purge_txt'] = 'Purge Maildir nach';
+$wb['days_txt'] = 'Tagen.';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_transport_list.lng b/interface/web/mail/lib/lang/de_mail_transport_list.lng
index ecd228f..3efda20 100644
--- a/interface/web/mail/lib/lang/de_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_transport_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Advanced Email Routing';
+$wb['list_head_txt'] = 'Erweitertes Email Routing';
 $wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['transport_txt'] = 'Transport';
 $wb['sort_order_txt'] = 'Sortiert nach';
-$wb['add_new_record_txt'] = 'Neuen transport hinzufügen';
+$wb['add_new_record_txt'] = 'Neuen Transport hinzufügen';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index 63babff..8348ed9 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['custom_mailfilter_txt'] = 'Custom mail filter recipe';
+$wb['custom_mailfilter_txt'] = 'Benutzerdefiniertes Mail Filter Rezept';
 $wb['email_txt'] = 'Email';
 $wb['cryptpwd_txt'] = 'Passwort';
 $wb['active_txt'] = 'Aktiv';
@@ -18,8 +18,8 @@
 $wb['access_txt'] = 'Aktiviere Zugriff';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- nicht aktiviert -';
-$wb['limit_mailbox_txt'] = 'Die max. Anzahl an Mailboxen für ihren Account wurde erreich.';
-$wb['limit_mailquota_txt'] = 'Der max. Speicherplatz für ihre Mailboxen wurde erreicht. Der max. verfügbare Speicher in MB ist';
+$wb['limit_mailbox_txt'] = 'Die maximale Anzahl an Mailboxen für ihr Konto wurde erreich.';
+$wb['limit_mailquota_txt'] = 'Der maximale Speicherplatz für ihre Mailboxen wurde erreicht. Der maximal verfügbare Speicher in MB ist';
 $wb['welcome_mail_subject'] = 'Willkommen zu ihrem neuen Emailaccount.';
 $wb['welcome_mail_message'] = 'Willkommen zu ihrem neuen Emailaccount.';
 $wb['disableimap_txt'] = 'IMAP deaktivieren';
@@ -27,5 +27,5 @@
 $wb['password_strength_txt'] = 'Passwortkomplexität';
 $wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
 $wb['welcome_mail_fromemail_txt'] = 'webmaster@ihredomain.at';
-$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
+$wb['duplicate_alias_or_forward_txt'] = 'Es existiert bereits ein Alias oder eine Weiterleitung mit dieser Email Adresse.';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_user_filter_list.lng b/interface/web/mail/lib/lang/de_mail_user_filter_list.lng
index 7e0d53e..3d9fd82 100644
--- a/interface/web/mail/lib/lang/de_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_filter_list.lng
@@ -3,5 +3,5 @@
 $wb['add_new_record_txt'] = 'Neuen Filter hinzufügen';
 $wb['page_txt'] = 'Seite';
 $wb['page_of_txt'] = 'von';
-$wb['delete_confirmation'] = 'Do you really want to Delete the mailfilter?';
+$wb['delete_confirmation'] = 'Wollen Sie den Mailfilter wirklich löschen?';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_whitelist.lng b/interface/web/mail/lib/lang/de_mail_whitelist.lng
index 43994a1..528c7cf 100644
--- a/interface/web/mail/lib/lang/de_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/de_mail_whitelist.lng
@@ -5,5 +5,5 @@
 $wb['active_txt'] = 'Aktiv';
 $wb['source_error_notempty'] = 'Emailadresse ist leer.';
 $wb['type_txt'] = 'Typ';
-$wb['limit_mailfilter_txt'] = 'Die max. Anzahl an Emailfilter für ihren Account wurde erreicht.';
+$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an Emailfilter für ihr Konto wurde erreicht.';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_whitelist_list.lng b/interface/web/mail/lib/lang/de_mail_whitelist_list.lng
index ec95d31..cb7f293 100644
--- a/interface/web/mail/lib/lang/de_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_whitelist_list.lng
@@ -3,7 +3,7 @@
 $wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Whitelisted Adressen';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Typ';
 $wb['recipient_txt'] = 'Empfänger';
 $wb['add_new_record_txt'] = 'Whitelist Eintrag hinzufügen';
 $wb['access_txt'] = 'Zugriff';
diff --git a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
index c9441b8..89aeae7 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
@@ -5,5 +5,5 @@
 $wb['email_txt'] = 'Emailadresse';
 $wb['priority_txt'] = 'Priorität';
 $wb['active_txt'] = 'Aktiv';
-$wb['limit_spamfilter_wblist_txt'] = 'The max. number of White- or Blacklist records for your account is reached.';
+$wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für ihr Konto wurde erreicht.';
 ?>
diff --git a/interface/web/mail/lib/lang/de_spamfilter_config.lng b/interface/web/mail/lib/lang/de_spamfilter_config.lng
index 1b56626..f82f27f 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_config.lng
@@ -4,14 +4,14 @@
 $wb['netmask_txt'] = 'Netmask';
 $wb['gateway_txt'] = 'Gateway';
 $wb['hostname_txt'] = 'Hostname';
-$wb['nameservers_txt'] = 'Nameservers';
+$wb['nameservers_txt'] = 'Nameserver';
 $wb['module_txt'] = 'Server Module';
 $wb['maildir_path_txt'] = 'Maildir Pfad';
 $wb['homedir_path_txt'] = 'Homedir Pfad';
 $wb['mailuser_uid_txt'] = 'Mailuser UID';
 $wb['mailuser_gid_txt'] = 'Mailuser GID';
 $wb['mailuser_name_txt'] = 'Mailuser Name';
-$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['mailuser_group_txt'] = 'Mailuser Gruppe';
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Passwort';
diff --git a/interface/web/mail/lib/lang/de_spamfilter_policy.lng b/interface/web/mail/lib/lang/de_spamfilter_policy.lng
index a36b3b4..ff2426f 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_policy.lng
@@ -1,38 +1,38 @@
 <?php
 $wb['policy_name_txt'] = 'Richtlinienname';
-$wb['virus_lover_txt'] = 'Virus lover';
-$wb['spam_lover_txt'] = 'SPAM lover';
-$wb['banned_files_lover_txt'] = 'Banned files lover';
-$wb['bad_header_lover_txt'] = 'Bad header lover';
-$wb['bypass_virus_checks_txt'] = 'Bypass virus checks';
-$wb['bypass_banned_checks_txt'] = 'Bypass banned checks';
-$wb['bypass_header_checks_txt'] = 'Bypass header checks';
-$wb['virus_quarantine_to_txt'] = 'Forward virus to email';
-$wb['spam_quarantine_to_txt'] = 'Forward spam to email';
-$wb['banned_quarantine_to_txt'] = 'Forward banned to email';
-$wb['bad_header_quarantine_to_txt'] = 'Forward bad header to email';
-$wb['clean_quarantine_to_txt'] = 'Forward clean to email';
-$wb['other_quarantine_to_txt'] = 'Forward other to email';
-$wb['spam_tag_level_txt'] = 'SPAM tag level';
-$wb['spam_tag2_level_txt'] = 'SPAM tag2 level';
-$wb['spam_kill_level_txt'] = 'SPAM kill level';
-$wb['spam_dsn_cutoff_level_txt'] = 'SPAM dsn cutoff level';
-$wb['spam_quarantine_cutoff_level_txt'] = 'SPAM quarantine cutoff level';
-$wb['spam_modifies_subj_txt'] = 'SPAM modifies subject';
-$wb['spam_subject_tag_txt'] = 'SPAM Betreff Markierung';
-$wb['spam_subject_tag2_txt'] = 'SPAM Betreff Markierung 2';
-$wb['addr_extension_virus_txt'] = 'Addr. extension virus';
-$wb['addr_extension_spam_txt'] = 'Addr. extension SPAM';
-$wb['addr_extension_banned_txt'] = 'Addr. extension banned';
-$wb['addr_extension_bad_header_txt'] = 'Addr extension bad header';
-$wb['warnvirusrecip_txt'] = 'Warn virus recip.';
-$wb['warnbannedrecip_txt'] = 'Warn banned recip.';
-$wb['warnbadhrecip_txt'] = 'Warn bad header recip.';
-$wb['newvirus_admin_txt'] = 'Newvirus admin';
+$wb['virus_lover_txt'] = 'Virus Liebhaber';
+$wb['spam_lover_txt'] = 'SPAM Liebhaber';
+$wb['banned_files_lover_txt'] = 'Banned Files Liebhaber';
+$wb['bad_header_lover_txt'] = 'Bad Header Liebhaber';
+$wb['bypass_virus_checks_txt'] = 'Umgehe Virus Überprüfungen';
+$wb['bypass_banned_checks_txt'] = 'Umgehe Banned Überprüfungen';
+$wb['bypass_header_checks_txt'] = 'Umgehe Header Überprüfungen';
+$wb['virus_quarantine_to_txt'] = 'Weiterleiten von Viren zur Email Adresse';
+$wb['spam_quarantine_to_txt'] = 'Weiterleiten von Spam zur Email Adresse';
+$wb['banned_quarantine_to_txt'] = 'Weiterleiten von Banned zur Email Adresse';
+$wb['bad_header_quarantine_to_txt'] = 'Weiterleiten von Bad Header zur Email Adresse';
+$wb['clean_quarantine_to_txt'] = 'Weiterleiten von sauberen Mails zur Email Adresse';
+$wb['other_quarantine_to_txt'] = 'Weiterleiten von anderen Mails zur Email Adresse';
+$wb['spam_tag_level_txt'] = 'SPAM tag Level';
+$wb['spam_tag2_level_txt'] = 'SPAM tag2 Level';
+$wb['spam_kill_level_txt'] = 'SPAM kill Level';
+$wb['spam_dsn_cutoff_level_txt'] = 'SPAM dsn cutoff Level';
+$wb['spam_quarantine_cutoff_level_txt'] = 'SPAM quarantine cutoff Level';
+$wb['spam_modifies_subj_txt'] = 'SPAM ändert Betreff';
+$wb['spam_subject_tag_txt'] = 'SPAM Betreff Markierung tag';
+$wb['spam_subject_tag2_txt'] = 'SPAM Betreff Markierung tag2';
+$wb['addr_extension_virus_txt'] = 'Adresserweiterung Virus';
+$wb['addr_extension_spam_txt'] = 'Adresserweiterung SPAM';
+$wb['addr_extension_banned_txt'] = 'Adresserweiterung Banned';
+$wb['addr_extension_bad_header_txt'] = 'Adresserweiterung Bad Header';
+$wb['warnvirusrecip_txt'] = 'Warne Virus Empfänger';
+$wb['warnbannedrecip_txt'] = 'Warne Banned Empfänger';
+$wb['warnbadhrecip_txt'] = 'Warne Bad Header Empfänger';
+$wb['newvirus_admin_txt'] = 'Newvirus Administrator';
 $wb['virus_admin_txt'] = 'Virus Administrator';
-$wb['banned_admin_txt'] = 'Banned admin';
-$wb['bad_header_admin_txt'] = 'Bad header admin';
+$wb['banned_admin_txt'] = 'Banned Administrator';
+$wb['bad_header_admin_txt'] = 'Bad Header Administrator';
 $wb['spam_admin_txt'] = 'SPAM Administrator';
 $wb['message_size_limit_txt'] = 'Limit der Nachrichtengröße';
-$wb['banned_rulenames_txt'] = 'Banned rulenames';
+$wb['banned_rulenames_txt'] = 'Banned Richtliniennamen';
 ?>
diff --git a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
index 7aec5c5..fdb514e 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
@@ -5,5 +5,5 @@
 $wb['email_txt'] = 'Email';
 $wb['priority_txt'] = 'Priorität';
 $wb['active_txt'] = 'Aktiv';
-$wb['limit_spamfilter_wblist_txt'] = 'The max. number of White- or Blacklist records for your account is reached.';
+$wb['limit_spamfilter_wblist_txt'] = 'The maximale Anzahl an White- oder Blacklist Einträgen für ihr Konto wurde erreicht.';
 ?>
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index 65ee78a..bfca13a 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -28,4 +28,5 @@
 $wb["disableimap_txt"] = 'Disable IMAP';
 $wb["disablepop3_txt"] = 'Disable POP3';
 $wb["duplicate_alias_or_forward_txt"] = 'There is already an alias or forwrd with this email address.';
+$wb["quota_error_value"] = 'Invalid quota value. Allowed values are: -1 for unlimited or numbers > 1';
 ?>
diff --git a/interface/web/mail/lib/lang/hu.lng b/interface/web/mail/lib/lang/hu.lng
new file mode 100644
index 0000000..b4ff49d
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['Email Alias'] = 'Email Alias';
+$wb['Email Blacklist'] = 'Email Fekete lista';
+$wb['Blacklist'] = 'Fekete lista';
+$wb['Mail Content Filter'] = 'Mail tartalom szűrő';
+$wb['Filter'] = 'Szűrés';
+$wb['Mail Domain'] = 'Mail Domain';
+$wb['Domain'] = 'Domain';
+$wb['Email Catchall'] = 'Email Gyüjtő';
+$wb['Email Forward'] = 'Email Továbbítás';
+$wb['Get Email'] = 'Get Email';
+$wb['Spamfilter'] = 'Spamszűrő';
+$wb['Email Routing'] = 'Email Routing';
+$wb['Email transport'] = 'Email transport';
+$wb['Mailbox'] = 'Levelezőláda';
+$wb['Autoresponder'] = 'Autoválasz';
+$wb['Mail Filter'] = 'Mail szűrő';
+$wb['Custom Rules'] = 'Saját szabályok';
+$wb['Email filter'] = 'Email szűrő';
+$wb['Email Whitelist'] = 'Email fehér lista';
+$wb['Whitelist'] = 'Fehér lista';
+$wb['Spamfilter blacklist'] = 'Spamszűrő fekete lista';
+$wb['Spamfilter Config'] = 'Spamszűrő Beállítás';
+$wb['Server'] = 'Szerver';
+$wb['Spamfilter policy'] = 'Spamszűrő szabályok';
+$wb['Policy'] = 'Szabályok';
+$wb['Quarantine'] = 'Karantén';
+$wb['Tag-Level'] = 'Tag-Level';
+$wb['Other'] = 'Egyéb';
+$wb['Spamfilter users'] = 'Spamszűrő felhasználó';
+$wb['Users'] = 'Felhasználók';
+$wb['Spamfilter Whitelist'] = 'Spamfilter Whitelist';
+$wb['Email'] = 'Email';
+$wb['Email Mailbox'] = 'Email levelezőláda';
+$wb['Email Accounts'] = 'Email hozzáférések';
+$wb['User / Domain'] = 'Felhaszáló / Domain';
+$wb['Server Settings'] = 'Szerver Beállítások';
+$wb['Fetchmail'] = 'Fetchmail';
+$wb['Mailbox traffic'] = 'Levező fiók forgalom';
+$wb['Statistics'] = 'Statisztika';
+$wb['Postfix Whitelist'] = 'Postfix Fehér lista';
+$wb['Postfix Blacklist'] = 'Postfix Fekete lista';
+$wb['Content Filter'] = 'Tartalom szűrő';
+$wb['Global Filters'] = 'Globális szűrők';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_alias.lng b/interface/web/mail/lib/lang/hu_mail_alias.lng
new file mode 100644
index 0000000..2e9d7c4
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_alias.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['email_txt'] = 'Email';
+$wb['destination_txt'] = 'Címzett';
+$wb['active_txt'] = 'Aktív';
+$wb['email_error_isemail'] = 'Érvénytelen email cím.';
+$wb['email_error_unique'] = 'Már létező email cím';
+$wb['no_domain_perm'] = 'Nincs joga ehhez a domainhoz.';
+$wb['destination_error_isemail'] = 'Címzett email címe érvénytelen';
+$wb['limit_mailalias_txt'] = 'Nincs több alias lehetőség.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_alias_list.lng b/interface/web/mail/lib/lang/hu_mail_alias_list.lng
new file mode 100644
index 0000000..0aceb6f
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_alias_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Email Alias';
+$wb['active_txt'] = 'Aktív';
+$wb['source_txt'] = 'Forrás';
+$wb['destination_txt'] = 'Címzett';
+$wb['email_txt'] = 'Email';
+$wb['add_new_record_txt'] = 'Új email alias';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_blacklist.lng b/interface/web/mail/lib/lang/hu_mail_blacklist.lng
new file mode 100644
index 0000000..3976612
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_blacklist.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['source_txt'] = 'Feketelistás cím';
+$wb['recipient_txt'] = 'Címzett';
+$wb['active_txt'] = 'Aktív';
+$wb['source_error_notempty'] = 'Cím üres.';
+$wb['type_txt'] = 'Típus';
+$wb['limit_mailfilter_txt'] = 'Nincs több szűrő lehetőség.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_blacklist_list.lng b/interface/web/mail/lib/lang/hu_mail_blacklist_list.lng
new file mode 100644
index 0000000..685b592
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_blacklist_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'Email Feketelista';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['source_txt'] = 'Feketelistás cím';
+$wb['type_txt'] = 'Tipus';
+$wb['recipient_txt'] = 'Címzett';
+$wb['add_new_record_txt'] = 'Új feketelistás';
+$wb['access_txt'] = 'hozzáférés';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_content_filter.lng b/interface/web/mail/lib/lang/hu_mail_content_filter.lng
new file mode 100644
index 0000000..f119de1
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_content_filter.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['type_txt'] = 'Szűrő';
+$wb['pattern_txt'] = 'Keresendő. Minta';
+$wb['data_txt'] = 'Adat';
+$wb['action_txt'] = 'Teendő';
+$wb['active_txt'] = 'Aktív';
+$wb['pattern_error_empty'] = 'Minta mező üres.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_content_filter_list.lng b/interface/web/mail/lib/lang/hu_mail_content_filter_list.lng
new file mode 100644
index 0000000..f029f29
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_content_filter_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Postfix Fejlés és levéltest ellenőzés';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['pattern_txt'] = 'Minta';
+$wb['action_txt'] = 'Művelet';
+$wb['add_new_record_txt'] = 'Új tartalom szűrő';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_domain.lng b/interface/web/mail/lib/lang/hu_mail_domain.lng
new file mode 100644
index 0000000..778996d
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_domain.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Típus';
+$wb['active_txt'] = 'Aktív';
+$wb['domain_error_empty'] = 'Domain üres';
+$wb['domain_error_unique'] = 'Már létező domain';
+$wb['domain_error_regex'] = 'Nem valós Domain név';
+$wb['client_txt'] = 'Kliens';
+$wb['limit_maildomain_txt'] = 'Meghaladta az ön hozzáférésével elérhető domainek számát.';
+$wb['policy_txt'] = 'Spamszűrő';
+$wb['no_policy'] = '- nem engedélyezett -';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_domain_catchall.lng b/interface/web/mail/lib/lang/hu_mail_domain_catchall.lng
new file mode 100644
index 0000000..8f003da
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_domain_catchall.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['domain_txt'] = 'Domain';
+$wb['destination_txt'] = 'Címzett';
+$wb['active_txt'] = 'Aktív';
+$wb['domain_error_unique'] = 'Már van Catchall ehhez a domainhez';
+$wb['no_domain_perm'] = 'Nincs joga ehhez a domainhez';
+$wb['domain_error_regex'] = 'Érvénytelen domain vagy a domain érvénytelen karaktereket tartalmaz.';
+$wb['limit_mailcatchall_txt'] = 'Nincs több catchall lehetőség.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/hu_mail_domain_catchall_list.lng
new file mode 100644
index 0000000..c416b0e
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_domain_catchall_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Email Catchall';
+$wb['active_txt'] = 'Aktív';
+$wb['source_txt'] = 'Forrás';
+$wb['destination_txt'] = 'Címzett email címe';
+$wb['server_id_txt'] = 'Szerver';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Új Catchall';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_domain_list.lng b/interface/web/mail/lib/lang/hu_mail_domain_list.lng
new file mode 100644
index 0000000..b109537
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Email Domain';
+$wb['server_id_txt'] = 'Szerver';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Új domain';
+$wb['active_txt'] = 'Aktív';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_forward.lng b/interface/web/mail/lib/lang/hu_mail_forward.lng
new file mode 100644
index 0000000..b6ed2c6
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_forward.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['email_txt'] = 'Email';
+$wb['destination_txt'] = 'Címzett Email';
+$wb['active_txt'] = 'Aktív';
+$wb['limit_mailforward_txt'] = 'Nincs több email továbbítási lehetőség.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_forward_list.lng b/interface/web/mail/lib/lang/hu_mail_forward_list.lng
new file mode 100644
index 0000000..f0ff749
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_forward_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Email továbbítás';
+$wb['active_txt'] = 'aktív';
+$wb['source_txt'] = 'Forrás';
+$wb['destination_txt'] = 'Címzett';
+$wb['email_txt'] = 'Email';
+$wb['add_new_record_txt'] = 'Új email továbbítás';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_get.lng b/interface/web/mail/lib/lang/hu_mail_get.lng
new file mode 100644
index 0000000..0f74776
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_get.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['type_txt'] = 'Típus';
+$wb['source_server_txt'] = 'Pop3/Imap Szerver';
+$wb['source_username_txt'] = 'Felhasználónév';
+$wb['source_password_txt'] = 'Jelszó';
+$wb['source_delete_txt'] = 'Letöltés után törli a leveleket';
+$wb['destination_txt'] = 'Címzett';
+$wb['active_txt'] = 'Aktív';
+$wb['limit_fetchmail_txt'] = 'Nincs több Legyügyjtés lehetőség.';
+$wb['source_server_error_isempty'] = 'Szerver üres.';
+$wb['source_username_error_isempty'] = 'Felhasználónév üres.';
+$wb['source_password_error_isempty'] = 'Jelszó üres.';
+$wb['destination_error_isemail'] = 'Nem választott címzettet.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_get_list.lng b/interface/web/mail/lib/lang/hu_mail_get_list.lng
new file mode 100644
index 0000000..15dd370
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_get_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Legyüjtés külső POP3 / IMAP szerverről';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['source_server_txt'] = 'Külső szerver';
+$wb['source_username_txt'] = 'Felhasználónév';
+$wb['destination_txt'] = 'Címzett';
+$wb['add_new_record_txt'] = 'Új legyűjtés';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_spamfilter.lng b/interface/web/mail/lib/lang/hu_mail_spamfilter.lng
new file mode 100644
index 0000000..9a69912
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_spamfilter.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['email_txt'] = 'Email';
+$wb['spam_rewrite_score_int_txt'] = 'Újra pontoz';
+$wb['spam_redirect_score_int_txt'] = 'Átirányítás forrás';
+$wb['spam_delete_score_int_txt'] = 'Pontokat töröl';
+$wb['spam_rewrite_subject_txt'] = 'Tárgy mezőt átír';
+$wb['spam_redirect_maildir_txt'] = 'Átirányít ebbe a levelezőládába';
+$wb['active_txt'] = 'Aktív';
+$wb['spam_rewrite_txt'] = 'Átírja az email tárgyát ha eléri ezt a pontszámot';
+$wb['spam_redirect_txt'] = 'A kiválasztott levelezőládába átirányítja a levelet, ha eléri ezt a pontszámot.';
+$wb['spam_delete_txt'] = 'Törli az email ha eléri ezt a pontszámot';
+$wb['disable_txt'] = 'Tipp: A szürés tiltásához, állítsa a pontot 0.00-ra.';
+$wb['email_error_isemail'] = 'Email cím érvénytelen.';
+$wb['email_error_unique'] = 'Ehhez az emailhez tartozik már egy szűrő.';
+$wb['spam_redirect_maildir_purge_txt'] = 'Levelesládát kiüríti ';
+$wb['days_txt'] = 'nap után.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/hu_mail_spamfilter_list.lng
new file mode 100644
index 0000000..7ff963e
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_spamfilter_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Spamszűrő';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['server_name_txt'] = 'szerver_név';
+$wb['email_txt'] = 'Email';
+$wb['add_new_record_txt'] = 'Új spamszűrő';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_transport.lng b/interface/web/mail/lib/lang/hu_mail_transport.lng
new file mode 100644
index 0000000..6dc08df
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_transport.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['domain_txt'] = 'Domain';
+$wb['destination_txt'] = 'Címzett';
+$wb['type_txt'] = 'Típus';
+$wb['mx_txt'] = 'MX rekorde ellenőrzés nélkül';
+$wb['sort_order_txt'] = 'Rendezés';
+$wb['active_txt'] = 'Aktív';
+$wb['limit_mailrouting_txt'] = 'Nincs több Email irányítás lehetőség.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_transport_list.lng b/interface/web/mail/lib/lang/hu_mail_transport_list.lng
new file mode 100644
index 0000000..2fd1a27
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_transport_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Haladó Email irányítás';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['domain_txt'] = 'Domain';
+$wb['transport_txt'] = 'Szállító közeg';
+$wb['sort_order_txt'] = 'Rendezés';
+$wb['add_new_record_txt'] = 'Új irányítás';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_user.lng b/interface/web/mail/lib/lang/hu_mail_user.lng
new file mode 100644
index 0000000..ce7385a
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_user.lng
@@ -0,0 +1,31 @@
+<?php
+$wb['custom_mailfilter_txt'] = 'Egyéni levelezés szűrő';
+$wb['email_txt'] = 'Email';
+$wb['cryptpwd_txt'] = 'Jelszó';
+$wb['active_txt'] = 'Aktív';
+$wb['email_error_isemail'] = 'Email cím érvénytelen.';
+$wb['email_error_unique'] = 'Már lézető email cím.';
+$wb['autoresponder_text_txt'] = 'Szöveg.';
+$wb['autoresponder_txt'] = 'Automatikus válasz';
+$wb['no_domain_perm'] = 'Nincs joga ehhez a domainhoz';
+$wb['error_no_pwd'] = 'Jeszó üres.';
+$wb['quota_error_isint'] = 'Mailbox méret mező csak szákot tartalmazhat';
+$wb['quota_txt'] = 'Korlát MB-ban kifejezve';
+$wb['server_id_txt'] = 'szerver_azonosító';
+$wb['password_txt'] = 'Jelszó';
+$wb['maildir_txt'] = 'levelezőláda';
+$wb['postfix_txt'] = 'Bejövő engedélyezés';
+$wb['access_txt'] = 'Hozzáférés engelyezés';
+$wb['policy_txt'] = 'Spam szűrő';
+$wb['no_policy'] = '- nem engelyézett -';
+$wb['limit_mailbox_txt'] = 'Nincs több mailbox lehetőség.';
+$wb['limit_mailquota_txt'] = 'Mailbox tárhely elfogyott.';
+$wb['welcome_mail_subject'] = 'Isten hozta az új levelezőládjában';
+$wb['welcome_mail_message'] = 'Isten hozta az új levelezőládjában. Az Ön webmestere.';
+$wb['disableimap_txt'] = 'IMAP Tiltás';
+$wb['disablepop3_txt'] = 'POP3 Tiltás';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_user_filter.lng b/interface/web/mail/lib/lang/hu_mail_user_filter.lng
new file mode 100644
index 0000000..74256ee
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_user_filter.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['rulename_txt'] = 'Név';
+$wb['action_txt'] = 'Művelet';
+$wb['target_txt'] = 'Mappa';
+$wb['active_txt'] = 'Aktív';
+$wb['rulename_error_empty'] = 'A név üres';
+$wb['searchterm_is_empty'] = 'Keresési feltétel üres';
+$wb['source_txt'] = 'Forrás';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_user_filter_list.lng b/interface/web/mail/lib/lang/hu_mail_user_filter_list.lng
new file mode 100644
index 0000000..d204f95
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_user_filter_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['rulename_txt'] = 'Név';
+$wb['page_txt'] = 'Oldal';
+$wb['page_of_txt'] = 'Összesen';
+$wb['add_new_record_txt'] = 'Új szűrő';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_user_list.lng b/interface/web/mail/lib/lang/hu_mail_user_list.lng
new file mode 100644
index 0000000..b3bdf64
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_user_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Levelező fiók';
+$wb['email_txt'] = 'Email';
+$wb['autoresponder_txt'] = 'Automatikus válasz';
+$wb['add_new_record_txt'] = 'Levelező fiókot létrehoz';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_user_stats_list.lng b/interface/web/mail/lib/lang/hu_mail_user_stats_list.lng
new file mode 100644
index 0000000..bcd809a
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_user_stats_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Email forgalom';
+$wb['email_txt'] = 'Email';
+$wb['this_month_txt'] = 'Ebben a hónapban';
+$wb['last_month_txt'] = 'Múlt hónapban';
+$wb['this_year_txt'] = 'Idén';
+$wb['last_year_txt'] = 'Tavaly';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_whitelist.lng b/interface/web/mail/lib/lang/hu_mail_whitelist.lng
new file mode 100644
index 0000000..215fe9c
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_whitelist.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['source_txt'] = 'Fehérlista Cím';
+$wb['recipient_txt'] = 'Feladó';
+$wb['active_txt'] = 'Aktív';
+$wb['source_error_notempty'] = 'Cím mező üres.';
+$wb['type_txt'] = 'Típus';
+$wb['limit_mailfilter_txt'] = 'Nincs több szűrő lehetőség.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_mail_whitelist_list.lng b/interface/web/mail/lib/lang/hu_mail_whitelist_list.lng
new file mode 100644
index 0000000..c0e3cf5
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_whitelist_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'Email Fehérlista';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['source_txt'] = 'Fehérlistás cím';
+$wb['type_txt'] = 'Típus';
+$wb['recipient_txt'] = 'Címzett';
+$wb['add_new_record_txt'] = 'Új Fehérlista';
+$wb['access_txt'] = 'hozzáférés';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/hu_spamfilter_blacklist.lng
new file mode 100644
index 0000000..5da945a
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_spamfilter_blacklist.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Felhasználó';
+$wb['email_txt'] = 'Email';
+$wb['priority_txt'] = 'Sorrend';
+$wb['active_txt'] = 'Aktív';
+$wb['limit_spamfilter_wblist_txt'] = 'Nincs több Fehér- Feketelista lehetőség.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/hu_spamfilter_blacklist_list.lng
new file mode 100644
index 0000000..4b2d5b2
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_spamfilter_blacklist_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Spamszűrő Feketelista';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['priority_txt'] = 'Sorrend';
+$wb['rid_txt'] = 'Felhasználó';
+$wb['email_txt'] = 'Fehérlistás Email';
+$wb['add_new_record_txt'] = 'Új Feketelista';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_spamfilter_config.lng b/interface/web/mail/lib/lang/hu_spamfilter_config.lng
new file mode 100644
index 0000000..c88a806
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_spamfilter_config.lng
@@ -0,0 +1,21 @@
+<?php
+$wb['getmail_config_dir_txt'] = 'Legyűjtés beállítás elérés';
+$wb['ip_address_txt'] = 'IP cím';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Átjáró';
+$wb['hostname_txt'] = 'Állomásnév';
+$wb['nameservers_txt'] = 'Névszerverek';
+$wb['module_txt'] = 'Szerver Modul';
+$wb['maildir_path_txt'] = 'Maildir elérési út';
+$wb['homedir_path_txt'] = 'Home könyvtár elérési út';
+$wb['mailuser_uid_txt'] = 'Mailfelhasználó UID';
+$wb['mailuser_gid_txt'] = 'Mailfelhasználó GID';
+$wb['mailuser_name_txt'] = 'Mailfelhasználó Név';
+$wb['mailuser_group_txt'] = 'Mailfelhasználó Csoport';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost felhasználó';
+$wb['relayhost_password_txt'] = 'Relayhost jelszó';
+$wb['mailbox_size_limit_txt'] = 'Mailbox Méret korlát';
+$wb['message_size_limit_txt'] = 'Üzenet méret korlát';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_spamfilter_config_list.lng b/interface/web/mail/lib/lang/hu_spamfilter_config_list.lng
new file mode 100644
index 0000000..4385a4c
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_spamfilter_config_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Szerver Beállítás';
+$wb['server_name_txt'] = 'Szerver';
+$wb['server_id_txt'] = 'szerver_azonosító';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_spamfilter_policy.lng b/interface/web/mail/lib/lang/hu_spamfilter_policy.lng
new file mode 100644
index 0000000..75b6e37
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_spamfilter_policy.lng
@@ -0,0 +1,39 @@
+<?php
+$wb['policy_name_txt'] = 'Szabály neve';
+$wb['virus_lover_txt'] = 'Virust szereti';
+$wb['spam_lover_txt'] = 'SPAMet szereti';
+$wb['banned_files_lover_txt'] = 'Tiltott fáljlokat szereti';
+$wb['bad_header_lover_txt'] = 'Hibás fejlécet szereti';
+$wb['bypass_virus_checks_txt'] = 'Vírus ellenőrzés';
+$wb['bypass_banned_checks_txt'] = 'Tiltottak ellenőrzése';
+$wb['bypass_header_checks_txt'] = 'Fejlécek ellenőrzése';
+$wb['virus_quarantine_to_txt'] = 'Vírus erre az email címre továbbítja';
+$wb['spam_quarantine_to_txt'] = 'Spamet erre az email címre továbbítja';
+$wb['banned_quarantine_to_txt'] = 'Tiltottakat erre az email címre továbbítja';
+$wb['bad_header_quarantine_to_txt'] = 'Hibás fejéceket erre az email címre továbbítja';
+$wb['clean_quarantine_to_txt'] = 'Tiszta leveleket erre az email címre továbbítja';
+$wb['other_quarantine_to_txt'] = 'Egyéb leveleket erre az email címre továbbítja';
+$wb['spam_tag_level_txt'] = 'SPAM tag szint';
+$wb['spam_tag2_level_txt'] = 'SPAM tag2 szint';
+$wb['spam_kill_level_txt'] = 'SPAM kill szint';
+$wb['spam_dsn_cutoff_level_txt'] = 'SPAM dsn cutoff szint';
+$wb['spam_quarantine_cutoff_level_txt'] = 'SPAM karantén cutoff szint';
+$wb['spam_modifies_subj_txt'] = 'SPAM módosítja a tárgy mezőt';
+$wb['spam_subject_tag_txt'] = 'SPAM tárgy mező tag';
+$wb['spam_subject_tag2_txt'] = 'SPAM tárgy mező tag2';
+$wb['addr_extension_virus_txt'] = 'Addr. extension virus';
+$wb['addr_extension_spam_txt'] = 'Addr. extension SPAM';
+$wb['addr_extension_banned_txt'] = 'Addr. extension tiltott';
+$wb['addr_extension_bad_header_txt'] = 'Addr extension hibás fejléc';
+$wb['warnvirusrecip_txt'] = 'Virus címzettet figyelmeztet';
+$wb['warnbannedrecip_txt'] = 'Tiltott  címzettet figyelmeztet';
+$wb['warnbadhrecip_txt'] = 'Hibás fejéc  címzettet figyelmeztet';
+$wb['newvirus_admin_txt'] = 'Új virus admin';
+$wb['virus_admin_txt'] = 'Virus admin';
+$wb['banned_admin_txt'] = 'Tiltott admin';
+$wb['bad_header_admin_txt'] = 'Hibás fejléc admin';
+$wb['spam_admin_txt'] = 'SPAM admin';
+$wb['message_size_limit_txt'] = 'Levél méret limit';
+$wb['banned_rulenames_txt'] = 'Tiltószabály nevek';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/hu_spamfilter_policy_list.lng
new file mode 100644
index 0000000..adbbbde
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_spamfilter_policy_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Spamszűrő szabály';
+$wb['policy_name_txt'] = 'Név';
+$wb['virus_lover_txt'] = 'Virust szereti';
+$wb['spam_lover_txt'] = 'Spamet szereti';
+$wb['banned_files_lover_txt'] = 'Tiltott fájlokat szereti';
+$wb['bad_header_lover_txt'] = 'Hibás fejlécet szereti';
+$wb['add_new_record_txt'] = 'Új Szabály';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_spamfilter_users.lng b/interface/web/mail/lib/lang/hu_spamfilter_users.lng
new file mode 100644
index 0000000..496d07d
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_spamfilter_users.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['priority_txt'] = 'Sorrend';
+$wb['policy_id_txt'] = 'Szabály';
+$wb['email_txt'] = 'Email (Minta)';
+$wb['fullname_txt'] = 'Név';
+$wb['local_txt'] = 'Helyi';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_spamfilter_users_list.lng b/interface/web/mail/lib/lang/hu_spamfilter_users_list.lng
new file mode 100644
index 0000000..9b8f735
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_spamfilter_users_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'Spamszűrő Felhasználó';
+$wb['local_txt'] = 'Helyi';
+$wb['server_id_txt'] = 'Server';
+$wb['priority_txt'] = 'Sorrend';
+$wb['policy_id_txt'] = 'Sazbály';
+$wb['fullname_txt'] = 'Név';
+$wb['email_txt'] = 'Email';
+$wb['add_new_record_txt'] = 'Új Spamszűrő Felhasználó';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/hu_spamfilter_whitelist.lng
new file mode 100644
index 0000000..5da945a
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_spamfilter_whitelist.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Felhasználó';
+$wb['email_txt'] = 'Email';
+$wb['priority_txt'] = 'Sorrend';
+$wb['active_txt'] = 'Aktív';
+$wb['limit_spamfilter_wblist_txt'] = 'Nincs több Fehér- Feketelista lehetőség.';
+?>
+
diff --git a/interface/web/mail/lib/lang/hu_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/hu_spamfilter_whitelist_list.lng
new file mode 100644
index 0000000..e4e98ae
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_spamfilter_whitelist_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Spamszűrő Fehérlista';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['priority_txt'] = 'Sorrend';
+$wb['rid_txt'] = 'Felhasználó';
+$wb['email_txt'] = 'Fehérlistás Email';
+$wb['add_new_record_txt'] = 'Új fehérlistás';
+?>
+
diff --git a/interface/web/mail/lib/lang/nl.lng b/interface/web/mail/lib/lang/nl.lng
index 2bded78..a7db668 100644
--- a/interface/web/mail/lib/lang/nl.lng
+++ b/interface/web/mail/lib/lang/nl.lng
@@ -1,23 +1,23 @@
 <?php
-$wb['Email Alias'] = 'Email alias';
-$wb['Email Blacklist'] = 'Email blacklist';
+$wb['Email Alias'] = 'E-mail alias';
+$wb['Email Blacklist'] = 'E-mail blacklist';
 $wb['Blacklist'] = 'Blacklist';
 $wb['Mail Content Filter'] = 'Mail content filter';
 $wb['Filter'] = 'Filter';
-$wb['Mail Domain'] = 'Mail Domein';
-$wb['Domain'] = 'Domein';
-$wb['Email Catchall'] = 'Email Catchall';
-$wb['Email Forward'] = 'Email Forward';
-$wb['Get Email'] = 'Ontvang Email';
+$wb['Mail Domain'] = 'E-mail domein';
+$wb['Domain'] = 'E-mail domeinen';
+$wb['Email Catchall'] = 'E-mail catch-all';
+$wb['Email Forward'] = 'E-mail forward';
+$wb['Get Email'] = 'Ontvang e-mail';
 $wb['Spamfilter'] = 'Spamfilter';
-$wb['Email Routing'] = 'Email Routing';
-$wb['Email transport'] = 'Email transport';
-$wb['Mailbox'] = 'Mailbox';
+$wb['Email Routing'] = 'E-mail routing';
+$wb['Email transport'] = 'E-mail transport';
+$wb['Mailbox'] = 'E-mailaccount';
 $wb['Autoresponder'] = 'Autoresponder';
 $wb['Mail Filter'] = 'Mail filter';
-$wb['Custom Rules'] = 'Custom rules';
-$wb['Email filter'] = 'Email filter';
-$wb['Email Whitelist'] = 'Email whitelist';
+$wb['Custom Rules'] = 'Aangepaste regels';
+$wb['Email filter'] = 'E-mail filter';
+$wb['Email Whitelist'] = 'E-mail whitelist';
 $wb['Whitelist'] = 'Whitelist';
 $wb['Spamfilter blacklist'] = 'Spamfilter blacklist';
 $wb['Spamfilter Config'] = 'Spamfilter config';
@@ -30,16 +30,17 @@
 $wb['Spamfilter users'] = 'Spamfilter gebruikers';
 $wb['Users'] = 'Gebruikers';
 $wb['Spamfilter Whitelist'] = 'Spamfilter whitelist';
-$wb['Email'] = 'Email';
-$wb['Email Mailbox'] = 'Email mailbox';
-$wb['Email Accounts'] = 'Email accounts';
+$wb['Email'] = 'E-mail';
+$wb['Email Mailbox'] = 'E-mail accounts';
+$wb['Email Accounts'] = 'E-mail';
 $wb['User / Domain'] = 'Gebruiker / domein';
 $wb['Server Settings'] = 'Server instellingen';
 $wb['Fetchmail'] = 'Fetchmail';
-$wb['Mailbox traffic'] = 'Mailbox dataverkeer';
+$wb['Mailbox traffic'] = 'E-mailaccount dataverkeer';
 $wb['Statistics'] = 'Statistieken';
 $wb['Postfix Whitelist'] = 'Postfix whitelist';
 $wb['Postfix Blacklist'] = 'Postfix blacklist';
 $wb['Content Filter'] = 'Content filter';
 $wb['Global Filters'] = 'Globale filters';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_alias.lng b/interface/web/mail/lib/lang/nl_mail_alias.lng
index 021749a..a167a70 100644
--- a/interface/web/mail/lib/lang/nl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/nl_mail_alias.lng
@@ -1,11 +1,12 @@
 <?php
-$wb['email_txt'] = 'Email';
-$wb['destination_txt'] = 'Bestemming';
-$wb['active_txt'] = 'Actief';
-$wb['email_error_isemail'] = 'Emailadres is ongeldig.';
-$wb['email_error_unique'] = 'Duplicaat emailadres.';
-$wb['no_domain_perm'] = 'U heeft geen toestemming voor dit domain.';
-$wb['destination_error_isemail'] = 'Emailadres geadresseerde is ongeldig.';
-$wb['limit_mailalias_txt'] = 'Het max. aantal emailaliassen voor uw account is bereikt.';
-$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
+$wb['email_txt'] = 'E-mail';
+$wb['destination_txt'] = 'Doorsturen aan account';
+$wb['active_txt'] = 'Actief?';
+$wb['email_error_isemail'] = 'E-mailadres is ongeldig.';
+$wb['email_error_unique'] = 'E-mailadres is reeds toegevoegd.';
+$wb['no_domain_perm'] = 'U heeft geen toestemming voor het aanmaken van een alias op dit domein.';
+$wb['destination_error_isemail'] = 'E-mailadres geadresseerde is ongeldig.';
+$wb['limit_mailalias_txt'] = 'Het max. aantal e-mailaliassen voor uw account is bereikt.';
+$wb['duplicate_mailbox_txt'] = 'Er is al een e-mailaccount ingesteld op het door u gewenste adres.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_alias_list.lng b/interface/web/mail/lib/lang/nl_mail_alias_list.lng
index f3270a4..eb9b59a 100644
--- a/interface/web/mail/lib/lang/nl_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_alias_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Email alias';
-$wb['active_txt'] = 'Actief';
-$wb['source_txt'] = 'Bron';
-$wb['destination_txt'] = 'Bestemming';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Toevoegen nieuwe email alias';
+$wb['list_head_txt'] = 'E-mail aliassen';
+$wb['active_txt'] = 'Actief?';
+$wb['source_txt'] = 'Geadresseerde';
+$wb['destination_txt'] = 'Doorsturen naar account';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Nieuwe e-mailalias toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_blacklist.lng b/interface/web/mail/lib/lang/nl_mail_blacklist.lng
index 28ba53e..9c1d0cc 100644
--- a/interface/web/mail/lib/lang/nl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/nl_mail_blacklist.lng
@@ -2,8 +2,9 @@
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Blacklist adres';
 $wb['recipient_txt'] = 'Ontvanger';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['source_error_notempty'] = 'Adres is leeg.';
 $wb['type_txt'] = 'Type';
-$wb['limit_mailfilter_txt'] = 'Het max. aantal email filters voor uw account is bereikt.';
+$wb['limit_mailfilter_txt'] = 'Het max. aantal e-mailfilters voor uw account is bereikt.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng b/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng
index 88582ac..15649c9 100644
--- a/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Email Blacklist';
-$wb['active_txt'] = 'Actief';
+$wb['list_head_txt'] = 'E-mail blacklist';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Blacklisted adres';
 $wb['type_txt'] = 'Type';
 $wb['recipient_txt'] = 'Ontvanger';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw Blacklist record';
-$wb['access_txt'] = 'toegang';
+$wb['add_new_record_txt'] = 'Nieuw blacklist record toevoegen';
+$wb['access_txt'] = 'Toegang';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_content_filter.lng b/interface/web/mail/lib/lang/nl_mail_content_filter.lng
index be2ed9f..69723e1 100644
--- a/interface/web/mail/lib/lang/nl_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/nl_mail_content_filter.lng
@@ -7,3 +7,4 @@
 $wb['active_txt'] = 'Actieve';
 $wb['pattern_error_empty'] = 'Patroon is leeg.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng b/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng
index d760e9e..0b6896d 100644
--- a/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Postfix header en body checks';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['pattern_txt'] = 'Patroon';
 $wb['action_txt'] = 'Actie';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw content filter';
+$wb['add_new_record_txt'] = 'Nieuw content filter toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng
index 0eef2a4..6cbae6a 100644
--- a/interface/web/mail/lib/lang/nl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/nl_mail_domain.lng
@@ -1,13 +1,14 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domein';
+$wb['domain_txt'] = 'Domeinnaam';
 $wb['type_txt'] = 'Type';
-$wb['active_txt'] = 'Actief';
-$wb['domain_error_empty'] = 'Domein is leeg.';
-$wb['domain_error_unique'] = 'Duplicaat domein.';
+$wb['active_txt'] = 'Actief?';
+$wb['domain_error_empty'] = 'Domeinnaam is leeg.';
+$wb['domain_error_unique'] = 'Domeinnaam is reeds aanwezig.';
 $wb['domain_error_regex'] = 'Ongeldige domeinnaam.';
 $wb['client_txt'] = 'Klant';
-$wb['limit_maildomain_txt'] = 'Het max. aantal aan emaildomeinen voor uw account is bereikt.';
+$wb['limit_maildomain_txt'] = 'Het max. aantal aan e-maildomeinen voor uw account is bereikt.';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- niet ingeschakeld -';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng
index bce9dfe..7377fe9 100644
--- a/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['domain_txt'] = 'Domein';
-$wb['destination_txt'] = 'Bestemming';
-$wb['active_txt'] = 'Actief';
-$wb['domain_error_unique'] = 'Er is al een Catchall record voor dit domein.';
-$wb['no_domain_perm'] = 'U heeft geen permissies voor dit domein.';
+$wb['domain_txt'] = 'Domeinnaam';
+$wb['destination_txt'] = 'Doorsturen naar account';
+$wb['active_txt'] = 'Actief?';
+$wb['domain_error_unique'] = 'Er is al een catch-all record voor dit domein.';
+$wb['no_domain_perm'] = 'U heeft geen toegangsrechten voor dit domein.';
 $wb['domain_error_regex'] = 'Ongeldige domeinnaam of het domein bevat ongeldige karakters.';
-$wb['limit_mailcatchall_txt'] = 'Het max. aantal email catchall accounts voor uw account is bereikt.';
+$wb['limit_mailcatchall_txt'] = 'Het max. aantal e-mail catch-all accounts voor uw account is bereikt.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng
index a695207..ce27d06 100644
--- a/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Email Catchall';
-$wb['active_txt'] = 'Actief';
-$wb['source_txt'] = 'bron';
-$wb['destination_txt'] = 'Emailadres geadresseerde';
+$wb['list_head_txt'] = 'E-mail catch-all accounts';
+$wb['active_txt'] = 'Actief?';
+$wb['source_txt'] = 'Domeinnaam';
+$wb['destination_txt'] = 'Doorsturen naar account';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuwe catchall';
+$wb['domain_txt'] = 'Domeinnaam';
+$wb['add_new_record_txt'] = 'Nieuwe catch-all toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_domain_list.lng b/interface/web/mail/lib/lang/nl_mail_domain_list.lng
index 0249b47..8181a04 100644
--- a/interface/web/mail/lib/lang/nl_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_domain_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Email domein';
+$wb['list_head_txt'] = 'E-mail domeinen';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw domein';
-$wb['active_txt'] = 'Actief';
+$wb['domain_txt'] = 'Domeinnaam';
+$wb['add_new_record_txt'] = 'Nieuw domein toevoegen';
+$wb['active_txt'] = 'Actief?';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_forward.lng b/interface/web/mail/lib/lang/nl_mail_forward.lng
index d12e664..1368042 100644
--- a/interface/web/mail/lib/lang/nl_mail_forward.lng
+++ b/interface/web/mail/lib/lang/nl_mail_forward.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['email_txt'] = 'Email';
-$wb['destination_txt'] = 'Emailadres geadresseerde';
-$wb['active_txt'] = 'Actief';
+$wb['email_txt'] = 'E-mail';
+$wb['destination_txt'] = 'Doorsturen naar e-mailadres';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_mailforward_txt'] = 'Het max. aantal email forwarders voor uw account is bereikt.';
-$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
+$wb['duplicate_mailbox_txt'] = 'Er is al een e-mailaccount aanwezig op het door u gewenste adres.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_forward_list.lng b/interface/web/mail/lib/lang/nl_mail_forward_list.lng
index c4333a1..2953076 100644
--- a/interface/web/mail/lib/lang/nl_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_forward_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Mail forward (doorsturen)';
-$wb['active_txt'] = 'Actief';
-$wb['source_txt'] = 'bron';
-$wb['destination_txt'] = 'Bestemming';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Toevoegen nieuwe email forward';
+$wb['list_head_txt'] = 'E-mail doorsturen';
+$wb['active_txt'] = 'Actief?';
+$wb['source_txt'] = 'Geadresseerde';
+$wb['destination_txt'] = 'Doorsturen naar e-mailadres';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Nieuwe e-mail forward toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_get.lng b/interface/web/mail/lib/lang/nl_mail_get.lng
index bdb4c35..5bbebf4 100644
--- a/interface/web/mail/lib/lang/nl_mail_get.lng
+++ b/interface/web/mail/lib/lang/nl_mail_get.lng
@@ -1,15 +1,16 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['type_txt'] = 'Type';
-$wb['source_server_txt'] = 'Pop3/Imap server';
+$wb['type_txt'] = 'Type server';
+$wb['source_server_txt'] = 'POP3/IMAP server';
 $wb['source_username_txt'] = 'Gebruikersnaam';
 $wb['source_password_txt'] = 'Wachtwoord';
-$wb['source_delete_txt'] = 'Verwijder emails na ontvangst';
-$wb['destination_txt'] = 'Bestemming';
-$wb['active_txt'] = 'Actief';
-$wb['limit_fetchmail_txt'] = 'The max. aantal Fetchmail records voor uw domein is bereikt.';
-$wb['source_server_error_isempty'] = 'Server is empty.';
-$wb['source_username_error_isempty'] = 'Username is empty.';
-$wb['source_password_error_isempty'] = 'Password is empty.';
-$wb['destination_error_isemail'] = 'No destination selected.';
+$wb['source_delete_txt'] = 'E-mailberichten na ontvangst verwijderen';
+$wb['destination_txt'] = 'Doorsturen naar account';
+$wb['active_txt'] = 'Actief?';
+$wb['limit_fetchmail_txt'] = 'Het max. aantal Fetchmail records voor uw domein is bereikt.';
+$wb['source_server_error_isempty'] = 'Server is leeg.';
+$wb['source_username_error_isempty'] = 'Gebruikersnaam is leeg.';
+$wb['source_password_error_isempty'] = 'Wachtwoord is leeg.';
+$wb['destination_error_isemail'] = 'Er is geen bestemming geselecteerd.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_get_list.lng b/interface/web/mail/lib/lang/nl_mail_get_list.lng
index bd284a5..42971fc 100644
--- a/interface/web/mail/lib/lang/nl_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_get_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Haal emails op van externe POP3 / IMAP servers';
-$wb['active_txt'] = 'Actief';
+$wb['list_head_txt'] = 'E-mails ophalen van externe POP3 / IMAP servers';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['source_server_txt'] = 'Externe server';
 $wb['source_username_txt'] = 'Gebruikersnaam';
 $wb['destination_txt'] = 'Bestemming';
-$wb['add_new_record_txt'] = 'Toevoegen nieuwe account';
+$wb['add_new_record_txt'] = 'Nieuwe account toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_spamfilter.lng b/interface/web/mail/lib/lang/nl_mail_spamfilter.lng
index 44403e0..b69cb8d 100644
--- a/interface/web/mail/lib/lang/nl_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/nl_mail_spamfilter.lng
@@ -1,17 +1,18 @@
 <?php
-$wb['email_txt'] = 'Email';
-$wb['spam_rewrite_score_int_txt'] = 'Rewrite score';
-$wb['spam_redirect_score_int_txt'] = 'Redirect score';
-$wb['spam_delete_score_int_txt'] = 'Delete score';
-$wb['spam_rewrite_subject_txt'] = 'Rewrite onderwerp';
-$wb['spam_redirect_maildir_txt'] = 'Redirect mailbox';
-$wb['active_txt'] = 'Actief';
-$wb['spam_rewrite_txt'] = 'Herschrijf email onderwerp boven deze score.';
-$wb['spam_redirect_txt'] = 'Redirect email boven deze score naar de geselecteerde mailbox.';
-$wb['spam_delete_txt'] = 'Verwijder email boven deze score.';
+$wb['email_txt'] = 'E-mail';
+$wb['spam_rewrite_score_int_txt'] = 'Herschrijf score';
+$wb['spam_redirect_score_int_txt'] = 'Verplaats score';
+$wb['spam_delete_score_int_txt'] = 'Verwijdering score';
+$wb['spam_rewrite_subject_txt'] = 'Herschrijf onderwerp';
+$wb['spam_redirect_maildir_txt'] = 'Verplaats naar map';
+$wb['active_txt'] = 'Actief?';
+$wb['spam_rewrite_txt'] = 'Herschrijf e-mail onderwerp boven deze score.';
+$wb['spam_redirect_txt'] = 'Verplaats e-mail boven deze score naar de geselecteerde map.';
+$wb['spam_delete_txt'] = 'Verwijder e-mail boven deze score.';
 $wb['disable_txt'] = 'Hint: Om de filteroptie uit te schakelen, zet de score op 0.00.';
-$wb['email_error_isemail'] = 'Emailadres is ongeldig.';
-$wb['email_error_unique'] = 'Er is al een spamfilter record voor dit emailadres.';
-$wb['spam_redirect_maildir_purge_txt'] = 'Purge Maildir na';
+$wb['email_error_isemail'] = 'E-mailadres is ongeldig.';
+$wb['email_error_unique'] = 'Er is al een spamfilter record voor dit e-mailadres.';
+$wb['spam_redirect_maildir_purge_txt'] = 'Leeg map na';
 $wb['days_txt'] = 'dagen.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng
index a84c0fc..45123b9 100644
--- a/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Spamfilter';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
-$wb['server_name_txt'] = 'servernaam';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Toevoegen spamfilter record';
+$wb['server_name_txt'] = 'Servernaam';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Spamfilter record toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_transport.lng b/interface/web/mail/lib/lang/nl_mail_transport.lng
index 18e873d..3915706 100644
--- a/interface/web/mail/lib/lang/nl_mail_transport.lng
+++ b/interface/web/mail/lib/lang/nl_mail_transport.lng
@@ -1,10 +1,11 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domein';
+$wb['domain_txt'] = 'Domeinnaam';
 $wb['destination_txt'] = 'Bestemming';
 $wb['type_txt'] = 'Type';
-$wb['mx_txt'] = 'Geen MX lookup';
+$wb['mx_txt'] = 'MX lookup uitschakelen';
 $wb['sort_order_txt'] = 'Gesorteerd op';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_mailrouting_txt'] = 'Het max. aantal routes voor uw account is bereikt.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_transport_list.lng b/interface/web/mail/lib/lang/nl_mail_transport_list.lng
index 41a9dda..87602ea 100644
--- a/interface/web/mail/lib/lang/nl_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_transport_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Advanced email routing';
-$wb['active_txt'] = 'Actief';
+$wb['list_head_txt'] = 'Geavanceerde e-mail routing';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domein';
-$wb['transport_txt'] = 'Transport';
+$wb['domain_txt'] = 'Domeinnaam';
+$wb['transport_txt'] = 'Bestemming';
 $wb['sort_order_txt'] = 'Sorteren op';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw transport';
+$wb['add_new_record_txt'] = 'Nieuw e-mail route toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng
index 28182ef..f0d990d 100644
--- a/interface/web/mail/lib/lang/nl_mail_user.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user.lng
@@ -1,33 +1,33 @@
 <?php
-$wb['custom_mailfilter_txt'] = 'Custom mail filter recipe';
-$wb['email_txt'] = 'Email';
+$wb['custom_mailfilter_txt'] = 'Aangepaste mail-filter instellingen';
+$wb['email_txt'] = 'E-mail';
 $wb['cryptpwd_txt'] = 'Wachtwoord';
 $wb['password_strength_txt'] = 'Wachtwoord sterkte';
-$wb['active_txt'] = 'Actief';
-$wb['email_error_isemail'] = 'Email adres is ongeldig.';
-$wb['email_error_unique'] = 'Email adres bestaat reeds.';
+$wb['active_txt'] = 'Actief?';
+$wb['email_error_isemail'] = 'E-mailadres is ongeldig.';
+$wb['email_error_unique'] = 'E-mailadres bestaat reeds.';
 $wb['autoresponder_text_txt'] = 'Tekst';
 $wb['autoresponder_txt'] = 'Autoresponder';
-$wb['no_domain_perm'] = 'U heeft geen toestemming voor dit domein.';
-$wb['error_no_pwd'] = 'Wachtwoord  is leeg.';
-$wb['quota_error_isint'] = 'Mailbox grootte moet een numerieke waarde zijn.';
-$wb['quota_txt'] = 'quota in MB';
-$wb['server_id_txt'] = 'server_id';
-$wb['password_txt'] = 'wachtwoord';
-$wb['maildir_txt'] = 'maildir';
+$wb['no_domain_perm'] = 'U heeft geen toestemming om dit domein te beheren.';
+$wb['error_no_pwd'] = 'Wachtwoord is leeg.';
+$wb['quota_error_isint'] = 'Schijfruimte limiet e-mailaccount moet een numerieke waarde zijn.';
+$wb['quota_txt'] = 'Schijfruimte limiet';
+$wb['server_id_txt'] = 'Server ID';
+$wb['password_txt'] = 'Wachtwoord';
+$wb['maildir_txt'] = 'Maildir';
 $wb['postfix_txt'] = 'Inschakelen ontvangen';
 $wb['access_txt'] = 'Inschakelen toegang';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- niet ingeschakeld -';
-$wb['limit_mailbox_txt'] = 'Het max. aantal aan mailboxen voor uw account is bereikt.';
-$wb['limit_mailquota_txt'] = 'De max. ruimte voor mailboxen is bereikt. De max. beschikbare ruimte in MB is';
-$wb['welcome_mail_subject'] = 'Welkom op uw nieuwe email account.';
-$wb['welcome_mail_message'] = 'Welkom op uw nieuwe email account.
-
-Uw webmaster.';
+$wb['limit_mailbox_txt'] = 'Het max. aantal aan e-mailaccounts voor uw account is bereikt.';
+$wb['limit_mailquota_txt'] = 'De max. ruimte voor e-mailaccounts is bereikt. De max. beschikbare ruimte in MB is';
+$wb['welcome_mail_subject'] = 'Welkom bij uw nieuwe e-mailaccount.';
+$wb['welcome_mail_message'] = 'Welkom in uw nieuwe e-mailaccount.';
 $wb['disableimap_txt'] = 'Uitschakelen IMAP';
 $wb['disablepop3_txt'] = 'Uitschakelen POP3';
 $wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
 $wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
-$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
+$wb['duplicate_alias_or_forward_txt'] = 'Er is al een e-mailalias of een forward ingesteld voor dit e-mailadres.';
+$wb['quota_error_value'] = 'Ongeldige schijfruimte-limiet. Toegestaan zijn: -1 (onbeperkt) of cijfers (>1)';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_user_filter.lng b/interface/web/mail/lib/lang/nl_mail_user_filter.lng
index 29f2738..4968942 100644
--- a/interface/web/mail/lib/lang/nl_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user_filter.lng
@@ -2,8 +2,9 @@
 $wb['rulename_txt'] = 'Naam';
 $wb['action_txt'] = 'Actie';
 $wb['target_txt'] = 'Map';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['rulename_error_empty'] = 'Naam is leeg.';
 $wb['searchterm_is_empty'] = 'Zoekterm is leeg.';
 $wb['source_txt'] = 'Bron';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng b/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng
index c8318ee..9c0bc55 100644
--- a/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng
@@ -1,7 +1,8 @@
 <?php
 $wb['rulename_txt'] = 'Naam';
-$wb['add_new_record_txt'] = 'Toevoegen Filter';
-$wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
-$wb['delete_confirmation'] = 'Do you really want to Delete the mailfilter?';
+$wb['add_new_record_txt'] = 'Filter toevoegen';
+$wb['page_txt'] = 'Pagina';
+$wb['page_of_txt'] = 'van';
+$wb['delete_confirmation'] = 'Weet u zeker dat u deze e-mailfilter wilt verwijderen?';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_user_list.lng b/interface/web/mail/lib/lang/nl_mail_user_list.lng
index 22e5a24..22ef55e 100644
--- a/interface/web/mail/lib/lang/nl_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Mailbox';
-$wb['email_txt'] = 'Email';
+$wb['list_head_txt'] = 'E-mail accounts';
+$wb['email_txt'] = 'E-mail';
 $wb['autoresponder_txt'] = 'Autoresponder';
-$wb['add_new_record_txt'] = 'Toevoegen nieuwe mailbox';
+$wb['add_new_record_txt'] = 'Nieuw e-mailaccount toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng b/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng
index c152885..3eb2d8f 100644
--- a/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Mail verkeer';
-$wb['email_txt'] = 'Email';
+$wb['list_head_txt'] = 'E-mail verkeer';
+$wb['email_txt'] = 'E-mailaccount';
 $wb['this_month_txt'] = 'Deze maand';
-$wb['last_month_txt'] = 'Laatste maand';
+$wb['last_month_txt'] = 'Vorige maand';
 $wb['this_year_txt'] = 'Dit jaar';
 $wb['last_year_txt'] = 'Vorig jaar';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_whitelist.lng b/interface/web/mail/lib/lang/nl_mail_whitelist.lng
index db8a2c9..687f0a3 100644
--- a/interface/web/mail/lib/lang/nl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/nl_mail_whitelist.lng
@@ -2,8 +2,9 @@
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Whitelist adres';
 $wb['recipient_txt'] = 'Ontvanger';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['source_error_notempty'] = 'Adres is niet ingevuld.';
 $wb['type_txt'] = 'Type';
-$wb['limit_mailfilter_txt'] = 'Het max. aantal email filters voor uw account is bereikt.';
+$wb['limit_mailfilter_txt'] = 'Het max. aantal e-mailfilters voor uw account is bereikt.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng b/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng
index 8905a55..dd2e9a7 100644
--- a/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Email Whitelist';
-$wb['active_txt'] = 'Actief';
+$wb['list_head_txt'] = 'E-mail whitelist';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Whitelisted adres';
 $wb['type_txt'] = 'Type';
 $wb['recipient_txt'] = 'Ontvanger';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw whitelist record';
-$wb['access_txt'] = 'toegang';
+$wb['add_new_record_txt'] = 'Nieuw whitelist record toevoegen';
+$wb['access_txt'] = 'Toegang';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng
index f7314fa..acc7d6c 100644
--- a/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng
@@ -2,8 +2,9 @@
 $wb['server_id_txt'] = 'Server';
 $wb['wb_txt'] = 'wb';
 $wb['rid_txt'] = 'Gebruiker';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['priority_txt'] = 'Prioriteit';
-$wb['active_txt'] = 'Actief';
-$wb['limit_spamfilter_wblist_txt'] = 'The max. number of White- or Blacklist records for your account is reached.';
+$wb['active_txt'] = 'Actief?';
+$wb['limit_spamfilter_wblist_txt'] = 'Het max. aantal white- en blacklist-records van uw account is bereikt.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng
index 604e995..9c17a49 100644
--- a/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng
@@ -1,9 +1,10 @@
 <?php
 $wb['list_head_txt'] = 'Spamfilter blacklist';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['priority_txt'] = 'Prioriteit';
 $wb['rid_txt'] = 'Gebruiker';
-$wb['email_txt'] = 'Whitelisted email';
-$wb['add_new_record_txt'] = 'Toevoegen blacklist record';
+$wb['email_txt'] = 'Whitelisted e-mail';
+$wb['add_new_record_txt'] = 'Blacklist record toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_spamfilter_config.lng b/interface/web/mail/lib/lang/nl_spamfilter_config.lng
index 7e487c9..db8bfb5 100644
--- a/interface/web/mail/lib/lang/nl_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/nl_spamfilter_config.lng
@@ -18,3 +18,4 @@
 $wb['mailbox_size_limit_txt'] = 'Mailboxgrootte Limiet';
 $wb['message_size_limit_txt'] = 'Berichtgrootte Limiet';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng
index cbae14c..f74bcf2 100644
--- a/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng
@@ -3,3 +3,4 @@
 $wb['server_name_txt'] = 'Server';
 $wb['server_id_txt'] = 'server ID';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_spamfilter_policy.lng b/interface/web/mail/lib/lang/nl_spamfilter_policy.lng
index fbb4f22..ba53e31 100644
--- a/interface/web/mail/lib/lang/nl_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/nl_spamfilter_policy.lng
@@ -1,33 +1,33 @@
 <?php
 $wb['policy_name_txt'] = 'Policy Naam';
-$wb['virus_lover_txt'] = 'Virusl liefhebber';
+$wb['virus_lover_txt'] = 'Virus liefhebber';
 $wb['spam_lover_txt'] = 'SPAM liefhebber';
 $wb['banned_files_lover_txt'] = 'Banned bestand liefhebber';
 $wb['bad_header_lover_txt'] = 'Bad header liefhebber';
 $wb['bypass_virus_checks_txt'] = 'Omleiding virus checks';
 $wb['bypass_banned_checks_txt'] = 'Omleiding banned checks';
 $wb['bypass_header_checks_txt'] = 'Omleiding header checks';
-$wb['virus_quarantine_to_txt'] = 'Doorsturen virus naar email';
-$wb['spam_quarantine_to_txt'] = 'Doorsturen spam naar email';
-$wb['banned_quarantine_to_txt'] = 'Doorsturen banned naar email';
-$wb['bad_header_quarantine_to_txt'] = 'Doorsturen bad header naar email';
-$wb['clean_quarantine_to_txt'] = 'Doorsturen clean naar email';
-$wb['other_quarantine_to_txt'] = 'Doorsturen overige naar email';
+$wb['virus_quarantine_to_txt'] = 'Doorsturen virus naar e-mailadres';
+$wb['spam_quarantine_to_txt'] = 'Doorsturen spam naar e-mailadres';
+$wb['banned_quarantine_to_txt'] = 'Doorsturen banned naar e-mailadres';
+$wb['bad_header_quarantine_to_txt'] = 'Doorsturen bad header naar e-mailadres';
+$wb['clean_quarantine_to_txt'] = 'Doorsturen clean naar e-mailadres';
+$wb['other_quarantine_to_txt'] = 'Doorsturen overige naar e-mailadres';
 $wb['spam_tag_level_txt'] = 'SPAM tag niveau';
 $wb['spam_tag2_level_txt'] = 'SPAM tag2 niveau';
 $wb['spam_kill_level_txt'] = 'SPAM kill niveau';
 $wb['spam_dsn_cutoff_level_txt'] = 'SPAM dsn cutoff niveau';
 $wb['spam_quarantine_cutoff_level_txt'] = 'SPAM quarantine cutoff niveau';
-$wb['spam_modifies_subj_txt'] = 'SPAM wijzigd onderwerp';
+$wb['spam_modifies_subj_txt'] = 'SPAM onderwerp wijziging';
 $wb['spam_subject_tag_txt'] = 'SPAM onderwerp tag';
 $wb['spam_subject_tag2_txt'] = 'SPAM onderwerp tag2';
 $wb['addr_extension_virus_txt'] = 'Addr. extensie virus';
 $wb['addr_extension_spam_txt'] = 'Addr. extensie SPAM';
 $wb['addr_extension_banned_txt'] = 'Addr. extensie banned';
 $wb['addr_extension_bad_header_txt'] = 'Addr. extensie bad header';
-$wb['warnvirusrecip_txt'] = 'Waarschuw virus recip.';
-$wb['warnbannedrecip_txt'] = 'Waarschuw banned recip.';
-$wb['warnbadhrecip_txt'] = 'Waarschuw bad header recip.';
+$wb['warnvirusrecip_txt'] = 'Waarschuw virus geadresseerde';
+$wb['warnbannedrecip_txt'] = 'Waarschuw banned geadresseerde';
+$wb['warnbadhrecip_txt'] = 'Waarschuw bad header geadresseerde';
 $wb['newvirus_admin_txt'] = 'Nieuw virus admin';
 $wb['virus_admin_txt'] = 'Virus admin';
 $wb['banned_admin_txt'] = 'Banned admin';
@@ -36,3 +36,4 @@
 $wb['message_size_limit_txt'] = 'Berichtgrootte limiet';
 $wb['banned_rulenames_txt'] = 'Verboden regelnaam';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng
index f6d07e6..a046dcd 100644
--- a/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng
@@ -5,5 +5,6 @@
 $wb['spam_lover_txt'] = 'Spam liefhebber';
 $wb['banned_files_lover_txt'] = 'Verbannen bestanden liefhebbers';
 $wb['bad_header_lover_txt'] = 'Verbannen header liefhebbers';
-$wb['add_new_record_txt'] = 'Toevoegen policy record';
+$wb['add_new_record_txt'] = 'Policy record toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_spamfilter_users.lng b/interface/web/mail/lib/lang/nl_spamfilter_users.lng
index 2322761..0e9454c 100644
--- a/interface/web/mail/lib/lang/nl_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/nl_spamfilter_users.lng
@@ -2,7 +2,8 @@
 $wb['server_id_txt'] = 'Server';
 $wb['priority_txt'] = 'Prioriteit';
 $wb['policy_id_txt'] = 'Policy';
-$wb['email_txt'] = 'Email (patroon)';
+$wb['email_txt'] = 'E-mail (patroon)';
 $wb['fullname_txt'] = 'Naam';
 $wb['local_txt'] = 'Lokaal';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng
index 2f62a2e..bfac37a 100644
--- a/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng
@@ -5,6 +5,7 @@
 $wb['priority_txt'] = 'Prioriteit';
 $wb['policy_id_txt'] = 'Policy';
 $wb['fullname_txt'] = 'Naam';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Toevoegen Spamfilter gebruiker';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Spamfilter gebruiker toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng
index f7314fa..acc7d6c 100644
--- a/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng
@@ -2,8 +2,9 @@
 $wb['server_id_txt'] = 'Server';
 $wb['wb_txt'] = 'wb';
 $wb['rid_txt'] = 'Gebruiker';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['priority_txt'] = 'Prioriteit';
-$wb['active_txt'] = 'Actief';
-$wb['limit_spamfilter_wblist_txt'] = 'The max. number of White- or Blacklist records for your account is reached.';
+$wb['active_txt'] = 'Actief?';
+$wb['limit_spamfilter_wblist_txt'] = 'Het max. aantal white- en blacklist-records van uw account is bereikt.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng
index 8a67ddb..b86571d 100644
--- a/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng
@@ -1,9 +1,10 @@
 <?php
 $wb['list_head_txt'] = 'Spamfilter whitelist';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['priority_txt'] = 'Prioriteit';
 $wb['rid_txt'] = 'Gebruiker';
-$wb['email_txt'] = 'Whitelisted email';
-$wb['add_new_record_txt'] = 'Toevoegen whitelist record';
+$wb['email_txt'] = 'Whitelisted e-mail';
+$wb['add_new_record_txt'] = 'Whitelist record toevoegen';
 ?>
+
diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng
new file mode 100644
index 0000000..d748c03
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl.lng
@@ -0,0 +1,45 @@
+<?php
+$wb['Email Alias'] = 'Alias E-mail';
+$wb['Email Blacklist'] = 'Czarna lista E-mail';
+$wb['Blacklist'] = 'Czarna lista';
+$wb['Mail Content Filter'] = 'Zawartość filrtu E-mail';
+$wb['Filter'] = 'Filtr';
+$wb['Mail Domain'] = 'Domena E-mail';
+$wb['Domain'] = 'Domena';
+$wb['Email Catchall'] = 'E-mail Catchall';
+$wb['Email Forward'] = 'Przekierowanie E-mail';
+$wb['Get Email'] = 'Get Email';
+$wb['Spamfilter'] = 'Filtr spamu';
+$wb['Email Routing'] = 'Ścieżka E-mail';
+$wb['Email transport'] = 'Przenieś E-mail';
+$wb['Mailbox'] = 'Skrzynka pocztowa';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Mail Filter'] = 'Filtr poczty';
+$wb['Custom Rules'] = 'Podstawowe zasady';
+$wb['Email filter'] = 'Filtr E-mail';
+$wb['Email Whitelist'] = 'Biała lista E-mail';
+$wb['Whitelist'] = 'Biała lista';
+$wb['Spamfilter blacklist'] = 'Filtr spamu czarnej listy';
+$wb['Spamfilter Config'] = 'konfiguracja filtrów spamu';
+$wb['Server'] = 'Serwer';
+$wb['Spamfilter policy'] = 'Polityka filtrów spamu';
+$wb['Policy'] = 'Polityka';
+$wb['Quarantine'] = 'Kwarantanna';
+$wb['Tag-Level'] = 'Poziom uchwytu';
+$wb['Other'] = 'Inny';
+$wb['Spamfilter users'] = 'Filtr spamu użytkowników';
+$wb['Users'] = 'Użytkownicy';
+$wb['Spamfilter Whitelist'] = 'Filtr spamu białej listy';
+$wb['Email'] = 'E-mail';
+$wb['Email Mailbox'] = 'Skrzynka pocztowa E-mail';
+$wb['Email Accounts'] = 'Konta E-mail';
+$wb['User / Domain'] = 'Użytkownik / Domena';
+$wb['Server Settings'] = 'Ustawienia serwera';
+$wb['Fetchmail'] = 'Fetchmail';
+$wb['Mailbox traffic'] = 'Ruch w skrzynce pocztowej';
+$wb['Statistics'] = 'Statystyki';
+$wb['Postfix Whitelist'] = 'Popraw białą listę';
+$wb['Postfix Blacklist'] = 'Popraw czarną listę';
+$wb['Content Filter'] = 'Zawartość filtru';
+$wb['Global Filters'] = 'Globalne filtry';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng
new file mode 100644
index 0000000..8556be8
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_alias.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['email_txt'] = 'E-mail';
+$wb['destination_txt'] = 'Opis';
+$wb['active_txt'] = 'Aktywny';
+$wb['email_error_isemail'] = 'Adres e-mail jest niepoprawny.';
+$wb['email_error_unique'] = 'Duplikat adresów e-mail.';
+$wb['no_domain_perm'] = 'Nie masz dostępu do tej domeny.';
+$wb['destination_error_isemail'] = 'Element docelowy adresów e-mail jest niepoprawny.';
+$wb['limit_mailalias_txt'] = 'Maksymalna ilość aliasów e-mail dla Twojego konta została przekroczona.';
+$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_alias_list.lng b/interface/web/mail/lib/lang/pl_mail_alias_list.lng
new file mode 100644
index 0000000..b6ce95d
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_alias_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Aliasy E-mail';
+$wb['active_txt'] = 'Aktywny';
+$wb['source_txt'] = 'źródło';
+$wb['destination_txt'] = 'Element docelowy';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Dodaj nowy alias e-mail';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
new file mode 100644
index 0000000..528f2f7
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['source_txt'] = 'Adres Czarnej listy';
+$wb['recipient_txt'] = 'Odbiorca';
+$wb['active_txt'] = 'Aktywny';
+$wb['source_error_notempty'] = 'Adres jest pusty.';
+$wb['type_txt'] = 'Typ';
+$wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów dla Twojego konta została przekroczona.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
new file mode 100644
index 0000000..ebef666
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Czarna lista E-mail';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['source_txt'] = 'Adresy wpisane na czarną listę';
+$wb['type_txt'] = 'Typ';
+$wb['recipient_txt'] = 'Odbiorca';
+$wb['add_new_record_txt'] = 'Dodaj nowy wpis czarnej listy';
+$wb['access_txt'] = 'dostęp';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter.lng b/interface/web/mail/lib/lang/pl_mail_content_filter.lng
new file mode 100644
index 0000000..54efa4f
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_content_filter.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['type_txt'] = 'Filtr';
+$wb['pattern_txt'] = 'Wyrażenie regularne, wzór';
+$wb['data_txt'] = 'Data';
+$wb['action_txt'] = 'Akcja';
+$wb['active_txt'] = 'Aktywny';
+$wb['pattern_error_empty'] = 'Wzór jest pusty.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
new file mode 100644
index 0000000..6b0dd9b
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Popraw nagłowek oraz stronę';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['pattern_txt'] = 'Wzór';
+$wb['action_txt'] = 'Akcja';
+$wb['add_new_record_txt'] = 'Dodaj nowy zbiór filtrów';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng
new file mode 100644
index 0000000..6f9c68c
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -0,0 +1,13 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Typ';
+$wb['active_txt'] = 'Aktywny';
+$wb['domain_error_empty'] = 'Domena jest pusta.';
+$wb['domain_error_unique'] = 'Duplikat domeny.';
+$wb['domain_error_regex'] = 'Niepoprawna nazwa domeny.';
+$wb['client_txt'] = 'Klient';
+$wb['limit_maildomain_txt'] = 'Maksymalna ilość domen e-mail dla Twojego konta została perzekroczona.';
+$wb['policy_txt'] = 'Filtr spamu';
+$wb['no_policy'] = '-nie używane-';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
new file mode 100644
index 0000000..c77cc73
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['domain_txt'] = 'Domena';
+$wb['destination_txt'] = 'Element docelowy';
+$wb['active_txt'] = 'Aktywny';
+$wb['domain_error_unique'] = 'Jest już wpis Catchall dla tej domeny.';
+$wb['no_domain_perm'] = 'Nie masz dostępu do tej domeny.';
+$wb['domain_error_regex'] = 'Nieprawidłowa nazwa domeny. Domena zawiera niedozolone znaki.';
+$wb['limit_mailcatchall_txt'] = 'Maksymalna ilość kont e-mial catchall dla Twojej domeny została przekroczona.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
new file mode 100644
index 0000000..1f0aad1
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'E-mail Catchall';
+$wb['active_txt'] = 'Aktywny';
+$wb['source_txt'] = 'źródło';
+$wb['destination_txt'] = 'Element docelowy adresu E-mail';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['add_new_record_txt'] = 'Dodaj nowy Catchall';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_list.lng
new file mode 100644
index 0000000..ec51e2c
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Domena E-mail';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['add_new_record_txt'] = 'Dodaj nową domenę';
+$wb['active_txt'] = 'Aktywny';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_forward.lng b/interface/web/mail/lib/lang/pl_mail_forward.lng
new file mode 100644
index 0000000..f5b5fa7
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_forward.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['email_txt'] = 'E-mail';
+$wb['destination_txt'] = 'Element docelowy E-mail';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_mailforward_txt'] = 'Maksymalna ilość przekierowań e-mail dla Twojego konta została przekroczona.';
+$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_forward_list.lng b/interface/web/mail/lib/lang/pl_mail_forward_list.lng
new file mode 100644
index 0000000..1044bd5
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_forward_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Przekierowanie E-mail';
+$wb['active_txt'] = 'Aktywny';
+$wb['source_txt'] = 'źródło';
+$wb['destination_txt'] = 'Element docelowy';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Dodaj nowe przekierowanie E-mail';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng
new file mode 100644
index 0000000..b2a1b5c
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_get.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['type_txt'] = 'Typ';
+$wb['source_server_txt'] = 'Pop3/Imap Serwer';
+$wb['source_username_txt'] = 'Nazwa uzytkownika';
+$wb['source_password_txt'] = 'Hasło';
+$wb['source_delete_txt'] = 'Usuń adresy e-mail po odzyskaniu';
+$wb['destination_txt'] = 'Element docelowy';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_fetchmail_txt'] = 'Maksymalna ilość wpisów Fetchmail dla Twojego konta została przekroczona.';
+$wb['source_server_error_isempty'] = 'Serwer jest pusty.';
+$wb['source_username_error_isempty'] = 'Nazwa użytkownika jest pusta.';
+$wb['source_password_error_isempty'] = 'Hasło jest puste.';
+$wb['destination_error_isemail'] = 'Nie wybrano elementu docelowego.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_get_list.lng b/interface/web/mail/lib/lang/pl_mail_get_list.lng
new file mode 100644
index 0000000..cd473d9
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_get_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Pokaż adresy e-mail z zewnętrznych serwerów POP3 / IMAP';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['source_server_txt'] = 'Zewnętrzny Serwer';
+$wb['source_username_txt'] = 'Nazwa użytkownika';
+$wb['destination_txt'] = 'Element docelowy';
+$wb['add_new_record_txt'] = 'Dodaj nowe konto';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
new file mode 100644
index 0000000..3879f24
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['email_txt'] = 'E-mail';
+$wb['spam_rewrite_score_int_txt'] = 'Popraw wynik';
+$wb['spam_redirect_score_int_txt'] = 'Przekieruj wynik';
+$wb['spam_delete_score_int_txt'] = 'Usuń wynik';
+$wb['spam_rewrite_subject_txt'] = 'Popraw temat';
+$wb['spam_redirect_maildir_txt'] = 'Przekieruj skrzynkę pocztową';
+$wb['active_txt'] = 'Aktywny';
+$wb['spam_rewrite_txt'] = 'Popraw temat wiadomości e-mail z tym wynikiem.';
+$wb['spam_redirect_txt'] = 'Przekieruj wiadomość e-mail z tym wynikiem do wybranej skrzynki pocztowej.';
+$wb['spam_delete_txt'] = 'Usuń wiadomość e-mail z tym wynikiem.';
+$wb['disable_txt'] = 'Podpowiedź: Aby wyłączyć opcje filtru, ustaw wynik na 0.00.';
+$wb['email_error_isemail'] = 'Adres e-mail jest niepoprawny.';
+$wb['email_error_unique'] = 'Istnieje już wpis z filtrem spamu dla tego adresu e-mail.';
+$wb['spam_redirect_maildir_purge_txt'] = 'Wyczyść później Maildir';
+$wb['days_txt'] = 'Dni.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
new file mode 100644
index 0000000..d6097bb
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Filtr spamu';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['server_name_txt'] = 'nazwa_serwera';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Dodaj nowy wpis z filtrem spamu';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_transport.lng b/interface/web/mail/lib/lang/pl_mail_transport.lng
new file mode 100644
index 0000000..035a5b0
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_transport.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['destination_txt'] = 'Element docelowy';
+$wb['type_txt'] = 'Typ';
+$wb['mx_txt'] = 'Brak MX';
+$wb['sort_order_txt'] = 'Sortuj według';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_mailrouting_txt'] = 'Maksymalna ilość ścieżek dla Twojego konta została przekroczona.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_transport_list.lng b/interface/web/mail/lib/lang/pl_mail_transport_list.lng
new file mode 100644
index 0000000..fa5c584
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_transport_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Zaawansowane ścieżki E-mail';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['transport_txt'] = 'Przenieś';
+$wb['sort_order_txt'] = 'Sortuj według';
+$wb['add_new_record_txt'] = 'Dodaj nowe przeniesienie';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng
new file mode 100644
index 0000000..22e2f4c
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -0,0 +1,31 @@
+<?php
+$wb['custom_mailfilter_txt'] = 'Standardowy filtr e-mail';
+$wb['email_txt'] = 'E-mail';
+$wb['cryptpwd_txt'] = 'Hasło';
+$wb['password_strength_txt'] = 'Siła hasła';
+$wb['active_txt'] = 'Aktywny';
+$wb['email_error_isemail'] = 'Adres e-mail jest niepoprawny.';
+$wb['email_error_unique'] = 'Duplikat adresu e-mail.';
+$wb['autoresponder_text_txt'] = 'Tekst';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['no_domain_perm'] = 'Nie masz dostępu do tej domeny.';
+$wb['error_no_pwd'] = 'Hasło jest puste.';
+$wb['quota_error_isint'] = 'Wielkość skrzynki pocztowej musi być liczbą.';
+$wb['quota_txt'] = 'Limit';
+$wb['server_id_txt'] = 'Serwer_id';
+$wb['password_txt'] = 'Hasło';
+$wb['maildir_txt'] = 'Maildir';
+$wb['postfix_txt'] = 'Możliwe otrzymywanie';
+$wb['access_txt'] = 'Możliwy dostęp';
+$wb['policy_txt'] = 'Filtr spamu';
+$wb['no_policy'] = '- nie dostępny -';
+$wb['limit_mailbox_txt'] = 'Maksymalna ilość skrzynek pocztowych dla Twojego konta została przekroczona.';
+$wb['limit_mailquota_txt'] = 'Maxymalna pojemność skrzynki pocztowej została przekroczona. Maksymalne dostępne miejsce w MB to: ';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
+$wb['welcome_mail_subject'] = 'Witaj w swoim nowym koncie pocztowym.';
+$wb['welcome_mail_message'] = 'Witaj w swoim nowym koncie pocztowym. Admin.';
+$wb['disableimap_txt'] = 'Wyłącz IMAP';
+$wb['disablepop3_txt'] = 'Wyłącz POP3';
+$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter.lng b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
new file mode 100644
index 0000000..b960120
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['rulename_txt'] = 'Nazwa';
+$wb['action_txt'] = 'Akcja';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Aktywny';
+$wb['rulename_error_empty'] = 'Nazwa jest pusta.';
+$wb['searchterm_is_empty'] = 'Szukany termin jest pusty.';
+$wb['source_txt'] = 'Źródło';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
new file mode 100644
index 0000000..cea7c44
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['rulename_txt'] = 'Nazwa';
+$wb['add_new_record_txt'] = 'Dodaj nowy filtr';
+$wb['page_txt'] = 'Strona';
+$wb['page_of_txt'] = 'z';
+$wb['delete_confirmation'] = 'Do you really want to Delete the mailfilter?';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user_list.lng b/interface/web/mail/lib/lang/pl_mail_user_list.lng
new file mode 100644
index 0000000..c8e7a4f
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Skrzynka pocztowa';
+$wb['email_txt'] = 'E-mail';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['add_new_record_txt'] = 'Dodaj nową skrzynkę pocztową';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
new file mode 100644
index 0000000..b978068
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Ruch wiadomości';
+$wb['email_txt'] = 'E-mail';
+$wb['this_month_txt'] = 'Ten miesiąc';
+$wb['last_month_txt'] = 'Ostatni miesiąc';
+$wb['this_year_txt'] = 'Ten rok';
+$wb['last_year_txt'] = 'Ostatni rok';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist.lng b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
new file mode 100644
index 0000000..203c5ba
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['source_txt'] = 'Adres białej listy';
+$wb['recipient_txt'] = 'Odbiorca';
+$wb['active_txt'] = 'Aktywny';
+$wb['source_error_notempty'] = 'Adres jest pusty.';
+$wb['type_txt'] = 'Typ';
+$wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta zosała przekroczona.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
new file mode 100644
index 0000000..10e6dfc
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'E-mail białej listy';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['source_txt'] = 'Adres dodany do białej listy';
+$wb['type_txt'] = 'Typ';
+$wb['recipient_txt'] = 'odbiorca';
+$wb['add_new_record_txt'] = 'Dodaj nowy wpis białej listy';
+$wb['access_txt'] = 'dostęp';
+?>
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
new file mode 100644
index 0000000..6da8ddc
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Użytkownik';
+$wb['email_txt'] = 'E-mail';
+$wb['priority_txt'] = 'Priorytet';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_spamfilter_wblist_txt'] = 'Maksymalna ilość wpisów do białej i czarnej listy dla Twojego konta została przekroczona.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
new file mode 100644
index 0000000..c237a7a
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Filtr spamu czarnej listy';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['priority_txt'] = 'Priorytet';
+$wb['rid_txt'] = 'Użytkownik';
+$wb['email_txt'] = 'E-mail dodany do czarnej listy';
+$wb['add_new_record_txt'] = 'Dodaj wpis czarnej listy';
+?>
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config.lng b/interface/web/mail/lib/lang/pl_spamfilter_config.lng
new file mode 100644
index 0000000..c750d95
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config.lng
@@ -0,0 +1,20 @@
+<?php
+$wb['getmail_config_dir_txt'] = 'Ścieżka konfiguracyjna Getmail';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['netmask_txt'] = 'Maska';
+$wb['gateway_txt'] = 'Bramka';
+$wb['hostname_txt'] = 'Nazwa serwera';
+$wb['nameservers_txt'] = 'Nazwy serwerów';
+$wb['module_txt'] = 'Moduł serwera';
+$wb['maildir_path_txt'] = 'Ścieżka Maildir';
+$wb['homedir_path_txt'] = 'Ścieżka Homedir';
+$wb['mailuser_uid_txt'] = 'UID użytkownika e-mail';
+$wb['mailuser_gid_txt'] = 'GID użytkownika e-mail';
+$wb['mailuser_name_txt'] = 'Nazwa użytkownika e-mail';
+$wb['mailuser_group_txt'] = 'Grupa użytkownika e-mail';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Użytkownik Relayhost';
+$wb['relayhost_password_txt'] = 'Hasło Relayhost';
+$wb['mailbox_size_limit_txt'] = 'Limit wielkości skrzynki pocztowej';
+$wb['message_size_limit_txt'] = 'Limit wielkości wiadomości';
+?>
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
new file mode 100644
index 0000000..45b3f31
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Konfiguracja serwer';
+$wb['server_name_txt'] = 'Serwer';
+$wb['server_id_txt'] = 'id_serwera';
+?>
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
new file mode 100644
index 0000000..0e4df55
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
@@ -0,0 +1,38 @@
+<?php
+$wb['policy_name_txt'] = 'Nazwa polityki';
+$wb['virus_lover_txt'] = 'Przyjmuj wirusy';
+$wb['spam_lover_txt'] = 'Przyjmuj SPAM';
+$wb['banned_files_lover_txt'] = 'Przyjmuj zablokowane pliki';
+$wb['bad_header_lover_txt'] = 'Przyjmuj złe nagłowki';
+$wb['bypass_virus_checks_txt'] = 'Omijaj zaznaczone jako wirus';
+$wb['bypass_banned_checks_txt'] = 'Omijaj zaznaczone jako zabrobione';
+$wb['bypass_header_checks_txt'] = 'Omijaj zaznaczone jako złe nagłowki';
+$wb['virus_quarantine_to_txt'] = 'Przekieruj wirusy na adres e-mail';
+$wb['spam_quarantine_to_txt'] = 'Przekieruj spam na adres e-mail';
+$wb['banned_quarantine_to_txt'] = 'Przekieruj zabronione na adres e-mail';
+$wb['bad_header_quarantine_to_txt'] = 'Przekieruj złe nagłowki na adres e-mail';
+$wb['clean_quarantine_to_txt'] = 'Przekieruj czyste na adres e-mail';
+$wb['other_quarantine_to_txt'] = 'Przekieruj inne na adres e-mail';
+$wb['spam_tag_level_txt'] = 'Poziom oznaczania spamu';
+$wb['spam_tag2_level_txt'] = 'Poziom oznaczania spamu 2';
+$wb['spam_kill_level_txt'] = 'Poziom usunięcia spamu';
+$wb['spam_dsn_cutoff_level_txt'] = 'Poziom spam przy którym nastąpi odcięcie dns';
+$wb['spam_quarantine_cutoff_level_txt'] = 'Poziom spam przy którym nastąpi odcięcie kwarantanny';
+$wb['spam_modifies_subj_txt'] = 'Modyfikacja tematu';
+$wb['spam_subject_tag_txt'] = 'Przedrostek tematu ze spamem';
+$wb['spam_subject_tag2_txt'] = 'Przedrostek tematu ze spamem 2';
+$wb['addr_extension_virus_txt'] = 'Przedrostek z informacją o wirusie';
+$wb['addr_extension_spam_txt'] = 'Przedrostek z informacją o spamie';
+$wb['addr_extension_banned_txt'] = 'Przedrostek z informacją o zablokowanej treści';
+$wb['addr_extension_bad_header_txt'] = 'Przedrostek z informacją o złych nagłówkach';
+$wb['warnvirusrecip_txt'] = 'Ostrzeż odbiorcę o wirusie';
+$wb['warnbannedrecip_txt'] = 'Ostrzeż odbiorcę o zablokowanej trści';
+$wb['warnbadhrecip_txt'] = 'Ostrzeż odbiorcę o złych nagłówkach';
+$wb['newvirus_admin_txt'] = 'Admin obsługi nowych wirusów';
+$wb['virus_admin_txt'] = 'Admin obsługi wirusów';
+$wb['banned_admin_txt'] = 'Admin obłsugi zablokowanych treści';
+$wb['bad_header_admin_txt'] = 'Admin obsługi złych nagłowków';
+$wb['spam_admin_txt'] = 'Admin obsługi spamu';
+$wb['message_size_limit_txt'] = 'Limit wielkości wiadomości';
+$wb['banned_rulenames_txt'] = 'Zabrobione nazwy zasad';
+?>
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
new file mode 100644
index 0000000..43d9d41
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Polityka filtrów spamu';
+$wb['policy_name_txt'] = 'Nazwa';
+$wb['virus_lover_txt'] = 'Przyjmuj wirusy';
+$wb['spam_lover_txt'] = 'Przyjmuj spam';
+$wb['banned_files_lover_txt'] = 'Przyjmuj zablokowane pliki';
+$wb['bad_header_lover_txt'] = 'Przyjmuj złe nagłowki';
+$wb['add_new_record_txt'] = 'Dodaj wpis plityki';
+?>
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users.lng b/interface/web/mail/lib/lang/pl_spamfilter_users.lng
new file mode 100644
index 0000000..573f9be
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['priority_txt'] = 'Priorytet';
+$wb['policy_id_txt'] = 'Polityka';
+$wb['email_txt'] = 'Email (Wzór)';
+$wb['fullname_txt'] = 'Nazwa';
+$wb['local_txt'] = 'Lokalne';
+?>
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
new file mode 100644
index 0000000..dde2a62
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Filtr spamu użytkowników';
+$wb['local_txt'] = 'Lokalny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['priority_txt'] = 'Priorytet';
+$wb['policy_id_txt'] = 'Polityka';
+$wb['fullname_txt'] = 'Nazwa';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Dodaj filtr spamu użytkownika';
+?>
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
new file mode 100644
index 0000000..be83601
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Użytkownik';
+$wb['email_txt'] = 'E-mail';
+$wb['priority_txt'] = 'Priorytet';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_spamfilter_wblist_txt'] = 'Maksymalna liczba wpisów białej lub czarnej listy została przekroczona.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
new file mode 100644
index 0000000..6517cf4
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Filtrs spamu białej listy';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['priority_txt'] = 'Priorytet';
+$wb['rid_txt'] = 'Użytkownik';
+$wb['email_txt'] = 'Adres e-mail dodany do białej listy';
+$wb['add_new_record_txt'] = 'Dodaj wpis do białej listy';
+?>
diff --git a/interface/web/mail/mail_alias_edit.php b/interface/web/mail/mail_alias_edit.php
index b6ce17f..ead9bc2 100644
--- a/interface/web/mail/mail_alias_edit.php
+++ b/interface/web/mail/mail_alias_edit.php
@@ -120,8 +120,8 @@
 		unset($this->dataRecord["email_local_part"]);
 		unset($this->dataRecord["email_domain"]);
 		
-		//* Check if there is no mailbox with this address
-		$tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE email = '".$app->db->quote($this->dataRecord["source"])."'");
+		//* Check if there is no active mailbox with this address
+		$tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE postfix = 'y' AND email = '".$app->db->quote($this->dataRecord["source"])."'");
 		if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_mailbox_txt")."<br>";
 		unset($tmp);
 		
diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
index f89cd36..33f86f5 100644
--- a/interface/web/mail/mail_forward_edit.php
+++ b/interface/web/mail/mail_forward_edit.php
@@ -117,8 +117,8 @@
 		unset($this->dataRecord["email_local_part"]);
 		unset($this->dataRecord["email_domain"]);
 		
-		//* Check if there is no mailbox with this address
-		$tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE email = '".$app->db->quote($this->dataRecord["source"])."'");
+		//* Check if there is no active mailbox with this address
+		$tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE postfix = 'y' AND email = '".$app->db->quote($this->dataRecord["source"])."'");
 		if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_mailbox_txt")."<br>";
 		unset($tmp);
 		
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 9289eeb..05ddeeb 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -182,7 +182,7 @@
 			$this->dataRecord["gid"] = $mail_config["mailuser_gid"];
 			
 			//* Check if there is no alias or forward with this address
-			$tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE source = '".$app->db->quote($this->dataRecord["email"])."'");
+			$tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE active = 'y' AND source = '".$app->db->quote($this->dataRecord["email"])."'");
 			if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_alias_or_forward_txt")."<br>";
 			unset($tmp);
 			
diff --git a/interface/web/mail/mail_user_filter_edit.php b/interface/web/mail/mail_user_filter_edit.php
index 89f4b4f..72f13c9 100644
--- a/interface/web/mail/mail_user_filter_edit.php
+++ b/interface/web/mail/mail_user_filter_edit.php
@@ -70,6 +70,7 @@
 		
 		$mailuser = $app->db->queryOneRecord("SELECT sys_groupid, custom_mailfilter FROM mail_user WHERE mailuser_id = ".$this->dataRecord["mailuser_id"]);
 		$rule_content = $mailuser['custom_mailfilter']."\n".$app->db->quote($this->getRule());
+		$rule_content = $app->db->quote($rule_content);
 		$app->db->datalogUpdate('mail_user', "custom_mailfilter = '$rule_content'", 'mailuser_id', $this->dataRecord["mailuser_id"]);
 		
 		// set permissions
@@ -104,7 +105,7 @@
 			$out .= $this->getRule();
 		}
 		
-		$out = mysql_real_escape_string($out);
+		$out = $app->db->quote($out);
 		$app->db->datalogUpdate('mail_user', "custom_mailfilter = '$out'", 'mailuser_id', $this->dataRecord["mailuser_id"]);
 	
 	}
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm
index 671a0fb..c884a67 100644
--- a/interface/web/mail/templates/mail_alias_list.htm
+++ b/interface/web/mail/templates/mail_alias_list.htm
@@ -1,57 +1,57 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_mail_alias">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_alias_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
-            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_alias_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
-            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_alias_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
-            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_alias_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_alias">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_alias_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_alias_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_alias_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_alias_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm
index 29ad203..afbc695 100644
--- a/interface/web/mail/templates/mail_blacklist_list.htm
+++ b/interface/web/mail/templates/mail_blacklist_list.htm
@@ -1,60 +1,60 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_mail_blacklist">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_blacklist_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
-            <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
-            <td class="tbl_col_type"><select name="search_type" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_type'}</select></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
-            <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_blacklist">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_blacklist_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+            <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+            <td class="tbl_col_type"><select name="search_type" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_type'}</select></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+            <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm
index 9548b88..bbc1f6c 100644
--- a/interface/web/mail/templates/mail_content_filter_list.htm
+++ b/interface/web/mail/templates/mail_content_filter_list.htm
@@ -1,60 +1,60 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_mail_content_filter">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_content_filter_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_pattern" scope="col"><tmpl_var name="pattern_txt"></th>
-            <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_pattern"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></td>
-            <td class="tbl_col_action"><select name="search_action" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_action'}</select></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_pattern"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="pattern"}</a></td>
-            <td class="tbl_col_action"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="action"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_content_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_content_filter">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_content_filter_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_pattern" scope="col"><tmpl_var name="pattern_txt"></th>
+            <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_pattern"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></td>
+            <td class="tbl_col_action"><select name="search_action" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_action'}</select></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_pattern"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="pattern"}</a></td>
+            <td class="tbl_col_action"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="action"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_content_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm
index 7bf6381..50f289a 100644
--- a/interface/web/mail/templates/mail_domain_catchall_list.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_list.htm
@@ -1,57 +1,57 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_mail_domain_catchall">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_catchall_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
-            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_catchall_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
-            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
-            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_catchall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_domain_catchall">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_catchall_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_catchall_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_catchall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm
index 1039d5f..487cfb4 100644
--- a/interface/web/mail/templates/mail_domain_list.htm
+++ b/interface/web/mail/templates/mail_domain_list.htm
@@ -1,57 +1,57 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_mail_domain">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_domain">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm
index 7d0313a..d90de08 100644
--- a/interface/web/mail/templates/mail_forward_list.htm
+++ b/interface/web/mail/templates/mail_forward_list.htm
@@ -1,57 +1,57 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_mail_forward">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_forward_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
-            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_forward_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
-            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_forward_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
-            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_forward_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_forward">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_forward_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_forward_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_forward_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_forward_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm
index 1072e41..0a66b47 100644
--- a/interface/web/mail/templates/mail_get_list.htm
+++ b/interface/web/mail/templates/mail_get_list.htm
@@ -1,63 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_mail_get">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_get_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_source_server" scope="col"><tmpl_var name="source_server_txt"></th>
-            <th class="tbl_col_source_username" scope="col"><tmpl_var name="source_username_txt"></th>
-            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_source_server"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></td>
-            <td class="tbl_col_source_username"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></td>
-            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_get_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_source_server"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_server"}</a></td>
-            <td class="tbl_col_source_username"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_username"}</a></td>
-            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_get_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_get">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_get_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_source_server" scope="col"><tmpl_var name="source_server_txt"></th>
+            <th class="tbl_col_source_username" scope="col"><tmpl_var name="source_username_txt"></th>
+            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_source_server"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></td>
+            <td class="tbl_col_source_username"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></td>
+            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_get_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_source_server"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_server"}</a></td>
+            <td class="tbl_col_source_username"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_username"}</a></td>
+            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_get_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm
index d7d56e4..a9ad450 100644
--- a/interface/web/mail/templates/mail_transport_list.htm
+++ b/interface/web/mail/templates/mail_transport_list.htm
@@ -1,63 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_mail_transport">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_transport_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_transport" scope="col"><tmpl_var name="transport_txt"></th>
-            <th class="tbl_col_sort_order" scope="col"><tmpl_var name="sort_order_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_transport_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_transport_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-            <td class="tbl_col_transport"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></td>
-            <td class="tbl_col_sort_order"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_transport_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
-            <td class="tbl_col_transport"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="transport"}</a></td>
-            <td class="tbl_col_sort_order"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sort_order"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_transport_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_transport">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_transport_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+            <th class="tbl_col_transport" scope="col"><tmpl_var name="transport_txt"></th>
+            <th class="tbl_col_sort_order" scope="col"><tmpl_var name="sort_order_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_transport_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_transport_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+            <td class="tbl_col_transport"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></td>
+            <td class="tbl_col_sort_order"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_transport_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+            <td class="tbl_col_transport"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="transport"}</a></td>
+            <td class="tbl_col_sort_order"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sort_order"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_transport_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm
index a2c7d15..be85427 100644
--- a/interface/web/mail/templates/mail_user_filter_list.htm
+++ b/interface/web/mail/templates/mail_user_filter_list.htm
@@ -1,45 +1,45 @@
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mail/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mail/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
index 8ed1360..fc04406 100644
--- a/interface/web/mail/templates/mail_user_list.htm
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -1,55 +1,55 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_mail_user">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
-            <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
-            <td class="tbl_col_autoresponder"><input type="text" name="search_autoresponder" value="{tmpl_var name='search_autoresponder'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
-            <td class="tbl_col_autoresponder"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <tmpl_if name="mailboxlist_webmail_link"><a class="icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_user">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+            <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+            <td class="tbl_col_autoresponder"><input type="text" name="search_autoresponder" value="{tmpl_var name='search_autoresponder'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+            <td class="tbl_col_autoresponder"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <tmpl_if name="mailboxlist_webmail_link"><a class="icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm
index 4a3fc1a..75ad06a 100644
--- a/interface/web/mail/templates/mail_whitelist_list.htm
+++ b/interface/web/mail/templates/mail_whitelist_list.htm
@@ -1,60 +1,60 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_mail_whitelist">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_whitelist_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
-            <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
-            <td class="tbl_col_type"><select name="search_type" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_type'}</select></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
-            <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_whitelist">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_whitelist_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+            <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+            <td class="tbl_col_type"><select name="search_type" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_type'}</select></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+            <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm
index 38b47df..81ee455 100644
--- a/interface/web/mail/templates/spamfilter_blacklist_list.htm
+++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm
@@ -1,63 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_spamfilter_blacklist">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_blacklist_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
-            <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
-            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_priority"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_priority'}</select></td>
-            <td class="tbl_col_rid"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_rid'}</select></td>
-            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
-            <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
-            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_blacklist">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_blacklist_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+            <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
+            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_priority"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_priority'}</select></td>
+            <td class="tbl_col_rid"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_rid'}</select></td>
+            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+            <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
+            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm
index 7ff6e67..cb16ef4 100644
--- a/interface/web/mail/templates/spamfilter_config_list.htm
+++ b/interface/web/mail/templates/spamfilter_config_list.htm
@@ -1,51 +1,51 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_spamfilter_config">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_config_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('mail/spamfilter_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_config">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_config_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('mail/spamfilter_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm
index 20cf2ff..40b3ba4 100644
--- a/interface/web/mail/templates/spamfilter_policy_list.htm
+++ b/interface/web/mail/templates/spamfilter_policy_list.htm
@@ -1,63 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_spamfilter_policy">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_policy_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_policy_name" scope="col"><tmpl_var name="policy_name_txt"></th>
-            <th class="tbl_col_virus_lover" scope="col"><tmpl_var name="virus_lover_txt"></th>
-            <th class="tbl_col_spam_lover" scope="col"><tmpl_var name="spam_lover_txt"></th>
-            <th class="tbl_col_banned_files_lover" scope="col"><tmpl_var name="banned_files_lover_txt"></th>
-            <th class="tbl_col_bad_header_lover" scope="col"><tmpl_var name="bad_header_lover_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_policy_name"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
-            <td class="tbl_col_virus_lover"><select name="search_virus_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_virus_lover'}</select></td>
-            <td class="tbl_col_spam_lover"><select name="search_spam_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_spam_lover'}</select></td>
-            <td class="tbl_col_banned_files_lover"><select name="search_banned_files_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_banned_files_lover'}</select></td>
-            <td class="tbl_col_bad_header_lover"><select name="search_bad_header_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_bad_header_lover'}</select></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_policy_name"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_name"}</a></td>
-            <td class="tbl_col_virus_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virus_lover"}</a></td>
-            <td class="tbl_col_spam_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="spam_lover"}</a></td>
-            <td class="tbl_col_banned_files_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="banned_files_lover"}</a></td>
-            <td class="tbl_col_bad_header_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="bad_header_lover"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_policy_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_policy">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_policy_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_policy_name" scope="col"><tmpl_var name="policy_name_txt"></th>
+            <th class="tbl_col_virus_lover" scope="col"><tmpl_var name="virus_lover_txt"></th>
+            <th class="tbl_col_spam_lover" scope="col"><tmpl_var name="spam_lover_txt"></th>
+            <th class="tbl_col_banned_files_lover" scope="col"><tmpl_var name="banned_files_lover_txt"></th>
+            <th class="tbl_col_bad_header_lover" scope="col"><tmpl_var name="bad_header_lover_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_policy_name"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
+            <td class="tbl_col_virus_lover"><select name="search_virus_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_virus_lover'}</select></td>
+            <td class="tbl_col_spam_lover"><select name="search_spam_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_spam_lover'}</select></td>
+            <td class="tbl_col_banned_files_lover"><select name="search_banned_files_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_banned_files_lover'}</select></td>
+            <td class="tbl_col_bad_header_lover"><select name="search_bad_header_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_bad_header_lover'}</select></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_policy_name"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_name"}</a></td>
+            <td class="tbl_col_virus_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virus_lover"}</a></td>
+            <td class="tbl_col_spam_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="spam_lover"}</a></td>
+            <td class="tbl_col_banned_files_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="banned_files_lover"}</a></td>
+            <td class="tbl_col_bad_header_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="bad_header_lover"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_policy_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm
index 43296c0..e949c8b 100644
--- a/interface/web/mail/templates/spamfilter_users_list.htm
+++ b/interface/web/mail/templates/spamfilter_users_list.htm
@@ -1,63 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_spamfilter_users">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_users_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_local" scope="col"><tmpl_var name="local_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
-            <th class="tbl_col_policy_id" scope="col"><tmpl_var name="policy_id_txt"></th>
-            <th class="tbl_col_fullname" scope="col"><tmpl_var name="fullname_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_local"><select name="search_local" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_local'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_priority"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_priority'}</select></td>
-            <td class="tbl_col_policy_id"><select name="search_policy_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_policy_id'}</select></td>
-            <td class="tbl_col_fullname"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_local"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="local"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
-            <td class="tbl_col_policy_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_id"}</a></td>
-            <td class="tbl_col_fullname"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="fullname"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_users">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_users_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_local" scope="col"><tmpl_var name="local_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+            <th class="tbl_col_policy_id" scope="col"><tmpl_var name="policy_id_txt"></th>
+            <th class="tbl_col_fullname" scope="col"><tmpl_var name="fullname_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_local"><select name="search_local" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_local'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_priority"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_priority'}</select></td>
+            <td class="tbl_col_policy_id"><select name="search_policy_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_policy_id'}</select></td>
+            <td class="tbl_col_fullname"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_local"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="local"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+            <td class="tbl_col_policy_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_id"}</a></td>
+            <td class="tbl_col_fullname"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="fullname"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm
index 3a79422..417e34d 100644
--- a/interface/web/mail/templates/spamfilter_whitelist_list.htm
+++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm
@@ -1,63 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_spamfilter_whitelist">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_whitelist_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
-            <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
-            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_priority"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_priority'}</select></td>
-            <td class="tbl_col_rid"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_rid'}</select></td>
-            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
-            <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
-            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_whitelist">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_whitelist_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+            <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
+            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_priority"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_priority'}</select></td>
+            <td class="tbl_col_rid"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_rid'}</select></td>
+            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+            <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
+            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/monitor/datalog_list.php b/interface/web/monitor/datalog_list.php
index 3dc9f86..4402b33 100644
--- a/interface/web/monitor/datalog_list.php
+++ b/interface/web/monitor/datalog_list.php
@@ -49,8 +49,8 @@
 $servers = $app->db->queryAllRecords("SELECT server_id, updated FROM server");
 
 $sql = '(';
-foreach($servers as $s) {
-	$sql .= " (datalog_id > ".$s['updated']." AND server_id = ".$s['server_id'].") OR ";
+foreach($servers as $sv) {
+	$sql .= " (datalog_id > ".$sv['updated']." AND server_id = ".$sv['server_id'].") OR ";
 }
 $sql = substr($sql,0,-4);
 $sql .= ')';
diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng
index e04c601..a631ee3 100644
--- a/interface/web/monitor/lib/lang/br.lng
+++ b/interface/web/monitor/lib/lang/br.lng
@@ -26,7 +26,7 @@
 $wb['Show Overview'] = 'Exibir Visão Geral';
 $wb['System State (All Servers)'] = 'Estado do Sistema (Todos os Servidores)';
 $wb['Hardware-Information'] = 'Informação de Hardware';
-$wb['Show CPU info'] = 'Exibir informações da UCP';
+$wb['Show CPU info'] = 'Exibir informações da CPU';
 $wb['Server State'] = 'Estado do Servidor';
 $wb['Show Update State'] = 'Exiba Status Atualizado';
 $wb['Show RAID state'] = 'Exiba Status do RAID';
diff --git a/interface/web/monitor/lib/lang/br_datalog_list.lng b/interface/web/monitor/lib/lang/br_datalog_list.lng
new file mode 100644
index 0000000..4920bfc
--- /dev/null
+++ b/interface/web/monitor/lib/lang/br_datalog_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Fila de Trabalho';
+$wb['tstamp_txt'] = 'Data';
+$wb['server_id_txt'] = 'Servidor';
+$wb['dbtable_txt'] = 'Tabela BD';
+$wb['action_txt'] = 'Ação';
+$wb['status_txt'] = 'Status';
+?>
+
diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng
new file mode 100644
index 0000000..83db070
--- /dev/null
+++ b/interface/web/monitor/lib/lang/hu.lng
@@ -0,0 +1,138 @@
+<?php
+$wb['Server online since'] = 'Szerver műkődési idő';
+$wb['Users online'] = 'Online felhasználók';
+$wb['System load 1 minute'] = 'Rendszer load 1 az elmúlt 1 percben';
+$wb['System load 5 minutes'] = 'Rendszer load 5 az elmúlt 1 percben';
+$wb['System load 15 minutes'] = 'Rendszer load 15 az elmúlt 1 percben';
+$wb['Server Load'] = 'Szerver Load';
+$wb['Disk usage'] = 'Lemez kihasználtság';
+$wb['Memory usage'] = 'Memória használat';
+$wb['no_data_serverload_txt'] = 'Nincs adat a szerver terheléséről';
+$wb['no_data_memusage_txt'] = 'Nincs adat a memória használatról';
+$wb['no_data_diskusage_txt'] = 'Nincs adat a lemez kihasználtságról';
+$wb['no_data_cpuinfo_txt'] = 'Nincs adat a processzor használatról';
+$wb['no_data_services_txt'] = 'Nincs adat a szolgáltatásokról';
+$wb['no_logdata_txt'] = 'Nincs adat a naplófájlokról';
+$wb['Monitoring'] = 'Monitorozás';
+$wb['Server to Monitor'] = 'Monitorozott szerver';
+$wb['Logfiles'] = 'Naplófájlok';
+$wb['Status of services'] = 'Szolgáltatások állapota';
+$wb['No Refresh'] = 'Nincs frissités';
+$wb['minutes'] = 'percenként';
+$wb['no_data_updates_txt'] = 'No data about updates available at the moment. Please check again later.';
+$wb['no_data_raid_txt'] = 'No data about RAID available at the moment. Please check again later.';
+$wb['no_data_rkhunter_txt'] = 'No data about RKHunter available at the moment. Please check again later.';
+$wb['no_data_mailq_txt'] = 'No data Mailqueue available at the moment. Please check again later.';
+$wb['Show Overview'] = 'Show Overview';
+$wb['System State (All Servers)'] = 'System State (All Servers)';
+$wb['Hardware-Information'] = 'Hardware-Information';
+$wb['Show CPU info'] = 'Show CPU info';
+$wb['Server State'] = 'Server State';
+$wb['Show Update State'] = 'Show Update State';
+$wb['Show RAID state'] = 'Show RAID state';
+$wb['Show Server load'] = 'Show Server load';
+$wb['Show Disk usage'] = 'Show Disk usage';
+$wb['Show Memory usage'] = 'Show Memory usage';
+$wb['Show Services'] = 'Show Services';
+$wb['Show Mail-Queue'] = 'Show Mail-Queue';
+$wb['Show Mail-Log'] = 'Show Mail-Log';
+$wb['Show Mail warn-Log'] = 'Show Mail warn-Log';
+$wb['Show Mail err-Log'] = 'Show Mail err-Log';
+$wb['Show System-Log'] = 'Show System-Log';
+$wb['Show ISPC Cron-Log'] = 'Show ISPC Cron-Log';
+$wb['Show Freshclam-Log'] = 'Show Freshclam-Log';
+$wb['Show Clamav-Log'] = 'Show Clamav-Log';
+$wb['Show ISPConfig-Log'] = 'Show ISPConfig-Log';
+$wb['Show RKHunter-Log'] = 'Show RKHunter-Log';
+$wb['Show Jobqueue'] = 'Show Jobqueue';
+$wb['monitor_general_serverstate_txt'] = 'Server State';
+$wb['monitor_general_systemstate_txt'] = 'System State';
+$wb['monitor_diskusage_filesystem_txt'] = 'Filesystem';
+$wb['monitor_diskusage_type_txt'] = 'Type';
+$wb['monitor_diskusage_size_txt'] = 'Size';
+$wb['monitor_diskusage_used_txt'] = 'Used';
+$wb['monitor_diskusage_available_txt'] = 'Available';
+$wb['monitor_diskusage_usage_txt'] = 'Use%';
+$wb['monitor_diskusage_mounted_txt'] = 'Mounted on';
+$wb['monitor_logs_mail_txt'] = 'Mail - Log';
+$wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log';
+$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log';
+$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
+$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
+$wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
+$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
+$wb['monitor_nomdadm_txt'] = 'mdadm is not installed or your Server has no supported RAID';
+$wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data';
+$wb['monitor_serverstate_server_txt'] = 'Server';
+$wb['monitor_serverstate_state_txt'] = 'State';
+$wb['monitor_serverstate_unknown_txt'] = 'unknown';
+$wb['monitor_serverstate_info_txt'] = 'info';
+$wb['monitor_serverstate_warning_txt'] = 'warning';
+$wb['monitor_serverstate_critical_txt'] = 'critical';
+$wb['monitor_serverstate_error_txt'] = 'error';
+$wb['monitor_serverstate_moreinfo_txt'] = 'More information...';
+$wb['monitor_serverstate_more_txt'] = 'More...';
+$wb['monitor_serverstate_fclamok_txt'] = 'Your Virus-protection is ok';
+$wb['monitor_serverstate_fclamoutdated_txt'] = 'Your Virus-protection is OUTDATED!';
+$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!';
+$wb['monitor_serverstate_hdok_txt'] = 'The state of your Hard-Disk space is ok';
+$wb['monitor_serverstate_hdgoingfull_txt'] = 'Your Hard-Disk space is going full';
+$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Your Hard-Disk is nearly full';
+$wb['monitor_serverstate_hdveryfull_txt'] = 'Your Hard-Disk is very full';
+$wb['monitor_serverstate_hdfull_txt'] = 'Your Hard-Disk has no more space left';
+$wb['monitor_serverstate_hdunknown_txt'] = 'Hard-Disk: ???';
+$wb['monitor_serverstate_listok_txt'] = 'ok';
+$wb['monitor_serverstate_listinfo_txt'] = 'info';
+$wb['monitor_serverstate_listwarning_txt'] = 'warning';
+$wb['monitor_serverstate_listcritical_txt'] = 'critical';
+$wb['monitor_serverstate_listerror_txt'] = 'error';
+$wb['monitor_serverstate_listunknown_txt'] = 'unknown';
+$wb['monitor_serverstate_loadok_txt'] = 'Your Server load is ok';
+$wb['monitor_serverstate_loadheavy_txt'] = 'Your Server in under heavy load';
+$wb['monitor_serverstate_loadhigh_txt'] = 'Your Server in under high load';
+$wb['monitor_serverstate_loaghigher_txt'] = 'Your Server in under higher load';
+$wb['monitor_serverstate_loadhighest_txt'] = 'Your Server in under highest load';
+$wb['monitor_serverstate_loadunknown_txt'] = 'Server Load: ???';
+$wb['monitor_serverstate_mailqok_txt'] = 'Your Mailq load is ok';
+$wb['monitor_serverstate_mailqheavy_txt'] = 'Your Mailq in under heavy load';
+$wb['monitor_serverstate_mailqhigh_txt'] = 'Your Mailq in under high load';
+$wb['monitor_serverstate_mailqhigher_txt'] = 'Your Mailq in under higher load';
+$wb['monitor_serverstate_mailqhighest_txt'] = 'Your Mailq in under highest load';
+$wb['monitor_serverstate_mailqunknown_txt'] = 'Mailq: ???';
+$wb['monitor_serverstate_raidok_txt'] = 'Your RAID is ok';
+$wb['monitor_serverstate_raidresync_txt'] = 'Your RAID is in RESYNC mode';
+$wb['monitor_serverstate_raidfault_txt'] = 'Your RAID has one FAULT disk. Replace as soon as possible!';
+$wb['monitor_serverstate_raiderror_txt'] = 'Your RAID is not working anymore';
+$wb['monitor_serverstate_raidunknown_txt'] = 'RAID state: ???';
+$wb['monitor_serverstate_servicesonline_txt'] = 'All needed Services are online';
+$wb['monitor_serverstate_servicesoffline_txt'] = 'One or more needed Services are offline';
+$wb['monitor_serverstate_servicesunknown_txt'] = 'Services:???';
+$wb['monitor_serverstate_syslogok_txt'] = 'The System-Log is O.K.';
+$wb['monitor_serverstate_syslogwarning_txt'] = 'There are some warnings in your System-Log';
+$wb['monitor_serverstate_syslogerror_txt'] = 'There are errors in your System-Log';
+$wb['monitor_serverstate_syslogunknown_txt'] = 'sys-log:???';
+$wb['monitor_serverstate_updatesok_txt'] = 'Your System is up to date.';
+$wb['monitor_serverstate_updatesneeded_txt'] = 'One or more Components needs a update';
+$wb['monitor_serverstate_updatesunknown_txt'] = 'System-Update:???';
+$wb['monitor_services_online_txt'] = 'Online';
+$wb['monitor_services_offline_txt'] = 'Offline';
+$wb['monitor_services_web_txt'] = 'Web-Server:';
+$wb['monitor_services_ftp_txt'] = 'FTP-Server:';
+$wb['monitor_services_smtp_txt'] = 'SMTP-Server:';
+$wb['monitor_services_pop_txt'] = 'POP3-Server:';
+$wb['monitor_services_imap_txt'] = 'IMAP-Server:';
+$wb['monitor_services_mydns_txt'] = 'myDNS-Server:';
+$wb['monitor_services_mysql_txt'] = 'mySQL-Server:';
+$wb['monitor_settings_datafromdate_txt'] = 'Data from: ';
+$wb['monitor_settings_datetimeformat_txt'] = 'Y-m-d H:i';
+$wb['monitor_settings_refreshsq_txt'] = 'Refresh sequence:';
+$wb['monitor_settings_server_txt'] = 'Server';
+$wb['monitor_title_cpuinfo_txt'] = 'CPU Info';
+$wb['monitor_title_updatestate_txt'] = 'Update State';
+$wb['monitor_title_mailq_txt'] = 'Mailqueue';
+$wb['monitor_title_raidstate_txt'] = 'RAID-State';
+$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Log';
+$wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring';
+?>
+
diff --git a/interface/web/monitor/lib/lang/hu_datalog_list.lng b/interface/web/monitor/lib/lang/hu_datalog_list.lng
new file mode 100644
index 0000000..2ab459a
--- /dev/null
+++ b/interface/web/monitor/lib/lang/hu_datalog_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Munkamenet sor';
+$wb['tstamp_txt'] = 'Dátum';
+$wb['server_id_txt'] = 'Szerver';
+$wb['dbtable_txt'] = 'DB Tábla';
+$wb['action_txt'] = 'Művelet';
+$wb['status_txt'] = 'Állapot';
+?>
+
diff --git a/interface/web/monitor/lib/lang/hu_syslog_list.lng b/interface/web/monitor/lib/lang/hu_syslog_list.lng
new file mode 100644
index 0000000..918d490
--- /dev/null
+++ b/interface/web/monitor/lib/lang/hu_syslog_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'ISPConfig Log';
+$wb['tstamp_txt'] = 'Dátum';
+$wb['server_id_txt'] = 'Szerver';
+$wb['loglevel_txt'] = 'Naplózási szint';
+$wb['message_txt'] = 'Üzenet';
+?>
+
diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng
index 6dce3d2..fe63972 100644
--- a/interface/web/monitor/lib/lang/nl.lng
+++ b/interface/web/monitor/lib/lang/nl.lng
@@ -1,137 +1,138 @@
 <?php
-$wb['Memory usage'] = 'Memory gebruik';
-$wb['Server online since'] = 'Server online since';
-$wb['Users online'] = 'Users Online';
-$wb['System load 1 minute'] = 'System load 1 minute';
-$wb['System load 5 minutes'] = 'System load 5 minutes';
-$wb['System load 15 minutes'] = 'System load 15 minutes';
+$wb['Memory usage'] = 'Geheugengebruik';
+$wb['Server online since'] = 'Server online sinds';
+$wb['Users online'] = 'Gebruikers online';
+$wb['System load 1 minute'] = 'System load 1 minuut';
+$wb['System load 5 minutes'] = 'System load 5 minuten';
+$wb['System load 15 minutes'] = 'System load 15 minuten';
 $wb['Server Load'] = 'Server Load';
-$wb['Disk usage'] = 'Disk usage';
-$wb['no_data_serverload_txt'] = 'No data about the server load available at the moment. Please check again later.';
-$wb['no_data_memusage_txt'] = 'No data about the memory usage available at the moment. Please check again later.';
-$wb['no_data_diskusage_txt'] = 'No data about the disk usage available at the moment. Please check again later.';
-$wb['no_data_cpuinfo_txt'] = 'No data about the CPU available at the moment. Please check again later.';
-$wb['no_data_services_txt'] = 'No data about the services available at the moment. Please check again later.';
-$wb['no_logdata_txt'] = 'No log data available at the moment. Please check again later.';
-$wb['Monitoring'] = 'Monitoring';
-$wb['Server to Monitor'] = 'Server to Monitor';
-$wb['Logfiles'] = 'Logfiles';
-$wb['Status of services'] = 'Status of services';
-$wb['No Refresh'] = 'No Refresh';
-$wb['minutes'] = 'minutes';
-$wb['Show Overview'] = 'Show Overview';
-$wb['System State (All Servers)'] = 'System State (All Servers)';
-$wb['Hardware-Information'] = 'Hardware-information';
-$wb['Show CPU info'] = 'Toon CPU info';
+$wb['Disk usage'] = 'Schrijfruimte gebruik';
+$wb['no_data_serverload_txt'] = 'Er zijn op dit moment geen gegevens van de server load. Probeer het later opnieuw.';
+$wb['no_data_memusage_txt'] = 'Er zijn op dit moment geen gegevens van het geheugengebruik. Probeer het later opnieuw.';
+$wb['no_data_diskusage_txt'] = 'Er zijn op dit moment geen gegevens van het schijfruimte gebruik. Probeer het later opnieuw.';
+$wb['no_data_cpuinfo_txt'] = 'Er is op dit moment geen informatie over de CPU beschikbaar. Probeer het later opnieuw.';
+$wb['no_data_services_txt'] = 'Er zijn op dit moment geen gegevens beschikbaar van de services. Probeer het later opnieuw.';
+$wb['no_logdata_txt'] = 'Er zijn op dit moment geen logboekgegevens beschikbaar. Probeer het later opnieuw.';
+$wb['Monitoring'] = 'Controle';
+$wb['Server to Monitor'] = 'Details-status server';
+$wb['Logfiles'] = 'Toon logbestanden';
+$wb['Status of services'] = 'Status van de services';
+$wb['No Refresh'] = 'Niet vernieuwen';
+$wb['minutes'] = 'minuten';
+$wb['Show Overview'] = 'Totaaloverzicht';
+$wb['System State (All Servers)'] = 'Statussen van alle servers';
+$wb['Hardware-Information'] = 'Hardware informatie';
+$wb['Show CPU info'] = 'CPU informatie';
 $wb['Server State'] = 'Server status';
-$wb['Show Update State'] = 'Toon update status';
-$wb['Show RAID state'] = 'Toon RAID status';
-$wb['Show Server load'] = 'Toon server load';
-$wb['Show Disk usage'] = 'Toon disk gebruik';
-$wb['Show Memory usage'] = 'Toon geheugen gebruik';
-$wb['Show Services'] = 'Toon services';
-$wb['Show Mail-Queue'] = 'Toon mail-queue';
-$wb['Show Mail-Log'] = 'Toon mail-log';
-$wb['Show Mail warn-Log'] = 'Toon mail warn-log';
-$wb['Show Mail err-Log'] = 'Toon mail err-log';
-$wb['Show System-Log'] = 'Toon system-log';
-$wb['Show Freshclam-Log'] = 'Toon Freshclam-log';
-$wb['Show Clamav-Log'] = 'Toon Clamav-Log';
-$wb['Show ISPConfig-Log'] = 'Toon ISPConfig-log';
-$wb['Show RKHunter-Log'] = 'Toon RKHunter-log';
-$wb['Show Jobqueue'] = 'Toon jobqueue';
-$wb['Show ISPC Cron-Log'] = 'Toon ISPC Cron-log';
-$wb['no_data_updates_txt'] = 'No data about updates available at the moment. Please check again later.';
-$wb['no_data_raid_txt'] = 'No data about RAID available at the moment. Please check again later.';
-$wb['no_data_rkhunter_txt'] = 'No data about RKHunter available at the moment. Please check again later.';
-$wb['no_data_mailq_txt'] = 'No data Mailqueue available at the moment. Please check again later.';
-$wb['monitor_general_serverstate_txt'] = 'Server State';
-$wb['monitor_general_systemstate_txt'] = 'System State';
-$wb['monitor_diskusage_filesystem_txt'] = 'Filesystem';
+$wb['Show Update State'] = 'Updates';
+$wb['Show RAID state'] = 'RAID status';
+$wb['Show Server load'] = 'Server load';
+$wb['Show Disk usage'] = 'Schijfruimte gebruik';
+$wb['Show Memory usage'] = 'Geheugen gebruik';
+$wb['Show Services'] = 'Services';
+$wb['Show Mail-Queue'] = 'E-mail wachtrij';
+$wb['Show Mail-Log'] = 'E-Mail mail-log';
+$wb['Show Mail warn-Log'] = 'E-Mail warn-log';
+$wb['Show Mail err-Log'] = 'E-Mail mail-err-log';
+$wb['Show System-Log'] = 'Systeem logboek';
+$wb['Show Freshclam-Log'] = 'Freshclam-log';
+$wb['Show Clamav-Log'] = 'Clamav-Log';
+$wb['Show ISPConfig-Log'] = 'ISPconfig-log';
+$wb['Show RKHunter-Log'] = 'Rootkit Hunter-log';
+$wb['Show Jobqueue'] = 'ISPconfig taak-wachtrij';
+$wb['Show ISPC Cron-Log'] = 'ISPconfig Cron-log';
+$wb['no_data_updates_txt'] = 'Er zijn op dit moment geen gegevens beschikbaar. Probeer het later opnieuw.';
+$wb['no_data_raid_txt'] = 'Er is op dit moment geen RAID informatie bekend. Probeer het later opnieuw.';
+$wb['no_data_rkhunter_txt'] = 'Er is op dit moment geen informatie beschikbaar over de Rootkit Hunter. Probeer het later opnieuw.';
+$wb['no_data_mailq_txt'] = 'Er is op dit moment geen informatie van de mail wachtrij beschikbaar. Probeer het later opnieuw.';
+$wb['monitor_general_serverstate_txt'] = 'Server status';
+$wb['monitor_general_systemstate_txt'] = 'Systeemstatus';
+$wb['monitor_diskusage_filesystem_txt'] = 'Bestandssysteem';
 $wb['monitor_diskusage_type_txt'] = 'Type';
-$wb['monitor_diskusage_size_txt'] = 'Size';
-$wb['monitor_diskusage_used_txt'] = 'Used';
-$wb['monitor_diskusage_available_txt'] = 'Available';
-$wb['monitor_diskusage_usage_txt'] = 'Use%';
-$wb['monitor_diskusage_mounted_txt'] = 'Mounted on';
+$wb['monitor_diskusage_size_txt'] = 'Grootte';
+$wb['monitor_diskusage_used_txt'] = 'Gebruikt';
+$wb['monitor_diskusage_available_txt'] = 'Beschikbaar';
+$wb['monitor_diskusage_usage_txt'] = '% Gebruikt';
+$wb['monitor_diskusage_mounted_txt'] = 'Gekoppeld aan';
 $wb['monitor_logs_mail_txt'] = 'Mail - Log';
 $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log';
 $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log';
-$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
+$wb['monitor_logs_messages_txt'] = 'Systemberichten - Log';
 $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
 $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
 $wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
-$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
-$wb['monitor_nomdadm_txt'] = 'mdadm is not installed or your Server has no supported RAID';
-$wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data';
+$wb['monitor_logs_ispc_txt'] = 'ISPconfig - Log';
+$wb['monitor_nomdadm_txt'] = 'mdadm is niet geinstalleerd of deze server ondersteunt/gebruikt geen software RAID.';
+$wb['monitor_norkhunter_txt'] = 'RKHunter is niet geinstalleerd. Hierdoor is er geen informatie beschikbaar.';
 $wb['monitor_serverstate_server_txt'] = 'Server';
-$wb['monitor_serverstate_state_txt'] = 'State';
-$wb['monitor_serverstate_unknown_txt'] = 'unknown';
+$wb['monitor_serverstate_state_txt'] = 'status';
+$wb['monitor_serverstate_unknown_txt'] = 'onbekend';
 $wb['monitor_serverstate_info_txt'] = 'info';
-$wb['monitor_serverstate_warning_txt'] = 'warning';
-$wb['monitor_serverstate_critical_txt'] = 'critical';
-$wb['monitor_serverstate_error_txt'] = 'error';
-$wb['monitor_serverstate_moreinfo_txt'] = 'More information...';
-$wb['monitor_serverstate_more_txt'] = 'More...';
-$wb['monitor_serverstate_fclamok_txt'] = 'Your Virus-protection is ok';
-$wb['monitor_serverstate_fclamoutdated_txt'] = 'Your Virus-protection is OUTDATED!';
+$wb['monitor_serverstate_warning_txt'] = 'waarschuwing';
+$wb['monitor_serverstate_critical_txt'] = 'kritiek';
+$wb['monitor_serverstate_error_txt'] = 'fout';
+$wb['monitor_serverstate_moreinfo_txt'] = 'Meer informatie...';
+$wb['monitor_serverstate_more_txt'] = 'Meer...';
+$wb['monitor_serverstate_fclamok_txt'] = 'Anti-virus beveiliging werkt correct.';
+$wb['monitor_serverstate_fclamoutdated_txt'] = 'Anti-virus software is verouderd.';
 $wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!';
-$wb['monitor_serverstate_hdok_txt'] = 'The state of your Hard-Disk space is ok';
-$wb['monitor_serverstate_hdgoingfull_txt'] = 'Your Hard-Disk space is going full';
-$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Your Hard-Disk is nearly full';
-$wb['monitor_serverstate_hdveryfull_txt'] = 'Your Hard-Disk is very full';
-$wb['monitor_serverstate_hdfull_txt'] = 'Your Hard-Disk has no more space left';
-$wb['monitor_serverstate_hdunknown_txt'] = 'Hard-Disk: ???';
+$wb['monitor_serverstate_hdok_txt'] = 'Harde schijf status is OK';
+$wb['monitor_serverstate_hdgoingfull_txt'] = 'Schrijfruimte raakt geleidelijk vol';
+$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Er is nauwelijks schijfruimte beschikbaar';
+$wb['monitor_serverstate_hdveryfull_txt'] = 'Er is zeer weinig schijfruimte beschikbaar';
+$wb['monitor_serverstate_hdfull_txt'] = 'Er is geen schijfruimte beschikbaar';
+$wb['monitor_serverstate_hdunknown_txt'] = 'Harde schijf: ???';
 $wb['monitor_serverstate_listok_txt'] = 'ok';
 $wb['monitor_serverstate_listinfo_txt'] = 'info';
-$wb['monitor_serverstate_listwarning_txt'] = 'warning';
-$wb['monitor_serverstate_listcritical_txt'] = 'critical';
-$wb['monitor_serverstate_listerror_txt'] = 'error';
-$wb['monitor_serverstate_listunknown_txt'] = 'unknown';
-$wb['monitor_serverstate_loadok_txt'] = 'Your Server load is ok';
-$wb['monitor_serverstate_loadheavy_txt'] = 'Your Server in under heavy load';
-$wb['monitor_serverstate_loadhigh_txt'] = 'Your Server in under high load';
-$wb['monitor_serverstate_loaghigher_txt'] = 'Your Server in under higher load';
-$wb['monitor_serverstate_loadhighest_txt'] = 'Your Server in under highest load';
-$wb['monitor_serverstate_loadunknown_txt'] = 'Server Load: ???';
-$wb['monitor_serverstate_mailqok_txt'] = 'Your Mailq load is ok';
-$wb['monitor_serverstate_mailqheavy_txt'] = 'Your Mailq in under heavy load';
-$wb['monitor_serverstate_mailqhigh_txt'] = 'Your Mailq in under high load';
-$wb['monitor_serverstate_mailqhigher_txt'] = 'Your Mailq in under higher load';
-$wb['monitor_serverstate_mailqhighest_txt'] = 'Your Mailq in under highest load';
+$wb['monitor_serverstate_listwarning_txt'] = 'waarschuwing';
+$wb['monitor_serverstate_listcritical_txt'] = 'kritiek';
+$wb['monitor_serverstate_listerror_txt'] = 'fout';
+$wb['monitor_serverstate_listunknown_txt'] = 'onbekend';
+$wb['monitor_serverstate_loadok_txt'] = 'Server load binnen veilige marges';
+$wb['monitor_serverstate_loadheavy_txt'] = 'Server wordt bovengemiddeld belast';
+$wb['monitor_serverstate_loadhigh_txt'] = 'Server wordt zwaar belast';
+$wb['monitor_serverstate_loaghigher_txt'] = 'Server wordt erg zwaar belast';
+$wb['monitor_serverstate_loadhighest_txt'] = 'Server wordt zeer zwaar belast';
+$wb['monitor_serverstate_loadunknown_txt'] = 'Server load: ???';
+$wb['monitor_serverstate_mailqok_txt'] = 'Mailq load binnen veilige marges';
+$wb['monitor_serverstate_mailqheavy_txt'] = 'Mailq wordt bovengemiddeld belast';
+$wb['monitor_serverstate_mailqhigh_txt'] = 'Your Mailq wordt zwaar belast';
+$wb['monitor_serverstate_mailqhigher_txt'] = 'Your Mailq wordt erg zwaar belast';
+$wb['monitor_serverstate_mailqhighest_txt'] = 'Your Mailq wordt zeer zwaar belast';
 $wb['monitor_serverstate_mailqunknown_txt'] = 'Mailq: ???';
-$wb['monitor_serverstate_raidok_txt'] = 'Your RAID is ok';
-$wb['monitor_serverstate_raidresync_txt'] = 'Your RAID is in RESYNC mode';
-$wb['monitor_serverstate_raidfault_txt'] = 'Your RAID has one FAULT disk. Replace as soon as possible!';
-$wb['monitor_serverstate_raiderror_txt'] = 'Your RAID is not working anymore';
-$wb['monitor_serverstate_raidunknown_txt'] = 'RAID state: ???';
-$wb['monitor_serverstate_servicesonline_txt'] = 'All needed Services are online';
-$wb['monitor_serverstate_servicesoffline_txt'] = 'One or more needed Services are offline';
-$wb['monitor_serverstate_servicesunknown_txt'] = 'Services:???';
-$wb['monitor_serverstate_syslogok_txt'] = 'The System-Log is O.K.';
-$wb['monitor_serverstate_syslogwarning_txt'] = 'There are some warnings in your System-Log';
-$wb['monitor_serverstate_syslogerror_txt'] = 'There are errors in your System-Log';
+$wb['monitor_serverstate_raidok_txt'] = 'RAID functioneert correct';
+$wb['monitor_serverstate_raidresync_txt'] = 'RAID-array wordt gesynchroniseerd (RESYNC mode)';
+$wb['monitor_serverstate_raidfault_txt'] = 'RAID-array heeft een defecte schijf. Zo spoedig mogelijk vervangen!';
+$wb['monitor_serverstate_raiderror_txt'] = 'RAID-configuratie is uitgeschakeld!';
+$wb['monitor_serverstate_raidunknown_txt'] = 'RAID status: ???';
+$wb['monitor_serverstate_servicesonline_txt'] = 'Alle vereiste services zijn online';
+$wb['monitor_serverstate_servicesoffline_txt'] = 'Een of meerdere vereiste services zijn offline';
+$wb['monitor_serverstate_servicesunknown_txt'] = 'Services :???';
+$wb['monitor_serverstate_syslogok_txt'] = 'Systeem logboek is ok';
+$wb['monitor_serverstate_syslogwarning_txt'] = 'Er komen waarschuwingen voor in System-Log';
+$wb['monitor_serverstate_syslogerror_txt'] = 'Er komen fouten voor in System-Log';
 $wb['monitor_serverstate_syslogunknown_txt'] = 'sys-log:???';
-$wb['monitor_serverstate_updatesok_txt'] = 'Your System is up to date.';
-$wb['monitor_serverstate_updatesneeded_txt'] = 'One or more Components needs a update';
-$wb['monitor_serverstate_updatesunknown_txt'] = 'System-Update:???';
+$wb['monitor_serverstate_updatesok_txt'] = 'Systeem is up-to-date';
+$wb['monitor_serverstate_updatesneeded_txt'] = 'Een of meerdere onderdelen moeten worden bijgewerkt';
+$wb['monitor_serverstate_updatesunknown_txt'] = 'Systeem-Update:???';
 $wb['monitor_services_online_txt'] = 'Online';
 $wb['monitor_services_offline_txt'] = 'Offline';
-$wb['monitor_services_web_txt'] = 'Web-Server:';
-$wb['monitor_services_ftp_txt'] = 'FTP-Server:';
-$wb['monitor_services_smtp_txt'] = 'SMTP-Server:';
-$wb['monitor_services_pop_txt'] = 'POP3-Server:';
-$wb['monitor_services_imap_txt'] = 'IMAP-Server:';
-$wb['monitor_services_mydns_txt'] = 'myDNS-Server:';
-$wb['monitor_services_mysql_txt'] = 'mySQL-Server:';
-$wb['monitor_settings_datafromdate_txt'] = 'Data from: ';
+$wb['monitor_services_web_txt'] = 'Web Server:';
+$wb['monitor_services_ftp_txt'] = 'FTP Server:';
+$wb['monitor_services_smtp_txt'] = 'SMTP Server:';
+$wb['monitor_services_pop_txt'] = 'POP3 Server:';
+$wb['monitor_services_imap_txt'] = 'IMAP Server:';
+$wb['monitor_services_mydns_txt'] = 'myDNS Server:';
+$wb['monitor_services_mysql_txt'] = 'MySQL Server:';
+$wb['monitor_settings_datafromdate_txt'] = 'Data vanaf: ';
 $wb['monitor_settings_datetimeformat_txt'] = 'Y-m-d H:i';
-$wb['monitor_settings_refreshsq_txt'] = 'Refresh sequence:';
+$wb['monitor_settings_refreshsq_txt'] = 'Vernieuwingsfrequentie:';
 $wb['monitor_settings_server_txt'] = 'Server';
-$wb['monitor_title_cpuinfo_txt'] = 'CPU Info';
-$wb['monitor_title_updatestate_txt'] = 'Update State';
-$wb['monitor_title_mailq_txt'] = 'Mailqueue';
-$wb['monitor_title_raidstate_txt'] = 'RAID-State';
+$wb['monitor_title_cpuinfo_txt'] = 'CPU Informatie';
+$wb['monitor_title_updatestate_txt'] = 'Status update';
+$wb['monitor_title_mailq_txt'] = 'E-mail wachtrij';
+$wb['monitor_title_raidstate_txt'] = 'RAID status';
 $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Log';
-$wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring';
+$wb['monitor_updates_nosupport_txt'] = 'Uw distributie ondersteunt deze controle-software niet';
 ?>
+
diff --git a/interface/web/monitor/lib/lang/nl_datalog_list.lng b/interface/web/monitor/lib/lang/nl_datalog_list.lng
index 8ad63ff..1e48717 100644
--- a/interface/web/monitor/lib/lang/nl_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/nl_datalog_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Jobqueue';
-$wb['tstamp_txt'] = 'Date';
+$wb['list_head_txt'] = 'ISPconfig taak-wachtrij';
+$wb['tstamp_txt'] = 'Datum';
 $wb['server_id_txt'] = 'Server';
-$wb['dbtable_txt'] = 'DB Table';
-$wb['action_txt'] = 'Action';
+$wb['dbtable_txt'] = 'Database tabel';
+$wb['action_txt'] = 'Actie';
 $wb['status_txt'] = 'Status';
 ?>
+
diff --git a/interface/web/monitor/lib/lang/nl_syslog_list.lng b/interface/web/monitor/lib/lang/nl_syslog_list.lng
index a7a5888..f5420b0 100644
--- a/interface/web/monitor/lib/lang/nl_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/nl_syslog_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'ISPConfig Log';
+$wb['list_head_txt'] = 'ISPconfig logboek';
 $wb['tstamp_txt'] = 'Datum';
 $wb['server_id_txt'] = 'Server';
 $wb['loglevel_txt'] = 'Loglevel';
 $wb['message_txt'] = 'Bericht';
 ?>
+
diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng
new file mode 100644
index 0000000..3b50364
--- /dev/null
+++ b/interface/web/monitor/lib/lang/pl.lng
@@ -0,0 +1,137 @@
+<?php
+$wb['Server online since'] = 'Serwer online do tej pory';
+$wb['Users online'] = 'Użytkowników Online';
+$wb['System load 1 minute'] = 'Obciążenie systemu przez ostatnią minute';
+$wb['System load 5 minutes'] = 'Obciążenie systemu przez ostatnie 5 minut';
+$wb['System load 15 minutes'] = 'Obciążenie systemu przez ostatnie 15 minut';
+$wb['Server Load'] = 'Serwer włączony';
+$wb['Disk usage'] = 'Użycie dysku';
+$wb['Memory usage'] = 'Użycie pamięci';
+$wb['no_data_serverload_txt'] = 'Żadne dane o serwerze nie zostały załadowane w tym momencie. Prosze spróbować ponownie później.';
+$wb['no_data_memusage_txt'] = 'Żadne dane o użyciu pamięci nie zostały załadowane w tym momencie. Prosze spróbować ponownie później.';
+$wb['no_data_diskusage_txt'] = 'Żadne dane o użyciu dysku nie zostały załadowane w tym momencie. Proszę spróbować ponownie później.';
+$wb['no_data_cpuinfo_txt'] = 'Żadne dane o procesorze nie zostały załadowane w tym momencie. Prosze spróbować ponownie później.';
+$wb['no_data_services_txt'] = 'Żadne dane o serwisach nie zostały zaladowane w tym momencie. Proszę spróbować ponownie później.';
+$wb['no_data_updates_txt'] = 'Żadne dane o akutalizacjach nie zostały załadowane w tym momencie. Proszę spróbować ponownie później.';
+$wb['no_data_raid_txt'] = 'Żadne dane o RAID nie zostały załadowane w tym momencie. Proszę spróbować ponownie później.';
+$wb['no_data_rkhunter_txt'] = 'Żadne dane o RKHunter nie zostały załadowane w tym momencie. Proszę spróbować ponownie później.';
+$wb['no_data_mailq_txt'] = 'Żadne dane o Mail nie zostały załadowane w tym momencie. Proszę spróbować ponownie później.';
+$wb['no_logdata_txt'] = 'Log nie jest dostępny w tym momencie. Proszę spróbować ponownie później.';
+$wb['Monitoring'] = 'Monitoring';
+$wb['Server to Monitor'] = 'Serwer do monitorowania';
+$wb['Logfiles'] = 'Pliki logów';
+$wb['Status of services'] = 'Stan serwisów';
+$wb['No Refresh'] = 'Nie odświeżaj';
+$wb['minutes'] = 'minuty';
+$wb['Show Overview'] = 'Pokaż wszystko';
+$wb['System State (All Servers)'] = 'Status systemu (Wszystkie serwery)';
+$wb['Hardware-Information'] = 'Informacje o sprzęcie';
+$wb['Show CPU info'] = 'Pokaż informacje o procesorze';
+$wb['Server State'] = 'Status serwera';
+$wb['Show Update State'] = 'Pokaż status aktualizacji';
+$wb['Show RAID state'] = 'Pokaż status RAID';
+$wb['Show Server load'] = 'Pokaż obciążenie serwera';
+$wb['Show Disk usage'] = 'Pokaż użycie dysku';
+$wb['Show Memory usage'] = 'Pokaż użycie pamięci';
+$wb['Show Services'] = 'Pokaż serwisy';
+$wb['Show Mail-Queue'] = 'Pokaż kolejke Mail';
+$wb['Show Mail-Log'] = 'Pokaż Log Mail';
+$wb['Show Mail warn-Log'] = 'Pokaż Log ostrzeżeń Mail';
+$wb['Show Mail err-Log'] = 'Pokaż Log błedów Mail';
+$wb['Show System-Log'] = 'Pokaż Log systemowy';
+$wb['Show ISPC Cron-Log'] = 'Pokaż Log ISPC Crone';
+$wb['Show Freshclam-Log'] = 'Pokaż Log Freshclam';
+$wb['Show Clamav-Log'] = 'Pokaż Log Clamav';
+$wb['Show ISPConfig-Log'] = 'Pokaż Log ISPConfig';
+$wb['Show RKHunter-Log'] = 'Pokaż Log RKHunter';
+$wb['Show Jobqueue'] = 'Pokaż kolejkę zadań';
+$wb['monitor_general_serverstate_txt'] = 'Stan serwera';
+$wb['monitor_general_systemstate_txt'] = 'Stan systemu';
+$wb['monitor_diskusage_filesystem_txt'] = 'System plików';
+$wb['monitor_diskusage_type_txt'] = 'Typ';
+$wb['monitor_diskusage_size_txt'] = 'Wielkość';
+$wb['monitor_diskusage_used_txt'] = 'Używane';
+$wb['monitor_diskusage_available_txt'] = 'Dostępne';
+$wb['monitor_diskusage_usage_txt'] = 'Wykorzystane%';
+$wb['monitor_diskusage_mounted_txt'] = 'Zamontowane w';
+$wb['monitor_logs_mail_txt'] = 'Log Mail';
+$wb['monitor_logs_mailwarn_txt'] = 'Log ostrzeżeń Mail';
+$wb['monitor_logs_mailerr_txt'] = 'Log błedów Mail';
+$wb['monitor_logs_messages_txt'] = 'Log wiadomości systemu';
+$wb['monitor_logs_ispccron_txt'] = 'Log ISPConfig Cron';
+$wb['monitor_logs_freshclam_txt'] = 'Log Freshclam';
+$wb['monitor_logs_clamav_txt'] = 'Log Clamav';
+$wb['monitor_logs_ispc_txt'] = 'Log ISPConfig';
+$wb['monitor_nomdadm_txt'] = 'mdadm nie jest zainstalowany lub twój serwer nie obsluguje RAID';
+$wb['monitor_norkhunter_txt'] = 'RKHunter nie jest zainstalowany, więc nie ma Log-u';
+$wb['monitor_serverstate_server_txt'] = 'Serwer';
+$wb['monitor_serverstate_state_txt'] = 'Status';
+$wb['monitor_serverstate_unknown_txt'] = 'nieznany';
+$wb['monitor_serverstate_info_txt'] = 'info';
+$wb['monitor_serverstate_warning_txt'] = 'ostrzeżenie';
+$wb['monitor_serverstate_critical_txt'] = 'krytyczny';
+$wb['monitor_serverstate_error_txt'] = 'bład';
+$wb['monitor_serverstate_moreinfo_txt'] = 'Więcej informacji...';
+$wb['monitor_serverstate_more_txt'] = 'Więcej...';
+$wb['monitor_serverstate_fclamok_txt'] = 'Twoja ochrona antyvirusowa jest ok';
+$wb['monitor_serverstate_fclamoutdated_txt'] = 'Twoja ochrona antyvirusowa nie jest aktualna!';
+$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!';
+$wb['monitor_serverstate_hdok_txt'] = 'Stan pamięci na dysku twardym jest ok';
+$wb['monitor_serverstate_hdgoingfull_txt'] = 'Stan pamięci na dysku twardym kończy się';
+$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Twardy dysk jest prawie pełny';
+$wb['monitor_serverstate_hdveryfull_txt'] = 'Na twardym dysku pozostało mało miejsca';
+$wb['monitor_serverstate_hdfull_txt'] = 'Na dysku twardym nie ma już wolnego miejsca';
+$wb['monitor_serverstate_hdunknown_txt'] = 'Twardy dysk: ???';
+$wb['monitor_serverstate_listok_txt'] = 'ok';
+$wb['monitor_serverstate_listinfo_txt'] = 'info';
+$wb['monitor_serverstate_listwarning_txt'] = 'ostrzeżenie';
+$wb['monitor_serverstate_listcritical_txt'] = 'krytyczny';
+$wb['monitor_serverstate_listerror_txt'] = 'bład';
+$wb['monitor_serverstate_listunknown_txt'] = 'nieznany';
+$wb['monitor_serverstate_loadok_txt'] = 'Serwer działa poprawnie';
+$wb['monitor_serverstate_loadheavy_txt'] = 'Serwer zaczyna być przeciązony';
+$wb['monitor_serverstate_loadhigh_txt'] = 'Serwer jest średnio obiciążony';
+$wb['monitor_serverstate_loaghigher_txt'] = 'Serwer jest za bardzo obciążony';
+$wb['monitor_serverstate_loadhighest_txt'] = 'Serwer jest krytycznie przeciążony';
+$wb['monitor_serverstate_loadunknown_txt'] = 'Przeciążenie serwera: ???';
+$wb['monitor_serverstate_mailqok_txt'] = 'Mailq działa poprawnie';
+$wb['monitor_serverstate_mailqheavy_txt'] = 'Mailq zaczyna być przeciązony';
+$wb['monitor_serverstate_mailqhigh_txt'] = 'Mailq jest średnio obiciążony';
+$wb['monitor_serverstate_mailqhigher_txt'] = 'Mailq jest za bardzo obciążony';
+$wb['monitor_serverstate_mailqhighest_txt'] = 'Mailq jest krytycznie przeciążony';
+$wb['monitor_serverstate_mailqunknown_txt'] = 'Mailq: ???';
+$wb['monitor_serverstate_raidok_txt'] = 'RAID działa poprawnie';
+$wb['monitor_serverstate_raidresync_txt'] = 'RAID nie jest z synchronizowany';
+$wb['monitor_serverstate_raidfault_txt'] = 'RAID ma jeden niesprawny dysk. Wymień go najszybciej jak to możliwe!';
+$wb['monitor_serverstate_raiderror_txt'] = 'RAID nie włączy się już więcej';
+$wb['monitor_serverstate_raidunknown_txt'] = 'Stan RAID: ???';
+$wb['monitor_serverstate_servicesonline_txt'] = 'Wszystkie wymagane serwisy działają poprawnie';
+$wb['monitor_serverstate_servicesoffline_txt'] = 'Jeden z wymaganych serwisów jest wyłączony';
+$wb['monitor_serverstate_servicesunknown_txt'] = 'Serwisy:???';
+$wb['monitor_serverstate_syslogok_txt'] = 'Log systemowy jest ok';
+$wb['monitor_serverstate_syslogwarning_txt'] = 'W logu systemowym są ostrzeżenia';
+$wb['monitor_serverstate_syslogerror_txt'] = 'W logu systemowym są błedy';
+$wb['monitor_serverstate_syslogunknown_txt'] = 'Log systemowy:???';
+$wb['monitor_serverstate_updatesok_txt'] = 'Twój system jest aktualny.';
+$wb['monitor_serverstate_updatesneeded_txt'] = 'Jeden lub więcej komponentów wymaga aktualizacji';
+$wb['monitor_serverstate_updatesunknown_txt'] = 'Aktualizacja systemu:???';
+$wb['monitor_services_online_txt'] = 'Online';
+$wb['monitor_services_offline_txt'] = 'Offline';
+$wb['monitor_services_web_txt'] = 'Web-Server:';
+$wb['monitor_services_ftp_txt'] = 'FTP-Server:';
+$wb['monitor_services_smtp_txt'] = 'SMTP-Server:';
+$wb['monitor_services_pop_txt'] = 'POP3-Server:';
+$wb['monitor_services_imap_txt'] = 'IMAP-Server:';
+$wb['monitor_services_mydns_txt'] = 'myDNS-Server:';
+$wb['monitor_services_mysql_txt'] = 'mySQL-Server:';
+$wb['monitor_settings_datafromdate_txt'] = 'Dane z: ';
+$wb['monitor_settings_datetimeformat_txt'] = 'Y-m-d H:i';
+$wb['monitor_settings_refreshsq_txt'] = 'Odśwież sekwencje:';
+$wb['monitor_settings_server_txt'] = 'Serwer';
+$wb['monitor_title_cpuinfo_txt'] = 'Info o procesorze';
+$wb['monitor_title_updatestate_txt'] = 'Aktualizuj status';
+$wb['monitor_title_mailq_txt'] = 'Kolejka Mail';
+$wb['monitor_title_raidstate_txt'] = 'Status RAID';
+$wb['monitor_title_rkhunterlog_txt'] = 'Log RKHunter';
+$wb['monitor_updates_nosupport_txt'] = 'Twoja dystrybucja systemu nie obsługuje monitorowania';
+?>
diff --git a/interface/web/monitor/lib/lang/pl_datalog_list.lng b/interface/web/monitor/lib/lang/pl_datalog_list.lng
new file mode 100644
index 0000000..398ca51
--- /dev/null
+++ b/interface/web/monitor/lib/lang/pl_datalog_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Kolejka zadań';
+$wb['tstamp_txt'] = 'Data';
+$wb['server_id_txt'] = 'Serwer';
+$wb['dbtable_txt'] = 'Tabele DB';
+$wb['action_txt'] = 'Akcja';
+$wb['status_txt'] = 'Status';
+?>
diff --git a/interface/web/monitor/lib/lang/pl_syslog_list.lng b/interface/web/monitor/lib/lang/pl_syslog_list.lng
new file mode 100644
index 0000000..125494b
--- /dev/null
+++ b/interface/web/monitor/lib/lang/pl_syslog_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Log ISPConfig';
+$wb['tstamp_txt'] = 'Data';
+$wb['server_id_txt'] = 'Serwer';
+$wb['loglevel_txt'] = 'Poziom Logu';
+$wb['message_txt'] = 'Wiadomość';
+?>
diff --git a/interface/web/sites/ajax_get_ip.php b/interface/web/sites/ajax_get_ip.php
index fbe9203..0d3227b 100644
--- a/interface/web/sites/ajax_get_ip.php
+++ b/interface/web/sites/ajax_get_ip.php
@@ -41,11 +41,11 @@
 	$sql = "SELECT ip_address FROM server_ip WHERE server_id = $server_id";
 	$ips = $app->db->queryAllRecords($sql);
 	// $ip_select = "<option value=''></option>";
-	$ip_select = "<option value='*'>*</option>\r\n";
+	$ip_select = "*";
 	if(is_array($ips)) {
 		foreach( $ips as $ip) {
 			//$selected = ($ip["ip_address"] == $this->dataRecord["ip_address"])?'SELECTED':'';
-			$ip_select .= "<option value='$ip[ip_address]'>$ip[ip_address]</option>\r\n";
+			$ip_select .= "#$ip[ip_address]";
 		}
 	}
 	unset($tmp);
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index 088e37a..2fb8a05 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -255,6 +255,9 @@
 			}
 		}
 		unset($old_record);
+		
+		if(strlen($dbname_prefix . $this->dataRecord['database_name']) > 64) $app->tform->errorMessage .= str_replace('{db}',$dbname_prefix . $this->dataRecord['database_name'],$app->tform->wordbook["database_name_error_len"]).'<br />';
+		if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}',$dbuser_prefix . $this->dataRecord['database_user'],$app->tform->wordbook["database_user_error_len"]).'<br />';
 
 		if ($app->tform->errorMessage == ''){
 			/* restrict the names if there is no error */
@@ -278,11 +281,17 @@
 		$global_config = $app->getconf->get_global_config('sites');
 		$dbname_prefix = replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
 		$dbuser_prefix = replacePrefix($global_config['dbuser_prefix'], $this->dataRecord);
+		
+		if(strlen($dbname_prefix . $this->dataRecord['database_name']) > 64) $app->tform->errorMessage .= str_replace('{db}',$dbname_prefix . $this->dataRecord['database_name'],$app->tform->wordbook["database_name_error_len"]).'<br />';
+		if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}',$dbuser_prefix . $this->dataRecord['database_user'],$app->tform->wordbook["database_user_error_len"]).'<br />';
+
 
 		/* restrict the names */
         /* crop user and db names if they are too long -> mysql: user: 16 chars / db: 64 chars */
-		$this->dataRecord['database_name'] = substr($dbname_prefix . $this->dataRecord['database_name'], 0, 64);
-		$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
+		if ($app->tform->errorMessage == ''){
+			$this->dataRecord['database_name'] = substr($dbname_prefix . $this->dataRecord['database_name'], 0, 64);
+			$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
+		}
 
 		parent::onBeforeInsert();
 	}
diff --git a/interface/web/sites/database_phpmyadmin.php b/interface/web/sites/database_phpmyadmin.php
index db23582..baf547d 100644
--- a/interface/web/sites/database_phpmyadmin.php
+++ b/interface/web/sites/database_phpmyadmin.php
@@ -60,5 +60,4 @@
 isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http';
 header('location:' . $http . '://' . $serverData['server_name'] . '/phpmyadmin');
 exit;
-
 ?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/bg_ftp_user.lng b/interface/web/sites/lib/lang/bg_ftp_user.lng
index 1b7d4aa..7627ad7 100644
--- a/interface/web/sites/lib/lang/bg_ftp_user.lng
+++ b/interface/web/sites/lib/lang/bg_ftp_user.lng
@@ -23,4 +23,5 @@
 $wb['directory_error_empty'] = 'Не е посочена директория.';
 $wb['quota_files_unity_txt'] = 'Files';
 $wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_shell_user.lng b/interface/web/sites/lib/lang/bg_shell_user.lng
index 38e1318..5e75413 100644
--- a/interface/web/sites/lib/lang/bg_shell_user.lng
+++ b/interface/web/sites/lib/lang/bg_shell_user.lng
@@ -18,4 +18,5 @@
 $wb['uid_error_empty'] = 'Не е посочено GID.';
 $wb['directory_error_empty'] = 'Не е посочена директория.';
 $wb['limit_shell_user_txt'] = 'Достигнат е максималният разрешен брой Shell потребители.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/br.lng b/interface/web/sites/lib/lang/br.lng
index 44b172a..4a14177 100644
--- a/interface/web/sites/lib/lang/br.lng
+++ b/interface/web/sites/lib/lang/br.lng
@@ -13,5 +13,6 @@
 $wb['Shell-User'] = 'Usuário-Shell';
 $wb['Shell'] = 'Shell';
 $wb['Websites'] = 'Websites';
-$wb["Stats"] = 'Estatísticas';
+$wb['Stats'] = 'Estatísticas';
 ?>
+
diff --git a/interface/web/sites/lib/lang/br_cron.lng b/interface/web/sites/lib/lang/br_cron.lng
index 8cb7f08..b6991d6 100644
--- a/interface/web/sites/lib/lang/br_cron.lng
+++ b/interface/web/sites/lib/lang/br_cron.lng
@@ -1,21 +1,22 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb['parent_domain_id_txt'] = 'Parent website';
-$wb['active_txt'] = 'Active';
-$wb['client_txt'] = 'Client';
-$wb['run_min_txt'] = 'Minutes';
-$wb['run_hour_txt'] = 'Hours';
-$wb['run_mday_txt'] = 'Days of month';
-$wb['run_month_txt'] = 'Months';
-$wb['run_wday_txt'] = 'Days of week';
-$wb['command_txt'] = 'Command to run (commands are executed via sh, urls via wget)';
-$wb['limit_cron_txt'] = 'The maximum number of allowed cron jobs was reached.';
-$wb['limit_cron_frequency_txt'] = 'The cron job frequency exceeds the allowed limit.';
-$wb['run_min_error_format'] = 'Invalid format for minutes.';
-$wb['run_hour_error_format'] = 'Invalid format for hours.';
-$wb['run_mday_error_format'] = 'Invalid format for days of month.';
-$wb['run_month_error_format'] = 'Invalid format for months.';
-$wb['run_wday_error_format'] = 'Invalid format for days of the week.';
-$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
-$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Site Web Parente';
+$wb['active_txt'] = 'Ativo';
+$wb['client_txt'] = 'Cliente';
+$wb['run_min_txt'] = 'Minutos';
+$wb['run_hour_txt'] = 'Horas';
+$wb['run_mday_txt'] = 'Dias do mês';
+$wb['run_month_txt'] = 'Meses';
+$wb['run_wday_txt'] = 'Dias da semana';
+$wb['command_txt'] = 'Comando a executar (os comandos serão executados via sh ou urls via wget)';
+$wb['limit_cron_txt'] = 'O número máximo de tarefas no cron foi atingido.';
+$wb['limit_cron_frequency_txt'] = 'A frequência das tarefas no cron ultrapassou o limite permitido.';
+$wb['run_min_error_format'] = 'Formato dos minutos inválido.';
+$wb['run_hour_error_format'] = 'Formato dos horas inválido.';
+$wb['run_mday_error_format'] = 'Formato dos dias do mês inválido.';
+$wb['run_month_error_format'] = 'Formato dos meses inválido.';
+$wb['run_wday_error_format'] = 'Formato dos dias da semana inválido.';
+$wb['command_error_format'] = 'Formato de comando inválido. Somente endereços url http/https são permitidos.';
+$wb['unknown_fieldtype_error'] = 'Um tipo desconhecido de campo foi usado.';
+?>
+
diff --git a/interface/web/sites/lib/lang/br_cron_list.lng b/interface/web/sites/lib/lang/br_cron_list.lng
index b5c8d15..f5bbe66 100644
--- a/interface/web/sites/lib/lang/br_cron_list.lng
+++ b/interface/web/sites/lib/lang/br_cron_list.lng
@@ -1,12 +1,13 @@
 <?php
-$wb["list_head_txt"] = 'Cron Jobs';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["run_min_txt"] = 'Minute';
-$wb["run_hour_txt"] = 'Hour';
-$wb["run_mday_txt"] = 'Day of month';
-$wb["run_month_txt"] = 'Month';
-$wb["run_wday_txt"] = 'Day of week';
-$wb["command_txt"] = 'Command';
-$wb["add_new_cron_txt"] = 'Add new Cron job';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Tarefas no Cron';
+$wb['active_txt'] = 'Ativas';
+$wb['server_id_txt'] = 'Servidor';
+$wb['run_min_txt'] = 'Minutos';
+$wb['run_hour_txt'] = 'Horas';
+$wb['run_mday_txt'] = 'Dias do mês';
+$wb['run_month_txt'] = 'Mês';
+$wb['run_wday_txt'] = 'Dia da semana';
+$wb['command_txt'] = 'Comando';
+$wb['add_new_cron_txt'] = 'Adcionar uma nova tarefa no cron';
+?>
+
diff --git a/interface/web/sites/lib/lang/br_database.lng b/interface/web/sites/lib/lang/br_database.lng
index 3530656..ccd1075 100644
--- a/interface/web/sites/lib/lang/br_database.lng
+++ b/interface/web/sites/lib/lang/br_database.lng
@@ -1,22 +1,24 @@
 <?php
-$wb["server_id_txt"] = 'Servidor';
-$wb["type_txt"] = 'Tipo';
-$wb["database_name_txt"] = 'Nome do Banco de Dados';
-$wb["database_user_txt"] = 'Usuário do Banco de Dados';
-$wb["database_password_txt"] = 'Senha do Banco de Dados';
-$wb["password_strength_txt"] = 'Segurança da Senha';
-$wb["database_charset_txt"] = 'Charset do Banco de Dados';
-$wb["remote_access_txt"] = 'Acesso Remoto';
-$wb["client_txt"] = 'Cliente';
-$wb["active_txt"] = 'Ativo';
-$wb["database_name_error_empty"] = 'O nome do banco está em branco.';
-$wb["database_name_error_unique"] = 'Já existe um banco de dados com este nome no servidor. O nome escolhido deve ser único.';
-$wb["database_name_error_regex"] = 'Nome do banco inválido. O nome do banco só pode conter estes caracteres: a-z, A-Z, 0-9 e o underscore. Tamanho: 2 - 64 caracteres.';
-$wb["database_user_error_empty"] = 'O nome do usuário está em branco.';
-$wb["database_user_error_unique"] = 'Já existe um banco de dados com este nome no servidor. O nome escolhido deve ser único.';
-$wb["database_user_error_regex"] = 'Nome do banco inválido. O nome do banco só pode conter estes caracteres: a-z, A-Z, 0-9 e o underscore. Tamanho: 2 - 64 caracteres.';
-$wb["limit_database_txt"] = 'O limite máximo de bancos de dados foi atingido.';
-$wb["database_name_change_txt"] = 'O nome do banco não pode ser modificado';
-$wb["database_charset_change_txt"] = 'O charset do banco não pode ser mudado';
+$wb['server_id_txt'] = 'Servidor';
+$wb['type_txt'] = 'Tipo';
+$wb['database_name_txt'] = 'Nome do Banco de Dados';
+$wb['database_user_txt'] = 'Usuário do Banco de Dados';
+$wb['database_password_txt'] = 'Senha do Banco de Dados';
+$wb['password_strength_txt'] = 'Segurança da Senha';
+$wb['database_charset_txt'] = 'Charset do Banco de Dados';
+$wb['remote_access_txt'] = 'Acesso Remoto';
+$wb['client_txt'] = 'Cliente';
+$wb['active_txt'] = 'Ativo';
+$wb['database_name_error_empty'] = 'O nome do banco está em branco.';
+$wb['database_name_error_unique'] = 'Já existe um banco de dados com este nome no servidor. O nome escolhido deve ser único.';
+$wb['database_name_error_regex'] = 'Nome do banco inválido. O nome do banco só pode conter estes caracteres: a-z, A-Z, 0-9 e o underscore. Tamanho: 2 - 64 caracteres.';
+$wb['database_user_error_empty'] = 'O nome do usuário está em branco.';
+$wb['database_user_error_unique'] = 'Já existe um banco de dados com este nome no servidor. O nome escolhido deve ser único.';
+$wb['database_user_error_regex'] = 'Nome do banco inválido. O nome do banco só pode conter estes caracteres: a-z, A-Z, 0-9 e o underscore. Tamanho: 2 - 64 caracteres.';
+$wb['limit_database_txt'] = 'O limite máximo de bancos de dados foi atingido.';
+$wb['database_name_change_txt'] = 'O nome do banco não pode ser modificado';
+$wb['database_charset_change_txt'] = 'O charset do banco não pode ser mudado';
+$wb['remote_ips_txt'] = 'Endereços IP Remotos (separados por , deixe em branco para <i>quaisquer ips</i>)';
+$wb['database_remote_error_ips'] = 'Pelo menos um dos endereços ip informados não é válido.';
 ?>
 
diff --git a/interface/web/sites/lib/lang/br_database_list.lng b/interface/web/sites/lib/lang/br_database_list.lng
index 133f502..ec5054f 100644
--- a/interface/web/sites/lib/lang/br_database_list.lng
+++ b/interface/web/sites/lib/lang/br_database_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Banco de Dados';
-$wb["active_txt"] = 'Ativo';
-$wb["remote_access_txt"] = 'Acesso Remoto';
-$wb["server_id_txt"] = 'Servidor';
-$wb["database_name_txt"] = 'Nome do banco';
-$wb["add_new_record_txt"] = 'Adcionar um novo banco';
+$wb['list_head_txt'] = 'Banco de Dados';
+$wb['active_txt'] = 'Ativo';
+$wb['remote_access_txt'] = 'Acesso Remoto';
+$wb['server_id_txt'] = 'Servidor';
+$wb['database_name_txt'] = 'Nome do banco';
+$wb['add_new_record_txt'] = 'Adcionar um novo banco';
 ?>
+
diff --git a/interface/web/sites/lib/lang/br_ftp_user.lng b/interface/web/sites/lib/lang/br_ftp_user.lng
index fb30f46..46f3e53 100644
--- a/interface/web/sites/lib/lang/br_ftp_user.lng
+++ b/interface/web/sites/lib/lang/br_ftp_user.lng
@@ -1,27 +1,28 @@
 <?php
-$wb["uid_txt"] = 'UID';
-$wb["gid_txt"] = 'GID';
-$wb["dir_txt"] = 'Diretório';
-$wb["quota_files_txt"] = 'Quota de Arquivo';
-$wb["quota_files_unity_txt"] = 'Arquivos';
-$wb["ul_ratio_txt"] = 'Taxa de Upload';
-$wb["dl_ratio_txt"] = 'Taxa de Download';
-$wb["ul_bandwidth_txt"] = 'Banda de Upload';
-$wb["dl_bandwidth_txt"] = 'Banda de Download';
-$wb["server_id_txt"] = 'Servidor';
-$wb["parent_domain_id_txt"] = 'Website';
-$wb["username_txt"] = 'Usuário';
-$wb["password_txt"] = 'Senha';
-$wb["password_strength_txt"] = 'Tamanho da senha';
-$wb["quota_size_txt"] = 'Quota de Disco';
-$wb["active_txt"] = 'Ativo';
-$wb["limit_ftp_user_txt"] = 'O número máximo de usuários de FTP para sua conta foi atingido.';
-$wb["username_error_empty"] = 'Nome de usuário em branco.';
-$wb["username_error_unique"] = 'O nome de usuário deve ser único.';
-$wb["username_error_regex"] = 'The username contains charachters that are not allowed.';
-$wb["quota_size_error_empty"] = 'Quota em branco.';
-$wb["uid_error_empty"] = 'UID em branco.';
-$wb["uid_error_empty"] = 'GID em branco.';
-$wb["directory_error_empty"] = 'Diretório vazio.';
+$wb['uid_txt'] = 'UID';
+$wb['gid_txt'] = 'GID';
+$wb['dir_txt'] = 'Diretório';
+$wb['quota_files_txt'] = 'Cota de Arquivo';
+$wb['quota_files_unity_txt'] = 'Arquivos';
+$wb['ul_ratio_txt'] = 'Taxa de Upload';
+$wb['dl_ratio_txt'] = 'Taxa de Download';
+$wb['ul_bandwidth_txt'] = 'Banda de Upload';
+$wb['dl_bandwidth_txt'] = 'Banda de Download';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['username_txt'] = 'Usuário';
+$wb['password_txt'] = 'Senha';
+$wb['password_strength_txt'] = 'Tamanho da senha';
+$wb['quota_size_txt'] = 'Cota de Disco';
+$wb['active_txt'] = 'Ativo';
+$wb['limit_ftp_user_txt'] = 'O número máximo de usuários de FTP para sua conta foi atingido.';
+$wb['username_error_empty'] = 'Nome de usuário em branco.';
+$wb['username_error_unique'] = 'O nome de usuário deve ser único.';
+$wb['username_error_regex'] = 'O nome de usuário contém caracteres não permitidos.';
+$wb['quota_size_error_empty'] = 'Quota em branco.';
+$wb['uid_error_empty'] = 'GID em branco.';
+$wb['directory_error_empty'] = 'Diretório vazio.';
+$wb['directory_error_notinweb'] = 'O diretório não esta dentro do diretório web principal.';
+$wb['parent_domain_id_error_empty'] = 'Nenhum website selecionado.';
 ?>
 
diff --git a/interface/web/sites/lib/lang/br_ftp_user_list.lng b/interface/web/sites/lib/lang/br_ftp_user_list.lng
index 0e111c2..9978c60 100644
--- a/interface/web/sites/lib/lang/br_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/br_ftp_user_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Usuário-FTP';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["parent_domain_id_txt"] = 'Site';
-$wb["username_txt"] = 'Usuário';
-$wb["add_new_record_txt"] = 'Adcionar um novo Usuário FTP';
+$wb['list_head_txt'] = 'Usuário-FTP';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Site';
+$wb['username_txt'] = 'Usuário';
+$wb['add_new_record_txt'] = 'Adcionar um novo Usuário FTP';
 ?>
+
diff --git a/interface/web/sites/lib/lang/br_shell_user.lng b/interface/web/sites/lib/lang/br_shell_user.lng
index 80b144a..939bc76 100644
--- a/interface/web/sites/lib/lang/br_shell_user.lng
+++ b/interface/web/sites/lib/lang/br_shell_user.lng
@@ -1,23 +1,23 @@
 <?php
-$wb["uid_txt"] = 'Nome do usuário';
-$wb["gid_txt"] = 'Groupo';
-$wb["shell_txt"] = 'Shell';
-$wb["dir_txt"] = 'Diretório';
-$wb["server_id_txt"] = 'Servidor';
-$wb["parent_domain_id_txt"] = 'Site';
-$wb["username_txt"] = 'Nome do usuário';
-$wb["password_txt"] = 'Senha';
-$wb["password_strength_txt"] = 'Dificuldade da senha';
-$wb["chroot_txt"] = 'Chroot Shell';
-$wb["quota_size_txt"] = 'Quota';
-$wb["active_txt"] = 'Ativo';
-$wb["username_error_empty"] = 'Nome de usuário em branco.';
-$wb["username_error_unique"] = 'O nome de usuário deve ser único.';
-$wb["username_error_regex"] = 'The username contains charachters that are not allowed.';
-$wb["quota_size_error_empty"] = 'Quota em branco.';
-$wb["uid_error_empty"] = 'UID em branco.';
-$wb["uid_error_empty"] = 'GID em branco.';
-$wb["directory_error_empty"] = 'Diretório vazio.';
-$wb["limit_shell_user_txt"] = 'O número máximo de usuários shell para sua conta foi atingido.';
+$wb['uid_txt'] = 'Nome do usuário';
+$wb['gid_txt'] = 'Groupo';
+$wb['shell_txt'] = 'Shell';
+$wb['dir_txt'] = 'Diretório';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Site';
+$wb['username_txt'] = 'Nome do usuário';
+$wb['password_txt'] = 'Senha';
+$wb['password_strength_txt'] = 'Dificuldade da senha';
+$wb['chroot_txt'] = 'Chroot Shell';
+$wb['quota_size_txt'] = 'Quota';
+$wb['active_txt'] = 'Ativo';
+$wb['username_error_empty'] = 'Nome de usuário em branco.';
+$wb['username_error_unique'] = 'O nome de usuário deve ser único.';
+$wb['username_error_regex'] = 'O nome do usuário contém caracteres não permitidos.';
+$wb['quota_size_error_empty'] = 'Quota em branco.';
+$wb['uid_error_empty'] = 'GID em branco.';
+$wb['directory_error_empty'] = 'Diretório vazio.';
+$wb['limit_shell_user_txt'] = 'O número máximo de usuários shell para sua conta foi atingido.';
+$wb['parent_domain_id_error_empty'] = 'Nenhum website selecionado.';
 ?>
 
diff --git a/interface/web/sites/lib/lang/br_shell_user_list.lng b/interface/web/sites/lib/lang/br_shell_user_list.lng
index d6080a7..8c2e71d 100644
--- a/interface/web/sites/lib/lang/br_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/br_shell_user_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Usuário de Shell';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["parent_domain_id_txt"] = 'Site';
-$wb["username_txt"] = 'Usuário';
-$wb["add_new_record_txt"] = 'Adcionar novo usuário de Shell';
+$wb['list_head_txt'] = 'Usuário de Shell';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Site';
+$wb['username_txt'] = 'Usuário';
+$wb['add_new_record_txt'] = 'Adcionar novo usuário de Shell';
 ?>
+
diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
index 3749d6e..4343b84 100644
--- a/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
@@ -1,11 +1,12 @@
 <?php
-$wb["list_head_txt"] = 'Domínio Alias';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["parent_domain_id_txt"] = 'Website';
-$wb["domain_txt"] = 'Domínio Alias';
-$wb["add_new_record_txt"] = 'Adcionar novo domínio alias';
-$wb["domain_error_empty"] = 'Domínio em branco.';
-$wb["domain_error_unique"] = 'O domínio deve ser único.';
-$wb["domain_error_regex"] = 'Nome de domínio inválido.';
+$wb['list_head_txt'] = 'Domínio Alias';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Domínio Alias';
+$wb['add_new_record_txt'] = 'Adcionar novo domínio alias';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'O domínio deve ser único.';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng
index 5952956..057e894 100644
--- a/interface/web/sites/lib/lang/br_web_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_domain.lng
@@ -1,50 +1,50 @@
 <?php
-$wb["ssl_state_txt"] = 'Estado';
-$wb["ssl_locality_txt"] = 'Localização';
-$wb["ssl_organisation_txt"] = 'Empresa';
-$wb["ssl_organisation_unit_txt"] = 'Departamento';
-$wb["ssl_country_txt"] = 'Pais';
-$wb["ssl_request_txt"] = 'Requisição SSL';
-$wb["ssl_cert_txt"] = 'Certificado SSL';
-$wb["ssl_bundle_txt"] = 'SSL Bundle';
-$wb["ssl_action_txt"] = 'SSL Action';
-$wb["server_id_txt"] = 'Servidor';
-$wb["domain_txt"] = 'Domínio';
-$wb["type_txt"] = 'Tipo';
-$wb["parent_domain_id_txt"] = 'Site Parente';
-$wb["redirect_type_txt"] = 'Tipo Redirecionamento';
-$wb["redirect_path_txt"] = 'Caminho de redirecionamento';
-$wb["active_txt"] = 'Ativo';
-$wb["document_root_txt"] = 'Documentroot';
-$wb["system_user_txt"] = 'Usuário Linux';
-$wb["system_group_txt"] = 'Groupo Linux';
-$wb["ip_address_txt"] = 'Endereço-IP';
-$wb["vhost_type_txt"] = 'Tipo de VHost';
-$wb["hd_quota_txt"] = 'Quota de Disco';
-$wb["traffic_quota_txt"] = 'Quota de Tráfego';
-$wb["cgi_txt"] = 'CGI';
-$wb["ssi_txt"] = 'SSI';
-$wb["errordocs_txt"] = 'Suas Páginas de  Erro';
-$wb["subdomain_txt"] = 'Auto-Subdomínio';
-$wb["ssl_txt"] = 'SSL';
-$wb["suexec_txt"] = 'SuEXEC';
-$wb["php_txt"] = 'PHP';
-$wb["client_txt"] = 'Cliente';
-$wb["limit_web_domain_txt"] = 'O número máximo de domínios web para sua conta foi atingido.';
-$wb["limit_web_aliasdomain_txt"] = 'O número máximo de aliases domínio para sua conta foi atingido.';
-$wb["limit_web_subdomain_txt"] = 'O número máximo de sub-domínios para sua conta foi atingido.';
-$wb["apache_directives_txt"] = 'Diretivas do Apache';
-$wb["domain_error_empty"] = 'Domínio em branco.';
-$wb["domain_error_unique"] = 'Já existe site, alias ou sub-domínio com este nome';
-$wb["domain_error_regex"] = 'Nome de domínio inválido.';
-$wb["hd_quota_error_empty"] = 'Quota de disco está em branco.';
-$wb["traffic_quota_error_empty"] = 'Quota de tráfego está em branco.';
+$wb['ssl_state_txt'] = 'Estado';
+$wb['ssl_locality_txt'] = 'Localização';
+$wb['ssl_organisation_txt'] = 'Empresa';
+$wb['ssl_organisation_unit_txt'] = 'Departamento';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Site Parente';
+$wb['redirect_type_txt'] = 'Tipo Redirecionamento';
+$wb['redirect_path_txt'] = 'Caminho de redirecionamento';
+$wb['active_txt'] = 'Ativo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Usuário Linux';
+$wb['system_group_txt'] = 'Groupo Linux';
+$wb['ip_address_txt'] = 'Endereço-IP';
+$wb['vhost_type_txt'] = 'Tipo de VHost';
+$wb['hd_quota_txt'] = 'Cota de Disco';
+$wb['traffic_quota_txt'] = 'Cota de Tráfego';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Suas Páginas de  Erro';
+$wb['subdomain_txt'] = 'Auto-Subdomínio';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'O número máximo de domínios web para sua conta foi atingido.';
+$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases domínio para sua conta foi atingido.';
+$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domínios para sua conta foi atingido.';
+$wb['apache_directives_txt'] = 'Diretivas do Apache';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'Já existe site, alias ou sub-domínio com este nome';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
+$wb['hd_quota_error_empty'] = 'Quota de disco está em branco.';
+$wb['traffic_quota_error_empty'] = 'Quota de tráfego está em branco.';
 $wb['error_ssl_state_empty'] = 'Estado do SSL está em branco.';
 $wb['error_ssl_locality_empty'] = 'Localização do SSL está em branco.';
 $wb['error_ssl_organisation_empty'] = 'Empresa do SSL está em branco.';
 $wb['error_ssl_organisation_unit_empty'] = 'Departamento do SSL está em branco.';
-$wb['error_ssl_country_empty'] = 'Pais do SSL em branco.';
-$wb["client_group_id_txt"] = 'Cliente';
-$wb["stats_password_txt"] = 'Senha do diretório de estatísticas';
+$wb['error_ssl_country_empty'] = 'País do SSL em branco.';
+$wb['client_group_id_txt'] = 'Cliente';
+$wb['stats_password_txt'] = 'Senha do diretório de estatísticas';
 ?>
 
diff --git a/interface/web/sites/lib/lang/br_web_domain_list.lng b/interface/web/sites/lib/lang/br_web_domain_list.lng
index e48d6d3..ff4c134 100644
--- a/interface/web/sites/lib/lang/br_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_domain_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Websites';
-$wb["domain_id_txt"] = 'ID';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["domain_txt"] = 'Domínio';
-$wb["add_new_record_txt"] = 'Adcionar um novo site';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['add_new_record_txt'] = 'Adcionar um novo site';
 ?>
+
diff --git a/interface/web/sites/lib/lang/br_web_sites_stats_list.lng b/interface/web/sites/lib/lang/br_web_sites_stats_list.lng
index 20f018b..18bf044 100644
--- a/interface/web/sites/lib/lang/br_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/br_web_sites_stats_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Web traffic';
-$wb["domain_txt"] = 'Domain';
-$wb["this_month_txt"] = 'This month';
-$wb["last_month_txt"] = 'Last month';
-$wb["this_year_txt"] = 'This year';
-$wb["last_year_txt"] = 'Last year';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Tráfego Web';
+$wb['domain_txt'] = 'Domínio';
+$wb['this_month_txt'] = 'Este mês';
+$wb['last_month_txt'] = 'Último mês';
+$wb['this_year_txt'] = 'Este ano';
+$wb['last_year_txt'] = 'Último ano';
+?>
+
diff --git a/interface/web/sites/lib/lang/br_web_subdomain.lng b/interface/web/sites/lib/lang/br_web_subdomain.lng
index 66e162e..3552eab 100644
--- a/interface/web/sites/lib/lang/br_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/br_web_subdomain.lng
@@ -1,39 +1,40 @@
 <?php
-$wb["ssl_state_txt"] = 'Estado';
-$wb["ssl_locality_txt"] = 'Localidade';
-$wb["ssl_organisation_txt"] = 'Empresa';
-$wb["ssl_organisation_unit_txt"] = 'Departamento';
-$wb["ssl_country_txt"] = 'Pais';
-$wb["ssl_request_txt"] = 'Requisição SSL';
-$wb["ssl_cert_txt"] = 'Certificado SSL';
-$wb["ssl_bundle_txt"] = 'Pacote SSL';
-$wb["ssl_action_txt"] = 'Ação SSL';
-$wb["server_id_txt"] = 'Servidor';
-$wb["domain_txt"] = 'Domínio';
-$wb["type_txt"] = 'Tipo';
-$wb["parent_domain_id_txt"] = 'Site Parente';
-$wb["redirect_type_txt"] = 'Tipo do Redirecionamento';
-$wb["redirect_path_txt"] = 'Caminho do Redirecionamento';
-$wb["active_txt"] = 'Ativo';
-$wb["document_root_txt"] = 'Documentroot';
-$wb["system_user_txt"] = 'Usuário no Linux';
-$wb["system_group_txt"] = 'Grupo no Linux';
-$wb["ip_address_txt"] = 'Endereço-IP';
-$wb["vhost_type_txt"] = 'Tipo de VHost';
-$wb["hd_quota_txt"] = 'Quota de Disco';
-$wb["traffic_quota_txt"] = 'Quota de Tráfico';
-$wb["cgi_txt"] = 'CGI';
-$wb["ssi_txt"] = 'SSI';
-$wb["ssl_txt"] = 'SSL';
-$wb["suexec_txt"] = 'SuEXEC';
-$wb["php_txt"] = 'PHP';
-$wb["client_txt"] = 'Cliente';
-$wb["limit_web_domain_txt"] = 'O número máximo de domínios web para esta conta foi atingido.';
-$wb["limit_web_aliasdomain_txt"] = 'O número máximo de aliases para esta conta foi atingido.';
-$wb["limit_web_subdomain_txt"] = 'O número máximo de sub-domínios para esta conta foi atingido.';
-$wb["apache_directives_txt"] = 'Diretivas apache';
-$wb["domain_error_empty"] = 'Domínio em branco.';
-$wb["domain_error_unique"] = 'Já existe alias ou sub-domínio com este nome.';
-$wb["domain_error_regex"] = 'Nome de domínio inválido.';
-$wb["host_txt"] = 'Host';
+$wb['ssl_state_txt'] = 'Estado';
+$wb['ssl_locality_txt'] = 'Localidade';
+$wb['ssl_organisation_txt'] = 'Empresa';
+$wb['ssl_organisation_unit_txt'] = 'Departamento';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'Pacote SSL';
+$wb['ssl_action_txt'] = 'Ação SSL';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Site Parente';
+$wb['redirect_type_txt'] = 'Tipo do Redirecionamento';
+$wb['redirect_path_txt'] = 'Caminho do Redirecionamento';
+$wb['active_txt'] = 'Ativo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Usuário no Linux';
+$wb['system_group_txt'] = 'Grupo no Linux';
+$wb['ip_address_txt'] = 'Endereço-IP';
+$wb['vhost_type_txt'] = 'Tipo de VHost';
+$wb['hd_quota_txt'] = 'Cota de Disco';
+$wb['traffic_quota_txt'] = 'Cota de Tráfico';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'O número máximo de domínios web para esta conta foi atingido.';
+$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
+$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domínios para esta conta foi atingido.';
+$wb['apache_directives_txt'] = 'Diretivas apache';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'Já existe alias ou sub-domínio com este nome.';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
+$wb['host_txt'] = 'Host';
 ?>
+
diff --git a/interface/web/sites/lib/lang/br_web_subdomain_list.lng b/interface/web/sites/lib/lang/br_web_subdomain_list.lng
index 364d321..2a812b5 100644
--- a/interface/web/sites/lib/lang/br_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_subdomain_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'Sub-domínios';
-$wb["active_txt"] = 'Ativo';
-$wb["server_id_txt"] = 'Servidor';
-$wb["parent_domain_id_txt"] = 'Website';
-$wb["domain_txt"] = 'Sub=domínio';
-$wb["add_new_record_txt"] = 'Adcionar um novo sub-domínio';
+$wb['list_head_txt'] = 'Sub-domínios';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Sub-domínio';
+$wb['add_new_record_txt'] = 'Adcionar um novo sub-domínio';
 ?>
+
diff --git a/interface/web/sites/lib/lang/de.lng b/interface/web/sites/lib/lang/de.lng
index c653df2..848c37b 100644
--- a/interface/web/sites/lib/lang/de.lng
+++ b/interface/web/sites/lib/lang/de.lng
@@ -13,5 +13,5 @@
 $wb['Shell-User'] = 'Shell Benutzer';
 $wb['Shell'] = 'Shell';
 $wb['Websites'] = 'Websites';
-$wb['Stats'] = 'Statistics';
+$wb['Stats'] = 'Statistiken';
 ?>
diff --git a/interface/web/sites/lib/lang/de_cron.lng b/interface/web/sites/lib/lang/de_cron.lng
index c65bf38..bd0c8b7 100644
--- a/interface/web/sites/lib/lang/de_cron.lng
+++ b/interface/web/sites/lib/lang/de_cron.lng
@@ -16,6 +16,6 @@
 $wb['run_mday_error_format'] = 'Das Format f&uuml;r Tage des Monats ist nicht korrekt.';
 $wb['run_month_error_format'] = 'Das Format f&uuml;r Monate ist nicht korrekt.';
 $wb['run_wday_error_format'] = 'Das Format f&uuml;r Wochentage ist nicht korrekt.';
-$wb['command_error_format'] = 'Das Format f&uuml;r den Befehl ist nicht korrekt. Beachte, dass bei einem URL Aufruf nur http und https erlaubt ist.';
+$wb['command_error_format'] = 'Das Format f&uuml;r den Befehl ist nicht korrekt. Beachten Sie, dass bei einem URL Aufruf nur http und https erlaubt ist.';
 $wb['unknown_fieldtype_error'] = 'Es wurde ein unbekanntes Feld verwendet.';
 ?>
diff --git a/interface/web/sites/lib/lang/de_cron_list.lng b/interface/web/sites/lib/lang/de_cron_list.lng
index 7cdfd3b..9778e9f 100644
--- a/interface/web/sites/lib/lang/de_cron_list.lng
+++ b/interface/web/sites/lib/lang/de_cron_list.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['list_head_txt'] = 'Cron Jobs';
-$wb['active_txt'] = 'Activ';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
 $wb['run_min_txt'] = 'Minute';
 $wb['run_hour_txt'] = 'Stunde';
diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng
index 66241ef..5415acd 100644
--- a/interface/web/sites/lib/lang/de_database.lng
+++ b/interface/web/sites/lib/lang/de_database.lng
@@ -16,7 +16,7 @@
 $wb['database_user_error_empty'] = 'Datenbank Benutzer ist leer.';
 $wb['database_user_error_unique'] = 'Es existiert bereits ein Benutzer mit diesem Namen am Server. Um einen eindeutigen Namen zu erhalten können sie z.B. den Domainnamen vor dem Benutzernamen verwenden.';
 $wb['database_user_error_regex'] = 'Ungültiger Benutzername. Der Benutzername darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.';
-$wb['limit_database_txt'] = 'Die max. Anzahl an Datenbanken wurde erreicht.';
+$wb['limit_database_txt'] = 'Die maximale Anzahl an Datenbanken wurde erreicht.';
 $wb['database_name_change_txt'] = 'Der Datenbankname kann nicht geändert werden.';
 $wb['database_charset_change_txt'] = 'Der Zeichensatz der Datenbank kann nicht geändert werden.';
 $wb['password_strength_txt'] = 'Passwortkomplexität';
diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng
index 3991289..02449e3 100644
--- a/interface/web/sites/lib/lang/de_ftp_user.lng
+++ b/interface/web/sites/lib/lang/de_ftp_user.lng
@@ -23,4 +23,5 @@
 $wb['directory_error_empty'] = 'Verzeichniss ist leer.';
 $wb['password_strength_txt'] = 'Passwortkomplexität';
 $wb['directory_error_notinweb'] = 'Das Verzeichnis befindet sich nicht innerhalb des Verzeichnisses der Website.';
+$wb['parent_domain_id_error_empty'] = 'Keine Website ausgewählt.';
 ?>
diff --git a/interface/web/sites/lib/lang/de_shell_user.lng b/interface/web/sites/lib/lang/de_shell_user.lng
index 0b21404..92589ee 100644
--- a/interface/web/sites/lib/lang/de_shell_user.lng
+++ b/interface/web/sites/lib/lang/de_shell_user.lng
@@ -18,4 +18,5 @@
 $wb['directory_error_empty'] = 'Verzeichnis ist leer.';
 $wb['limit_shell_user_txt'] = 'Die maximale Anzahl an Shellbenutzer wurde erreicht.';
 $wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['parent_domain_id_error_empty'] = 'Keine Website ausgewählt.';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
index 8326df2..229fcf2 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -28,15 +28,15 @@
 $wb['suexec_txt'] = 'SuEXEC';
 $wb['php_txt'] = 'PHP';
 $wb['client_txt'] = 'Kunde';
-$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für ihren Account wurde erreicht.';
-$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für ihren Account wurde erreicht.';
-$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Subdomains für ihren Account wurde erreicht.';
-$wb['apache_directives_txt'] = 'Apache directives';
+$wb['limit_web_domain_txt'] = 'Die maximale Anzahl an Webdomains für ihr Konto wurde erreicht.';
+$wb['limit_web_aliasdomain_txt'] = 'Die maximale Anzahl an Aliasdomains für ihr Konto wurde erreicht.';
+$wb['limit_web_subdomain_txt'] = 'Die maximale Anzahl an Subdomains für ihr Konto wurde erreicht.';
+$wb['apache_directives_txt'] = 'Apache Direktiven';
 $wb['domain_error_empty'] = 'Domain ist leer.';
 $wb['domain_error_unique'] = 'Domain muss eindeutig sein';
 $wb['domain_error_regex'] = 'Domainname ungültig.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota ist leer.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota ist leer.';
+$wb['hd_quota_error_empty'] = 'Harddisk Quota ist leer.';
+$wb['traffic_quota_error_empty'] = 'Traffic Quota ist leer.';
 $wb['errordocs_txt'] = 'Eigene Fehlerseiten';
 $wb['error_ssl_state_empty'] = 'SSL Status ist leer.';
 $wb['error_ssl_locality_empty'] = 'SSL Lokalität ist leer.';
diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng
index d7d5e8e..19ff862 100644
--- a/interface/web/sites/lib/lang/de_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_subdomain.lng
@@ -21,7 +21,7 @@
 $wb['ip_address_txt'] = 'IP-Adresse';
 $wb['vhost_type_txt'] = 'VHost Type';
 $wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quaota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
 $wb['cgi_txt'] = 'CGI';
 $wb['ssi_txt'] = 'SSI';
 $wb['ssl_txt'] = 'SSL';
@@ -31,7 +31,7 @@
 $wb['limit_web_domain_txt'] = 'Die maximale Anzahl an Webdomains für ihr Konto wurde erreicht.';
 $wb['limit_web_aliasdomain_txt'] = 'Die maximale Anzahl an Aliasdomains für ihr Konto wurde erreicht.';
 $wb['limit_web_subdomain_txt'] = 'Die maximale Anzahl an Web Subdomains für ihr Konto wurde erreicht.';
-$wb['apache_directives_txt'] = 'Apache directives';
+$wb['apache_directives_txt'] = 'Apache Direktiven';
 $wb['domain_error_empty'] = 'Domain ist leer.';
 $wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
 $wb['domain_error_regex'] = 'Domainname ist ungültig.';
diff --git a/interface/web/sites/lib/lang/en_database.lng b/interface/web/sites/lib/lang/en_database.lng
index 555511a..48d7ea3 100644
--- a/interface/web/sites/lib/lang/en_database.lng
+++ b/interface/web/sites/lib/lang/en_database.lng
@@ -20,4 +20,6 @@
 $wb["limit_database_txt"] = 'The max. number of databases is reached.';
 $wb["database_name_change_txt"] = 'The database name can not be changed';
 $wb["database_charset_change_txt"] = 'The database charset can not be changed';
+$wb["database_name_error_len"] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.';
+$wb["database_user_error_len"] = 'Database username - {user}- too long. The max. database username length incl. prefix is 16 chars.';
 ?>
diff --git a/interface/web/sites/lib/lang/es_cron.lng b/interface/web/sites/lib/lang/es_cron.lng
index 8cb7f08..fecb4ab 100644
--- a/interface/web/sites/lib/lang/es_cron.lng
+++ b/interface/web/sites/lib/lang/es_cron.lng
@@ -1,5 +1,5 @@
 <?php
-$wb["server_id_txt"] = 'Server';
+$wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Parent website';
 $wb['active_txt'] = 'Active';
 $wb['client_txt'] = 'Client';
@@ -18,4 +18,4 @@
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/es_cron_list.lng b/interface/web/sites/lib/lang/es_cron_list.lng
index b5c8d15..ad56ea9 100644
--- a/interface/web/sites/lib/lang/es_cron_list.lng
+++ b/interface/web/sites/lib/lang/es_cron_list.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["list_head_txt"] = 'Cron Jobs';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["run_min_txt"] = 'Minute';
-$wb["run_hour_txt"] = 'Hour';
-$wb["run_mday_txt"] = 'Day of month';
-$wb["run_month_txt"] = 'Month';
-$wb["run_wday_txt"] = 'Day of week';
-$wb["command_txt"] = 'Command';
-$wb["add_new_cron_txt"] = 'Add new Cron job';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Cron Jobs';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['run_min_txt'] = 'Minute';
+$wb['run_hour_txt'] = 'Hour';
+$wb['run_mday_txt'] = 'Day of month';
+$wb['run_month_txt'] = 'Month';
+$wb['run_wday_txt'] = 'Day of week';
+$wb['command_txt'] = 'Command';
+$wb['add_new_cron_txt'] = 'Add new Cron job';
+?>
diff --git a/interface/web/sites/lib/lang/es_ftp_user.lng b/interface/web/sites/lib/lang/es_ftp_user.lng
index 148cdc9..550fa18 100644
--- a/interface/web/sites/lib/lang/es_ftp_user.lng
+++ b/interface/web/sites/lib/lang/es_ftp_user.lng
@@ -23,4 +23,5 @@
 $wb['directory_error_empty'] = 'Directorio vacío';
 $wb['quota_files_unity_txt'] = 'Files';
 $wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/es_shell_user.lng b/interface/web/sites/lib/lang/es_shell_user.lng
index 8edb9d9..e9548cf 100644
--- a/interface/web/sites/lib/lang/es_shell_user.lng
+++ b/interface/web/sites/lib/lang/es_shell_user.lng
@@ -18,4 +18,5 @@
 $wb['uid_error_empty'] = 'GID vacío';
 $wb['directory_error_empty'] = 'Directorio vacío';
 $wb['limit_shell_user_txt'] = 'Se ha alcanzado el número máximo de usuarios de consola';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_cron.lng b/interface/web/sites/lib/lang/fi_cron.lng
index 8cb7f08..fecb4ab 100644
--- a/interface/web/sites/lib/lang/fi_cron.lng
+++ b/interface/web/sites/lib/lang/fi_cron.lng
@@ -1,5 +1,5 @@
 <?php
-$wb["server_id_txt"] = 'Server';
+$wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Parent website';
 $wb['active_txt'] = 'Active';
 $wb['client_txt'] = 'Client';
@@ -18,4 +18,4 @@
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/fi_cron_list.lng b/interface/web/sites/lib/lang/fi_cron_list.lng
index b5c8d15..ad56ea9 100644
--- a/interface/web/sites/lib/lang/fi_cron_list.lng
+++ b/interface/web/sites/lib/lang/fi_cron_list.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["list_head_txt"] = 'Cron Jobs';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["run_min_txt"] = 'Minute';
-$wb["run_hour_txt"] = 'Hour';
-$wb["run_mday_txt"] = 'Day of month';
-$wb["run_month_txt"] = 'Month';
-$wb["run_wday_txt"] = 'Day of week';
-$wb["command_txt"] = 'Command';
-$wb["add_new_cron_txt"] = 'Add new Cron job';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Cron Jobs';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['run_min_txt'] = 'Minute';
+$wb['run_hour_txt'] = 'Hour';
+$wb['run_mday_txt'] = 'Day of month';
+$wb['run_month_txt'] = 'Month';
+$wb['run_wday_txt'] = 'Day of week';
+$wb['command_txt'] = 'Command';
+$wb['add_new_cron_txt'] = 'Add new Cron job';
+?>
diff --git a/interface/web/sites/lib/lang/fi_ftp_user.lng b/interface/web/sites/lib/lang/fi_ftp_user.lng
index 9cdfa08..c416717 100755
--- a/interface/web/sites/lib/lang/fi_ftp_user.lng
+++ b/interface/web/sites/lib/lang/fi_ftp_user.lng
@@ -23,4 +23,5 @@
 $wb['password_strength_txt'] = 'Salasanan vahvuus';
 $wb['quota_files_unity_txt'] = 'Files';
 $wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_shell_user.lng b/interface/web/sites/lib/lang/fi_shell_user.lng
index de3365f..a925c4c 100755
--- a/interface/web/sites/lib/lang/fi_shell_user.lng
+++ b/interface/web/sites/lib/lang/fi_shell_user.lng
@@ -18,4 +18,5 @@
 $wb['directory_error_empty'] = 'Kansio-kenttä on tyhjä.';
 $wb['limit_shell_user_txt'] = 'Shell-käyttäjien määrä on ylitetty.';
 $wb['password_strength_txt'] = 'Salasanan vahvuus';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_ftp_user.lng b/interface/web/sites/lib/lang/fr_ftp_user.lng
index df48d9a..190f4a3 100644
--- a/interface/web/sites/lib/lang/fr_ftp_user.lng
+++ b/interface/web/sites/lib/lang/fr_ftp_user.lng
@@ -23,4 +23,5 @@
 $wb['directory_error_empty'] = 'Directory empty.';
 $wb['quota_files_unity_txt'] = 'Files';
 $wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_shell_user.lng b/interface/web/sites/lib/lang/fr_shell_user.lng
index 31a6aa7..0f2ea6c 100644
--- a/interface/web/sites/lib/lang/fr_shell_user.lng
+++ b/interface/web/sites/lib/lang/fr_shell_user.lng
@@ -18,4 +18,5 @@
 $wb['uid_error_empty'] = 'GID empty.';
 $wb['directory_error_empty'] = 'Directory empty.';
 $wb['limit_shell_user_txt'] = 'The max number of shell users is reached.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/hu.lng b/interface/web/sites/lib/lang/hu.lng
new file mode 100644
index 0000000..6bf70fd
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['Database'] = 'Adatbázis';
+$wb['Options'] = 'Beállítások';
+$wb['Shell User'] = 'Shell felhasználó';
+$wb['Domain'] = 'Domain';
+$wb['Redirect'] = 'Átirányítás';
+$wb['SSL'] = 'SSL';
+$wb['Subdomain'] = 'Aldomain';
+$wb['Sites'] = 'Weboldalak';
+$wb['Aliasdomain'] = 'Aliasdomain';
+$wb['FTP-User'] = 'FTP-felhasználó';
+$wb['FTP'] = 'FTP';
+$wb['Shell-User'] = 'Shell-felhasználó';
+$wb['Shell'] = 'Shell';
+$wb['Websites'] = 'Weboldalak';
+$wb['Stats'] = 'Statisztikák';
+?>
+
diff --git a/interface/web/sites/lib/lang/hu_database.lng b/interface/web/sites/lib/lang/hu_database.lng
new file mode 100644
index 0000000..285bafc6
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_database.lng
@@ -0,0 +1,22 @@
+<?php
+$wb['server_id_txt'] = 'Szerver';
+$wb['type_txt'] = 'Típus';
+$wb['database_name_txt'] = 'Adatbázis neve';
+$wb['database_user_txt'] = 'Adatbázis felhasználó';
+$wb['database_password_txt'] = 'Adatbázis jeszó';
+$wb['database_charset_txt'] = 'Adatbázis karakterkódolás';
+$wb['remote_access_txt'] = 'Távoli hozzáférés';
+$wb['client_txt'] = 'Kliens';
+$wb['active_txt'] = 'Aktív';
+$wb['database_name_error_empty'] = 'Adatbázis neve üres.';
+$wb['database_name_error_unique'] = 'Adatbázis név már foglalt.';
+$wb['database_name_error_regex'] = 'Hibás adatbázisnév. A következő karaktereket használhatja: a-z, A-Z, 0-9 és aláhúzás (_). Hossza:  2 - 64 karakter.';
+$wb['database_user_error_empty'] = 'Adatbázis felhasználó üres.';
+$wb['database_user_error_unique'] = 'adatbázi felhasználónév már foglalt.';
+$wb['database_user_error_regex'] = 'Hibás adatbázis felhasználónév. A következő karaktereket használhatja: a-z, A-Z, 0-9 és aláhúzás (_). Hossza: 2 - 64 karakter.';
+$wb['limit_database_txt'] = 'Nincs több adatbázis lehetőség.';
+$wb['database_name_change_txt'] = 'Adatbázis neve nem módosítható.';
+$wb['database_charset_change_txt'] = 'Adatbázis karakterkódolás nem módosítható.';
+$wb['password_strength_txt'] = 'Jelszó erőssége';
+?>
+
diff --git a/interface/web/sites/lib/lang/hu_database_list.lng b/interface/web/sites/lib/lang/hu_database_list.lng
new file mode 100644
index 0000000..a24bc9e
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_database_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Adatbázis';
+$wb['active_txt'] = 'Aktív';
+$wb['remote_access_txt'] = 'Távoli hozzáférés';
+$wb['server_id_txt'] = 'Szerver';
+$wb['database_name_txt'] = 'Adatbázis neve';
+$wb['add_new_record_txt'] = 'Új adatbázis';
+?>
+
diff --git a/interface/web/sites/lib/lang/hu_ftp_user.lng b/interface/web/sites/lib/lang/hu_ftp_user.lng
new file mode 100644
index 0000000..2d99bd1
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_ftp_user.lng
@@ -0,0 +1,26 @@
+<?php
+$wb['uid_txt'] = 'UID';
+$wb['gid_txt'] = 'GID';
+$wb['dir_txt'] = 'Könyvtár';
+$wb['quota_files_txt'] = 'Fájlkorlát';
+$wb['ul_ratio_txt'] = 'Feltöltési arány';
+$wb['dl_ratio_txt'] = 'Letöltési arány';
+$wb['ul_bandwidth_txt'] = 'Feltöltési sávszélesség';
+$wb['dl_bandwidth_txt'] = 'Letöltési sávszélesség';
+$wb['server_id_txt'] = 'Szerver';
+$wb['parent_domain_id_txt'] = 'Weboldal';
+$wb['username_txt'] = 'Felhasználónév';
+$wb['password_txt'] = 'Jelszó';
+$wb['quota_size_txt'] = 'Tárhely korlát';
+$wb['active_txt'] = 'Aktív';
+$wb['limit_ftp_user_txt'] = 'Nincs több FTP felhasználó lehetőség.';
+$wb['username_error_empty'] = 'Felhasználónév üres.';
+$wb['username_error_unique'] = 'Felhasználónév már foglalt.';
+$wb['username_error_regex'] = 'Felhasználónév illegális karaktereket tartalmaz.';
+$wb['quota_size_error_empty'] = 'Korlát Üres';
+$wb['uid_error_empty'] = 'GID üres.';
+$wb['directory_error_empty'] = 'Könyvtár üres.';
+$wb['quota_files_unity_txt'] = 'Fájlok';
+$wb['password_strength_txt'] = 'Jelszó erőssége';
+?>
+
diff --git a/interface/web/sites/lib/lang/hu_ftp_user_list.lng b/interface/web/sites/lib/lang/hu_ftp_user_list.lng
new file mode 100644
index 0000000..8addfd5
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_ftp_user_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'FTP-felhasználó';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['parent_domain_id_txt'] = 'Weboldal';
+$wb['username_txt'] = 'Felhasználónév';
+$wb['add_new_record_txt'] = 'Új FTP-felhasználó';
+?>
+
diff --git a/interface/web/sites/lib/lang/hu_shell_user.lng b/interface/web/sites/lib/lang/hu_shell_user.lng
new file mode 100644
index 0000000..f3c9a15
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_shell_user.lng
@@ -0,0 +1,22 @@
+<?php
+$wb['uid_txt'] = 'Web felhasználónév';
+$wb['gid_txt'] = 'Csoport';
+$wb['shell_txt'] = 'Shell';
+$wb['dir_txt'] = 'Könyvtár';
+$wb['server_id_txt'] = 'Szerver';
+$wb['parent_domain_id_txt'] = 'Weboldal';
+$wb['username_txt'] = 'Felhasználónév';
+$wb['password_txt'] = 'Jelszó';
+$wb['chroot_txt'] = 'Chroot Shell';
+$wb['quota_size_txt'] = 'Korlát';
+$wb['active_txt'] = 'Aktív';
+$wb['username_error_empty'] = 'Felhasználónév üres';
+$wb['username_error_unique'] = 'Felhasználónév már foglalt.';
+$wb['username_error_regex'] = 'Felhasználónév illegális karaktereket tartalmaz.';
+$wb['quota_size_error_empty'] = 'Korlát üres.';
+$wb['uid_error_empty'] = 'GID üres.';
+$wb['directory_error_empty'] = 'Könyvtár üres.';
+$wb['limit_shell_user_txt'] = 'The max number of shell users is reached.';
+$wb['password_strength_txt'] = 'Password strength';
+?>
+
diff --git a/interface/web/sites/lib/lang/hu_shell_user_list.lng b/interface/web/sites/lib/lang/hu_shell_user_list.lng
new file mode 100644
index 0000000..acd8fa5
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_shell_user_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Shell felhasználó';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['parent_domain_id_txt'] = 'Weboldal';
+$wb['username_txt'] = 'Felhasználónév';
+$wb['add_new_record_txt'] = 'Új Shell felhasználó';
+?>
+
diff --git a/interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng
new file mode 100644
index 0000000..a72054b
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Aliasdomain';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['parent_domain_id_txt'] = 'Weboldal';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['add_new_record_txt'] = 'Új Aliasdomain';
+$wb['domain_error_empty'] = 'Domain üres';
+$wb['domain_error_unique'] = 'Domain már foglalt.';
+$wb['domain_error_regex'] = 'Domain név hibás.';
+?>
+
diff --git a/interface/web/sites/lib/lang/hu_web_domain.lng b/interface/web/sites/lib/lang/hu_web_domain.lng
new file mode 100644
index 0000000..c5e459e
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_domain.lng
@@ -0,0 +1,50 @@
+<?php
+$wb['ssl_state_txt'] = 'Állam';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Cég';
+$wb['ssl_organisation_unit_txt'] = 'Osztály';
+$wb['ssl_country_txt'] = 'Állam';
+$wb['ssl_request_txt'] = 'SSL Kérés';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Aktció';
+$wb['server_id_txt'] = 'Szerver';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Tipus';
+$wb['parent_domain_id_txt'] = 'Szülő Weboldal';
+$wb['redirect_type_txt'] = 'Átirányítás tipusa';
+$wb['redirect_path_txt'] = 'Átirányítás útvonal';
+$wb['active_txt'] = 'Aktív';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux felahsználó';
+$wb['system_group_txt'] = 'Linux csoport';
+$wb['ip_address_txt'] = 'IP-ím';
+$wb['vhost_type_txt'] = 'VHost Típus';
+$wb['hd_quota_txt'] = 'Táhely Korlát';
+$wb['traffic_quota_txt'] = 'Forgalom Korlát';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Saját hibaoldal';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Kliens';
+$wb['limit_web_domain_txt'] = 'Nincs több weboldal lehetőség.';
+$wb['limit_web_aliasdomain_txt'] = 'Nincs több aliasdomain lehetőség.';
+$wb['limit_web_subdomain_txt'] = 'Nincs több aldomain lehetőség.';
+$wb['apache_directives_txt'] = 'Apache directivák';
+$wb['domain_error_empty'] = 'Domain üres';
+$wb['domain_error_unique'] = 'Domain már foglalt.';
+$wb['domain_error_regex'] = 'Domain név hibás.';
+$wb['hd_quota_error_empty'] = 'Tárgely korlát üres.';
+$wb['traffic_quota_error_empty'] = 'Forgalom korlát üres.';
+$wb['subdomain_txt'] = 'Auto-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['client_group_id_txt'] = 'Kliens';
+$wb['stats_password_txt'] = 'Statisztika jelszó';
+?>
+
diff --git a/interface/web/sites/lib/lang/hu_web_subdomain.lng b/interface/web/sites/lib/lang/hu_web_subdomain.lng
new file mode 100644
index 0000000..921164e
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_subdomain.lng
@@ -0,0 +1,40 @@
+<?php
+$wb['ssl_state_txt'] = 'Megye';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Cég';
+$wb['ssl_organisation_unit_txt'] = 'Osztály';
+$wb['ssl_country_txt'] = 'Ország';
+$wb['ssl_request_txt'] = 'SSL Kérés';
+$wb['ssl_cert_txt'] = 'SSL Tanusítvány';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Akció';
+$wb['server_id_txt'] = 'Szrver';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Típus';
+$wb['parent_domain_id_txt'] = 'Szülő weboldal';
+$wb['redirect_type_txt'] = 'Átirányítás tipusa';
+$wb['redirect_path_txt'] = 'Átirány útvonal';
+$wb['active_txt'] = 'Aktív';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux Felhasználó';
+$wb['system_group_txt'] = 'Linux Csoport';
+$wb['ip_address_txt'] = 'IP-cím';
+$wb['vhost_type_txt'] = 'VHost Típus';
+$wb['hd_quota_txt'] = 'Tárhely Korlát';
+$wb['traffic_quota_txt'] = 'Forgalom Korlát';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Kliens';
+$wb['limit_web_domain_txt'] = 'Nincs több weboldal lehetőség.';
+$wb['limit_web_aliasdomain_txt'] = 'Nincs több aliasdomain lehetőség';
+$wb['limit_web_subdomain_txt'] = 'Nincs több aldomain lehetőség.';
+$wb['apache_directives_txt'] = 'Apache directivák';
+$wb['domain_error_empty'] = 'Domain üres';
+$wb['domain_error_unique'] = 'Domain már foglalt.';
+$wb['domain_error_regex'] = 'Domain név érvénytelen';
+$wb['host_txt'] = 'Állomás';
+?>
+
diff --git a/interface/web/sites/lib/lang/hu_web_subdomain_list.lng b/interface/web/sites/lib/lang/hu_web_subdomain_list.lng
new file mode 100644
index 0000000..f3b4d53
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_subdomain_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Aldomainok';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['parent_domain_id_txt'] = 'Weboldal';
+$wb['domain_txt'] = 'aldomain';
+$wb['add_new_record_txt'] = 'Új Aldomain';
+?>
+
diff --git a/interface/web/sites/lib/lang/it_cron.lng b/interface/web/sites/lib/lang/it_cron.lng
index 8cb7f08..fecb4ab 100644
--- a/interface/web/sites/lib/lang/it_cron.lng
+++ b/interface/web/sites/lib/lang/it_cron.lng
@@ -1,5 +1,5 @@
 <?php
-$wb["server_id_txt"] = 'Server';
+$wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Parent website';
 $wb['active_txt'] = 'Active';
 $wb['client_txt'] = 'Client';
@@ -18,4 +18,4 @@
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/it_cron_list.lng b/interface/web/sites/lib/lang/it_cron_list.lng
index b5c8d15..ad56ea9 100644
--- a/interface/web/sites/lib/lang/it_cron_list.lng
+++ b/interface/web/sites/lib/lang/it_cron_list.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["list_head_txt"] = 'Cron Jobs';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["run_min_txt"] = 'Minute';
-$wb["run_hour_txt"] = 'Hour';
-$wb["run_mday_txt"] = 'Day of month';
-$wb["run_month_txt"] = 'Month';
-$wb["run_wday_txt"] = 'Day of week';
-$wb["command_txt"] = 'Command';
-$wb["add_new_cron_txt"] = 'Add new Cron job';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Cron Jobs';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['run_min_txt'] = 'Minute';
+$wb['run_hour_txt'] = 'Hour';
+$wb['run_mday_txt'] = 'Day of month';
+$wb['run_month_txt'] = 'Month';
+$wb['run_wday_txt'] = 'Day of week';
+$wb['command_txt'] = 'Command';
+$wb['add_new_cron_txt'] = 'Add new Cron job';
+?>
diff --git a/interface/web/sites/lib/lang/it_ftp_user.lng b/interface/web/sites/lib/lang/it_ftp_user.lng
index 4a5893c..9da2719 100644
--- a/interface/web/sites/lib/lang/it_ftp_user.lng
+++ b/interface/web/sites/lib/lang/it_ftp_user.lng
@@ -23,4 +23,5 @@
 $wb['directory_error_empty'] = 'Directory empty.';
 $wb['quota_files_unity_txt'] = 'Files';
 $wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/it_shell_user.lng b/interface/web/sites/lib/lang/it_shell_user.lng
index 31a6aa7..0f2ea6c 100644
--- a/interface/web/sites/lib/lang/it_shell_user.lng
+++ b/interface/web/sites/lib/lang/it_shell_user.lng
@@ -18,4 +18,5 @@
 $wb['uid_error_empty'] = 'GID empty.';
 $wb['directory_error_empty'] = 'Directory empty.';
 $wb['limit_shell_user_txt'] = 'The max number of shell users is reached.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/nl.lng b/interface/web/sites/lib/lang/nl.lng
index 409546a..aa3b4be 100644
--- a/interface/web/sites/lib/lang/nl.lng
+++ b/interface/web/sites/lib/lang/nl.lng
@@ -1,17 +1,18 @@
 <?php
-$wb['Database'] = 'Database';
+$wb['Database'] = 'Databases';
 $wb['Options'] = 'Opties';
 $wb['Shell User'] = 'Shell gebruiker';
-$wb['Domain'] = 'Domein';
+$wb['Domain'] = 'Website domeinen';
 $wb['Redirect'] = 'Redirect';
 $wb['SSL'] = 'SSL';
-$wb['Subdomain'] = 'Subdomein';
+$wb['Subdomain'] = 'Website subdomeinen';
 $wb['Sites'] = 'Sites';
-$wb['Aliasdomain'] = 'Aliasdomein';
-$wb['FTP-User'] = 'FTP-gebruiker';
+$wb['Aliasdomain'] = 'Website domeinaliassen';
+$wb['FTP-User'] = 'FTP gebruikers';
 $wb['FTP'] = 'FTP';
-$wb['Shell-User'] = 'Shell-gebruiker';
+$wb['Shell-User'] = 'Shell gebruikers';
 $wb['Shell'] = 'Shell';
 $wb['Websites'] = 'Websites';
-$wb['Stats'] = 'Statistics';
+$wb['Stats'] = 'Statistieken';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_cron.lng b/interface/web/sites/lib/lang/nl_cron.lng
index 8cb7f08..adf2d22 100644
--- a/interface/web/sites/lib/lang/nl_cron.lng
+++ b/interface/web/sites/lib/lang/nl_cron.lng
@@ -1,21 +1,22 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb['parent_domain_id_txt'] = 'Parent website';
-$wb['active_txt'] = 'Active';
-$wb['client_txt'] = 'Client';
-$wb['run_min_txt'] = 'Minutes';
-$wb['run_hour_txt'] = 'Hours';
-$wb['run_mday_txt'] = 'Days of month';
-$wb['run_month_txt'] = 'Months';
-$wb['run_wday_txt'] = 'Days of week';
-$wb['command_txt'] = 'Command to run (commands are executed via sh, urls via wget)';
-$wb['limit_cron_txt'] = 'The maximum number of allowed cron jobs was reached.';
-$wb['limit_cron_frequency_txt'] = 'The cron job frequency exceeds the allowed limit.';
-$wb['run_min_error_format'] = 'Invalid format for minutes.';
-$wb['run_hour_error_format'] = 'Invalid format for hours.';
-$wb['run_mday_error_format'] = 'Invalid format for days of month.';
-$wb['run_month_error_format'] = 'Invalid format for months.';
-$wb['run_wday_error_format'] = 'Invalid format for days of the week.';
-$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
-$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['active_txt'] = 'Actief?';
+$wb['client_txt'] = 'Klant';
+$wb['run_min_txt'] = 'Minuten';
+$wb['run_hour_txt'] = 'Uren';
+$wb['run_mday_txt'] = 'Dagen van maand';
+$wb['run_month_txt'] = 'Maanden';
+$wb['run_wday_txt'] = 'Dagen van week';
+$wb['command_txt'] = 'Uit te voeren commando<br />(Commando wordt uitgevoerd met sh,<br />URLs met wget)';
+$wb['limit_cron_txt'] = 'Het max. aantal toegestane cron-jobs is bereikt.';
+$wb['limit_cron_frequency_txt'] = 'De cronjob frequentie overschrijdt de toegestaande limiet.';
+$wb['run_min_error_format'] = 'Ongeldige indeling voor minuten.';
+$wb['run_hour_error_format'] = 'Ongeldige indeling voor uren.';
+$wb['run_mday_error_format'] = 'Ongeldige indeling voor dagen van maand.';
+$wb['run_month_error_format'] = 'Ongeldige indeling maand.';
+$wb['run_wday_error_format'] = 'Ongeldige indeling voor dagen van week.';
+$wb['command_error_format'] = 'Ongeldige commando indeling. In geval van een URL, alleen http/https wordt ondersteund.';
+$wb['unknown_fieldtype_error'] = 'Een onbekend veld-type wordt gebruikt.';
+?>
+
diff --git a/interface/web/sites/lib/lang/nl_cron_list.lng b/interface/web/sites/lib/lang/nl_cron_list.lng
index b5c8d15..cf2ca5c 100644
--- a/interface/web/sites/lib/lang/nl_cron_list.lng
+++ b/interface/web/sites/lib/lang/nl_cron_list.lng
@@ -1,12 +1,13 @@
 <?php
-$wb["list_head_txt"] = 'Cron Jobs';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["run_min_txt"] = 'Minute';
-$wb["run_hour_txt"] = 'Hour';
-$wb["run_mday_txt"] = 'Day of month';
-$wb["run_month_txt"] = 'Month';
-$wb["run_wday_txt"] = 'Day of week';
-$wb["command_txt"] = 'Command';
-$wb["add_new_cron_txt"] = 'Add new Cron job';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Cron Jobs';
+$wb['active_txt'] = 'Actief?';
+$wb['server_id_txt'] = 'Server';
+$wb['run_min_txt'] = 'Minuut';
+$wb['run_hour_txt'] = 'Uur';
+$wb['run_mday_txt'] = 'Dag van maand';
+$wb['run_month_txt'] = 'Maand';
+$wb['run_wday_txt'] = 'Dag van week';
+$wb['command_txt'] = 'Commando';
+$wb['add_new_cron_txt'] = 'Nieuwe Cron job toevoegen';
+?>
+
diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng
index afb759f..6b8108f 100644
--- a/interface/web/sites/lib/lang/nl_database.lng
+++ b/interface/web/sites/lib/lang/nl_database.lng
@@ -2,22 +2,25 @@
 $wb['server_id_txt'] = 'Server';
 $wb['type_txt'] = 'Type';
 $wb['database_name_txt'] = 'Databasenaam';
-$wb['database_user_txt'] = 'Database gebruiker';
+$wb['database_user_txt'] = 'Database gebruikersnaam';
 $wb['database_password_txt'] = 'Database wachtwoord';
 $wb['password_strength_txt'] = 'Wachtwoord sterkte';
 $wb['database_charset_txt'] = 'Database karakterset';
-$wb['remote_access_txt'] = 'Remote Access';
+$wb['remote_access_txt'] = 'Externe toegang';
 $wb['client_txt'] = 'Klant';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['database_name_error_empty'] = 'Databasenaam is leeg.';
-$wb['database_name_error_unique'] = 'Er bestaat al een database gebruiker met deze naam op de server. Om een unieke naam te verkrijgen, kunt u bijv. uw domeinnaam als gebruikersnaam gebruiken.';
-$wb['database_name_error_regex'] = 'Ongeldige database gebruikersnaam. De gebruikersnaam bevat deze karakters: a-z, A-Z, 0-9 en de underscore. Lengte: 2 - 64 karakters.';
-$wb['database_user_error_empty'] = 'Database gebruiker is leeg.';
+$wb['database_name_error_unique'] = 'De databasenaam is al in gebruik. Kies een andere naam. U zou bijv. ook uw domeinnaam als databasenaam kunnen gebruiken.';
+$wb['database_name_error_regex'] = 'Ongeldige databasenaam. Gebruik alleen deze karakters: a-z, A-Z, 0-9 en de underscore. Lengte: 2 - 64 karakters.';
+$wb['database_user_error_empty'] = 'Gebruikersnaam niet ingevuld.';
 $wb['database_user_error_unique'] = 'Er bestaat al een database gebruiker met deze naam op de server. Om een unieke naam te verkrijgen, kunt u bijv. uw domeinnaam als gebruikersnaam gebruiken.';
-$wb['database_user_error_regex'] = 'Ongeldige database gebruikersnaam. De gebruikersnaam bevat deze karakters: a-z, A-Z, 0-9 en de underscore. Lengte: 2 - 64 karakters.';
+$wb['database_user_error_regex'] = 'Ongeldige gebruikersnaam. Gebruik alleen deze karakters: a-z, A-Z, 0-9 en de underscore. Lengte: 2 - 64 karakters.';
 $wb['limit_database_txt'] = 'The max. aantal databases is bereikt.';
 $wb['database_name_change_txt'] = 'De databasenaam kan niet worden gewijzigd.';
-$wb['database_charset_change_txt'] = 'The database karakterset kan niet gewijzigd worden.';
-$wb['remote_ips_txt'] = 'Remote Access IPs (separate by , and leave blank for <i>any</i>)';
-$wb['database_remote_error_ips'] = 'At least one of the entered ip addresses is invalid.';
+$wb['database_charset_change_txt'] = 'De database karakterset kan niet gewijzigd worden.';
+$wb['remote_ips_txt'] = 'Externe toegang IP-adressen.<br />(Komma-gescheiden, lege waarden = iedereen accepteren)';
+$wb['database_remote_error_ips'] = 'Tenminste 1 IP-adres is ongeldig.';
+$wb['database_name_error_len'] = 'Databasenaam - {db} - is te lang. De maximale lengte is 64 tekens.';
+$wb['database_user_error_len'] = 'Database gebruikersnaam - {user} - is te lang. De maximale lengte inclusief prefix is 16 tekens.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_database_list.lng b/interface/web/sites/lib/lang/nl_database_list.lng
index 160e5c0..392b364 100644
--- a/interface/web/sites/lib/lang/nl_database_list.lng
+++ b/interface/web/sites/lib/lang/nl_database_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Database';
-$wb['active_txt'] = 'Actief';
-$wb['remote_access_txt'] = 'Remote Access';
+$wb['list_head_txt'] = 'Databases';
+$wb['active_txt'] = 'Actief?';
+$wb['remote_access_txt'] = 'Externe toegang';
 $wb['server_id_txt'] = 'Server';
 $wb['database_name_txt'] = 'Databasenaam';
 $wb['add_new_record_txt'] = 'Nieuwe database toevoegen';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_ftp_user.lng b/interface/web/sites/lib/lang/nl_ftp_user.lng
index ed5cce6..cddcc0f 100644
--- a/interface/web/sites/lib/lang/nl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/nl_ftp_user.lng
@@ -1,26 +1,28 @@
 <?php
 $wb['uid_txt'] = 'UID';
 $wb['gid_txt'] = 'GID';
-$wb['dir_txt'] = 'Directorie';
-$wb['quota_files_txt'] = 'Bestandquota';
-$wb['ul_ratio_txt'] = 'Uploadratio';
-$wb['dl_ratio_txt'] = 'Downloadratio';
-$wb['ul_bandwidth_txt'] = 'Uploadbandbreedte';
-$wb['dl_bandwidth_txt'] = 'Downloadbandbreedte';
+$wb['dir_txt'] = 'Directory';
+$wb['quota_files_txt'] = '# Bestanden';
+$wb['ul_ratio_txt'] = 'Upload-limiet';
+$wb['dl_ratio_txt'] = 'Download-limiet';
+$wb['ul_bandwidth_txt'] = 'Max. upload snelheid';
+$wb['dl_bandwidth_txt'] = 'Max. download snelheid';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['username_txt'] = 'Gebruikersnaam';
 $wb['password_txt'] = 'Wachtwoord';
 $wb['password_strength_txt'] = 'Wachtwoord sterkte';
-$wb['quota_size_txt'] = 'Harddisk-Quota';
-$wb['active_txt'] = 'Actief';
+$wb['quota_size_txt'] = 'Schijfruimte-limiet';
+$wb['active_txt'] = 'Actief?';
 $wb['limit_ftp_user_txt'] = 'Het max. aantal FTP gebruikers voor uw account is bereikt.';
-$wb['username_error_empty'] = 'Username is leeg.';
+$wb['username_error_empty'] = 'Gebruikersnaam is leeg.';
 $wb['username_error_unique'] = 'De gebruikersnaam moet uniek zijn.';
 $wb['username_error_regex'] = 'De gebruikersnaam bevat ongeldige karakters.';
-$wb['quota_size_error_empty'] = 'Quota is leeg.';
+$wb['quota_size_error_empty'] = 'Schijfruimte-limiet is leeg.';
 $wb['uid_error_empty'] = 'GID is leeg.';
-$wb['directory_error_empty'] = 'Directorie is leeg.';
-$wb['quota_files_unity_txt'] = 'Files';
-$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
+$wb['directory_error_empty'] = 'Directory is leeg.';
+$wb['quota_files_unity_txt'] = 'bestanden';
+$wb['directory_error_notinweb'] = 'Directory is niet binnen de website-root directory.';
+$wb['parent_domain_id_error_empty'] = 'Geen website geselecteerd.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_ftp_user_list.lng b/interface/web/sites/lib/lang/nl_ftp_user_list.lng
index 3908bbb..12f7267 100644
--- a/interface/web/sites/lib/lang/nl_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/nl_ftp_user_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'FTP-gebruiker';
-$wb['active_txt'] = 'Actief';
+$wb['list_head_txt'] = 'FTP gebruikers';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['username_txt'] = 'Gebruikersnaam';
-$wb['add_new_record_txt'] = 'Toevoegen nieuwe FTP-gebruiker';
+$wb['add_new_record_txt'] = 'Nieuwe FTP-gebruiker toevoegen';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_shell_user.lng b/interface/web/sites/lib/lang/nl_shell_user.lng
index d525d2c..f33b859 100644
--- a/interface/web/sites/lib/lang/nl_shell_user.lng
+++ b/interface/web/sites/lib/lang/nl_shell_user.lng
@@ -1,21 +1,23 @@
 <?php
-$wb['uid_txt'] = 'Web Gebruikersnaam';
-$wb['gid_txt'] = 'Groep';
+$wb['uid_txt'] = 'Website gebruikersnaam';
+$wb['gid_txt'] = 'Website groep';
 $wb['shell_txt'] = 'Shell';
-$wb['dir_txt'] = 'Dir';
+$wb['dir_txt'] = 'Directory';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Site';
+$wb['parent_domain_id_txt'] = 'Website';
 $wb['username_txt'] = 'Gebruikersnaam';
 $wb['password_txt'] = 'Wachtwoord';
 $wb['password_strength_txt'] = 'Wachtwoord sterkte';
 $wb['chroot_txt'] = 'Chroot Shell';
-$wb['quota_size_txt'] = 'Quota';
-$wb['active_txt'] = 'Actief';
+$wb['quota_size_txt'] = 'Schijfruimte limiet';
+$wb['active_txt'] = 'Actief?';
 $wb['username_error_empty'] = 'Gebruikersnaam is leeg.';
 $wb['username_error_unique'] = 'De gebruikersnaam moet uniek zijn.';
 $wb['username_error_regex'] = 'De gebruikersnaam bevat karakters die niet zijn toegestaan.';
-$wb['quota_size_error_empty'] = 'Quota is leeg.';
+$wb['quota_size_error_empty'] = 'Schijfruimte limiet is leeg.';
 $wb['uid_error_empty'] = 'GID leeg.';
-$wb['directory_error_empty'] = 'Directorie leeg.';
-$wb['limit_shell_user_txt'] = 'Het maximum aantal aan shell gebruikers is bereikt.';
+$wb['directory_error_empty'] = 'Directory leeg.';
+$wb['limit_shell_user_txt'] = 'Het maximum aantal shell gebruikers is bereikt.';
+$wb['parent_domain_id_error_empty'] = 'Geen website geselecteerd.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_shell_user_list.lng b/interface/web/sites/lib/lang/nl_shell_user_list.lng
index 2dad657..264cb97 100644
--- a/interface/web/sites/lib/lang/nl_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/nl_shell_user_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Shell Gebruiker';
-$wb['active_txt'] = 'Actief';
+$wb['list_head_txt'] = 'Shell gebruikers';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Site';
+$wb['parent_domain_id_txt'] = 'Website';
 $wb['username_txt'] = 'Gebruikersnaam';
-$wb['add_new_record_txt'] = 'Toevoegen nieuwe Shell Gebruiker';
+$wb['add_new_record_txt'] = 'Nieuwe Shell gebruiker toevoegen';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng
index d65314f..d408db5 100644
--- a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng
@@ -1,11 +1,12 @@
-<?php
-$wb['list_head_txt'] = 'Alias domein';
-$wb['active_txt'] = 'Actief';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Alias domein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw alias domein';
-$wb['domain_error_empty'] = 'Domein is leeg.';
-$wb['domain_error_unique'] = 'Domein moet uniek zijn.';
-$wb['domain_error_regex'] = 'Domeinnaam is ongeldig.';
-?>
+<?php
+$wb['list_head_txt'] = 'Domeinaliassen';
+$wb['active_txt'] = 'Actief';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Domeinalias';
+$wb['add_new_record_txt'] = 'Nieuwe domeinalias toevoegen';
+$wb['domain_error_empty'] = 'Domein is leeg.';
+$wb['domain_error_unique'] = 'Domein moet uniek zijn.';
+$wb['domain_error_regex'] = 'Domeinnaam is ongeldig.';
+?>
+
diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng
index d8a75f8..a592d1a 100644
--- a/interface/web/sites/lib/lang/nl_web_domain.lng
+++ b/interface/web/sites/lib/lang/nl_web_domain.lng
@@ -1,49 +1,50 @@
 <?php
-$wb['ssl_state_txt'] = 'Staat';
-$wb['ssl_locality_txt'] = 'Plaatsnaam';
+$wb['ssl_state_txt'] = 'Provincie';
+$wb['ssl_locality_txt'] = 'Plaats';
 $wb['ssl_organisation_txt'] = 'Organisatie';
-$wb['ssl_organisation_unit_txt'] = 'Organisatie eenheid';
+$wb['ssl_organisation_unit_txt'] = 'Organisatie afdeling';
 $wb['ssl_country_txt'] = 'Land';
 $wb['ssl_request_txt'] = 'SSL verzoek';
 $wb['ssl_cert_txt'] = 'SSL certificaat';
 $wb['ssl_bundle_txt'] = 'SSL bundel';
 $wb['ssl_action_txt'] = 'SSL actie';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domein';
+$wb['domain_txt'] = 'Domeinnaam';
 $wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Ouder website';
+$wb['parent_domain_id_txt'] = 'Koppelen aan website';
 $wb['redirect_type_txt'] = 'Redirect type';
 $wb['redirect_path_txt'] = 'Redirect pad';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['document_root_txt'] = 'Documentroot';
 $wb['system_user_txt'] = 'Linux gebruiker';
 $wb['system_group_txt'] = 'Linux groep';
-$wb['ip_address_txt'] = 'IP-Adres';
+$wb['ip_address_txt'] = 'IP-adres';
 $wb['vhost_type_txt'] = 'VHost type';
-$wb['hd_quota_txt'] = 'Harddisk quota';
-$wb['traffic_quota_txt'] = 'Dataverkeer quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
+$wb['hd_quota_txt'] = 'Schijfruimte limiet';
+$wb['traffic_quota_txt'] = 'Dataverkeer limiet';
+$wb['cgi_txt'] = 'CGI scripts';
+$wb['ssi_txt'] = 'SSI (CGI)';
 $wb['ssl_txt'] = 'SSL';
 $wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
+$wb['php_txt'] = 'PHP5 module';
 $wb['client_txt'] = 'Klant';
 $wb['limit_web_domain_txt'] = 'Het max. aantal web domeinen voor uw account is bereikt.';
 $wb['limit_web_aliasdomain_txt'] = 'Het max. aantal domeinaliassen voor uw account is bereikt.';
 $wb['limit_web_subdomain_txt'] = 'Het max. aantal web subdomeinen voor uw account is bereikt.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domein is leeg.';
+$wb['apache_directives_txt'] = 'Apache richtlijnen';
+$wb['domain_error_empty'] = 'Domeinnaam is leeg.';
 $wb['domain_error_unique'] = 'Domein moet uniek zijn.';
 $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['error_ssl_state_empty'] = 'SSL State is leeg.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is leeg.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is leeg.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is leeg.';
-$wb['error_ssl_country_empty'] = 'SSL Country is leeg.';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['hd_quota_error_empty'] = 'Schijfruimte limiet is leeg.';
+$wb['traffic_quota_error_empty'] = 'Dataverkeer limiet is leeg.';
+$wb['errordocs_txt'] = 'Eigen fout-paginas';
+$wb['error_ssl_state_empty'] = 'SSL: provincie is leeg.';
+$wb['error_ssl_locality_empty'] = 'SSL: plaats is leeg.';
+$wb['error_ssl_organisation_empty'] = 'SSL: organisatie is leeg.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL: organsatie afdeling is leeg.';
+$wb['error_ssl_country_empty'] = 'SSL: Land is leeg.';
+$wb['subdomain_txt'] = 'Automatische subdomeinen';
+$wb['client_group_id_txt'] = 'Klant';
+$wb['stats_password_txt'] = 'Website statistieken wachtwoord';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_web_domain_list.lng b/interface/web/sites/lib/lang/nl_web_domain_list.lng
index f42d9f1..9069f9f 100644
--- a/interface/web/sites/lib/lang/nl_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_domain_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Websites';
-$wb['active_txt'] = 'Actief';
+$wb['list_head_txt'] = 'Website domeinen';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuwe website';
+$wb['add_new_record_txt'] = 'Nieuwe website toevoegen';
 $wb['domain_id_txt'] = 'ID';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng
index 45bcd77..ff1064f 100644
--- a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Web verkeer';
-$wb['domain_txt'] = 'Domain';
+$wb['list_head_txt'] = 'Website statistieken';
+$wb['domain_txt'] = 'Website domein';
 $wb['this_month_txt'] = 'Deze maand';
 $wb['last_month_txt'] = 'Laatste maand';
 $wb['this_year_txt'] = 'Dit jaar';
 $wb['last_year_txt'] = 'Vorig jaar';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng
index a86267b..d5955ed 100644
--- a/interface/web/sites/lib/lang/nl_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/nl_web_subdomain.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['ssl_state_txt'] = 'Staat';
-$wb['ssl_locality_txt'] = 'Plaatsnaam';
+$wb['ssl_state_txt'] = 'Provincie';
+$wb['ssl_locality_txt'] = 'Plaats';
 $wb['ssl_organisation_txt'] = 'Organisatie';
-$wb['ssl_organisation_unit_txt'] = 'Organisatie eenheid';
+$wb['ssl_organisation_unit_txt'] = 'Organisatie afdeling';
 $wb['ssl_country_txt'] = 'Land';
 $wb['ssl_request_txt'] = 'SSL verzoek';
 $wb['ssl_cert_txt'] = 'SSL certificaat';
@@ -11,22 +11,22 @@
 $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domein';
 $wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Ouder website';
+$wb['parent_domain_id_txt'] = 'Gekoppeld aan website';
 $wb['redirect_type_txt'] = 'Redirect type';
 $wb['redirect_path_txt'] = 'Redirect pad';
-$wb['active_txt'] = 'Actief';
+$wb['active_txt'] = 'Actief?';
 $wb['document_root_txt'] = 'Documentroot';
 $wb['system_user_txt'] = 'Linux gebruiker';
 $wb['system_group_txt'] = 'Linux groep';
-$wb['ip_address_txt'] = 'IP-Adres';
+$wb['ip_address_txt'] = 'IP-adres';
 $wb['vhost_type_txt'] = 'VHost type';
-$wb['hd_quota_txt'] = 'Harddisk quota';
-$wb['traffic_quota_txt'] = 'Verkeer quota';
+$wb['hd_quota_txt'] = 'Schijfruimte limiet';
+$wb['traffic_quota_txt'] = 'Dataverkeer limiet';
 $wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
+$wb['ssi_txt'] = 'SSI (CGI)';
 $wb['ssl_txt'] = 'SSL';
 $wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
+$wb['php_txt'] = 'PHP5 module';
 $wb['client_txt'] = 'Klant';
 $wb['limit_web_domain_txt'] = 'Het max. aantal web domainen voor uw account is bereikt.';
 $wb['limit_web_aliasdomain_txt'] = 'Het max. aantal domeinaliassen voor uw account is bereikt.';
@@ -35,5 +35,6 @@
 $wb['domain_error_empty'] = 'Domein is leeg.';
 $wb['domain_error_unique'] = 'Domein moet uniek zijn.';
 $wb['domain_error_regex'] = 'Domeinnaam ongeldig.';
-$wb['host_txt'] = 'Host';
+$wb['host_txt'] = 'Hostnaam';
 ?>
+
diff --git a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng
index fbba7b9..b6c6711 100644
--- a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Subdomeinen';
-$wb['active_txt'] = 'Actief';
+$wb['list_head_txt'] = 'Website subdomeinen';
+$wb['active_txt'] = 'Actief?';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Subdomein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw subdomein';
+$wb['add_new_record_txt'] = 'Nieuw subdomein toevoegen';
 ?>
+
diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng
new file mode 100644
index 0000000..9135cbb
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['Database'] = 'Baza danych';
+$wb['Options'] = 'Opcje';
+$wb['Shell User'] = 'Użytkownik Shell';
+$wb['Domain'] = 'Strona www';
+$wb['Redirect'] = 'Przekierowanie';
+$wb['SSL'] = 'SSL';
+$wb['Subdomain'] = 'Subdomena';
+$wb['Sites'] = 'Strony';
+$wb['Aliasdomain'] = 'Alias domeny';
+$wb['FTP-User'] = 'Użytkownik FTP';
+$wb['FTP'] = 'FTP';
+$wb['Shell-User'] = 'Użytkownik Shell';
+$wb['Shell'] = 'Shell';
+$wb['Websites'] = 'Strony www';
+$wb['Stats'] = 'Statystyki';
+?>
diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng
new file mode 100644
index 0000000..fecb4ab
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_cron.lng
@@ -0,0 +1,21 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Parent website';
+$wb['active_txt'] = 'Active';
+$wb['client_txt'] = 'Client';
+$wb['run_min_txt'] = 'Minutes';
+$wb['run_hour_txt'] = 'Hours';
+$wb['run_mday_txt'] = 'Days of month';
+$wb['run_month_txt'] = 'Months';
+$wb['run_wday_txt'] = 'Days of week';
+$wb['command_txt'] = 'Command to run (commands are executed via sh, urls via wget)';
+$wb['limit_cron_txt'] = 'The maximum number of allowed cron jobs was reached.';
+$wb['limit_cron_frequency_txt'] = 'The cron job frequency exceeds the allowed limit.';
+$wb['run_min_error_format'] = 'Invalid format for minutes.';
+$wb['run_hour_error_format'] = 'Invalid format for hours.';
+$wb['run_mday_error_format'] = 'Invalid format for days of month.';
+$wb['run_month_error_format'] = 'Invalid format for months.';
+$wb['run_wday_error_format'] = 'Invalid format for days of the week.';
+$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
+$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
+?>
diff --git a/interface/web/sites/lib/lang/pl_cron_list.lng b/interface/web/sites/lib/lang/pl_cron_list.lng
new file mode 100644
index 0000000..ad56ea9
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_cron_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Cron Jobs';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['run_min_txt'] = 'Minute';
+$wb['run_hour_txt'] = 'Hour';
+$wb['run_mday_txt'] = 'Day of month';
+$wb['run_month_txt'] = 'Month';
+$wb['run_wday_txt'] = 'Day of week';
+$wb['command_txt'] = 'Command';
+$wb['add_new_cron_txt'] = 'Add new Cron job';
+?>
diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng
new file mode 100644
index 0000000..8fda3d1
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_database.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['server_id_txt'] = 'Serwer';
+$wb['type_txt'] = 'Typ';
+$wb['database_name_txt'] = 'Nazwa bazy danych';
+$wb['database_user_txt'] = 'Użytkownik bazy danych';
+$wb['database_password_txt'] = 'Hasło bazy danych';
+$wb['password_strength_txt'] = 'Siła hasła';
+$wb['database_charset_txt'] = 'Kodowanie bazy danych';
+$wb['remote_access_txt'] = 'Dostęp zewnętrzny';
+$wb['remote_ips_txt'] = 'Remote Access IPs (separate by , and leave blank for <i>any</i>)';
+$wb['database_remote_error_ips'] = 'At least one of the entered ip addresses is invalid.';
+$wb['client_txt'] = 'Klient';
+$wb['active_txt'] = 'Aktywny';
+$wb['database_name_error_empty'] = 'Nazwa bazy danych jest pusta.';
+$wb['database_name_error_unique'] = 'Istnieje już baza danych o takiej nazwie na serwerze. Aby mieć unikatową nazwę, np.: nazwij bazę danych tak samo jak domenę.';
+$wb['database_name_error_regex'] = 'Nieprawidłowa nazwa bazy danych. Nazwa bazy danych może zawierać znaki takie jak: a-z, A-Z, 0-9 oraz podkreślenie. Długość: 2 - 64 znaków.';
+$wb['database_user_error_empty'] = 'Nazwa użytkownika bazy danych jest pusta.';
+$wb['database_user_error_unique'] = 'Jest już użytkownik bazy danych o takiej nazwie. Aby mieć unikatową nazwę, np.: nazwij użytkownika tak samo jak domenę.';
+$wb['database_user_error_regex'] = 'Nieprawidłowa nazwa użytkownika bazy danych. Nazwa użytkownika bazy danych może zawierać znaki takie jak: a-z, A-Z, 0-9 oraz podkreślenie. Długość: 2 - 64 znaków.';
+$wb['limit_database_txt'] = 'Maksymalna liczba baz danych została przekroczona.';
+$wb['database_name_change_txt'] = 'Nie można zmienić nazwy bazy danych';
+$wb['database_charset_change_txt'] = 'Nie można zmienić kodowania bazy danych';
+?>
diff --git a/interface/web/sites/lib/lang/pl_database_list.lng b/interface/web/sites/lib/lang/pl_database_list.lng
new file mode 100644
index 0000000..ca92d98
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_database_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Baza danych';
+$wb['active_txt'] = 'Aktywna';
+$wb['remote_access_txt'] = 'Zewnętrzny dostęp';
+$wb['server_id_txt'] = 'Serwer';
+$wb['database_name_txt'] = 'Nazwa bazy danych';
+$wb['add_new_record_txt'] = 'Dodaj nową bazę danych';
+?>
diff --git a/interface/web/sites/lib/lang/pl_ftp_user.lng b/interface/web/sites/lib/lang/pl_ftp_user.lng
new file mode 100644
index 0000000..9270b25
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_ftp_user.lng
@@ -0,0 +1,27 @@
+<?php
+$wb['uid_txt'] = 'UID';
+$wb['gid_txt'] = 'GID';
+$wb['dir_txt'] = 'Katalog';
+$wb['quota_files_txt'] = 'Limit plików';
+$wb['quota_files_unity_txt'] = 'Pliki';
+$wb['ul_ratio_txt'] = 'Ilość upload-u';
+$wb['dl_ratio_txt'] = 'Ilość download-u';
+$wb['ul_bandwidth_txt'] = 'Szybkość wysyłania';
+$wb['dl_bandwidth_txt'] = 'Szybkość ściągania';
+$wb['server_id_txt'] = 'Serwer';
+$wb['parent_domain_id_txt'] = 'Strona www';
+$wb['username_txt'] = 'Nazwa użytkownika';
+$wb['password_txt'] = 'Hasło';
+$wb['password_strength_txt'] = 'Siła hasła';
+$wb['quota_size_txt'] = 'Limit na twardym dysku';
+$wb['active_txt'] = 'Aktywny';
+$wb['limit_ftp_user_txt'] = 'Maksymalna ilość użytkowników FTP dla Twojego konta została przekroczona.';
+$wb['username_error_empty'] = 'Nazwa użytkiownika jest pusta.';
+$wb['username_error_unique'] = 'Nazwa użytkownika musi być uniatowa.';
+$wb['username_error_regex'] = 'Nazwa użytkownika zawiera niedozwolone znaki.';
+$wb['quota_size_error_empty'] = 'Limit jest pusty.';
+$wb['uid_error_empty'] = 'GID jest puste.';
+$wb['directory_error_empty'] = 'Element docelowy jest pusty.';
+$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
+?>
diff --git a/interface/web/sites/lib/lang/pl_ftp_user_list.lng b/interface/web/sites/lib/lang/pl_ftp_user_list.lng
new file mode 100644
index 0000000..fecbba3
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_ftp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Użytkownik FTP';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['parent_domain_id_txt'] = 'Strona www';
+$wb['username_txt'] = 'Nazwa użytkownika';
+$wb['add_new_record_txt'] = 'Dodaj nowego użytkownika FTP';
+?>
diff --git a/interface/web/sites/lib/lang/pl_shell_user.lng b/interface/web/sites/lib/lang/pl_shell_user.lng
new file mode 100644
index 0000000..b2e518d
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_shell_user.lng
@@ -0,0 +1,22 @@
+<?php
+$wb['uid_txt'] = 'Sieciowa nazwa użytkownika';
+$wb['gid_txt'] = 'Grupa';
+$wb['shell_txt'] = 'Shell';
+$wb['dir_txt'] = 'Ścieżka';
+$wb['server_id_txt'] = 'Serwer';
+$wb['parent_domain_id_txt'] = 'Strona';
+$wb['username_txt'] = 'Nazwa użytkownika';
+$wb['password_txt'] = 'Hasło';
+$wb['password_strength_txt'] = 'Siła hasła';
+$wb['chroot_txt'] = 'Admin Shell';
+$wb['quota_size_txt'] = 'Limit';
+$wb['active_txt'] = 'Aktywny';
+$wb['username_error_empty'] = 'Nazwa użytkownika jest pusta.';
+$wb['username_error_unique'] = 'Nazwa użytkownika musi być unikatowa.';
+$wb['username_error_regex'] = 'Nazwa użytkownika.';
+$wb['quota_size_error_empty'] = 'Limit jest pusty.';
+$wb['uid_error_empty'] = 'GID jest pusty.';
+$wb['directory_error_empty'] = 'Element docelowy jest pusty.';
+$wb['limit_shell_user_txt'] = 'Maksymalna liczba użytkowników shell została przekroczona.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
+?>
diff --git a/interface/web/sites/lib/lang/pl_shell_user_list.lng b/interface/web/sites/lib/lang/pl_shell_user_list.lng
new file mode 100644
index 0000000..850c0eb
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_shell_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Użytkownik Shell';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['parent_domain_id_txt'] = 'Strona';
+$wb['username_txt'] = 'Nazwa użytkownika';
+$wb['add_new_record_txt'] = 'Dodaj nowego uzytkownika Shell';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
new file mode 100644
index 0000000..6dd8022
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'Alias domeny';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['parent_domain_id_txt'] = 'Strona www';
+$wb['domain_txt'] = 'Alias domeny';
+$wb['add_new_record_txt'] = 'Dodaj nowy alias domeny';
+$wb['domain_error_empty'] = 'Domena jest pusta.';
+$wb['domain_error_unique'] = 'Domena musi być unikatowa.';
+$wb['domain_error_regex'] = 'Nazwa domeny ma niepoprawny format.';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng
new file mode 100644
index 0000000..7fdc305
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_domain.lng
@@ -0,0 +1,49 @@
+<?php
+$wb['ssl_state_txt'] = 'Stan';
+$wb['ssl_locality_txt'] = 'Lokalność';
+$wb['ssl_organisation_txt'] = 'Organizacja';
+$wb['ssl_organisation_unit_txt'] = 'Jednosta organizacji';
+$wb['ssl_country_txt'] = 'Państwo';
+$wb['ssl_request_txt'] = 'Żądanie SSL';
+$wb['ssl_cert_txt'] = 'Certyfikat SSL';
+$wb['ssl_bundle_txt'] = 'Paczka SSL';
+$wb['ssl_action_txt'] = 'Akcja SSL';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Aktualna strona www';
+$wb['redirect_type_txt'] = 'Typ przekierowania';
+$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
+$wb['active_txt'] = 'Aktywny';
+$wb['document_root_txt'] = 'Głowny katalog';
+$wb['system_user_txt'] = 'Użytkownik Linuksa';
+$wb['system_group_txt'] = 'Grupa Linuks';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['vhost_type_txt'] = 'Typ wirtualnego serwera';
+$wb['hd_quota_txt'] = 'Limit dysku twardego';
+$wb['traffic_quota_txt'] = 'Limit ruchu na serwerze';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Własne strony błędów';
+$wb['subdomain_txt'] = 'Automatyczna subdomena';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Maksymalna ilość domen dla Twojego konta została przekroczona.';
+$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość aliasów domen dla Twojego konta została przekroczona.';
+$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen dla Twojego konta została przekroczona.';
+$wb['apache_directives_txt'] = 'Dyrektywy Apache';
+$wb['domain_error_empty'] = 'Domena jest pusta.';
+$wb['domain_error_unique'] = 'Istnieje już strona www, alias lub subdomena dla tej domeny.';
+$wb['domain_error_regex'] = 'Nazwa domeny jest niepoprawna.';
+$wb['hd_quota_error_empty'] = 'Limit twardego dysku jest pusty.';
+$wb['traffic_quota_error_empty'] = 'Limit ruchu na serwerze jest pusty.';
+$wb['error_ssl_state_empty'] = 'Stan SSL jest pusty.';
+$wb['error_ssl_locality_empty'] = 'Lokalność SSL jest pusta.';
+$wb['error_ssl_organisation_empty'] = 'Organizacja SSL jest pusta.';
+$wb['error_ssl_organisation_unit_empty'] = 'Jednosta ogranizacji SSL jest pusta.';
+$wb['error_ssl_country_empty'] = 'Państwo SSL jest puste.';
+$wb['client_group_id_txt'] = 'Klient';
+$wb['stats_password_txt'] = 'Hasło statystyk strony www';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_domain_list.lng b/interface/web/sites/lib/lang/pl_web_domain_list.lng
new file mode 100644
index 0000000..62b7455
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Strony www';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['add_new_record_txt'] = 'Dodaj nową stronę';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
new file mode 100644
index 0000000..b217f80
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Web traffic';
+$wb['domain_txt'] = 'Domain';
+$wb['this_month_txt'] = 'This month';
+$wb['last_month_txt'] = 'Last month';
+$wb['this_year_txt'] = 'This year';
+$wb['last_year_txt'] = 'Last year';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng
new file mode 100644
index 0000000..8154c22
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng
@@ -0,0 +1,39 @@
+<?php
+$wb['ssl_state_txt'] = 'Stan';
+$wb['ssl_locality_txt'] = 'Lokalność';
+$wb['ssl_organisation_txt'] = 'Organizacja';
+$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
+$wb['ssl_country_txt'] = 'Państwo';
+$wb['ssl_request_txt'] = 'Żądanie SSL';
+$wb['ssl_cert_txt'] = 'Certyfikat SSL';
+$wb['ssl_bundle_txt'] = 'Paczka SSL';
+$wb['ssl_action_txt'] = 'Akcja SSL';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Macieżysta strona www';
+$wb['redirect_type_txt'] = 'Typ przekierowania';
+$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
+$wb['active_txt'] = 'Aktywny';
+$wb['document_root_txt'] = 'Główny katalog';
+$wb['system_user_txt'] = 'Użytkownik Linuksa';
+$wb['system_group_txt'] = 'Grupa Linuks';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['vhost_type_txt'] = 'Typ wirtualnego hosta';
+$wb['hd_quota_txt'] = 'Limit twardego dysku';
+$wb['traffic_quota_txt'] = 'Limit ruchu na serwerze';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Maksymalna ilość domen dla Twojego konta została przekroczona.';
+$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość aliasów dla Twojego konta została przekroczona.';
+$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen dla Twojego konta została przekroczona.';
+$wb['apache_directives_txt'] = 'Dyrektywy Apache';
+$wb['domain_error_empty'] = 'Domena jest pusta.';
+$wb['domain_error_unique'] = 'Istnieje już domena, alias lub subdomena o podanej nazwie.';
+$wb['domain_error_regex'] = 'Nazwa domeny jest nieprawidłowa.';
+$wb['host_txt'] = 'Serwer';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
new file mode 100644
index 0000000..9ccb0a3
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomeny';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['parent_domain_id_txt'] = 'Strona www';
+$wb['domain_txt'] = 'Subdomena';
+$wb['add_new_record_txt'] = 'Dodaj nową subdomene';
+?>
diff --git a/interface/web/sites/lib/lang/ru_cron.lng b/interface/web/sites/lib/lang/ru_cron.lng
index 8cb7f08..fecb4ab 100644
--- a/interface/web/sites/lib/lang/ru_cron.lng
+++ b/interface/web/sites/lib/lang/ru_cron.lng
@@ -1,5 +1,5 @@
 <?php
-$wb["server_id_txt"] = 'Server';
+$wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Parent website';
 $wb['active_txt'] = 'Active';
 $wb['client_txt'] = 'Client';
@@ -18,4 +18,4 @@
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/ru_cron_list.lng b/interface/web/sites/lib/lang/ru_cron_list.lng
index b5c8d15..ad56ea9 100644
--- a/interface/web/sites/lib/lang/ru_cron_list.lng
+++ b/interface/web/sites/lib/lang/ru_cron_list.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["list_head_txt"] = 'Cron Jobs';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["run_min_txt"] = 'Minute';
-$wb["run_hour_txt"] = 'Hour';
-$wb["run_mday_txt"] = 'Day of month';
-$wb["run_month_txt"] = 'Month';
-$wb["run_wday_txt"] = 'Day of week';
-$wb["command_txt"] = 'Command';
-$wb["add_new_cron_txt"] = 'Add new Cron job';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Cron Jobs';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['run_min_txt'] = 'Minute';
+$wb['run_hour_txt'] = 'Hour';
+$wb['run_mday_txt'] = 'Day of month';
+$wb['run_month_txt'] = 'Month';
+$wb['run_wday_txt'] = 'Day of week';
+$wb['command_txt'] = 'Command';
+$wb['add_new_cron_txt'] = 'Add new Cron job';
+?>
diff --git a/interface/web/sites/lib/lang/ru_ftp_user.lng b/interface/web/sites/lib/lang/ru_ftp_user.lng
index 7c89c2e..e96e4c3 100644
--- a/interface/web/sites/lib/lang/ru_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ru_ftp_user.lng
@@ -23,4 +23,5 @@
 $wb['password_strength_txt'] = 'Password strength';
 $wb['quota_files_unity_txt'] = 'Files';
 $wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_shell_user.lng b/interface/web/sites/lib/lang/ru_shell_user.lng
index 2d8939f..085d7de 100644
--- a/interface/web/sites/lib/lang/ru_shell_user.lng
+++ b/interface/web/sites/lib/lang/ru_shell_user.lng
@@ -18,4 +18,5 @@
 $wb['directory_error_empty'] = 'Directory empty.';
 $wb['password_strength_txt'] = 'Password strength';
 $wb['limit_shell_user_txt'] = 'The max number of shell users is reached.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/se_cron.lng b/interface/web/sites/lib/lang/se_cron.lng
index 8cb7f08..fecb4ab 100644
--- a/interface/web/sites/lib/lang/se_cron.lng
+++ b/interface/web/sites/lib/lang/se_cron.lng
@@ -1,5 +1,5 @@
 <?php
-$wb["server_id_txt"] = 'Server';
+$wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Parent website';
 $wb['active_txt'] = 'Active';
 $wb['client_txt'] = 'Client';
@@ -18,4 +18,4 @@
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/se_cron_list.lng b/interface/web/sites/lib/lang/se_cron_list.lng
index b5c8d15..ad56ea9 100644
--- a/interface/web/sites/lib/lang/se_cron_list.lng
+++ b/interface/web/sites/lib/lang/se_cron_list.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["list_head_txt"] = 'Cron Jobs';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["run_min_txt"] = 'Minute';
-$wb["run_hour_txt"] = 'Hour';
-$wb["run_mday_txt"] = 'Day of month';
-$wb["run_month_txt"] = 'Month';
-$wb["run_wday_txt"] = 'Day of week';
-$wb["command_txt"] = 'Command';
-$wb["add_new_cron_txt"] = 'Add new Cron job';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Cron Jobs';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['run_min_txt'] = 'Minute';
+$wb['run_hour_txt'] = 'Hour';
+$wb['run_mday_txt'] = 'Day of month';
+$wb['run_month_txt'] = 'Month';
+$wb['run_wday_txt'] = 'Day of week';
+$wb['command_txt'] = 'Command';
+$wb['add_new_cron_txt'] = 'Add new Cron job';
+?>
diff --git a/interface/web/sites/lib/lang/se_ftp_user.lng b/interface/web/sites/lib/lang/se_ftp_user.lng
index df48d9a..190f4a3 100644
--- a/interface/web/sites/lib/lang/se_ftp_user.lng
+++ b/interface/web/sites/lib/lang/se_ftp_user.lng
@@ -23,4 +23,5 @@
 $wb['directory_error_empty'] = 'Directory empty.';
 $wb['quota_files_unity_txt'] = 'Files';
 $wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/se_shell_user.lng b/interface/web/sites/lib/lang/se_shell_user.lng
index 31a6aa7..0f2ea6c 100644
--- a/interface/web/sites/lib/lang/se_shell_user.lng
+++ b/interface/web/sites/lib/lang/se_shell_user.lng
@@ -18,4 +18,5 @@
 $wb['uid_error_empty'] = 'GID empty.';
 $wb['directory_error_empty'] = 'Directory empty.';
 $wb['limit_shell_user_txt'] = 'The max number of shell users is reached.';
+$wb['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm
index e2e8ca9..0041875 100644
--- a/interface/web/sites/templates/cron_list.htm
+++ b/interface/web/sites/templates/cron_list.htm
@@ -1,71 +1,71 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_cron">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/cron_edit.php');">
-          <span>{tmpl_var name="add_new_cron_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_run_min" scope="col"><tmpl_var name="run_min_txt"></th>
-            <th class="tbl_col_run_hour" scope="col"><tmpl_var name="run_hour_txt"></th>
-            <th class="tbl_col_run_mday" scope="col"><tmpl_var name="run_mday_txt"></th>
-            <th class="tbl_col_run_month" scope="col"><tmpl_var name="run_month_txt"></th>
-            <th class="tbl_col_run_wday" scope="col"><tmpl_var name="run_wday_txt"></th>
-            <th class="tbl_col_command" scope="col"><tmpl_var name="command_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/cron_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/cron_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_run_min"><input type="text" name="search_run_min" size="3" value="{tmpl_var name='search_run_min'}" /></td>
-            <td class="tbl_col_run_hour"><input type="text" name="search_run_hour" size="3" value="{tmpl_var name='search_run_hour'}" /></td>
-            <td class="tbl_col_run_mday"><input type="text" name="search_run_mday" size="3" value="{tmpl_var name='search_run_mday'}" /></td>
-            <td class="tbl_col_run_month"><input type="text" name="search_run_month" size="3" value="{tmpl_var name='search_run_month'}" /></td>
-            <td class="tbl_col_run_wday"><input type="text" name="search_run_wday" size="3" value="{tmpl_var name='search_run_wday'}" /></td>
-            <td class="tbl_col_command"><input type="text" name="search_command" value="{tmpl_var name='search_command'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/cron_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_run_min"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_min"}</a></td>
-            <td class="tbl_col_run_hour"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_hour"}</a></td>
-            <td class="tbl_col_run_mday"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_mday"}</a></td>
-            <td class="tbl_col_run_month"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_month"}</a></td>
-            <td class="tbl_col_run_wday"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_wday"}</a></td>
-            <td class="tbl_col_commnd"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="command"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('sites/cron_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="9"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_cron">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/cron_edit.php');">
+          <span>{tmpl_var name="add_new_cron_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_run_min" scope="col"><tmpl_var name="run_min_txt"></th>
+            <th class="tbl_col_run_hour" scope="col"><tmpl_var name="run_hour_txt"></th>
+            <th class="tbl_col_run_mday" scope="col"><tmpl_var name="run_mday_txt"></th>
+            <th class="tbl_col_run_month" scope="col"><tmpl_var name="run_month_txt"></th>
+            <th class="tbl_col_run_wday" scope="col"><tmpl_var name="run_wday_txt"></th>
+            <th class="tbl_col_command" scope="col"><tmpl_var name="command_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/cron_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/cron_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_run_min"><input type="text" name="search_run_min" size="3" value="{tmpl_var name='search_run_min'}" /></td>
+            <td class="tbl_col_run_hour"><input type="text" name="search_run_hour" size="3" value="{tmpl_var name='search_run_hour'}" /></td>
+            <td class="tbl_col_run_mday"><input type="text" name="search_run_mday" size="3" value="{tmpl_var name='search_run_mday'}" /></td>
+            <td class="tbl_col_run_month"><input type="text" name="search_run_month" size="3" value="{tmpl_var name='search_run_month'}" /></td>
+            <td class="tbl_col_run_wday"><input type="text" name="search_run_wday" size="3" value="{tmpl_var name='search_run_wday'}" /></td>
+            <td class="tbl_col_command"><input type="text" name="search_command" value="{tmpl_var name='search_command'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/cron_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_run_min"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_min"}</a></td>
+            <td class="tbl_col_run_hour"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_hour"}</a></td>
+            <td class="tbl_col_run_mday"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_mday"}</a></td>
+            <td class="tbl_col_run_month"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_month"}</a></td>
+            <td class="tbl_col_run_wday"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_wday"}</a></td>
+            <td class="tbl_col_commnd"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="command"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/cron_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="9"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index da5ffec..99e1d07 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -15,7 +15,7 @@
 		<input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
 		<tmpl_else>
 		<label for="server_id">{tmpl_var name='server_id_txt'}</label>
-        <select name="server_id" id="server_id" class="selectInput" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
+        <select name="server_id" id="server_id" class="selectInput">
 		  {tmpl_var name='server_id'}
 		</select>
 		</tmpl_if>
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm
index bf6530d..4e98200 100644
--- a/interface/web/sites/templates/database_list.htm
+++ b/interface/web/sites/templates/database_list.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_list_database">
 
   <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
       <div class="buttons">
         <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
           <span>{tmpl_var name="add_new_record_txt"}</span>
diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm
index 534cd0b..1fbda08 100644
--- a/interface/web/sites/templates/ftp_user_list.htm
+++ b/interface/web/sites/templates/ftp_user_list.htm
@@ -1,59 +1,59 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_ftp_user">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/ftp_user_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
-            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
-            <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/ftp_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
-            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('sites/ftp_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_ftp_user">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/ftp_user_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+            <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/ftp_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/ftp_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm
index 531740a..dd44149 100644
--- a/interface/web/sites/templates/shell_user_list.htm
+++ b/interface/web/sites/templates/shell_user_list.htm
@@ -1,59 +1,59 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_shell_user">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/shell_user_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
-            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
-            <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/shell_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
-            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('sites/shell_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_shell_user">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/shell_user_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+            <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/shell_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/shell_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm
index 408c553..b90fc29 100644
--- a/interface/web/sites/templates/web_aliasdomain_list.htm
+++ b/interface/web/sites/templates/web_aliasdomain_list.htm
@@ -1,59 +1,59 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_web_aliasdomain">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_aliasdomain_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
-            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
-            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
-            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_aliasdomain">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_aliasdomain_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index 3e67374..d19550f 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -15,7 +15,7 @@
 		<input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
 		<tmpl_else>
 		<label for="server_id">{tmpl_var name='server_id_txt'}</label>
-        <select name="server_id" id="server_id" class="selectInput" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
+        <select name="server_id" id="server_id" class="selectInput" onChange="loadOptionInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
 		  {tmpl_var name='server_id'}
 		</select>
 		</tmpl_if>
diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm
index a7126ed..e96df5b 100644
--- a/interface/web/sites/templates/web_domain_list.htm
+++ b/interface/web/sites/templates/web_domain_list.htm
@@ -1,59 +1,59 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_web_domain">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_domain_id"><input type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_domain_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_domain">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_domain_id"><input type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_domain_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm
index 3dbc0c6..a0aab0d 100644
--- a/interface/web/sites/templates/web_subdomain_list.htm
+++ b/interface/web/sites/templates/web_subdomain_list.htm
@@ -1,60 +1,60 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_web_subdomain">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_subdomain_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
-            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_active'}</select></td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
-            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
-            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_subdomain">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_subdomain_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 452e1c5..81de9f6 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -67,6 +67,7 @@
 			$client_group_id = $dataRecord['sys_groupid'];
       	}
     }
+	
     /* get the name of the client */
     $tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . $client_group_id);
     $clientName = $tmp['name'];
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 7878e82..a019b04 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -353,6 +353,18 @@
 			$app->db->query($sql);
 		}
 		
+		//* If the domain name has been changed, we will have to change all subdomains
+		if($this->dataRecord["domain"] != '' && $this->oldDataRecord["domain"] != '' && $this->dataRecord["domain"] != $this->oldDataRecord["domain"]) {
+			$records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE type = 'subdomain' AND domain LIKE '%.".$app->db->quote($this->oldDataRecord["domain"])."'");
+			foreach($records as $rec) {
+				$subdomain = $app->db->quote(str_replace($this->oldDataRecord["domain"],$this->dataRecord["domain"],$rec['domain']));
+				$app->db->datalogUpdate('web_domain', "domain = '".$subdomain."'", 'domain_id', $rec['domain_id']);
+			}
+			unset($records);
+			unset($rec);
+			unset($subdomain);
+		}
+		
 	}
 	
 	function onAfterDelete() {
diff --git a/interface/web/strengthmeter/lib/lang/hu_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/hu_strengthmeter.lng
new file mode 100644
index 0000000..0025ec1
--- /dev/null
+++ b/interface/web/strengthmeter/lib/lang/hu_strengthmeter.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['password_strength_0_txt'] = 'Túl rövid';
+$wb['password_strength_1_txt'] = 'Gyenge';
+$wb['password_strength_2_txt'] = 'Megfelel';
+$wb['password_strength_3_txt'] = 'Jó';
+$wb['password_strength_4_txt'] = 'Erős';
+$wb['password_strength_5_txt'] = 'Nagyon erős';
+?>
+
diff --git a/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng
index 2a6de41..29090b8 100644
--- a/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['password_strength_0_txt'] = 'Too short';
-$wb['password_strength_1_txt'] = 'Weak';
-$wb['password_strength_2_txt'] = 'Fair';
-$wb['password_strength_3_txt'] = 'Good';
-$wb['password_strength_4_txt'] = 'Strong';
-$wb['password_strength_5_txt'] = 'Very strong';
+$wb['password_strength_0_txt'] = 'Te kort';
+$wb['password_strength_1_txt'] = 'Zwak';
+$wb['password_strength_2_txt'] = 'Redelijk';
+$wb['password_strength_3_txt'] = 'Goed';
+$wb['password_strength_4_txt'] = 'Sterk';
+$wb['password_strength_5_txt'] = 'Zeer sterk';
 ?>
+
diff --git a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
new file mode 100644
index 0000000..df85c97
--- /dev/null
+++ b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['password_strength_0_txt'] = 'Za krótkie';
+$wb['password_strength_1_txt'] = 'Słabe';
+$wb['password_strength_2_txt'] = 'Zadowalające';
+$wb['password_strength_3_txt'] = 'Dobre';
+$wb['password_strength_4_txt'] = 'Silne';
+$wb['password_strength_5_txt'] = 'Bardzo mocne';
+?>
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 621ba94..8e22384 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -1,115 +1,115 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/>
-    <link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
-    <!--[if lte IE 7]>
-	    <link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
-    <![endif]-->
-    <!--[if lte ie 6]>
-      <style type="text/css" media="screen">
-        /*
-        Move these to your IE specific stylesheet if possible
-        */
-        .uniForm,
-        .uniForm fieldset,
-        .uniForm .ctrlHolder,
-        .uniForm .formHint,
-        .uniForm .buttonHolder, 
-        .uniForm .ctrlHolder .multiField,
-        .uniForm .inlineLabel{ zoom:1; }
-
-        .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
-        .uniForm .blockLabels label, .uniForm .blockLabels .label,
-        .uniForm .inlineLabel span{ padding-bottom: .2em; }
-
-        .uniForm .inlineLabel input,
-        .uniForm .inlineLabels .inlineLabel input,
-        .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
-      </style>
-    <![endif]-->
-    <!--[if gt ie 6]>
-      <style type="text/css" media="screen">
-        /*
-        Move these to your IE specific stylesheet if possible
-        */
-        .uniForm,
-        .uniForm fieldset,
-        .uniForm .ctrlHolder,
-        .uniForm .formHint,
-        .uniForm .buttonHolder, 
-        .uniForm .ctrlHolder .multiField,
-        .uniForm .inlineLabel{ zoom:1; }
-
-        .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
-        .uniForm .blockLabels label, .uniForm .blockLabels .label,
-        .uniForm .inlineLabel span{ padding-bottom: .2em; }
-
-        .uniForm .inlineLabel input,
-        .uniForm .inlineLabels .inlineLabel input,
-        .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
-      </style>
-    <![endif]-->
-    <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
-    <script type="text/javascript" src="js/yui/yahoo/yahoo-min.js"></script>
-    <script type="text/javascript" src="js/yui/connection/connection-min.js"></script>
-    <script type="text/javascript" src="js/scrigo.js.php"></script>
-    <script type="text/javascript" src="js/uni-form/jquery.js"></script>
-    <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
-</head>
-<body onload="loadInitContent()">
-    <div id="page_margins">
-        <div id="page">
-            <div id="header">
-                <div id="topsubnav">
-                    <!-- start: skip link navigation -->
-                    <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
-                    <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
-                    <!-- end: skip link navigation -->
-                    <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT</a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
-                </div>
-                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
-                <span>hosting control panel</span>
-            </div>
-            <!-- begin: main navigation #nav -->
-            <div id="nav">
-                <a id="navigation" name="navigation"></a>
-                <!-- skiplink anchor: navigation -->
-                <div id="nav_main">
-                    <div id="topNav">&nbsp;</div>
-                </div>
-            </div>
-            <!-- end: main navigation -->
-            <!-- begin: main content area #main -->
-            <div id="main">
-                <!-- begin: #col1 - first float column -->
-                <div id="col1">
-                    <div id="col1_content" class="clearfix">
-                        <div id="sideNav">&nbsp;</div>
-                    </div>
-                </div>
-                <!-- end: #col1 -->
-                <!-- begin: #col3 static column -->
-                <div id="col3">
-                    <div id="col3_content" class="clearfix">
-                        <a id="content" name="content"></a>
-                        <!-- skiplink anchor: Content -->
-                        <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
-                        <div id="pageContent"><!-- AJAX CONTENT --></div>
-                        </form>
-                    </div>
-                    <div id="ie_clearing">&nbsp;</div>
-                    <!-- End: IE Column Clearing -->
-                </div>
-                <!-- end: #col3 -->
-            </div>
-            <!-- end: #main -->
-        <!-- begin: #footer -->
-        <div id="footer">
-            Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"> <tmpl_var name="app_version"></a></div>
-        </div><!-- end: #footer -->
-    </div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/>
+    <link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
+    <!--[if lte IE 7]>
+	    <link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
+    <![endif]-->
+    <!--[if lte ie 6]>
+      <style type="text/css" media="screen">
+        /*
+        Move these to your IE specific stylesheet if possible
+        */
+        .uniForm,
+        .uniForm fieldset,
+        .uniForm .ctrlHolder,
+        .uniForm .formHint,
+        .uniForm .buttonHolder, 
+        .uniForm .ctrlHolder .multiField,
+        .uniForm .inlineLabel{ zoom:1; }
+
+        .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
+        .uniForm .blockLabels label, .uniForm .blockLabels .label,
+        .uniForm .inlineLabel span{ padding-bottom: .2em; }
+
+        .uniForm .inlineLabel input,
+        .uniForm .inlineLabels .inlineLabel input,
+        .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
+      </style>
+    <![endif]-->
+    <!--[if gt ie 6]>
+      <style type="text/css" media="screen">
+        /*
+        Move these to your IE specific stylesheet if possible
+        */
+        .uniForm,
+        .uniForm fieldset,
+        .uniForm .ctrlHolder,
+        .uniForm .formHint,
+        .uniForm .buttonHolder, 
+        .uniForm .ctrlHolder .multiField,
+        .uniForm .inlineLabel{ zoom:1; }
+
+        .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
+        .uniForm .blockLabels label, .uniForm .blockLabels .label,
+        .uniForm .inlineLabel span{ padding-bottom: .2em; }
+
+        .uniForm .inlineLabel input,
+        .uniForm .inlineLabels .inlineLabel input,
+        .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
+      </style>
+    <![endif]-->
+    <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
+    <script type="text/javascript" src="js/yui/yahoo/yahoo-min.js"></script>
+    <script type="text/javascript" src="js/yui/connection/connection-min.js"></script>
+    <script type="text/javascript" src="js/scrigo.js.php"></script>
+    <script type="text/javascript" src="js/uni-form/jquery.js"></script>
+    <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
+</head>
+<body onload="loadInitContent()">
+    <div id="page_margins">
+        <div id="page">
+            <div id="header">
+                <div id="topsubnav">
+                    <!-- start: skip link navigation -->
+                    <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
+                    <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
+                    <!-- end: skip link navigation -->
+                    <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT</a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+                </div>
+                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+                <span>hosting control panel</span>
+            </div>
+            <!-- begin: main navigation #nav -->
+            <div id="nav">
+                <a id="navigation" name="navigation"></a>
+                <!-- skiplink anchor: navigation -->
+                <div id="nav_main">
+                    <div id="topNav">&nbsp;</div>
+                </div>
+            </div>
+            <!-- end: main navigation -->
+            <!-- begin: main content area #main -->
+            <div id="main">
+                <!-- begin: #col1 - first float column -->
+                <div id="col1">
+                    <div id="col1_content" class="clearfix">
+                        <div id="sideNav">&nbsp;</div>
+                    </div>
+                </div>
+                <!-- end: #col1 -->
+                <!-- begin: #col3 static column -->
+                <div id="col3">
+                    <div id="col3_content" class="clearfix">
+                        <a id="content" name="content"></a>
+                        <!-- skiplink anchor: Content -->
+                        <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
+                        <div id="pageContent"><!-- AJAX CONTENT --></div>
+                        </form>
+                    </div>
+                    <div id="ie_clearing">&nbsp;</div>
+                    <!-- End: IE Column Clearing -->
+                </div>
+                <!-- end: #col3 -->
+            </div>
+            <!-- end: #main -->
+        <!-- begin: #footer -->
+        <div id="footer">
+            Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"> <tmpl_var name="app_version"></a>
+        </div><!-- end: #footer -->
+    </div>
+</body>
+</html>
diff --git a/interface/web/tools/lib/lang/hu.lng b/interface/web/tools/lib/lang/hu.lng
new file mode 100644
index 0000000..3cc7426
--- /dev/null
+++ b/interface/web/tools/lib/lang/hu.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['User Settings'] = 'Felhasználó beállítások';
+$wb['Settings'] = 'Beállítások';
+$wb['ISPConfig Tools'] = 'ISPConfig eszközök';
+$wb['Password and Language'] = 'Jelszó és nyelv';
+?>
+
diff --git a/interface/web/tools/lib/lang/hu_usersettings.lng b/interface/web/tools/lib/lang/hu_usersettings.lng
new file mode 100644
index 0000000..dd404aa
--- /dev/null
+++ b/interface/web/tools/lib/lang/hu_usersettings.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['passwort_txt'] = 'Jelszó';
+$wb['language_txt'] = 'Nyelv';
+$wb['password_mismatch'] = 'Jelszavak nem egyeznek meg.';
+$wb['Form to edit the user password and language.'] = 'Jelszó és nyelv beállító oldal.';
+$wb['Settings'] = 'Beállítások';
+$wb['password_strength_txt'] = 'Jelszó erősség';
+?>
+
diff --git a/interface/web/tools/lib/lang/nl.lng b/interface/web/tools/lib/lang/nl.lng
index d7e9283..3f1aa1b 100644
--- a/interface/web/tools/lib/lang/nl.lng
+++ b/interface/web/tools/lib/lang/nl.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['User Settings'] = 'Gebruiker instellingen';
+$wb['User Settings'] = 'Gebruikersinstellingen';
 $wb['Settings'] = 'Instellingen';
 $wb['ISPConfig Tools'] = 'ISPConfig Tools';
-$wb['Password and Language'] = 'Password and Language';
+$wb['Password and Language'] = 'Wachtwoord en taal';
 ?>
+
diff --git a/interface/web/tools/lib/lang/nl_usersettings.lng b/interface/web/tools/lib/lang/nl_usersettings.lng
index 60cee46..c27251c 100644
--- a/interface/web/tools/lib/lang/nl_usersettings.lng
+++ b/interface/web/tools/lib/lang/nl_usersettings.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['passwort_txt'] = 'Wachtwoord';
-$wb['language_txt'] = 'Taal';
+$wb['language_txt'] = 'Teksten tonen in de taal';
 $wb['password_mismatch'] = 'Het wachtwoord in het tweede veld komt niet overeen met het eerste wachtwoord.';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['Form to edit the user password and language.'] = 'Form to edit the user password and language.';
-$wb['Settings'] = 'Settings';
+$wb['password_strength_txt'] = 'Wachtwoord sterkte';
+$wb['Form to edit the user password and language.'] = 'Wijzig in het onderstaande formulier het wachtwoord en/of taal.';
+$wb['Settings'] = 'Instellingen';
 ?>
+
diff --git a/interface/web/tools/lib/lang/pl.lng b/interface/web/tools/lib/lang/pl.lng
new file mode 100644
index 0000000..8aa0391
--- /dev/null
+++ b/interface/web/tools/lib/lang/pl.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['User Settings'] = 'Ustawienia użytkownika';
+$wb['Settings'] = 'Ustawienia';
+$wb['ISPConfig Tools'] = 'ISPConfig Tools';
+$wb['Password and Language'] = 'Hasło i język';
+?>
diff --git a/interface/web/tools/lib/lang/pl_usersettings.lng b/interface/web/tools/lib/lang/pl_usersettings.lng
new file mode 100644
index 0000000..f8d7665
--- /dev/null
+++ b/interface/web/tools/lib/lang/pl_usersettings.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['passwort_txt'] = 'Hasło';
+$wb['password_strength_txt'] = 'Siła hasła';
+$wb['language_txt'] = 'Język';
+$wb['password_mismatch'] = 'Hasła nie pasują do siebie.';
+$wb['Form to edit the user password and language.'] = 'Formularz do edycji języka i hasła użytkownika.';
+$wb['Settings'] = 'Ustawienia';
+?>
diff --git a/server/conf/bash.bashrc.master b/server/conf/bash.bashrc.master
index 7347074..50b1bfd 100644
--- a/server/conf/bash.bashrc.master
+++ b/server/conf/bash.bashrc.master
@@ -32,7 +32,7 @@
     PS1='\[\033[01;32m\]$USER@$HOSTNAME\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
     ;;
 *)
-    PS1='\$USER@$HOSTNAME:\w\$ '
+    PS1='$USER@$HOSTNAME:\w\$ '
     ;;
 esac
 
diff --git a/server/conf/error/br/400.html b/server/conf/error/br/400.html
index 39fd163..2a00585 100644
--- a/server/conf/error/br/400.html
+++ b/server/conf/error/br/400.html
@@ -1,61 +1,61 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>ERROR 400 - Bad Request!</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="robots" content="noindex" />
-    <style type="text/css"><!--
-    body {
-        color: #444444;
-        background-color: #EEEEEE;
-        font-family: 'Trebuchet MS', sans-serif;
-        font-size: 80%;
-    }
-    h1 {}
-    h2 { font-size: 1.2em; }
-    #page{
-        background-color: #FFFFFF;
-        width: 60%;
-        margin: 24px auto;
-        padding: 12px;
-    }
-    #header {
-        padding: 6px ;
-        text-align: center;
-    }
-    .status3xx { background-color: #475076; color: #FFFFFF; }
-    .status4xx { background-color: #C55042; color: #FFFFFF; }
-    .status5xx { background-color: #F2E81A; color: #000000; }
-    #content {
-        padding: 4px 0 24px 0;
-    }
-    #footer {
-        color: #666666;
-        background: #f9f9f9;
-        padding: 10px 20px;
-        border-top: 5px #efefef solid;
-        font-size: 0.8em;
-        text-align: center;
-    }
-    #footer a {
-        color: #999999;
-    }
-    --></style>
-</head>
-<body>
-    <div id="page">
-        <div id="header" class="status4xx">
-            <h1>ERROR 400 - Bad Request!</h1>
-        </div>
-        <div id="content">
-            <h2>The following error occurred:</h2>
-            <p>You have used invalid syntax.</p>
-			<P>Please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//--> with any queries.</p>
-        </div>
-        <div id="footer">
-            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
-        </div>
-    </div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>ERROR 400 - Requisição ruim!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex" />
+    <style type="text/css"><!--
+    body {
+        color: #444444;
+        background-color: #EEEEEE;
+        font-family: 'Trebuchet MS', sans-serif;
+        font-size: 80%;
+    }
+    h1 {}
+    h2 { font-size: 1.2em; }
+    #page{
+        background-color: #FFFFFF;
+        width: 60%;
+        margin: 24px auto;
+        padding: 12px;
+    }
+    #header {
+        padding: 6px ;
+        text-align: center;
+    }
+    .status3xx { background-color: #475076; color: #FFFFFF; }
+    .status4xx { background-color: #C55042; color: #FFFFFF; }
+    .status5xx { background-color: #F2E81A; color: #000000; }
+    #content {
+        padding: 4px 0 24px 0;
+    }
+    #footer {
+        color: #666666;
+        background: #f9f9f9;
+        padding: 10px 20px;
+        border-top: 5px #efefef solid;
+        font-size: 0.8em;
+        text-align: center;
+    }
+    #footer a {
+        color: #999999;
+    }
+    --></style>
+</head>
+<body>
+    <div id="page">
+        <div id="header" class="status4xx">
+            <h1>ERROR 400 - Requisição ruim!</h1>
+        </div>
+        <div id="content">
+            <h2>O seguinte erro ocorreu:</h2>
+            <p>Você usou uma sintaxe inválida.</p>
+			<P>Se tiver qualquer dúvida extra sobre este erro contate seu webmaster.</p>
+        </div>
+        <div id="footer">
+            <p>Powered by     <a href="http://www.ispconfig.org">ISPConfig</a></p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/server/conf/error/br/401.html b/server/conf/error/br/401.html
index 28fc2a0..fdb9e0b 100644
--- a/server/conf/error/br/401.html
+++ b/server/conf/error/br/401.html
@@ -1,61 +1,61 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>ERROR 401 - Unauthorized!</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="robots" content="noindex" />
-    <style type="text/css"><!--
-    body {
-        color: #444444;
-        background-color: #EEEEEE;
-        font-family: 'Trebuchet MS', sans-serif;
-        font-size: 80%;
-    }
-    h1 {}
-    h2 { font-size: 1.2em; }
-    #page{
-        background-color: #FFFFFF;
-        width: 60%;
-        margin: 24px auto;
-        padding: 12px;
-    }
-    #header {
-        padding: 6px ;
-        text-align: center;
-    }
-    .status3xx { background-color: #475076; color: #FFFFFF; }
-    .status4xx { background-color: #C55042; color: #FFFFFF; }
-    .status5xx { background-color: #F2E81A; color: #000000; }
-    #content {
-        padding: 4px 0 24px 0;
-    }
-    #footer {
-        color: #666666;
-        background: #f9f9f9;
-        padding: 10px 20px;
-        border-top: 5px #efefef solid;
-        font-size: 0.8em;
-        text-align: center;
-    }
-    #footer a {
-        color: #999999;
-    }
-    --></style>
-</head>
-<body>
-    <div id="page">
-        <div id="header" class="status4xx">
-            <h1>ERROR 401 - Unauthorized!</h1>
-        </div>
-        <div id="content">
-            <h2>The following error occurred:</h2>
-            <p>The URL requested requires authorisation.</p>
-			<P>Please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//--> with any queries.</p>
-        </div>
-        <div id="footer">
-            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
-        </div>
-    </div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>ERRO 401 - Não autorizado!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex" />
+    <style type="text/css"><!--
+    body {
+        color: #444444;
+        background-color: #EEEEEE;
+        font-family: 'Trebuchet MS', sans-serif;
+        font-size: 80%;
+    }
+    h1 {}
+    h2 { font-size: 1.2em; }
+    #page{
+        background-color: #FFFFFF;
+        width: 60%;
+        margin: 24px auto;
+        padding: 12px;
+    }
+    #header {
+        padding: 6px ;
+        text-align: center;
+    }
+    .status3xx { background-color: #475076; color: #FFFFFF; }
+    .status4xx { background-color: #C55042; color: #FFFFFF; }
+    .status5xx { background-color: #F2E81A; color: #000000; }
+    #content {
+        padding: 4px 0 24px 0;
+    }
+    #footer {
+        color: #666666;
+        background: #f9f9f9;
+        padding: 10px 20px;
+        border-top: 5px #efefef solid;
+        font-size: 0.8em;
+        text-align: center;
+    }
+    #footer a {
+        color: #999999;
+    }
+    --></style>
+</head>
+<body>
+    <div id="page">
+        <div id="header" class="status4xx">
+            <h1>ERRO 401 - Não autorizado!</h1>
+        </div>
+        <div id="content">
+            <h2>O seguinte erro ocorreu:</h2>
+            <p>O endereço requisitado necessita de autorização para acesso. </p>
+			<P>Se tiver qualquer dúvida extra sobre este erro contate seu webmaster.</p>
+      </div>
+        <div id="footer">
+            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/server/conf/error/br/403.html b/server/conf/error/br/403.html
index 676f713..d05d315 100644
--- a/server/conf/error/br/403.html
+++ b/server/conf/error/br/403.html
@@ -1,61 +1,61 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>ERROR 403 - Forbidden!</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="robots" content="noindex" />
-    <style type="text/css"><!--
-    body {
-        color: #444444;
-        background-color: #EEEEEE;
-        font-family: 'Trebuchet MS', sans-serif;
-        font-size: 80%;
-    }
-    h1 {}
-    h2 { font-size: 1.2em; }
-    #page{
-        background-color: #FFFFFF;
-        width: 60%;
-        margin: 24px auto;
-        padding: 12px;
-    }
-    #header {
-        padding: 6px ;
-        text-align: center;
-    }
-    .status3xx { background-color: #475076; color: #FFFFFF; }
-    .status4xx { background-color: #C55042; color: #FFFFFF; }
-    .status5xx { background-color: #F2E81A; color: #000000; }
-    #content {
-        padding: 4px 0 24px 0;
-    }
-    #footer {
-        color: #666666;
-        background: #f9f9f9;
-        padding: 10px 20px;
-        border-top: 5px #efefef solid;
-        font-size: 0.8em;
-        text-align: center;
-    }
-    #footer a {
-        color: #999999;
-    }
-    --></style>
-</head>
-<body>
-    <div id="page">
-        <div id="header" class="status4xx">
-            <h1>ERROR 403 - Forbidden!</h1>
-        </div>
-        <div id="content">
-            <h2>The following error occurred:</h2>
-            <p>You are not permitted to access the requested URL.</p>
-			<P>Please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//--> with any queries.</p>
-        </div>
-        <div id="footer">
-            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
-        </div>
-    </div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>ERRO 403 - Acesso negado!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex" />
+    <style type="text/css"><!--
+    body {
+        color: #444444;
+        background-color: #EEEEEE;
+        font-family: 'Trebuchet MS', sans-serif;
+        font-size: 80%;
+    }
+    h1 {}
+    h2 { font-size: 1.2em; }
+    #page{
+        background-color: #FFFFFF;
+        width: 60%;
+        margin: 24px auto;
+        padding: 12px;
+    }
+    #header {
+        padding: 6px ;
+        text-align: center;
+    }
+    .status3xx { background-color: #475076; color: #FFFFFF; }
+    .status4xx { background-color: #C55042; color: #FFFFFF; }
+    .status5xx { background-color: #F2E81A; color: #000000; }
+    #content {
+        padding: 4px 0 24px 0;
+    }
+    #footer {
+        color: #666666;
+        background: #f9f9f9;
+        padding: 10px 20px;
+        border-top: 5px #efefef solid;
+        font-size: 0.8em;
+        text-align: center;
+    }
+    #footer a {
+        color: #999999;
+    }
+    --></style>
+</head>
+<body>
+    <div id="page">
+        <div id="header" class="status4xx">
+            <h1>ERRO 403 - Acesso negado!</h1>
+        </div>
+        <div id="content">
+            <h2>O seguinte erro ocorreu:</h2>
+            <p>Não foi permitido o seu acesso ao endereço especificado. </p>
+			<P>Se tiver qualquer dúvida extra sobre este erro contate seu webmaster.</p>
+      </div>
+        <div id="footer">
+            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/server/conf/error/br/404.html b/server/conf/error/br/404.html
index 78452ba..e5a53bf 100644
--- a/server/conf/error/br/404.html
+++ b/server/conf/error/br/404.html
@@ -1,61 +1,61 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>ERROR 404 - Not Found!</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="robots" content="noindex" />
-    <style type="text/css"><!--
-    body {
-        color: #444444;
-        background-color: #EEEEEE;
-        font-family: 'Trebuchet MS', sans-serif;
-        font-size: 80%;
-    }
-    h1 {}
-    h2 { font-size: 1.2em; }
-    #page{
-        background-color: #FFFFFF;
-        width: 60%;
-        margin: 24px auto;
-        padding: 12px;
-    }
-    #header {
-        padding: 6px ;
-        text-align: center;
-    }
-    .status3xx { background-color: #475076; color: #FFFFFF; }
-    .status4xx { background-color: #C55042; color: #FFFFFF; }
-    .status5xx { background-color: #F2E81A; color: #000000; }
-    #content {
-        padding: 4px 0 24px 0;
-    }
-    #footer {
-        color: #666666;
-        background: #f9f9f9;
-        padding: 10px 20px;
-        border-top: 5px #efefef solid;
-        font-size: 0.8em;
-        text-align: center;
-    }
-    #footer a {
-        color: #999999;
-    }
-    --></style>
-</head>
-<body>
-    <div id="page">
-        <div id="header" class="status4xx">
-            <h1>ERROR 404 - Not Found!</h1>
-        </div>
-        <div id="content">
-            <h2>The following error occurred:</h2>
-            <p>The requested URL was not found on this server.</p>
-			<P>Please check the URL or contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p>
-        </div>
-        <div id="footer">
-            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
-        </div>
-    </div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>ERRO 404 - Arquivo não encontrado!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex" />
+    <style type="text/css"><!--
+    body {
+        color: #444444;
+        background-color: #EEEEEE;
+        font-family: 'Trebuchet MS', sans-serif;
+        font-size: 80%;
+    }
+    h1 {}
+    h2 { font-size: 1.2em; }
+    #page{
+        background-color: #FFFFFF;
+        width: 60%;
+        margin: 24px auto;
+        padding: 12px;
+    }
+    #header {
+        padding: 6px ;
+        text-align: center;
+    }
+    .status3xx { background-color: #475076; color: #FFFFFF; }
+    .status4xx { background-color: #C55042; color: #FFFFFF; }
+    .status5xx { background-color: #F2E81A; color: #000000; }
+    #content {
+        padding: 4px 0 24px 0;
+    }
+    #footer {
+        color: #666666;
+        background: #f9f9f9;
+        padding: 10px 20px;
+        border-top: 5px #efefef solid;
+        font-size: 0.8em;
+        text-align: center;
+    }
+    #footer a {
+        color: #999999;
+    }
+    --></style>
+</head>
+<body>
+    <div id="page">
+        <div id="header" class="status4xx">
+            <h1>ERRO 404 - Arquivo não encontrado!</h1>
+        </div>
+        <div id="content">
+            <h2>O seguinte erro ocorreu:</h2>
+            <p>O endereço requisitado não foi encontrado neste servidor. </p>
+			<P>Se tiver qualquer dúvida extra sobre este erro cheque por atualizações neste endereço ou contate seu webmaster.</p>
+      </div>
+        <div id="footer">
+            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/server/conf/error/br/405.html b/server/conf/error/br/405.html
index c9ed8f6..cc23b89 100644
--- a/server/conf/error/br/405.html
+++ b/server/conf/error/br/405.html
@@ -1,61 +1,61 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>ERROR 405 - Method Not Allowed!</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="robots" content="noindex" />
-    <style type="text/css"><!--
-    body {
-        color: #444444;
-        background-color: #EEEEEE;
-        font-family: 'Trebuchet MS', sans-serif;
-        font-size: 80%;
-    }
-    h1 {}
-    h2 { font-size: 1.2em; }
-    #page{
-        background-color: #FFFFFF;
-        width: 60%;
-        margin: 24px auto;
-        padding: 12px;
-    }
-    #header {
-        padding: 6px ;
-        text-align: center;
-    }
-    .status3xx { background-color: #475076; color: #FFFFFF; }
-    .status4xx { background-color: #C55042; color: #FFFFFF; }
-    .status5xx { background-color: #F2E81A; color: #000000; }
-    #content {
-        padding: 4px 0 24px 0;
-    }
-    #footer {
-        color: #666666;
-        background: #f9f9f9;
-        padding: 10px 20px;
-        border-top: 5px #efefef solid;
-        font-size: 0.8em;
-        text-align: center;
-    }
-    #footer a {
-        color: #999999;
-    }
-    --></style>
-</head>
-<body>
-    <div id="page">
-        <div id="header" class="status4xx">
-            <h1>ERROR 405 - Method Not Allowed!</h1>
-        </div>
-        <div id="content">
-            <h2>The following error occurred:</h2>
-            <p>The method used is not permitted.</p>
-			<P>Please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//--> with any queries.</p>
-        </div>
-        <div id="footer">
-            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
-        </div>
-    </div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>ERRO 405 - Método não permitido!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex" />
+    <style type="text/css"><!--
+    body {
+        color: #444444;
+        background-color: #EEEEEE;
+        font-family: 'Trebuchet MS', sans-serif;
+        font-size: 80%;
+    }
+    h1 {}
+    h2 { font-size: 1.2em; }
+    #page{
+        background-color: #FFFFFF;
+        width: 60%;
+        margin: 24px auto;
+        padding: 12px;
+    }
+    #header {
+        padding: 6px ;
+        text-align: center;
+    }
+    .status3xx { background-color: #475076; color: #FFFFFF; }
+    .status4xx { background-color: #C55042; color: #FFFFFF; }
+    .status5xx { background-color: #F2E81A; color: #000000; }
+    #content {
+        padding: 4px 0 24px 0;
+    }
+    #footer {
+        color: #666666;
+        background: #f9f9f9;
+        padding: 10px 20px;
+        border-top: 5px #efefef solid;
+        font-size: 0.8em;
+        text-align: center;
+    }
+    #footer a {
+        color: #999999;
+    }
+    --></style>
+</head>
+<body>
+    <div id="page">
+        <div id="header" class="status4xx">
+            <h1>ERRO 405 - Método não permitido!</h1>
+        </div>
+        <div id="content">
+            <h2>O seguinte erro ocorreu:</h2>
+            <p>O método utilizado não é permitido. </p>
+			<P>Se tiver qualquer dúvida extra sobre este erro contate seu webmaster.</p>
+      </div>
+        <div id="footer">
+            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/server/conf/error/br/500.html b/server/conf/error/br/500.html
index 43864a7..330f47d 100644
--- a/server/conf/error/br/500.html
+++ b/server/conf/error/br/500.html
@@ -1,61 +1,61 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>ERROR 500 - Internal Server Error!</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="robots" content="noindex" />
-    <style type="text/css"><!--
-    body {
-        color: #444444;
-        background-color: #EEEEEE;
-        font-family: 'Trebuchet MS', sans-serif;
-        font-size: 80%;
-    }
-    h1 {}
-    h2 { font-size: 1.2em; }
-    #page{
-        background-color: #FFFFFF;
-        width: 60%;
-        margin: 24px auto;
-        padding: 12px;
-    }
-    #header {
-        padding: 6px ;
-        text-align: center;
-    }
-    .status3xx { background-color: #475076; color: #FFFFFF; }
-    .status4xx { background-color: #C55042; color: #FFFFFF; }
-    .status5xx { background-color: #F2E81A; color: #000000; }
-    #content {
-        padding: 4px 0 24px 0;
-    }
-    #footer {
-        color: #666666;
-        background: #f9f9f9;
-        padding: 10px 20px;
-        border-top: 5px #efefef solid;
-        font-size: 0.8em;
-        text-align: center;
-    }
-    #footer a {
-        color: #999999;
-    }
-    --></style>
-</head>
-<body>
-    <div id="page">
-        <div id="header" class="status5xx">
-            <h1>ERROR 500 - Internal Server Error!</h1>
-        </div>
-        <div id="content">
-            <h2>The following error occurred:</h2>
-            <p>The requested URL caused an internal server error.</p>
-			<P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p>
-        </div>
-        <div id="footer">
-            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
-        </div>
-    </div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>ERRO 500 - Erro interno do servidor!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex" />
+    <style type="text/css"><!--
+    body {
+        color: #444444;
+        background-color: #EEEEEE;
+        font-family: 'Trebuchet MS', sans-serif;
+        font-size: 80%;
+    }
+    h1 {}
+    h2 { font-size: 1.2em; }
+    #page{
+        background-color: #FFFFFF;
+        width: 60%;
+        margin: 24px auto;
+        padding: 12px;
+    }
+    #header {
+        padding: 6px ;
+        text-align: center;
+    }
+    .status3xx { background-color: #475076; color: #FFFFFF; }
+    .status4xx { background-color: #C55042; color: #FFFFFF; }
+    .status5xx { background-color: #F2E81A; color: #000000; }
+    #content {
+        padding: 4px 0 24px 0;
+    }
+    #footer {
+        color: #666666;
+        background: #f9f9f9;
+        padding: 10px 20px;
+        border-top: 5px #efefef solid;
+        font-size: 0.8em;
+        text-align: center;
+    }
+    #footer a {
+        color: #999999;
+    }
+    --></style>
+</head>
+<body>
+    <div id="page">
+        <div id="header" class="status5xx">
+            <h1>ERRO 500 - Erro interno do servidor!</h1>
+        </div>
+        <div id="content">
+            <h2>O seguinte erro ocorreu:</h2>
+            <p>O erro no endereço requisitado foi causado por uma requisição interna do servidor inválida. </p>
+			<P>Se está mensagem se repetir muitas vezes contate seu webmaster.</p>
+      </div>
+        <div id="footer">
+            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/server/conf/error/br/503.html b/server/conf/error/br/503.html
index eb55a56..aea971a 100644
--- a/server/conf/error/br/503.html
+++ b/server/conf/error/br/503.html
@@ -1,61 +1,61 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>ERROR 503 - Service Unavailable!</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="robots" content="noindex" />
-    <style type="text/css"><!--
-    body {
-        color: #444444;
-        background-color: #EEEEEE;
-        font-family: 'Trebuchet MS', sans-serif;
-        font-size: 80%;
-    }
-    h1 {}
-    h2 { font-size: 1.2em; }
-    #page{
-        background-color: #FFFFFF;
-        width: 60%;
-        margin: 24px auto;
-        padding: 12px;
-    }
-    #header {
-        padding: 6px ;
-        text-align: center;
-    }
-    .status3xx { background-color: #475076; color: #FFFFFF; }
-    .status4xx { background-color: #C55042; color: #FFFFFF; }
-    .status5xx { background-color: #F2E81A; color: #000000; }
-    #content {
-        padding: 4px 0 24px 0;
-    }
-    #footer {
-        color: #666666;
-        background: #f9f9f9;
-        padding: 10px 20px;
-        border-top: 5px #efefef solid;
-        font-size: 0.8em;
-        text-align: center;
-    }
-    #footer a {
-        color: #999999;
-    }
-    --></style>
-</head>
-<body>
-    <div id="page">
-        <div id="header" class="status5xx">
-            <h1>ERROR 503 - Service Unavailable!</h1>
-        </div>
-        <div id="content">
-            <h2>The following error occurred:</h2>
-            <p>The Service is not available at the moment due to a temporary overloading or maintenance of the server. Please try again later.</p>
-			<P>Please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//--> with any queries.</p>
-        </div>
-        <div id="footer">
-            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
-        </div>
-    </div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>ERRO 503 - Serviço Indisponível!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex" />
+    <style type="text/css"><!--
+    body {
+        color: #444444;
+        background-color: #EEEEEE;
+        font-family: 'Trebuchet MS', sans-serif;
+        font-size: 80%;
+    }
+    h1 {}
+    h2 { font-size: 1.2em; }
+    #page{
+        background-color: #FFFFFF;
+        width: 60%;
+        margin: 24px auto;
+        padding: 12px;
+    }
+    #header {
+        padding: 6px ;
+        text-align: center;
+    }
+    .status3xx { background-color: #475076; color: #FFFFFF; }
+    .status4xx { background-color: #C55042; color: #FFFFFF; }
+    .status5xx { background-color: #F2E81A; color: #000000; }
+    #content {
+        padding: 4px 0 24px 0;
+    }
+    #footer {
+        color: #666666;
+        background: #f9f9f9;
+        padding: 10px 20px;
+        border-top: 5px #efefef solid;
+        font-size: 0.8em;
+        text-align: center;
+    }
+    #footer a {
+        color: #999999;
+    }
+    --></style>
+</head>
+<body>
+    <div id="page">
+        <div id="header" class="status5xx">
+            <h1>ERRO 503 - Serviço Indisponível!</h1>
+        </div>
+        <div id="content">
+            <h2>O seguinte erro ocorreu:</h2>
+            <p>O serviço não está disponível no momento por uma sobrecarga temporária ou processo de manutenção. Por favor tente mais tarde.</p>
+			<P>Se tiver qualquer dúvida extra sobre este erro contate seu webmaster.</p>
+      </div>
+        <div id="footer">
+            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/server/conf/index/standard_index.html_br b/server/conf/index/standard_index.html_br
new file mode 100644
index 0000000..f47f71e
--- /dev/null
+++ b/server/conf/index/standard_index.html_br
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>Bem-Vindo!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <link rel="shortcut icon" href="/favicon.ico" />
+    <meta name="robots" content="noindex" />
+	<style type="text/css"><!--
+    body {
+        color: #444444;
+        background-color: #EEEEEE;
+        font-family: 'Trebuchet MS', sans-serif;
+        font-size: 80%;
+    }
+    h1 {}
+    h2 { font-size: 1.2em; }
+    #page{
+        background-color: #FFFFFF;
+        width: 60%;
+        margin: 24px auto;
+        padding: 12px;
+    }
+    #header{
+        padding: 6px ;
+        text-align: center;
+    }
+    .header{ background-color: #83A342; color: #FFFFFF; }
+    #content {
+        padding: 4px 0 24px 0;
+    }
+    #footer {
+        color: #666666;
+        background: #f9f9f9;
+        padding: 10px 20px;
+        border-top: 5px #efefef solid;
+        font-size: 0.8em;
+        text-align: center;
+    }
+    #footer a {
+        color: #999999;
+    }
+    --></style>
+</head>
+<body>
+    <div id="page">
+        <div id="header" class="header">
+            <h1>Bem-vindo ao <!--ADRESSE//-->seu site!<!--ADRESSE//--></h1>
+        </div>
+        <div id="content">
+            <h2>Esta é a página index padrão de seu site.</h2>
+            <p>Este arquivo pode ser reescrito ou subistituído sem quaisquer dificuldades. Esta página é produzida pelo arquivo <b>index.html</b> contido no diretório <b>web</b>.</p>
+            <p>Tendo quaisquer dúvidas ou problemas contate o <!--SUPPORT//-->suporte<!--SUPPORT//-->.</p>
+        </div>
+        <div id="footer">
+            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/server/conf/index/user_standard_index.html_br b/server/conf/index/user_standard_index.html_br
new file mode 100644
index 0000000..77db42f
--- /dev/null
+++ b/server/conf/index/user_standard_index.html_br
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>Bem-Vindo!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <link rel="shortcut icon" href="/favicon.ico" />
+    <meta name="robots" content="noindex" />
+	<style type="text/css"><!--
+    body {
+        color: #444444;
+        background-color: #EEEEEE;
+        font-family: 'Trebuchet MS', sans-serif;
+        font-size: 80%;
+    }
+    h1 {}
+    h2 { font-size: 1.2em; }
+    #page{
+        background-color: #FFFFFF;
+        width: 60%;
+        margin: 24px auto;
+        padding: 12px;
+    }
+    #header{
+        padding: 6px ;
+        text-align: center;
+    }
+    .header{ background-color: #83A342; color: #FFFFFF; }
+    #content {
+        padding: 4px 0 24px 0;
+    }
+    #footer {
+        color: #666666;
+        background: #f9f9f9;
+        padding: 10px 20px;
+        border-top: 5px #efefef solid;
+        font-size: 0.8em;
+        text-align: center;
+    }
+    #footer a {
+        color: #999999;
+    }
+    --></style>
+</head>
+<body>
+    <div id="page">
+        <div id="header" class="header">
+            <h1>Bem-vindo ao <!--ADRESSE//-->seu site!<!--ADRESSE//--></h1>
+        </div>
+        <div id="content">
+            <h2>Esta é a página index padrão para o usuário <b>{USER_USERNAME}</b>.</h2>
+            <p>Este arquivo pode ser reescrito ou subistituído sem quaisquer dificuldades. Esta página é produzida pelo arquivo <b>index.html</b> no diretório <b>user/{USER_USERNAME}/web</b>.</p>
+            <p>Tendo quaisquer dúvidas ou problemas contate o <!--SUPPORT//-->suporte<!--SUPPORT//-->.</p>
+        </div>
+        <div id="footer">
+            <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 9c8bf65..857a87b 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -36,7 +36,7 @@
 	
     <Directory {tmpl_var name='web_document_root_www'}>
         Options FollowSymLinks
-        AllowOverride Indexes AuthConfig Limit FileInfo
+        AllowOverride All
         Order allow,deny
         Allow from all
 <tmpl_if name='ssi' op='==' value='y'>
@@ -56,7 +56,7 @@
     </Directory>
     <Directory {tmpl_var name='web_document_root'}>
         Options FollowSymLinks
-        AllowOverride Indexes AuthConfig Limit FileInfo
+        AllowOverride All
         Order allow,deny
         Allow from all
 <tmpl_if name='ssi' op='==' value='y'>
@@ -187,7 +187,7 @@
     
 	<Directory {tmpl_var name='web_document_root_www'}>
         Options FollowSymLinks
-        AllowOverride Indexes AuthConfig Limit FileInfo
+        AllowOverride All
         Order allow,deny
         Allow from all
 <tmpl_if name='ssi' op='==' value='y'>
@@ -207,7 +207,7 @@
     </Directory>
     <Directory {tmpl_var name='web_document_root'}>
         Options FollowSymLinks
-        AllowOverride Indexes AuthConfig Limit FileInfo
+        AllowOverride All
         Order allow,deny
         Allow from all
 <tmpl_if name='ssi' op='==' value='y'>
@@ -252,7 +252,7 @@
     php_admin_value upload_tmp_dir <tmpl_var name='document_root'>/tmp
     php_admin_value session.save_path <tmpl_var name='document_root'>/tmp
 <tmpl_if name='security_level' op='==' value='20'>
-    php_admin_value open_basedir <tmpl_var name='document_root'>/web:<tmpl_var name='document_root'>/tmp:/usr/share/php5
+    php_admin_value open_basedir <tmpl_var name='document_root'>/web:<tmpl_var name='document_root'>/tmp:/usr/share/php5:/tmp
 </tmpl_if>
 </tmpl_if>
 <tmpl_if name='php' op='==' value='suphp'>
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 2cac46c..0c650e4 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -93,14 +93,18 @@
 foreach($records as $rec) {
 	$yesterday = date("Ymd",time() - 86400);
 	$logfile = escapeshellcmd($rec["document_root"].'/log/'.$yesterday.'-access.log');
-	if(@is_file($logfile)) {
-		$domain = escapeshellcmd($rec["domain"]);
-		$statsdir = escapeshellcmd($rec["document_root"].'/web/stats');
-		$webalizer = '/usr/bin/webalizer';
-		$webalizer_conf = '/etc/webalizer/webalizer.conf';
-		if(!@is_dir($statsdir)) mkdir($statsdir);
-		exec("$webalizer -c $webalizer_conf -n $domain -s $domain -r $domain -q -T -o $statsdir $logfile");
+	if(!@is_file($logfile)) {
+		$logfile = escapeshellcmd($rec["document_root"].'/log/'.$yesterday.'-access.log.gz');
+		if(!@is_file($logfile)) {
+			continue;
+		}
 	}
+	$domain = escapeshellcmd($rec["domain"]);
+	$statsdir = escapeshellcmd($rec["document_root"].'/web/stats');
+	$webalizer = '/usr/bin/webalizer';
+	$webalizer_conf = '/etc/webalizer/webalizer.conf';
+	if(!@is_dir($statsdir)) mkdir($statsdir);
+	exec("$webalizer -c $webalizer_conf -n $domain -s $domain -r $domain -q -T -p -o $statsdir $logfile");
 }
 
 #######################################################################################################
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index e0ac82f..0fe0b8e 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -40,6 +40,11 @@
                 if($conf["start_db"] == true) {
                 	$this->load('db_'.$conf["db_type"]);
                 	$this->db = new db;
+					if($this->db->linkId) $this->db->closeConn();
+					$this->db->dbHost = $conf["db_host"];
+					$this->db->dbName = $conf["db_database"];
+					$this->db->dbUser = $conf["db_user"];
+					$this->db->dbPass = $conf["db_password"];
 					
 					/*
 					Initialize the connection to the master DB, 
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 672de7f..986aa81 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -59,8 +59,8 @@
 		function updateError($location)
 		{
 			global $app;
-			$this->errorNumber = mysql_errno();
-			$this->errorMessage = mysql_error();
+			$this->errorNumber = mysql_errno($this->linkId);
+			$this->errorMessage = mysql_error($this->linkId);
 			$this->errorLocation = $location;
 			if($this->errorNumber && $this->show_error_messages && method_exists($app,'log'))
 			{
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index e84595f..f4bb65c 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -118,10 +118,12 @@
 						//$tmp_sql1 .= "$idx[0]";
 						//$tmp_sql2 .= "$idx[1]";
 						$sql = "REPLACE INTO $d[dbtable] ($tmp_sql1) VALUES ($tmp_sql2)";
+						$app->db->errorNumber = 0;
+						$app->db->errorMessage = '';
 						$app->db->query($sql);
 						if($app->db->errorNumber > 0) {
 							$replication_error = true;
-							$app->log("Replication failed. Error: (" . $d[dbtable] . ") " . $app->db->errorMessage . " # SQL: " . $sql,LOGLEVEL_ERROR);
+							$app->log("Replication failed. Error: (" . $d[dbtable] . ") in mysql server: (".$app->db->dbHost.") " . $app->db->errorMessage . " # SQL: " . $sql,LOGLEVEL_ERROR);
 						}
 						$app->log("Replicated from master: ".$sql,LOGLEVEL_DEBUG);
 					}
diff --git a/server/mods-available/dns_module.inc.php b/server/mods-available/dns_module.inc.php
new file mode 100644
index 0000000..79b0e5b
--- /dev/null
+++ b/server/mods-available/dns_module.inc.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+Copyright (c) 2009, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class dns_module {
+	
+	var $module_name = 'dns_module';
+	var $class_name = 'dns_module';
+	var $actions_available = array(	'dns_soa_insert',
+									'dns_soa_update',
+									'dns_soa_delete',
+									'dns_rr_insert',
+									'dns_rr_update',
+									'dns_rr_delete');
+	
+	//* This function is called during ispconfig installation to determine
+	//  if a symlink shall be created for this plugin.
+	function onInstall() {
+		global $conf;
+		
+		return true;
+		
+	}
+	
+	/*
+	 	This function is called when the module is loaded
+	*/
+	
+	function onLoad() {
+		global $app;
+		
+		/*
+		Annonce the actions that where provided by this module, so plugins 
+		can register on them.
+		*/
+		
+		$app->plugins->announceEvents($this->module_name,$this->actions_available);
+		
+		/*
+		As we want to get notified of any changes on several database tables,
+		we register for them.
+		
+		The following function registers the function "functionname"
+ 		to be executed when a record for the table "dbtable" is 
+ 		processed in the sys_datalog. "classname" is the name of the
+ 		class that contains the function functionname.
+		*/
+		
+		$app->modules->registerTableHook('dns_soa',$this->module_name,'process');
+		$app->modules->registerTableHook('dns_rr',$this->module_name,'process');
+		
+	}
+	
+	/*
+	 This function is called when a change in one of the registered tables is detected.
+	 The function then raises the events for the plugins.
+	*/
+
+	function process($tablename,$action,$data) {
+		global $app;
+		
+		switch ($tablename) {
+			case 'dns_soa':
+				if($action == 'i') $app->plugins->raiseEvent('dns_soa_insert',$data);
+				if($action == 'u') $app->plugins->raiseEvent('dns_soa_update',$data);
+				if($action == 'd') $app->plugins->raiseEvent('dns_soa_delete',$data);
+			break;
+			case 'dns_rr':
+				if($action == 'i') $app->plugins->raiseEvent('dns_rr_insert',$data);
+				if($action == 'u') $app->plugins->raiseEvent('dns_rr_update',$data);
+				if($action == 'd') $app->plugins->raiseEvent('dns_rr_delete',$data);
+			break;
+		} // end switch
+	} // end function
+	
+
+} // end class
+
+?>
\ No newline at end of file
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 1a962ec..087b5c4 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -461,40 +461,59 @@
 		
 		if($this->action == 'insert') {
 			// Chown and chmod the directories below the document root
-			exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
-		
-			// The document root itself has to be owned by root
-			exec("chown root:root ".escapeshellcmd($data["new"]["document_root"]));
+			$this->_exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
+			// The document root itself has to be owned by root in normal level and by the web owner in security level 20
+			if($web_config['security_level'] == 20) {
+				$this->_exec("chown $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
+			} else {
+				$this->_exec("chown root:root ".escapeshellcmd($data["new"]["document_root"]));
+			}
 		}
 		
 		
 		
-		// If the security level is set to high
+		//* If the security level is set to high
 		if($web_config['security_level'] == 20) {
 			
-			exec("chmod 711 ".escapeshellcmd($data["new"]["document_root"]."/"));
-			exec("chmod 711 ".escapeshellcmd($data["new"]["document_root"])."/*");
-			exec("chmod 710 ".escapeshellcmd($data["new"]["document_root"]."/web"));
+			$this->_exec("chmod 751 ".escapeshellcmd($data["new"]["document_root"]."/"));
+			$this->_exec("chmod 751 ".escapeshellcmd($data["new"]["document_root"])."/*");
+			$this->_exec("chmod 710 ".escapeshellcmd($data["new"]["document_root"]."/web"));
 			
 			// make temp direcory writable for the apache user and the website user
-			exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
+			$this->_exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
 			
 			$command = 'usermod';
 			$command .= ' --groups sshusers';
 			$command .= ' '.escapeshellcmd($data["new"]["system_user"]);
-			exec($command);
+			$this->_exec($command);
 			
 			//* add the apache user to the client group
 			$app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
 			
+			$this->_exec("chown $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
+			
+			/*
+			* Workaround for jailkit: If jailkit is enabled for the site, the 
+			* website root has to be owned by the root user and we have to chmod it to 755 then
+			*/
+			
+			//* Check if there is a jailkit user for this site
+			$tmp = $app->db->queryOneRecord("SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = ".$data["new"]["domain_id"]." AND chroot = 'jailkit'");
+			if($tmp['number'] > 0) {
+				$this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"]."/"));
+				$this->_exec("chown root:root ".escapeshellcmd($data["new"]["document_root"]."/"));
+			}
+			unset($tmp);
+			
 		// If the security Level is set to medium
 		} else {
 		
-			exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"]."/"));
-			exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"]."/*"));
+			$this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"]."/"));
+			$this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"]."/*"));
+			$this->_exec("chown root:root ".escapeshellcmd($data["new"]["document_root"]."/"));
 		
 			// make temp direcory writable for the apache user and the website user
-			exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
+			$this->_exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
 		}
 		
 		
@@ -898,6 +917,13 @@
 		
 	}
 	
+	//* Wrapper for exec function for easier debugging
+	private function _exec($command) {
+		global $app;
+		$app->log("exec: ".$command,LOGLEVEL_DEBUG);
+		exec($command);
+	}
+	
 
 } // end class
 
diff --git a/server/plugins-available/firewall_plugin.inc.php b/server/plugins-available/firewall_plugin.inc.php
index c446852..9039946 100644
--- a/server/plugins-available/firewall_plugin.inc.php
+++ b/server/plugins-available/firewall_plugin.inc.php
@@ -85,7 +85,7 @@
 				} else {
 					$p_clean = intval($p);
 				}
-				if($p_int > 0) $tcp_ports .= $p_clean . ' ';
+				$tcp_ports .= $p_clean . ' ';
 			}
 		}
 		$tcp_ports = trim($tcp_ports);
@@ -99,7 +99,7 @@
 				} else {
 					$p_clean = intval($p);
 				}
-				if($p_int > 0) $udp_ports .= $p_clean . ' ';
+				$udp_ports .= $p_clean . ' ';
 			}
 		}
 		$udp_ports = trim($udp_ports);
diff --git a/server/plugins-available/powerdns_plugin.inc.php b/server/plugins-available/powerdns_plugin.inc.php
new file mode 100644
index 0000000..7575554
--- /dev/null
+++ b/server/plugins-available/powerdns_plugin.inc.php
@@ -0,0 +1,349 @@
+<?php
+
+/*
+Copyright (c) 2009, Falko Timme, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+The powerdns database name has to be "powerdns" and it must be accessible
+by the "ispconfig" database user
+
+TABLE STRUCTURE of the "powerdns" database:
+
+CREATE TABLE `domains` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(255) NOT NULL,
+  `master` varchar(128) default NULL,
+  `last_check` int(11) default NULL,
+  `type` varchar(6) NOT NULL,
+  `notified_serial` int(11) default NULL,
+  `account` varchar(40) default NULL,
+  `ispconfig_id` int(11) NOT NULL,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `name_index` (`name`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1;
+
+CREATE TABLE `records` (
+  `id` int(11) NOT NULL auto_increment,
+  `domain_id` int(11) default NULL,
+  `name` varchar(255) default NULL,
+  `type` varchar(6) default NULL,
+  `content` varchar(255) default NULL,
+  `ttl` int(11) default NULL,
+  `prio` int(11) default NULL,
+  `change_date` int(11) default NULL,
+  `ispconfig_id` int(11) NOT NULL,
+  PRIMARY KEY  (`id`),
+  KEY `rec_name_index` (`name`),
+  KEY `nametype_index` (`name`,`type`),
+  KEY `domain_id` (`domain_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1;
+
+CREATE TABLE `supermasters` (
+  `ip` varchar(25) NOT NULL,
+  `nameserver` varchar(255) NOT NULL,
+  `account` varchar(40) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+
+IMPORTANT:
+- This plugin does not support ALIAS records (supported only by MyDNS).
+
+TODO:
+- introduce a variable for the PowerDNS database
+*/
+
+class powerdns_plugin {
+	
+	var $plugin_name = 'powerdns_plugin';
+	var $class_name  = 'powerdns_plugin';
+	
+	//* This function is called during ispconfig installation to determine
+	//  if a symlink shall be created for this plugin.
+	function onInstall() {
+		global $conf;
+		
+		if(isset($conf['powerdns']['installed']) && $conf['powerdns']['installed'] == true) {
+			return true;
+		} else {
+			return false;
+		}
+		
+	}
+	
+		
+	/*
+	 	This function is called when the plugin is loaded
+	*/
+	
+	function onLoad() {
+		global $app;
+		
+		/*
+		Register for the events
+		*/
+		
+		//* SOA
+		$app->plugins->registerEvent('dns_soa_insert',$this->plugin_name,'soa_insert');
+		$app->plugins->registerEvent('dns_soa_update',$this->plugin_name,'soa_update');
+		$app->plugins->registerEvent('dns_soa_delete',$this->plugin_name,'soa_delete');
+		
+		//* RR
+		$app->plugins->registerEvent('dns_rr_insert',$this->plugin_name,'rr_insert');
+		$app->plugins->registerEvent('dns_rr_update',$this->plugin_name,'rr_update');
+		$app->plugins->registerEvent('dns_rr_delete',$this->plugin_name,'rr_delete');
+		
+	}
+	
+	
+	function soa_insert($event_name,$data) {
+		global $app, $conf;
+		
+		if($data["new"]["active"] != 'Y') return;
+		
+		$origin = substr($data["new"]["origin"], 0, -1);
+		$ispconfig_id = $data["new"]["id"];
+		$app->db->query("INSERT INTO powerdns.domains (name, type, ispconfig_id) VALUES ('$origin', 'NATIVE', $ispconfig_id)");
+		$zone_id = mysql_insert_id();
+		if(substr($data["new"]["ns"], -1) == '.'){
+			$ns = substr($data["new"]["ns"], 0, -1);
+		} else {
+			$ns = $data["new"]["ns"].'.'.$origin;
+		}
+		if($ns == '') $ns = $origin;
+		
+		$hostmaster = substr($data["new"]["mbox"], 0, -1);
+		$content = $ns.' '.$hostmaster.' 0';
+		$ttl = $data["new"]["ttl"];
+		
+		$app->db->query("INSERT INTO powerdns.records (domain_id, name, type, content, ttl, prio, change_date, ispconfig_id) VALUES ($zone_id, '$origin', 'SOA', '$content', $ttl, 0, ".time().", $ispconfig_id)");
+	
+	}
+	
+	function soa_update($event_name,$data) {
+		global $app, $conf;
+		
+		if($data["new"]["active"] != 'Y'){
+			if($data["old"]["active"] != 'Y') return;
+			$this->soa_delete($event_name,$data);
+		} else {
+			if($data["old"]["active"] == 'Y'){
+				$origin = substr($data["new"]["origin"], 0, -1);
+				$ispconfig_id = $data["new"]["id"];
+				$app->db->query("UPDATE powerdns.domains SET name = '$origin' WHERE ispconfig_id = $ispconfig_id");		
+		
+				if(substr($data["new"]["ns"], -1) == '.'){
+					$ns = substr($data["new"]["ns"], 0, -1);
+				} else {
+					$ns = $data["new"]["ns"].'.'.$origin;
+				}
+				if($ns == '') $ns = $origin;
+				
+				$hostmaster = substr($data["new"]["mbox"], 0, -1);
+				$content = $ns.' '.$hostmaster.' 0';
+				$ttl = $data["new"]["ttl"];
+				$app->db->query("UPDATE powerdns.records SET name = '$origin', content = '$content', ttl = $ttl, change_date = ".time()." WHERE ispconfig_id = ".$data["new"]["id"]." AND type = 'SOA'");
+			} else {
+				$this->soa_insert($event_name,$data);
+				$ispconfig_id = $data["new"]["id"];
+				if($records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = $ispconfig_id AND active = 'Y'")){
+					foreach($records as $record){
+						foreach($record as $key => $val){
+							$data["new"][$key] = $val;
+						}
+						$this->rr_insert("dns_rr_insert", $data);
+					}
+				}
+
+			}
+		}
+			
+	}
+	
+	function soa_delete($event_name,$data) {
+		global $app, $conf;
+		
+		$zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["old"]["id"]);
+		$zone_id = $zone["id"];
+		$app->db->query("DELETE FROM powerdns.records WHERE domain_id = $zone_id");
+		$app->db->query("DELETE FROM powerdns.domains WHERE id = $zone_id");
+			
+	}
+	
+	function rr_insert($event_name,$data) {
+		global $app, $conf;
+		if($data["new"]["active"] != 'Y') return;
+		
+		$zone = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$data["new"]["zone"]);
+		$origin = substr($zone["origin"], 0, -1);
+		$powerdns_zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["new"]["zone"]);
+		$zone_id = $powerdns_zone["id"];
+		
+		$type = $data["new"]["type"];
+		
+		switch ($type) {
+			case "PTR":
+				$name = $data["new"]["name"];
+				break;
+    		default:
+				if(substr($data["new"]["name"], -1) == '.'){
+					$name = substr($data["new"]["name"], 0, -1);
+				} else {
+					if($data["new"]["name"] == ""){
+						$name = $origin;
+					} else {
+						$name = $data["new"]["name"].'.'.$origin;
+					}
+				}
+				if($name == '') $name = $origin;
+		}
+		
+		switch ($type) {
+			case "CNAME":
+			case "MX":
+			case "NS":
+			case "ALIAS":
+			case "PTR":
+			case "SRV":
+				if(substr($data["new"]["data"], -1) == '.'){
+					$content = substr($data["new"]["data"], 0, -1);
+				} else {
+					$content = $data["new"]["data"].'.'.$origin;
+				}
+				break;
+			case "HINFO":
+			    $content = $data["new"]["data"];
+				$quote1 = strpos($content, '"');
+				if($quote1 !== FALSE){
+					$quote2 = strpos(substr($content, ($quote1 + 1)), '"');
+				}
+				if($quote1 !== FALSE && $quote2 !== FALSE){
+					$text_between_quotes = str_replace(' ', '_', substr($content, ($quote1 + 1), (($quote2 - $quote1))));
+					$content = $text_between_quotes.substr($content, ($quote2 + 2));
+				}
+				break;
+    		default:
+				$content = $data["new"]["data"];
+		}
+		
+		$ttl = $data["new"]["ttl"];
+		$prio = $data["new"]["aux"];
+		$change_date = time();
+		$ispconfig_id = $data["new"]["id"];
+		
+		$app->db->query("INSERT INTO powerdns.records (domain_id, name, type, content, ttl, prio, change_date, ispconfig_id) VALUES ($zone_id, '$name', '$type', '$content', $ttl, $prio, $change_date, $ispconfig_id)");
+		
+	}
+	
+	function rr_update($event_name,$data) {
+		global $app, $conf;
+		
+		if($data["new"]["active"] != 'Y'){
+			if($data["old"]["active"] != 'Y') return;
+			$this->rr_delete($event_name,$data);
+		} else {
+			if($data["old"]["active"] == 'Y'){
+				$zone = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$data["new"]["zone"]);
+				$origin = substr($zone["origin"], 0, -1);
+				$powerdns_zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["new"]["zone"]);
+				$zone_id = $powerdns_zone["id"];
+				
+				$type = $data["new"]["type"];	
+		
+				switch ($type) {
+					case "PTR":
+						$name = $data["new"]["name"];
+						break;
+    				default:
+						if(substr($data["new"]["name"], -1) == '.'){
+							$name = substr($data["new"]["name"], 0, -1);
+						} else {
+							if($data["new"]["name"] == ""){
+								$name = $origin;
+							} else {
+								$name = $data["new"]["name"].'.'.$origin;
+							}
+						}
+						if($name == '') $name = $origin;
+				}
+
+				switch ($type) {
+					case "CNAME":
+					case "MX":
+					case "NS":
+					case "ALIAS":
+					case "PTR":
+					case "SRV":
+						if(substr($data["new"]["data"], -1) == '.'){
+							$content = substr($data["new"]["data"], 0, -1);
+						} else {
+							$content = $data["new"]["data"].'.'.$origin;
+						}
+						break;
+					case "HINFO":
+			    		$content = $data["new"]["data"];
+						$quote1 = strpos($content, '"');
+						if($quote1 !== FALSE){
+							$quote2 = strpos(substr($content, ($quote1 + 1)), '"');
+						}
+						if($quote1 !== FALSE && $quote2 !== FALSE){
+							$text_between_quotes = str_replace(' ', '_', substr($content, ($quote1 + 1), (($quote2 - $quote1))));
+							$content = $text_between_quotes.substr($content, ($quote2 + 2));
+						}
+						break;
+    				default:
+						$content = $data["new"]["data"];
+				}
+		
+				$ttl = $data["new"]["ttl"];
+				$prio = $data["new"]["aux"];
+				$change_date = time();
+				$ispconfig_id = $data["new"]["id"];
+				//echo "UPDATE powerdns.records SET name = '$name', type = '$type', content = '$content', ttl = $ttl, prio = $prio, change_date = ".time()." WHERE id = $record_id";
+				$app->db->query("UPDATE powerdns.records SET name = '$name', type = '$type', content = '$content', ttl = $ttl, prio = $prio, change_date = ".time()." WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'");
+				
+			} else {
+				$this->rr_insert($event_name,$data);
+			}
+		}
+		
+	}
+	
+	function rr_delete($event_name,$data) {
+		global $app, $conf;
+		
+		$ispconfig_id = $data["old"]["id"];
+		$app->db->query("DELETE FROM powerdns.records WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'");
+		
+	}
+	
+	
+	
+
+} // end class
+
+?>
\ No newline at end of file
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 13705c0..60524ba 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -84,13 +84,17 @@
 				$this->data = $data;
 				$this->app = $app;
 				$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
+				
+				$this->_update_website_security_level();
 			
 				$this->_setup_jailkit_chroot();
+				
+				$this->_add_jailkit_user();
 				
 				$command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
 				exec($command);
 				
-				$this->_add_jailkit_user();
+				$this->_update_website_security_level();
 			}
 		
 			$app->log("Jailkit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -119,9 +123,13 @@
 				$this->data = $data;
 				$this->app = $app;
 				$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
+				
+				$this->_update_website_security_level();
 			
 				$this->_setup_jailkit_chroot();
 				$this->_add_jailkit_user();
+				
+				$this->_update_website_security_level();
 			}
 		
 			$app->log("Jailkit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -157,6 +165,7 @@
 				exec($command);
 				$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
 			}
+			
 		}
 		
 		$app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);
@@ -263,7 +272,31 @@
 			$this->app->log("Added created jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG);
 	}
 	
+	//* Update the website root directory permissions depending on the security level
+	function _update_website_security_level() {
+		global $app,$conf;
+		
+		// load the server configuration options
+		$app->uses("getconf");
+		$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
+		
+		// Get the parent website of this shell user
+		$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$this->data['new']['parent_domain_id']);
+		
+		//* If the security level is set to high
+		if($web_config['security_level'] == 20) {
+			$this->_exec("chmod 755 ".escapeshellcmd($web["document_root"]));
+			$this->_exec("chown root:root ".escapeshellcmd($web["document_root"]));
+		}
+		
+	}
 	
+	//* Wrapper for exec function for easier debugging
+	private function _exec($command) {
+		global $app;
+		$app->log("exec: ".$command,LOGLEVEL_DEBUG);
+		exec($command);
+	}
 
 } // end class
 

--
Gitblit v1.9.1