From 11b3daff80a65d0d0b0dabf3ef99aa0c7018f76b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 11 Aug 2009 09:59:25 -0400
Subject: [PATCH] Fixed: FS#822 - Main tabs at top not applying translations.

---
 interface/web/sites/lib/lang/br_shell_user_list.lng          |    1 
 interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng |   19 
 interface/web/admin/lib/lang/pl_language_complete.lng        |   15 
 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      |   19 
 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            |   98 
 interface/web/admin/lib/lang/nl_server_config.lng            |    2 
 interface/web/designer/lib/lang/br_form_show.lng             |    1 
 interface/web/login/lib/lang/de.lng                          |   32 
 interface/lib/classes/listform_actions.inc.php               |    2 
 interface/web/mail/lib/lang/br_spamfilter_config_list.lng    |    1 
 interface/web/mail/lib/lang/pl_mail_get.lng                  |   31 
 interface/web/mail/lib/lang/br_mail_spamfilter_list.lng      |    1 
 interface/web/mail/lib/lang/de_mail_content_filter_list.lng  |   17 
 interface/web/mail/templates/spamfilter_users_list.htm       |  126 
 interface/web/admin/lib/lang/br_server_ip_list.lng           |    1 
 interface/web/mail/lib/lang/br_spamfilter_whitelist_list.lng |    1 
 interface/web/admin/lib/lang/pl_server.lng                   |   23 
 interface/web/admin/lib/lang/pl_server_ip_list.lng           |   13 
 interface/web/mail/lib/lang/de_spamfilter_config.lng         |   41 
 interface/web/dns/lib/lang/pl_dns_mx.lng                     |   33 
 interface/web/dns/lib/lang/br_dns_aaaa.lng                   |    1 
 interface/web/dns/lib/lang/de_dns_aaaa.lng                   |   31 
 interface/web/sites/lib/lang/de_web_domain.lng               |   99 
 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/de_mail_transport.lng            |   21 
 interface/web/admin/lib/lang/br_server_ip.lng                |    1 
 interface/web/admin/lib/lang/br_users.lng                    |    1 
 interface/web/admin/lib/lang/pl_groups.lng                   |   11 
 interface/web/client/templates/client_template_list.htm      |  104 
 interface/web/designer/lib/lang/de_form_list.lng             |   15 
 interface/web/mail/lib/lang/de_mail_domain.lng               |   27 
 interface/web/mail/lib/lang/pl_mail_domain.lng               |   27 
 interface/web/mail/lib/lang/pl_spamfilter_policy.lng         |   77 
 interface/web/client/lib/lang/nl.lng                         |    3 
 interface/web/admin/lib/lang/pl_system_config.lng            |   29 
 interface/web/designer/lib/lang/de.lng                       |    5 
 interface/web/sites/lib/lang/pl_shell_user_list.lng          |   17 
 interface/web/admin/lib/lang/pl_language_list.lng            |   16 
 interface/web/help/templates/support_message_list.htm        |  106 
 interface/web/mail/lib/lang/de.lng                           |   91 
 interface/web/mail/templates/mail_user_list.htm              |  110 
 interface/web/sites/lib/lang/pl_cron_list.lng                |   25 
 interface/web/client/lib/lang/bg.lng                         |    3 
 interface/web/dns/lib/lang/de_dns_mx.lng                     |   33 
 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            |    1 
 interface/web/mail/lib/lang/br_mail_content_filter_list.lng  |    1 
 interface/lib/lang/nl.lng                                    |    9 
 interface/web/sites/templates/database_list.htm              |    2 
 interface/web/admin/lib/lang/pl_language_edit.lng            |   18 
 interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng |   19 
 interface/web/client/lib/lang/de_clients_list.lng            |   19 
 interface/web/mail/lib/lang/de_mail_whitelist_list.lng       |   21 
 interface/web/mail/lib/lang/de_spamfilter_policy.lng         |   77 
 interface/web/admin/lib/lang/br_software_repo_list.lng       |    1 
 interface/web/designer/lib/lang/br_module_nav_edit.lng       |    1 
 interface/web/dns/lib/lang/pl_dns_cname.lng                  |   31 
 interface/web/mail/lib/lang/de_mail_alias.lng                |   23 
 interface/web/admin/lib/lang/de_language_complete.lng        |   15 
 interface/web/mail/templates/spamfilter_whitelist_list.htm   |  126 
 interface/web/sites/lib/lang/br_web_subdomain.lng            |    1 
 interface/web/mail/lib/lang/pl_mail_blacklist_list.lng       |   21 
 interface/web/mail/lib/lang/pl_mail_whitelist.lng            |   19 
 interface/web/client/lib/lang/pl_clients_list.lng            |    9 
 interface/web/admin/lib/lang/de_server.lng                   |   23 
 interface/web/admin/lib/lang/de_language_add.lng             |   17 
 interface/web/help/lib/lang/pl.lng                           |   17 
 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          |   19 
 interface/web/mail/lib/lang/de_mail_domain_list.lng          |   15 
 interface/lib/classes/listform_tpl_generator.inc.php         |  276 
 interface/web/mail/lib/lang/br_spamfilter_users.lng          |    1 
 interface/web/help/lib/lang/br.lng                           |    1 
 interface/web/sites/lib/lang/de.lng                          |   35 
 interface/web/admin/lib/lang/pl.lng                          |   72 
 interface/web/strengthmeter/lib/lang/de_strengthmeter.lng    |   17 
 interface/web/mail/lib/lang/br_mail_domain_catchall.lng      |    1 
 interface/web/sites/lib/lang/it_cron.lng                     |    4 
 interface/web/mail/lib/lang/br_mail_content_filter.lng       |    1 
 interface/web/dns/lib/lang/de.lng                            |   35 
 interface/web/dns/lib/lang/de_dns_a_list.lng                 |   29 
 interface/web/client/lib/lang/pl_reseller.lng                |  185 
 interface/web/dns/lib/lang/br_dns_txt.lng                    |    1 
 interface/web/mail/lib/lang/br_mail_domain_catchall_list.lng |    1 
 interface/web/mail/lib/lang/de_mail_blacklist.lng            |   19 
 interface/web/admin/lib/lang/br_firewall.lng                 |    1 
 interface/web/mail/lib/lang/de_mail_content_filter.lng       |   19 
 interface/web/mail/lib/lang/pl_mail_content_filter.lng       |   19 
 interface/web/admin/lib/lang/br_software_repo.lng            |    1 
 interface/web/client/lib/lang/bg_resellers_list.lng          |    9 
 interface/web/admin/lib/lang/br_language_add.lng             |    1 
 interface/web/sites/lib/lang/it_ftp_user.lng                 |    1 
 interface/web/admin/lib/lang/pl_server_config_list.lng       |    9 
 interface/web/admin/lib/lang/de_groups.lng                   |   11 
 interface/web/dns/lib/lang/pl_dns_srv.lng                    |   31 
 interface/web/mail/lib/lang/pl_mail_user_stats_list.lng      |   17 
 interface/web/login/lib/lang/es.lng                          |   11 
 interface/web/admin/lib/lang/pl_firewall_list.lng            |   17 
 interface/web/designer/lib/lang/pl.lng                       |    6 
 interface/web/client/lib/lang/es_resellers_list.lng          |    9 
 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                     |   31 
 interface/web/admin/lib/lang/br_server_config.lng            |    3 
 interface/web/mail/lib/lang/de_spamfilter_policy_list.lng    |   19 
 interface/web/designer/lib/lang/pl_module_list.lng           |   11 
 interface/web/sites/lib/lang/bg_ftp_user.lng                 |    1 
 interface/web/client/lib/lang/br_client_template_list.lng    |    1 
 interface/web/dns/lib/lang/br.lng                            |    1 
 interface/web/mail/lib/lang/pl_mail_user_filter_list.lng     |   15 
 interface/web/client/templates/clients_list.htm              |  124 
 interface/web/mail/lib/lang/de_spamfilter_users_list.lng     |   21 
 interface/web/mail/lib/lang/de_mail_get_list.lng             |   19 
 interface/web/dns/lib/lang/de_dns_txt.lng                    |   31 
 interface/web/sites/lib/lang/bg_shell_user.lng               |    1 
 interface/web/mail/lib/lang/br_mail_whitelist_list.lng       |    1 
 interface/web/mail/lib/lang/pl_mail_get_list.lng             |   19 
 interface/web/admin/lib/lang/de_software_repo.lng            |   15 
 interface/web/dns/lib/lang/de_dns_wizard.lng                 |   51 
 interface/web/sites/lib/lang/de_ftp_user_list.lng            |   17 
 interface/web/mail/lib/lang/br_mail_alias.lng                |    1 
 interface/web/sites/lib/lang/de_web_subdomain_list.lng       |   17 
 interface/web/mail/lib/lang/br_spamfilter_blacklist.lng      |    1 
 interface/web/admin/lib/lang/de_language_import.lng          |   15 
 interface/web/sites/lib/lang/nl_shell_user.lng               |    1 
 interface/web/admin/lib/lang/de_server_config_list.lng       |    9 
 interface/web/admin/lib/lang/pl_server_list.lng              |   23 
 interface/web/help/lib/lang/br_support_message_list.lng      |    1 
 interface/web/sites/lib/lang/br_cron.lng                     |    1 
 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  |   17 
 interface/web/mail/lib/lang/pl.lng                           |   95 
 interface/web/admin/lib/lang/pl_groups_list.lng              |   13 
 interface/web/sites/lib/lang/es_shell_user.lng               |    1 
 interface/web/admin/lib/lang/de_server_list.lng              |   23 
 interface/web/dns/lib/lang/pl_dns_soa.lng                    |   49 
 interface/web/mail/lib/lang/de_mail_user.lng                 |   63 
 interface/web/mail/templates/mail_alias_list.htm             |  114 
 interface/web/sites/lib/lang/de_web_domain_list.lng          |   17 
 interface/web/client/lib/lang/de_client_template.lng         |  105 
 interface/web/login/lib/lang/pl.lng                          |   36 
 interface/web/sites/lib/lang/fi_shell_user.lng               |    1 
 interface/web/dns/lib/lang/pl_dns_alias.lng                  |   31 
 interface/web/client/lib/lang/de_client_template_list.lng    |   11 
 interface/web/mail/lib/lang/br_mail_whitelist.lng            |    1 
 interface/web/mail/lib/lang/br_mail_forward_list.lng         |    1 
 interface/web/mail/templates/mail_domain_list.htm            |  114 
 interface/web/mail/lib/lang/br_mail_alias_list.lng           |    1 
 interface/web/designer/lib/lang/de_module_edit.lng           |   25 
 interface/lib/lang/de.lng                                    |   58 
 interface/web/mail/lib/lang/de_mail_forward_list.lng         |   17 
 interface/lib/lang/it.lng                                    |    9 
 interface/web/designer/lib/lang/pl_module_nav_item_edit.lng  |   17 
 interface/web/admin/lib/lang/br_users_list.lng               |    1 
 interface/web/client/templates/client_edit_limits.htm        |    2 
 interface/web/sites/lib/lang/nl_cron_list.lng                |   22 
 interface/web/sites/lib/lang/br_web_domain.lng               |    1 
 interface/web/designer/lib/lang/pl_module_edit.lng           |   28 
 interface/web/mail/lib/lang/pl_mail_whitelist_list.lng       |   21 
 interface/web/mail/lib/lang/br_mail_get_list.lng             |    1 
 interface/web/mail/lib/lang/br_mail_get.lng                  |    1 
 interface/web/sites/lib/lang/br_database.lng                 |    1 
 interface/web/tools/lib/lang/de.lng                          |   13 
 interface/web/client/lib/lang/it_resellers_list.lng          |    9 
 interface/web/login/lib/lang/br.lng                          |   12 
 interface/web/dns/lib/lang/pl_dns_wizard.lng                 |   53 
 interface/web/admin/lib/lang/br_server_config_list.lng       |    1 
 interface/web/dns/lib/lang/ru_dns_aaaa.lng                   |   28 
 interface/web/admin/lib/lang/pl_language_import.lng          |   15 
 interface/web/admin/lib/lang/de_firewall.lng                 |   23 
 interface/web/dns/templates/dns_a_list.htm                   |    2 
 interface/web/admin/lib/lang/de_software_repo_list.lng       |   13 
 interface/web/admin/lib/lang/pl_software_repo.lng            |   15 
 interface/web/help/lib/lang/de_support_message_list.lng      |   13 
 interface/web/admin/lib/lang/br_language_import.lng          |    1 
 interface/web/client/lib/lang/ru_resellers_list.lng          |    9 
 interface/web/dns/lib/lang/pl_dns_ns.lng                     |   31 
 interface/web/client/lib/lang/br_clients_list.lng            |    1 
 interface/web/admin/lib/lang/pl_users.lng                    |   58 
 interface/web/mail/lib/lang/de_mail_user_filter_list.lng     |   15 
 interface/web/client/lib/lang/fi_reseller.lng                |   93 
 interface/web/admin/lib/lang/br.lng                          |    1 
 interface/web/designer/lib/lang/de_module_show.lng           |   33 
 interface/web/mail/lib/lang/de_spamfilter_blacklist.lng      |   19 
 interface/web/sites/lib/lang/br_ftp_user_list.lng            |    1 
 interface/web/dns/lib/lang/de_dns_a.lng                      |   33 
 interface/web/mail/lib/lang/pl_spamfilter_config_list.lng    |   11 
 interface/web/admin/lib/lang/de_users_list.lng               |   17 
 interface/web/designer/lib/lang/br_module_nav_item_edit.lng  |    1 
 interface/web/designer/lib/lang/de_form_show.lng             |   37 
 interface/web/dns/lib/lang/br_dns_ptr.lng                    |    1 
 interface/web/sites/lib/lang/pl_web_domain_list.lng          |   17 
 interface/web/client/lib/lang/de_client.lng                  |  179 
 interface/web/sites/lib/lang/br_web_domain_list.lng          |    1 
 interface/web/admin/lib/lang/pl_server_ip.lng                |   13 
 interface/web/client/lib/lang/br_client_template.lng         |    1 
 interface/web/client/lib/lang/pl_client_template_list.lng    |   12 
 interface/web/monitor/lib/lang/br_syslog_list.lng            |    1 
 interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng      |   19 
 interface/web/sites/lib/lang/de_web_sites_stats_list.lng     |   17 
 interface/web/sites/templates/web_aliasdomain_list.htm       |  118 
 interface/web/admin/lib/lang/br_language_list.lng            |    1 
 interface/web/client/lib/lang/pl_client_template.lng         |  108 
 interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng |   19 
 interface/web/admin/lib/lang/pl_users_list.lng               |   17 
 interface/web/admin/lib/lang/br_system_config.lng            |    1 
 interface/web/designer/lib/lang/de_module_nav_item_edit.lng  |   17 
 interface/web/dns/lib/lang/br_dns_wizard.lng                 |    1 
 interface/web/mail/lib/lang/br_mail_user_stats_list.lng      |    1 
 interface/web/designer/lib/lang/de_form_edit.lng             |   49 
 interface/web/dns/lib/lang/de_dns_srv.lng                    |   31 
 interface/web/admin/lib/lang/de_language_list.lng            |   15 
 interface/web/dns/lib/lang/br_dns_ns.lng                     |    1 
 interface/web/client/lib/lang/bg_reseller.lng                |   93 
 interface/web/dns/lib/lang/se_dns_aaaa.lng                   |   28 
 interface/web/dns/lib/lang/br_dns_hinfo.lng                  |    1 
 interface/web/sites/lib/lang/nl_cron.lng                     |    4 
 interface/web/sites/lib/lang/it_cron_list.lng                |   22 
 interface/web/client/lib/lang/br_client.lng                  |    1 
 interface/web/designer/lib/lang/br_form_list.lng             |    1 
 interface/web/sites/lib/lang/de_web_subdomain.lng            |   79 
 interface/web/client/lib/lang/de.lng                         |   25 
 interface/web/sites/lib/lang/pl_web_subdomain.lng            |   79 
 interface/web/admin/lib/lang/br_software_package_list.lng    |    1 
 interface/web/login/lib/lang/it.lng                          |   11 
 interface/web/help/lib/lang/pl_support_message_list.lng      |   13 
 interface/web/dns/lib/lang/pl_dns_txt.lng                    |   31 
 interface/web/mail/templates/mail_whitelist_list.htm         |  120 
 interface/web/admin/lib/lang/it_server_config.lng            |    2 
 interface/web/client/lib/lang/pl_client.lng                  |  183 
 interface/web/dns/lib/lang/pl_dns_aaaa.lng                   |   31 
 interface/web/admin/lib/lang/br_firewall_list.lng            |    1 
 interface/web/login/lib/lang/en.lng                          |   38 
 interface/web/client/templates/resellers_list.htm            |    2 
 interface/web/sites/lib/lang/pl_database.lng                 |   48 
 interface/web/sites/templates/ftp_user_list.htm              |  118 
 interface/web/admin/lib/lang/br_groups.lng                   |    1 
 interface/web/sites/lib/lang/pl_cron.lng                     |   43 
 interface/web/mail/lib/lang/pl_mail_alias.lng                |   23 
 interface/web/mail/templates/mail_user_filter_list.htm       |   90 
 interface/web/sites/lib/lang/de_ftp_user.lng                 |   55 
 interface/web/dns/templates/dns_soa_list.htm                 |  124 
 interface/web/mail/templates/spamfilter_config_list.htm      |  102 
 interface/web/sites/lib/lang/br_cron_list.lng                |    1 
 interface/web/admin/lib/lang/fi_server_config.lng            |    2 
 interface/web/mail/lib/lang/pl_spamfilter_users_list.lng     |   21 
 interface/web/help/lib/lang/br_support_message.lng           |    1 
 interface/lib/lang/pl.lng                                    |   60 
 interface/web/mail/lib/lang/br_spamfilter_config.lng         |    1 
 interface/web/dns/lib/lang/de_dns_ns.lng                     |   31 
 interface/web/client/lib/lang/es.lng                         |    3 
 interface/web/sites/lib/lang/br_web_sites_stats_list.lng     |    1 
 interface/web/help/lib/lang/pl_support_message.lng           |   16 
 interface/web/sites/lib/lang/pl_web_domain.lng               |  100 
 interface/web/dns/lib/lang/nl_dns_aaaa.lng                   |   28 
 interface/web/dns/lib/lang/de_dns_soa.lng                    |   49 
 interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng |   19 
 interface/web/mail/lib/lang/br_mail_domain.lng               |    1 
 interface/web/admin/lib/lang/de_language_export.lng          |   13 
 interface/web/admin/lib/lang/br_language_complete.lng        |    1 
 interface/web/dns/lib/lang/de_dns_cname.lng                  |   31 
 interface/web/mail/lib/lang/de_mail_spamfilter_list.lng      |   17 
 interface/web/mail/lib/lang/br_spamfilter_blacklist_list.lng |    1 
 interface/web/admin/lib/lang/nl_firewall.lng                 |    2 
 interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng |   19 
 interface/web/dns/dns_soa_edit.php                           |    3 
 interface/web/mail/lib/lang/de_mail_user_list.lng            |   13 
 interface/web/dns/lib/lang/de_dns_alias.lng                  |   31 
 interface/web/sites/templates/web_domain_list.htm            |  118 
 interface/web/mail/lib/lang/de_mail_user_filter.lng          |   19 
 interface/web/sites/lib/lang/se_cron.lng                     |    4 
 interface/web/sites/templates/web_subdomain_list.htm         |  120 
 interface/web/sites/lib/lang/fi_ftp_user.lng                 |    1 
 interface/web/mail/lib/lang/pl_mail_transport.lng            |   21 
 interface/web/dns/lib/lang/br_dns_mx.lng                     |    1 
 interface/web/admin/lib/lang/de_software_package_list.lng    |   15 
 interface/web/dns/lib/lang/br_dns_soa.lng                    |    1 
 interface/web/mail/lib/lang/de_mail_user_stats_list.lng      |   17 
 interface/web/admin/lib/lang/br_server.lng                   |    1 
 interface/web/mail/lib/lang/pl_mail_transport_list.lng       |   19 
 interface/web/mail/lib/lang/pl_mail_blacklist.lng            |   19 
 interface/web/sites/lib/lang/br_ftp_user.lng                 |    1 
 interface/lib/lang/es.lng                                    |    9 
 interface/web/dns/lib/lang/pl_dns_hinfo.lng                  |   31 
 interface/web/designer/lib/lang/pl_module_show.lng           |   34 
 interface/web/mail/lib/lang/pl_mail_forward_list.lng         |   17 
 interface/web/sites/lib/lang/pl_web_sites_stats_list.lng     |   17 
 interface/web/tools/lib/lang/pl.lng                          |   13 
 interface/web/designer/lib/lang/br_module_list.lng           |    1 
 interface/web/dns/lib/lang/pl_dns_a_list.lng                 |   29 
 interface/web/sites/lib/lang/pl_ftp_user_list.lng            |   17 
 interface/web/admin/lib/lang/br_language_edit.lng            |    1 
 interface/web/admin/lib/lang/pl_server_config.lng            |   98 
 interface/web/client/lib/lang/se_reseller.lng                |   93 
 interface/web/sites/lib/lang/br_database_list.lng            |    1 
 interface/web/mail/templates/mail_content_filter_list.htm    |  120 
 interface/web/mail/lib/lang/de_mail_blacklist_list.lng       |   21 
 interface/web/designer/lib/lang/pl_form_list.lng             |   15 
 interface/web/mail/lib/lang/br_mail_blacklist.lng            |    1 
 interface/web/sites/lib/lang/br_shell_user.lng               |    1 
 interface/web/mail/lib/lang/br_mail_domain_list.lng          |    1 
 interface/web/admin/lib/lang/de_system_config.lng            |   27 
 interface/web/dns/lib/lang/br_dns_template.lng               |    1 
 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       |    1 
 interface/web/dns/lib/lang/de_dns_template.lng               |   13 
 interface/web/admin/templates/software_repo_list.htm         |  112 
 interface/web/sites/lib/lang/de_cron_list.lng                |   25 
 interface/web/mail/lib/lang/pl_mail_spamfilter.lng           |   35 
 interface/web/monitor/lib/lang/pl_datalog_list.lng           |   17 
 interface/web/admin/templates/groups_list.htm                |  108 
 interface/web/client/lib/lang/br_resellers_list.lng          |    1 
 interface/web/client/lib/lang/pl.lng                         |   25 
 interface/web/mail/lib/lang/de_spamfilter_users.lng          |   17 
 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/monitor/lib/lang/de.lng                        |  275 
 interface/web/mail/lib/lang/br.lng                           |    1 
 interface/web/mail/templates/spamfilter_blacklist_list.htm   |  126 
 interface/web/dns/lib/lang/pl_dns_template.lng               |   13 
 interface/web/mail/lib/lang/de_spamfilter_config_list.lng    |   11 
 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                          |   11 
 interface/web/mail/lib/lang/de_mail_spamfilter.lng           |   35 
 interface/web/mail/lib/lang/br_spamfilter_whitelist.lng      |    1 
 interface/web/sites/lib/lang/se_cron_list.lng                |   22 
 interface/web/admin/lib/lang/de_firewall_list.lng            |   17 
 interface/web/dns/lib/lang/pl_dns_ptr.lng                    |   31 
 interface/web/monitor/lib/lang/de_datalog_list.lng           |   17 
 interface/web/mail/templates/mail_get_list.htm               |  126 
 interface/web/admin/lib/lang/fr_server_config.lng            |    2 
 interface/web/mail/lib/lang/br_mail_transport.lng            |    1 
 interface/web/monitor/lib/lang/br_datalog_list.lng           |    1 
 interface/web/client/lib/lang/nl_reseller.lng                |   93 
 interface/web/mail/lib/lang/br_mail_transport_list.lng       |    1 
 interface/web/dns/lib/lang/br_dns_a.lng                      |    1 
 interface/web/admin/lib/lang/it_firewall.lng                 |    2 
 interface/lib/lang/br.lng                                    |   10 
 interface/web/admin/lib/lang/br_groups_list.lng              |    1 
 interface/web/client/lib/lang/fr_reseller.lng                |   93 
 interface/web/client/lib/lang/se.lng                         |    3 
 interface/web/admin/lib/lang/de_server_ip_list.lng           |   13 
 interface/web/client/lib/lang/fr.lng                         |    3 
 interface/web/mail/lib/lang/br_spamfilter_users_list.lng     |    1 
 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          |   19 
 interface/web/sites/lib/lang/es_ftp_user.lng                 |    1 
 interface/web/sites/lib/lang/de_database.lng                 |   47 
 interface/web/admin/templates/firewall_list.htm              |  120 
 interface/web/client/lib/lang/de_resellers_list.lng          |   19 
 interface/web/client/lib/lang/it.lng                         |    3 
 interface/web/dns/lib/lang/br_dns_alias.lng                  |    1 
 interface/web/mail/lib/lang/de_mail_get.lng                  |   31 
 interface/web/dns/lib/lang/br_dns_rp.lng                     |    1 
 interface/web/dns/lib/lang/br_dns_template_list.lng          |    1 
 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     |    1 
 interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng |   19 
 interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng    |   18 
 interface/web/dns/lib/lang/de_dns_hinfo.lng                  |   31 
 interface/web/admin/lib/lang/fr_firewall.lng                 |    2 
 interface/web/client/lib/lang/it_reseller.lng                |   93 
 interface/web/sites/lib/lang/pl_web_subdomain_list.lng       |   17 
 interface/web/mail/lib/lang/pl_mail_alias_list.lng           |   17 
 interface/web/strengthmeter/lib/lang/br_strengthmeter.lng    |    1 
 interface/web/sites/lib/lang/es_cron_list.lng                |   22 
 interface/web/mail/lib/lang/br_mail_forward.lng              |    1 
 interface/lib/lang/en.lng                                    |    9 
 interface/web/dns/lib/lang/de_dns_template_list.lng          |   13 
 interface/web/admin/lib/lang/de_groups_list.lng              |   13 
 interface/web/designer/lib/lang/de_module_nav_edit.lng       |   13 
 interface/web/mail/lib/lang/br_mail_user_filter.lng          |    1 
 interface/web/sites/lib/lang/pl.lng                          |   35 
 interface/web/designer/lib/lang/br_module_show.lng           |    1 
 interface/web/sites/lib/lang/fi_cron.lng                     |    4 
 interface/web/mail/lib/lang/de_spamfilter_whitelist.lng      |   19 
 interface/web/designer/lib/lang/br_form_edit.lng             |    1 
 interface/web/mail/lib/lang/pl_mail_user.lng                 |   64 
 interface/web/monitor/lib/lang/br.lng                        |    1 
 interface/web/admin/lib/lang/br_software_update_list.lng     |    1 
 interface/web/mail/templates/mail_blacklist_list.htm         |  120 
 interface/web/sites/lib/lang/br_web_subdomain_list.lng       |    1 
 interface/web/dns/lib/lang/pl_dns_rp.lng                     |   31 
 interface/web/client/lib/lang/br_reseller.lng                |    1 
 interface/web/sites/lib/lang/de_shell_user.lng               |   45 
 interface/web/client/lib/lang/ru.lng                         |    3 
 interface/web/monitor/lib/lang/de_syslog_list.lng            |   15 
 interface/web/monitor/lib/lang/pl_syslog_list.lng            |   15 
 interface/lib/classes/tform.inc.php                          |   24 
 interface/web/admin/lib/lang/pl_software_update_list.lng     |   18 
 interface/web/sites/lib/lang/br_web_aliasdomain_list.lng     |    1 
 interface/web/admin/lib/lang/pl_language_add.lng             |   17 
 interface/web/admin/lib/lang/ru_firewall.lng                 |    2 
 interface/web/client/lib/lang/de_reseller.lng                |  181 
 interface/web/sites/lib/lang/it_shell_user.lng               |    1 
 interface/web/dns/lib/lang/pl_dns_template_list.lng          |   13 
 interface/web/mail/lib/lang/de_mail_transport_list.lng       |   19 
 interface/web/admin/templates/users_list.htm                 |    2 
 interface/web/sites/lib/lang/se_shell_user.lng               |    1 
 interface/web/admin/lib/lang/de_language_edit.lng            |   17 
 interface/web/dns/lib/lang/br_dns_soa_list.lng               |    1 
 interface/web/admin/lib/lang/br_language_export.lng          |    1 
 interface/web/mail/lib/lang/pl_spamfilter_users.lng          |   17 
 interface/web/admin/lib/lang/bg_server_config.lng            |    2 
 interface/lib/lang/fr.lng                                    |    9 
 interface/web/dns/lib/lang/pl_dns_a.lng                      |   33 
 interface/web/mail/templates/mail_forward_list.htm           |  114 
 interface/web/mail/lib/lang/br_mail_user.lng                 |    1 
 interface/web/client/lib/lang/se_resellers_list.lng          |    9 
 interface/web/login/index.php                                |  391 
 interface/web/admin/lib/lang/pl_software_package_list.lng    |   16 
 interface/web/help/lib/lang/de_support_message.lng           |   15 
 interface/web/client/lib/lang/es_reseller.lng                |   93 
 interface/web/sites/lib/lang/pl_shell_user.lng               |   47 
 interface/web/mail/lib/lang/br_spamfilter_policy.lng         |    1 
 interface/web/admin/lib/lang/pl_firewall.lng                 |   24 
 interface/web/mail/lib/lang/de_mail_whitelist.lng            |   19 
 interface/web/admin/lib/lang/br_server_list.lng              |    1 
 interface/web/dns/lib/lang/br_dns_a_list.lng                 |    1 
 interface/web/monitor/lib/lang/pl.lng                        |  276 
 interface/web/dns/lib/lang/de_dns_soa_list.lng               |   19 
 interface/web/mail/lib/lang/de_mail_alias_list.lng           |   17 
 interface/web/dns/lib/lang/br_dns_srv.lng                    |    1 
 interface/web/login/lib/lang/fi.lng                          |   11 
 interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng     |   23 
 interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng      |   19 
 interface/web/sites/lib/lang/de_shell_user_list.lng          |   17 
 interface/web/client/lib/lang/br.lng                         |    1 
 interface/lib/lang/se.lng                                    |    9 
 interface/web/mail/lib/lang/pl_mail_user_list.lng            |   13 
 interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng    |   19 
 interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng      |   17 
 interface/web/admin/lib/lang/de.lng                          |   69 
 interface/web/admin/lib/lang/de_server_ip.lng                |   13 
 interface/web/help/lib/lang/de.lng                           |   15 
 interface/web/sites/lib/lang/ru_ftp_user.lng                 |    1 
 interface/web/admin/lib/lang/fi_firewall.lng                 |    2 
 interface/web/admin/lib/lang/se_firewall.lng                 |    2 
 interface/web/sites/lib/lang/br.lng                          |    1 
 interface/web/tools/lib/lang/br_usersettings.lng             |    1 
 interface/web/dns/lib/lang/pl_dns_soa_list.lng               |   19 
 interface/lib/lang/fi.lng                                    |    9 
 interface/web/dns/lib/lang/br_dns_cname.lng                  |    1 
 interface/web/sites/lib/lang/de_cron.lng                     |   43 
 interface/web/admin/lib/lang/de_users.lng                    |   57 
 interface/web/tools/lib/lang/pl_usersettings.lng             |   18 
 interface/web/dns/lib/lang/de_dns_ptr.lng                    |   31 
 interface/web/login/lib/lang/fr.lng                          |   11 
 interface/web/login/lib/lang/se.lng                          |   11 
 interface/web/sites/lib/lang/de_database_list.lng            |   17 
 interface/web/dns/lib/lang/pl.lng                            |   37 
 interface/web/sites/lib/lang/de_web_aliasdomain_list.lng     |   23 
 interface/web/sites/lib/lang/fr_ftp_user.lng                 |    1 
 interface/web/mail/lib/lang/de_mail_forward.lng              |   15 
 interface/web/admin/lib/lang/de_software_update_list.lng     |   17 
 interface/web/mail/lib/lang/de_mail_domain_catchall.lng      |   19 
 interface/web/designer/lib/lang/br_module_edit.lng           |    1 
 interface/web/sites/lib/lang/pl_database_list.lng            |   17 
 interface/web/tools/lib/lang/de_usersettings.lng             |   17 
 interface/web/designer/lib/lang/pl_form_show.lng             |   37 
 interface/web/admin/lib/lang/pl_language_export.lng          |   13 
 interface/web/sites/lib/lang/nl_ftp_user.lng                 |    1 
 interface/web/designer/lib/lang/pl_module_nav_edit.lng       |   13 
 interface/web/designer/lib/lang/br.lng                       |    1 
 interface/web/mail/lib/lang/pl_spamfilter_config.lng         |   41 
 interface/web/mail/lib/lang/br_mail_spamfilter.lng           |    1 
 interface/web/sites/lib/lang/pl_ftp_user.lng                 |   57 
 interface/web/tools/lib/lang/br.lng                          |    1 
 interface/web/mail/templates/mail_domain_catchall_list.htm   |  114 
 interface/web/designer/lib/lang/pl_form_edit.lng             |   51 
 interface/web/mail/lib/lang/pl_mail_forward.lng              |   15 
 interface/web/mail/lib/lang/br_spamfilter_policy_list.lng    |    1 
 interface/web/mail/lib/lang/pl_mail_domain_list.lng          |   15 
 interface/web/admin/lib/lang/pl_software_repo_list.lng       |   13 
 interface/web/client/lib/lang/nl_resellers_list.lng          |    9 
 interface/web/mail/templates/mail_transport_list.htm         |  126 
 493 files changed, 7,087 insertions(+), 6,426 deletions(-)

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/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..915f11d 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -21,5 +21,13 @@
 $wb['add_new_record_txt'] = 'Adcionar novo registro';
 $wb['btn_save_txt'] = 'Salvar';
 $wb['btn_cancel_txt'] = 'Voltar';
+$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/de.lng b/interface/lib/lang/de.lng
index a586bf6..6b660ff 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -1,25 +1,33 @@
-<?php
-$wb['conf_format_dateshort'] = 'd.m.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'] = 'd.m.Y H:i';
-$wb['301'] = 'Modul für Benutzer nicht erlaubt.';
-$wb['302'] = 'Modul ungültig.';
-$wb['1001'] = 'Der Benutzername und das Passwort dürfen nicht leer sein!';
-$wb['1002'] = 'Der Benutzername und/oder das Passwort sind nicht korrekt!';
-$wb['1003'] = 'Der Benutzername ist deaktiviert!';
-$wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?';
-$wb['error_no_view_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu lesen, oder der Datensatz existiert nicht!';
-$wb['error_no_delete_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu löschen!';
-$wb['page_txt'] = 'Seite';
-$wb['page_of_txt'] = 'von';
-$wb['page_next_txt'] = 'Weiter';
-$wb['page_back_txt'] = 'Zurück';
-$wb['delete_txt'] = 'Löschen';
-$wb['filter_txt'] = 'Filter';
-$wb['add_new_record_txt'] = 'Neuen Datensatz hinzufügen';
-$wb['btn_save_txt'] = 'Speichern';
-$wb['btn_cancel_txt'] = 'Abbrechen';
-?>
-
+<?php
+$wb['conf_format_dateshort'] = 'd.m.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'] = 'd.m.Y H:i';
+$wb['301'] = 'Modul für Benutzer nicht erlaubt.';
+$wb['302'] = 'Modul ungültig.';
+$wb['1001'] = 'Der Benutzername und das Passwort dürfen nicht leer sein!';
+$wb['1002'] = 'Der Benutzername und/oder das Passwort sind nicht korrekt!';
+$wb['1003'] = 'Der Benutzername ist deaktiviert!';
+$wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?';
+$wb['error_no_view_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu lesen, oder der Datensatz existiert nicht!';
+$wb['error_no_delete_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu löschen!';
+$wb['page_txt'] = 'Seite';
+$wb['page_of_txt'] = 'von';
+$wb['page_next_txt'] = 'Weiter';
+$wb['page_back_txt'] = 'Zurück';
+$wb['delete_txt'] = 'Löschen';
+$wb['filter_txt'] = 'Filter';
+$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/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..16f2855 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.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/pl.lng b/interface/lib/lang/pl.lng
index 13b7cb8..74dff0c 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -1,27 +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óć";
-?>
-
-
+<?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/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 53fc640..0130841 100644
--- a/interface/web/admin/lib/lang/br.lng
+++ b/interface/web/admin/lib/lang/br.lng
@@ -32,4 +32,3 @@
 $wb['Software'] = 'Software';
 $wb['Repositories'] = 'Repositórios';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_firewall.lng b/interface/web/admin/lib/lang/br_firewall.lng
index 8bc8cdb..40a7496 100644
--- a/interface/web/admin/lib/lang/br_firewall.lng
+++ b/interface/web/admin/lib/lang/br_firewall.lng
@@ -9,4 +9,3 @@
 $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 c3429c7..d299957 100644
--- a/interface/web/admin/lib/lang/br_firewall_list.lng
+++ b/interface/web/admin/lib/lang/br_firewall_list.lng
@@ -6,4 +6,3 @@
 $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_groups.lng b/interface/web/admin/lib/lang/br_groups.lng
index ee75776..41afadb 100644
--- a/interface/web/admin/lib/lang/br_groups.lng
+++ b/interface/web/admin/lib/lang/br_groups.lng
@@ -3,4 +3,3 @@
 $wb['name_txt'] = 'Grupo';
 $wb['name_err'] = 'O Nome do Grupo deve conter de 1 a 30 caracteres!';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_groups_list.lng b/interface/web/admin/lib/lang/br_groups_list.lng
index 68a49ce..bf2a286 100644
--- a/interface/web/admin/lib/lang/br_groups_list.lng
+++ b/interface/web/admin/lib/lang/br_groups_list.lng
@@ -4,4 +4,3 @@
 $wb['name_txt'] = 'Grupo';
 $wb['add_new_record_txt'] = 'Adicionar novo Grupo';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_language_add.lng b/interface/web/admin/lib/lang/br_language_add.lng
index d31fb97..064b9ea 100644
--- a/interface/web/admin/lib/lang/br_language_add.lng
+++ b/interface/web/admin/lib/lang/br_language_add.lng
@@ -6,4 +6,3 @@
 $wb['btn_save_txt'] = 'Criar um novo conjunto de idioma';
 $wb['btn_cancel_txt'] = 'Voltar';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_language_complete.lng b/interface/web/admin/lib/lang/br_language_complete.lng
index 4a6795e..c4c0b14 100644
--- a/interface/web/admin/lib/lang/br_language_complete.lng
+++ b/interface/web/admin/lib/lang/br_language_complete.lng
@@ -5,4 +5,3 @@
 $wb['btn_save_txt'] = 'Mesclar arquivos agora';
 $wb['btn_cancel_txt'] = 'Voltar';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_language_edit.lng b/interface/web/admin/lib/lang/br_language_edit.lng
index f023e9c..2a3f572 100644
--- a/interface/web/admin/lib/lang/br_language_edit.lng
+++ b/interface/web/admin/lib/lang/br_language_edit.lng
@@ -6,4 +6,3 @@
 $wb['btn_save_txt'] = 'Salvar';
 $wb['btn_cancel_txt'] = 'Voltar';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_language_export.lng b/interface/web/admin/lib/lang/br_language_export.lng
index f7f924c..d484661 100644
--- a/interface/web/admin/lib/lang/br_language_export.lng
+++ b/interface/web/admin/lib/lang/br_language_export.lng
@@ -4,4 +4,3 @@
 $wb['btn_save_txt'] = 'Exportar idioma selecionado para um arquivo';
 $wb['btn_cancel_txt'] = 'Voltar';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_language_import.lng b/interface/web/admin/lib/lang/br_language_import.lng
index 215ae64..bcc33da 100644
--- a/interface/web/admin/lib/lang/br_language_import.lng
+++ b/interface/web/admin/lib/lang/br_language_import.lng
@@ -5,4 +5,3 @@
 $wb['language_overwrite_txt'] = 'Sobre escrever o arquivo se existir.';
 $wb['btn_cancel_txt'] = 'Voltar';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_language_list.lng b/interface/web/admin/lib/lang/br_language_list.lng
index fe3d2a4..348b94a 100644
--- a/interface/web/admin/lib/lang/br_language_list.lng
+++ b/interface/web/admin/lib/lang/br_language_list.lng
@@ -5,4 +5,3 @@
 $wb['lang_file_txt'] = 'Arquido de Idioma';
 $wb['lang_file_date_txt'] = 'Ultima Modificação';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_server.lng b/interface/web/admin/lib/lang/br_server.lng
index ce97f76..0a9184a 100644
--- a/interface/web/admin/lib/lang/br_server.lng
+++ b/interface/web/admin/lib/lang/br_server.lng
@@ -9,4 +9,3 @@
 $wb['vserver_server_txt'] = 'Servidor VServer';
 $wb['active_txt'] = 'Ativado';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index e39e640..4112755 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -45,6 +45,5 @@
 $wb['wget_txt'] = 'Caminho para o wget';
 $wb['web_user_txt'] = 'Usuário Apache';
 $wb['web_group_txt'] = 'Grupo Apache';
-$wb['security_level'] = 'Nível de segurança';
+$wb['security_level_txt'] = 'Security level';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_server_config_list.lng b/interface/web/admin/lib/lang/br_server_config_list.lng
index 551867d..60047d5 100644
--- a/interface/web/admin/lib/lang/br_server_config_list.lng
+++ b/interface/web/admin/lib/lang/br_server_config_list.lng
@@ -2,4 +2,3 @@
 $wb['list_head_txt'] = 'Configuração do Servidor';
 $wb['server_name_txt'] = 'Servidor';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_server_ip.lng b/interface/web/admin/lib/lang/br_server_ip.lng
index b1bbc8e..36805c2 100644
--- a/interface/web/admin/lib/lang/br_server_ip.lng
+++ b/interface/web/admin/lib/lang/br_server_ip.lng
@@ -4,4 +4,3 @@
 $wb['virtualhost_txt'] = 'Nome VirtualHost HTTP';
 $wb['ip_err'] = 'Endereço IP inválido!';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_server_ip_list.lng b/interface/web/admin/lib/lang/br_server_ip_list.lng
index 6b137cc..864464e 100644
--- a/interface/web/admin/lib/lang/br_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/br_server_ip_list.lng
@@ -4,4 +4,3 @@
 $wb['ip_address_txt'] = 'Endereço IP';
 $wb['add_new_record_txt'] = 'Adicionar novo Endereço IP';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_server_list.lng b/interface/web/admin/lib/lang/br_server_list.lng
index 011e47e..5a1266c 100644
--- a/interface/web/admin/lib/lang/br_server_list.lng
+++ b/interface/web/admin/lib/lang/br_server_list.lng
@@ -9,4 +9,3 @@
 $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Adicionar novo Servidor';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_software_package_list.lng b/interface/web/admin/lib/lang/br_software_package_list.lng
index 2faa815..893cc4c 100644
--- a/interface/web/admin/lib/lang/br_software_package_list.lng
+++ b/interface/web/admin/lib/lang/br_software_package_list.lng
@@ -5,4 +5,3 @@
 $wb['package_description_txt'] = 'Descrição';
 $wb['action_txt'] = 'Acão';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_software_repo.lng b/interface/web/admin/lib/lang/br_software_repo.lng
index 9d09727..5b54c30 100644
--- a/interface/web/admin/lib/lang/br_software_repo.lng
+++ b/interface/web/admin/lib/lang/br_software_repo.lng
@@ -5,4 +5,3 @@
 $wb['repo_password_txt'] = 'Senha (opcional)';
 $wb['active_txt'] = 'Ativo';
 ?>
-
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 1b8d7eb..6941c7f 100644
--- a/interface/web/admin/lib/lang/br_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/br_software_repo_list.lng
@@ -4,4 +4,3 @@
 $wb['repo_name_txt'] = 'Repositório';
 $wb['repo_url_txt'] = 'URL';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_software_update_list.lng b/interface/web/admin/lib/lang/br_software_update_list.lng
index 6cc6a55..e6af8ec 100644
--- a/interface/web/admin/lib/lang/br_software_update_list.lng
+++ b/interface/web/admin/lib/lang/br_software_update_list.lng
@@ -6,4 +6,3 @@
 $wb['version_txt'] = 'Versão';
 $wb['action_txt'] = 'Ação';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng
index bc22ce6..0e2b172 100644
--- a/interface/web/admin/lib/lang/br_system_config.lng
+++ b/interface/web/admin/lib/lang/br_system_config.lng
@@ -11,4 +11,3 @@
 $wb['dblist_phpmyadmin_link_txt'] = 'Link para phpmyadmin';
 $wb['mailboxlist_webmail_link_txt'] = 'Link para o webmail';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_users.lng b/interface/web/admin/lib/lang/br_users.lng
index a63a2f4..28369f7 100644
--- a/interface/web/admin/lib/lang/br_users.lng
+++ b/interface/web/admin/lib/lang/br_users.lng
@@ -26,4 +26,3 @@
 $wb['default_group_txt'] = 'Grupo Padrão';
 $wb['startmodule_err'] = 'O módulo inicial não está contido nos módulos.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_users_list.lng b/interface/web/admin/lib/lang/br_users_list.lng
index 95224f7..dc27c80 100644
--- a/interface/web/admin/lib/lang/br_users_list.lng
+++ b/interface/web/admin/lib/lang/br_users_list.lng
@@ -6,4 +6,3 @@
 $wb['ort_txt'] = 'cidade';
 $wb['add_new_record_txt'] = 'Adcionar novo usuário';
 ?>
-
diff --git a/interface/web/admin/lib/lang/de.lng b/interface/web/admin/lib/lang/de.lng
index ae0fc3d..c7f33ed 100644
--- a/interface/web/admin/lib/lang/de.lng
+++ b/interface/web/admin/lib/lang/de.lng
@@ -1,35 +1,34 @@
-<?php
-$wb['1001'] = 'Benutzername oder Passwort ist leer.';
-$wb['1002'] = 'Benutzername oder Passwort ist falsch.';
-$wb['Firewall'] = 'Firewall';
-$wb['Groups'] = 'Gruppen';
-$wb['groups_description'] = 'Formular zur Bearbeitung von Systembenutzer Gruppen.';
-$wb['Server'] = 'Server';
-$wb['Services'] = 'Dienste';
-$wb['Config'] = 'Konfiguration';
-$wb['Server Config'] = 'Serverkonfiguration';
-$wb['Mail'] = 'Mail';
-$wb['Getmail'] = 'Getmail';
-$wb['Web'] = 'Web';
-$wb['FastCGI'] = 'FastCGI';
-$wb['Jailkit'] = 'Jailkit';
-$wb['System'] = 'System';
-$wb['Add user'] = 'Benutzer hinzufügen';
-$wb['Edit user'] = 'Benutzer bearbeiten';
-$wb['CP Users'] = 'CP Benutzer';
-$wb['Add group'] = 'Gruppe hinzufügen';
-$wb['Edit group'] = 'Gruppe bearbeiten';
-$wb['Edit server'] = 'Server bearbeiten';
-$wb['Edit Server IP'] = 'Server IP bearbeiten';
-$wb['Servers'] = 'Server';
-$wb['Sync. Now'] = 'Jetzt syncronisieren';
-$wb['DB Sync.'] = 'DB Syncronisation';
-$wb['Languages'] = 'Sprachen';
-$wb['New Language'] = 'Neue Sprache';
-$wb['Export'] = 'Exportieren';
-$wb['Import'] = 'Importieren';
-$wb['Language Editor'] = 'Sprachen Editor';
-$wb['Software'] = 'Software';
-$wb['Repositories'] = 'Repositories';
-?>
-
+<?php
+$wb['1001'] = 'Benutzername oder Passwort ist leer.';
+$wb['1002'] = 'Benutzername oder Passwort ist falsch.';
+$wb['Firewall'] = 'Firewall';
+$wb['Groups'] = 'Gruppen';
+$wb['groups_description'] = 'Formular zur Bearbeitung von Systembenutzer Gruppen.';
+$wb['Server'] = 'Server';
+$wb['Services'] = 'Dienste';
+$wb['Config'] = 'Konfiguration';
+$wb['Server Config'] = 'Serverkonfiguration';
+$wb['Mail'] = 'Mail';
+$wb['Getmail'] = 'Getmail';
+$wb['Web'] = 'Web';
+$wb['FastCGI'] = 'FastCGI';
+$wb['Jailkit'] = 'Jailkit';
+$wb['System'] = 'System';
+$wb['Add user'] = 'Benutzer hinzufügen';
+$wb['Edit user'] = 'Benutzer bearbeiten';
+$wb['CP Users'] = 'CP Benutzer';
+$wb['Add group'] = 'Gruppe hinzufügen';
+$wb['Edit group'] = 'Gruppe bearbeiten';
+$wb['Edit server'] = 'Server bearbeiten';
+$wb['Edit Server IP'] = 'Server IP bearbeiten';
+$wb['Servers'] = 'Server';
+$wb['Sync. Now'] = 'Jetzt syncronisieren';
+$wb['DB Sync.'] = 'DB Syncronisation';
+$wb['Languages'] = 'Sprachen';
+$wb['New Language'] = 'Neue Sprache';
+$wb['Export'] = 'Exportieren';
+$wb['Import'] = 'Importieren';
+$wb['Language Editor'] = 'Sprachen Editor';
+$wb['Software'] = 'Software';
+$wb['Repositories'] = 'Repositories';
+?>
diff --git a/interface/web/admin/lib/lang/de_firewall.lng b/interface/web/admin/lib/lang/de_firewall.lng
index 612bd88..0f58d7c 100644
--- a/interface/web/admin/lib/lang/de_firewall.lng
+++ b/interface/web/admin/lib/lang/de_firewall.lng
@@ -1,12 +1,11 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['tcp_port_txt'] = 'Offene TCP Ports';
-$wb['udp_port_txt'] = 'Offene UDP Ports';
-$wb['tcp_port_help_txt'] = 'Getrennt durch Beistrich';
-$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 ,.';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['tcp_port_txt'] = 'Offene TCP Ports';
+$wb['udp_port_txt'] = 'Offene UDP Ports';
+$wb['tcp_port_help_txt'] = 'Getrennt durch Beistrich';
+$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_firewall_list.lng b/interface/web/admin/lib/lang/de_firewall_list.lng
index 7e31e92..aefad61 100644
--- a/interface/web/admin/lib/lang/de_firewall_list.lng
+++ b/interface/web/admin/lib/lang/de_firewall_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Firewall';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['tcp_port_txt'] = 'Offene TCP Ports';
-$wb['udp_port_txt'] = 'Offene UDP Ports';
-$wb['add_new_record_txt'] = 'Firewalleintrag hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Firewall';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['tcp_port_txt'] = 'Offene TCP Ports';
+$wb['udp_port_txt'] = 'Offene UDP Ports';
+$wb['add_new_record_txt'] = 'Firewalleintrag hinzufügen';
+?>
diff --git a/interface/web/admin/lib/lang/de_groups.lng b/interface/web/admin/lib/lang/de_groups.lng
index f6ab5f0..25f81b1 100644
--- a/interface/web/admin/lib/lang/de_groups.lng
+++ b/interface/web/admin/lib/lang/de_groups.lng
@@ -1,6 +1,5 @@
-<?php
-$wb['description_txt'] = 'Beschreibung';
-$wb['name_txt'] = 'Gruppe';
-$wb['name_err'] = 'Das Feld Gruppe muss min. 1, max. 30 Zeichen lang sein.';
-?>
-
+<?php
+$wb['description_txt'] = 'Beschreibung';
+$wb['name_txt'] = 'Gruppe';
+$wb['name_err'] = 'Das Feld Gruppe muss min. 1, max. 30 Zeichen lang sein.';
+?>
diff --git a/interface/web/admin/lib/lang/de_groups_list.lng b/interface/web/admin/lib/lang/de_groups_list.lng
index 609ce0b..8f312e4 100644
--- a/interface/web/admin/lib/lang/de_groups_list.lng
+++ b/interface/web/admin/lib/lang/de_groups_list.lng
@@ -1,7 +1,6 @@
-<?php
-$wb['list_head_txt'] = 'Systembenutzergruppen';
-$wb['description_txt'] = 'Beschreibung';
-$wb['name_txt'] = 'Gruppe';
-$wb['add_new_record_txt'] = 'Neue Gruppe hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Systembenutzergruppen';
+$wb['description_txt'] = 'Beschreibung';
+$wb['name_txt'] = 'Gruppe';
+$wb['add_new_record_txt'] = 'Neue Gruppe hinzufügen';
+?>
diff --git a/interface/web/admin/lib/lang/de_language_add.lng b/interface/web/admin/lib/lang/de_language_add.lng
index cb9782e..118bdee 100644
--- a/interface/web/admin/lib/lang/de_language_add.lng
+++ b/interface/web/admin/lib/lang/de_language_add.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Neue Sprache hinzufügen';
-$wb['language_select_txt'] = 'Sprachbasis auswählen';
-$wb['language_new_txt'] = 'Neue Sprache';
-$wb['language_new_hint_txt'] = '2 Buchstaben ISO 639-1 Sprachcode (siehe http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
-$wb['btn_save_txt'] = 'Neues Sprachdateiset erstellen';
-$wb['btn_cancel_txt'] = 'Zurück';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Neue Sprache hinzufügen';
+$wb['language_select_txt'] = 'Sprachbasis auswählen';
+$wb['language_new_txt'] = 'Neue Sprache';
+$wb['language_new_hint_txt'] = '2 Buchstaben ISO 639-1 Sprachcode (siehe http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
+$wb['btn_save_txt'] = 'Neues Sprachdateiset erstellen';
+$wb['btn_cancel_txt'] = 'Zurück';
+?>
diff --git a/interface/web/admin/lib/lang/de_language_complete.lng b/interface/web/admin/lib/lang/de_language_complete.lng
index c23bd4d..1376e0c 100644
--- a/interface/web/admin/lib/lang/de_language_complete.lng
+++ b/interface/web/admin/lib/lang/de_language_complete.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['list_head_txt'] = 'Sprachdatei zusammenführen';
-$wb['list_desc_txt'] = 'Die ausgewählte Sprache mit der englischen Master Sprachdatei zusammenführen. <br />Dies fügt fehlende Sätze aus der englischen Master Sprachdatei in der gewählten Sprache ein.';
-$wb['language_select_txt'] = 'Sprache auswählen';
-$wb['btn_save_txt'] = 'Dateien jetzt zusammenführen';
-$wb['btn_cancel_txt'] = 'Zurück';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Sprachdatei zusammenführen';
+$wb['list_desc_txt'] = 'Die ausgewählte Sprache mit der englischen Master Sprachdatei zusammenführen. <br />Dies fügt fehlende Sätze aus der englischen Master Sprachdatei in der gewählten Sprache ein.';
+$wb['language_select_txt'] = 'Sprache auswählen';
+$wb['btn_save_txt'] = 'Dateien jetzt zusammenführen';
+$wb['btn_cancel_txt'] = 'Zurück';
+?>
diff --git a/interface/web/admin/lib/lang/de_language_edit.lng b/interface/web/admin/lib/lang/de_language_edit.lng
index 25a72af..30ab21b 100644
--- a/interface/web/admin/lib/lang/de_language_edit.lng
+++ b/interface/web/admin/lib/lang/de_language_edit.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Sprachdatei Editor';
-$wb['language_select_txt'] = 'Sprache auswählen';
-$wb['module_txt'] = 'Modul';
-$wb['lang_file_txt'] = 'Sprachdatei';
-$wb['btn_save_txt'] = 'Speichern';
-$wb['btn_cancel_txt'] = 'Zurück';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Sprachdatei Editor';
+$wb['language_select_txt'] = 'Sprache auswählen';
+$wb['module_txt'] = 'Modul';
+$wb['lang_file_txt'] = 'Sprachdatei';
+$wb['btn_save_txt'] = 'Speichern';
+$wb['btn_cancel_txt'] = 'Zurück';
+?>
diff --git a/interface/web/admin/lib/lang/de_language_export.lng b/interface/web/admin/lib/lang/de_language_export.lng
index b254dd2..70eb466 100644
--- a/interface/web/admin/lib/lang/de_language_export.lng
+++ b/interface/web/admin/lib/lang/de_language_export.lng
@@ -1,7 +1,6 @@
-<?php
-$wb['list_head_txt'] = 'Sprachdatei exportieren';
-$wb['language_select_txt'] = 'Sprache auswählen';
-$wb['btn_save_txt'] = 'Ausgewähltes Sprachdateiset exportieren';
-$wb['btn_cancel_txt'] = 'Zurück';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Sprachdatei exportieren';
+$wb['language_select_txt'] = 'Sprache auswählen';
+$wb['btn_save_txt'] = 'Ausgewähltes Sprachdateiset exportieren';
+$wb['btn_cancel_txt'] = 'Zurück';
+?>
diff --git a/interface/web/admin/lib/lang/de_language_import.lng b/interface/web/admin/lib/lang/de_language_import.lng
index c6e37cc..ac148d5 100644
--- a/interface/web/admin/lib/lang/de_language_import.lng
+++ b/interface/web/admin/lib/lang/de_language_import.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['list_head_txt'] = 'Sprachdatei importieren';
-$wb['language_import_txt'] = 'Sprache auswählen';
-$wb['btn_save_txt'] = 'Ausgewählte Sprache importieren';
-$wb['language_overwrite_txt'] = 'Datei überschreiben falls sie existiert.';
-$wb['btn_cancel_txt'] = 'Zurück';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Sprachdatei importieren';
+$wb['language_import_txt'] = 'Sprache auswählen';
+$wb['btn_save_txt'] = 'Ausgewählte Sprache importieren';
+$wb['language_overwrite_txt'] = 'Datei überschreiben falls sie existiert.';
+$wb['btn_cancel_txt'] = 'Zurück';
+?>
diff --git a/interface/web/admin/lib/lang/de_language_list.lng b/interface/web/admin/lib/lang/de_language_list.lng
index e37863f..074eab9 100644
--- a/interface/web/admin/lib/lang/de_language_list.lng
+++ b/interface/web/admin/lib/lang/de_language_list.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['list_head_txt'] = 'Sprachdatei Editor';
-$wb['language_select_txt'] = 'Wähle Sprache';
-$wb['module_txt'] = 'Modul';
-$wb['lang_file_txt'] = 'Sprachdatei';
-$wb['lang_file_date_txt'] = 'Letzte Änderung';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Sprachdatei Editor';
+$wb['language_select_txt'] = 'Wähle Sprache';
+$wb['module_txt'] = 'Modul';
+$wb['lang_file_txt'] = 'Sprachdatei';
+$wb['lang_file_date_txt'] = 'Letzte Änderung';
+?>
diff --git a/interface/web/admin/lib/lang/de_server.lng b/interface/web/admin/lib/lang/de_server.lng
index eed5732..4193d9b 100644
--- a/interface/web/admin/lib/lang/de_server.lng
+++ b/interface/web/admin/lib/lang/de_server.lng
@@ -1,12 +1,11 @@
-<?php
-$wb['config_txt'] = 'Konfiguration';
-$wb['server_name_txt'] = 'Servername';
-$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'] = 'DB-Server';
-$wb['vserver_server_txt'] = 'VServer-Server';
-$wb['active_txt'] = 'Aktiv';
-?>
-
+<?php
+$wb['config_txt'] = 'Konfiguration';
+$wb['server_name_txt'] = 'Servername';
+$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'] = 'DB-Server';
+$wb['vserver_server_txt'] = 'VServer-Server';
+$wb['active_txt'] = 'Aktiv';
+?>
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index f22e356..2ed5c68 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -1,49 +1,49 @@
-<?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['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
-$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 Pfad';
-$wb['fastcgi_starter_script_txt'] = 'FastCGI Starter Script';
-$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
-$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'] = '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 Gruppe';
-$wb['relayhost_txt'] = 'Relayhost';
-$wb['relayhost_user_txt'] = 'Relayhost User';
-$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'] = 'Nameserver';
-$wb['auto_network_configuration_txt'] = 'Netzwerk Konfiguration';
-$wb['website_basedir_txt'] = 'Website basedir';
-$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'] = 'Pfad für individuelle Crontabs';
-$wb['wget_txt'] = 'Pfad zum wget Programm';
-$wb['web_user_txt'] = 'Apache User';
-$wb['web_group_txt'] = 'Apache Gruppe';
-?>
-
+<?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['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$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 Pfad';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI Starter Script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$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'] = '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 Gruppe';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$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'] = 'Nameserver';
+$wb['auto_network_configuration_txt'] = 'Netzwerk Konfiguration';
+$wb['website_basedir_txt'] = 'Website basedir';
+$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'] = '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_server_config_list.lng b/interface/web/admin/lib/lang/de_server_config_list.lng
index 46a90e2..191b2c8 100644
--- a/interface/web/admin/lib/lang/de_server_config_list.lng
+++ b/interface/web/admin/lib/lang/de_server_config_list.lng
@@ -1,5 +1,4 @@
-<?php
-$wb['list_head_txt'] = 'Serverkonfiguration';
-$wb['server_name_txt'] = 'Server';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Serverkonfiguration';
+$wb['server_name_txt'] = 'Server';
+?>
diff --git a/interface/web/admin/lib/lang/de_server_ip.lng b/interface/web/admin/lib/lang/de_server_ip.lng
index b641cfb..6553d0d 100644
--- a/interface/web/admin/lib/lang/de_server_ip.lng
+++ b/interface/web/admin/lib/lang/de_server_ip.lng
@@ -1,7 +1,6 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP Adresse';
-$wb['virtualhost_txt'] = 'HTTP NameVirtualHost';
-$wb['ip_err'] = 'IP Adresse ungültig';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['virtualhost_txt'] = 'HTTP NameVirtualHost';
+$wb['ip_err'] = 'IP Adresse ungültig';
+?>
diff --git a/interface/web/admin/lib/lang/de_server_ip_list.lng b/interface/web/admin/lib/lang/de_server_ip_list.lng
index 0349f5a..0d0727c 100644
--- a/interface/web/admin/lib/lang/de_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/de_server_ip_list.lng
@@ -1,7 +1,6 @@
-<?php
-$wb['list_head_txt'] = 'IP Adressen';
-$wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP Adresse';
-$wb['add_new_record_txt'] = 'Neue IP Adresse hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'IP Adressen';
+$wb['server_id_txt'] = 'Server';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['add_new_record_txt'] = 'Neue IP Adresse hinzufügen';
+?>
diff --git a/interface/web/admin/lib/lang/de_server_list.lng b/interface/web/admin/lib/lang/de_server_list.lng
index 97359ba..332a603 100644
--- a/interface/web/admin/lib/lang/de_server_list.lng
+++ b/interface/web/admin/lib/lang/de_server_list.lng
@@ -1,12 +1,11 @@
-<?php
-$wb['list_head_txt'] = 'Server';
-$wb['server_name_txt'] = 'Name';
-$wb['mail_server_txt'] = 'Mail';
-$wb['web_server_txt'] = 'Web';
-$wb['dns_server_txt'] = 'DNS';
-$wb['file_server_txt'] = 'Datei';
-$wb['db_server_txt'] = 'DB';
-$wb['vserver_server_txt'] = 'VServer';
-$wb['add_new_record_txt'] = 'Neuen Server hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Server';
+$wb['server_name_txt'] = 'Name';
+$wb['mail_server_txt'] = 'Mail';
+$wb['web_server_txt'] = 'Web';
+$wb['dns_server_txt'] = 'DNS';
+$wb['file_server_txt'] = 'Datei';
+$wb['db_server_txt'] = 'DB';
+$wb['vserver_server_txt'] = 'VServer';
+$wb['add_new_record_txt'] = 'Neuen Server hinzufügen';
+?>
diff --git a/interface/web/admin/lib/lang/de_software_package_list.lng b/interface/web/admin/lib/lang/de_software_package_list.lng
index 7ccb33e..ca797d3 100644
--- a/interface/web/admin/lib/lang/de_software_package_list.lng
+++ b/interface/web/admin/lib/lang/de_software_package_list.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['list_head_txt'] = 'Softwarepakete';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Paket';
-$wb['package_description_txt'] = 'Beschreibung';
-$wb['action_txt'] = 'Aktion';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Softwarepakete';
+$wb['installed_txt'] = 'Status';
+$wb['package_title_txt'] = 'Paket';
+$wb['package_description_txt'] = 'Beschreibung';
+$wb['action_txt'] = 'Aktion';
+?>
diff --git a/interface/web/admin/lib/lang/de_software_repo.lng b/interface/web/admin/lib/lang/de_software_repo.lng
index 8875be9..6e54c4a 100644
--- a/interface/web/admin/lib/lang/de_software_repo.lng
+++ b/interface/web/admin/lib/lang/de_software_repo.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Benutzername (optional)';
-$wb['repo_password_txt'] = 'Passwort (optional)';
-$wb['active_txt'] = 'Aktiv';
-?>
-
+<?php
+$wb['repo_name_txt'] = 'Repository';
+$wb['repo_url_txt'] = 'URL';
+$wb['repo_username_txt'] = 'Benutzername (optional)';
+$wb['repo_password_txt'] = 'Passwort (optional)';
+$wb['active_txt'] = 'Aktiv';
+?>
diff --git a/interface/web/admin/lib/lang/de_software_repo_list.lng b/interface/web/admin/lib/lang/de_software_repo_list.lng
index 0607a4e..db6f49f 100644
--- a/interface/web/admin/lib/lang/de_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/de_software_repo_list.lng
@@ -1,7 +1,6 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Aktiv';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Repository';
+$wb['active_txt'] = 'Aktiv';
+$wb['repo_name_txt'] = 'Repository';
+$wb['repo_url_txt'] = 'URL';
+?>
diff --git a/interface/web/admin/lib/lang/de_software_update_list.lng b/interface/web/admin/lib/lang/de_software_update_list.lng
index dab68bd..6f01c1f 100644
--- a/interface/web/admin/lib/lang/de_software_update_list.lng
+++ b/interface/web/admin/lib/lang/de_software_update_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Softwareupdates';
-$wb['server_select_txt'] = 'Server wählen';
-$wb['installed_txt'] = 'Aktion';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Aktion';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Softwareupdates';
+$wb['server_select_txt'] = 'Server wählen';
+$wb['installed_txt'] = 'Aktion';
+$wb['update_title_txt'] = 'Update';
+$wb['version_txt'] = 'Version';
+$wb['action_txt'] = 'Aktion';
+?>
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 390cf91..88197d4 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -1,14 +1,13 @@
-<?php
-$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'] = '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';
-?>
-
+<?php
+$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'] = '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 deb28dd..b8b80fc 100644
--- a/interface/web/admin/lib/lang/de_users.lng
+++ b/interface/web/admin/lib/lang/de_users.lng
@@ -1,29 +1,28 @@
-<?php
-$wb['username_txt'] = 'Benutzername';
-$wb['username_err'] = 'Der Benutzername enthält ungültige Zeichen.';
-$wb['passwort_txt'] = 'Passwort';
-$wb['modules_txt'] = 'Module';
-$wb['startmodule_txt'] = 'Startmodul';
-$wb['app_theme_txt'] = 'Design';
-$wb['typ_txt'] = 'Typ';
-$wb['active_txt'] = 'Aktiv';
-$wb['language_txt'] = 'Sprache';
-$wb['name_txt'] = 'Name';
-$wb['vorname_txt'] = 'Vorname';
-$wb['unternehmen_txt'] = 'Unternehmen';
-$wb['strasse_txt'] = 'Strasse';
-$wb['ort_txt'] = 'Ort';
-$wb['plz_txt'] = 'PLZ';
-$wb['land_txt'] = 'Land';
-$wb['email_txt'] = 'Email';
-$wb['url_txt'] = 'URL';
-$wb['telefon_txt'] = 'Telefon';
-$wb['fax_txt'] = 'Fax';
-$wb['groups_txt'] = 'Gruppen';
-$wb['default_group_txt'] = 'Standardgruppe';
-$wb['username_empty'] = 'Der Benutzername ist leer';
-$wb['username_unique'] = 'Es gibt bereits ein Benutzer mit diesem Namen';
-$wb['startmodule_err'] = 'Start module is not within modules.';
-$wb['password_strength_txt'] = 'Passwortkomplexität';
-?>
-
+<?php
+$wb['username_txt'] = 'Benutzername';
+$wb['username_err'] = 'Der Benutzername enthält ungültige Zeichen.';
+$wb['passwort_txt'] = 'Passwort';
+$wb['modules_txt'] = 'Module';
+$wb['startmodule_txt'] = 'Startmodul';
+$wb['app_theme_txt'] = 'Design';
+$wb['typ_txt'] = 'Typ';
+$wb['active_txt'] = 'Aktiv';
+$wb['language_txt'] = 'Sprache';
+$wb['name_txt'] = 'Name';
+$wb['vorname_txt'] = 'Vorname';
+$wb['unternehmen_txt'] = 'Unternehmen';
+$wb['strasse_txt'] = 'Strasse';
+$wb['ort_txt'] = 'Ort';
+$wb['plz_txt'] = 'PLZ';
+$wb['land_txt'] = 'Land';
+$wb['email_txt'] = 'Email';
+$wb['url_txt'] = 'URL';
+$wb['telefon_txt'] = 'Telefon';
+$wb['fax_txt'] = 'Fax';
+$wb['groups_txt'] = 'Gruppen';
+$wb['default_group_txt'] = 'Standardgruppe';
+$wb['username_empty'] = 'Der Benutzername ist leer';
+$wb['username_unique'] = 'Es gibt bereits ein Benutzer mit diesem Namen';
+$wb['startmodule_err'] = 'Start module is not within modules.';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+?>
diff --git a/interface/web/admin/lib/lang/de_users_list.lng b/interface/web/admin/lib/lang/de_users_list.lng
index 06b327f..523efb4 100644
--- a/interface/web/admin/lib/lang/de_users_list.lng
+++ b/interface/web/admin/lib/lang/de_users_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Benutzer';
-$wb['username_txt'] = 'Benutzername';
-$wb['name_txt'] = 'Nachname';
-$wb['vorname_txt'] = 'Vorname';
-$wb['ort_txt'] = 'Ort';
-$wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Benutzer';
+$wb['username_txt'] = 'Benutzername';
+$wb['name_txt'] = 'Nachname';
+$wb['vorname_txt'] = 'Vorname';
+$wb['ort_txt'] = 'Ort';
+$wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
+?>
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/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_firewall.lng b/interface/web/admin/lib/lang/nl_firewall.lng
index 6a8a53a..57ec2af 100644
--- a/interface/web/admin/lib/lang/nl_firewall.lng
+++ b/interface/web/admin/lib/lang/nl_firewall.lng
@@ -6,4 +6,6 @@
 $wb['udp_port_help_txt'] = 'Gescheiden door komma';
 $wb['active_txt'] = 'Actief';
 $wb['firewall_error_unique'] = 'Er bestaat al een firewall record voor deze 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/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index fe73f16..50b089e 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_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/pl.lng b/interface/web/admin/lib/lang/pl.lng
index 69aba41..d3b0c94 100644
--- a/interface/web/admin/lib/lang/pl.lng
+++ b/interface/web/admin/lib/lang/pl.lng
@@ -1,38 +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['Groups'] = 'Grupy';
-$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';
-
-?>
-
+<?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
index 6f1c7b9..6628fd8 100644
--- a/interface/web/admin/lib/lang/pl_firewall.lng
+++ b/interface/web/admin/lib/lang/pl_firewall.lng
@@ -1,13 +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"] = 'Aktywny';
-$wb["firewall_error_unique"] = 'Istnieje już wpis firewall-a dla tego serwera.';
-$wb["active_txt"] = 'Active';
-$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 ",".';
-?>
-
+<?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
index 2b6aa26..f7e1640 100644
--- a/interface/web/admin/lib/lang/pl_firewall_list.lng
+++ b/interface/web/admin/lib/lang/pl_firewall_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index e908583..b3c8b9c 100644
--- a/interface/web/admin/lib/lang/pl_groups.lng
+++ b/interface/web/admin/lib/lang/pl_groups.lng
@@ -1,6 +1,5 @@
-<?php
-$wb["description_txt"] = 'Opis';
-$wb["name_txt"] = 'Grupa';
-$wb["name_err"] = 'Nazwa grupy musi mieć od 1 do 30 znaków.';
-?>
-
+<?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
index 8f8601f..2470a03 100644
--- a/interface/web/admin/lib/lang/pl_groups_list.lng
+++ b/interface/web/admin/lib/lang/pl_groups_list.lng
@@ -1,7 +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ę';
-?>
-
+<?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
index 3f72725..82e42ef 100644
--- a/interface/web/admin/lib/lang/pl_language_add.lng
+++ b/interface/web/admin/lib/lang/pl_language_add.lng
@@ -1,9 +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óć';
-?>
-
+<?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
index 56b7ce8..0096c69 100644
--- a/interface/web/admin/lib/lang/pl_language_complete.lng
+++ b/interface/web/admin/lib/lang/pl_language_complete.lng
@@ -1,8 +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óć';
-?>
-
+<?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
index d96a3dc..3a5e706 100644
--- a/interface/web/admin/lib/lang/pl_language_edit.lng
+++ b/interface/web/admin/lib/lang/pl_language_edit.lng
@@ -1,10 +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óć';
-?>
-
-
+<?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
index 2f3543c..82666fc 100644
--- a/interface/web/admin/lib/lang/pl_language_export.lng
+++ b/interface/web/admin/lib/lang/pl_language_export.lng
@@ -1,7 +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óć';
-?>
-
+<?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
index f414dfb..f3d631e 100644
--- a/interface/web/admin/lib/lang/pl_language_import.lng
+++ b/interface/web/admin/lib/lang/pl_language_import.lng
@@ -1,8 +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óć';
-?>
-
+<?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
index c7a0e02..68f710b 100644
--- a/interface/web/admin/lib/lang/pl_language_list.lng
+++ b/interface/web/admin/lib/lang/pl_language_list.lng
@@ -1,9 +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';
-?>
-
-
+<?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
index 09dc2cd..23d6043 100644
--- a/interface/web/admin/lib/lang/pl_server.lng
+++ b/interface/web/admin/lib/lang/pl_server.lng
@@ -1,12 +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';
-?>
-
+<?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
index a72b437..eb57202 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -1,49 +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';
-?>
-
+<?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
index db95019..f9e8dcf 100644
--- a/interface/web/admin/lib/lang/pl_server_config_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_config_list.lng
@@ -1,5 +1,4 @@
-<?php
-$wb["list_head_txt"] = 'Konfiguracja serwera';
-$wb["server_name_txt"] = 'Serwer';
-?>
-
+<?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
index d836e6b..c24d0a3 100644
--- a/interface/web/admin/lib/lang/pl_server_ip.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip.lng
@@ -1,7 +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';
-?>
-
+<?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
index b51e7a9..6ab81c1 100644
--- a/interface/web/admin/lib/lang/pl_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip_list.lng
@@ -1,7 +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';
-?>
-
+<?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
index d4b65f7..f61ba5f 100644
--- a/interface/web/admin/lib/lang/pl_server_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_list.lng
@@ -1,12 +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';
-?>
-
+<?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
index b98d956..9549333 100644
--- a/interface/web/admin/lib/lang/pl_software_package_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_list.lng
@@ -1,9 +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';
-?>
-
-
+<?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
index 3ee2dd4..d11a1b3 100644
--- a/interface/web/admin/lib/lang/pl_software_repo.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo.lng
@@ -1,8 +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';
-?>
-
+<?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
index c20873e..7ca6af9 100644
--- a/interface/web/admin/lib/lang/pl_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo_list.lng
@@ -1,7 +1,6 @@
-<?php
-$wb["list_head_txt"] = 'Repozytoria';
-$wb["active_txt"] = 'Aktywny';
-$wb["repo_name_txt"] = 'Repozytoria';
-$wb["repo_url_txt"] = 'URL';
-?>
-
+<?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
index 10f353e..e38bdf8 100644
--- a/interface/web/admin/lib/lang/pl_software_update_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_update_list.lng
@@ -1,10 +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';
-?>
-
-
+<?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
index b82ba16..09a9ed0 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -1,16 +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';
-
-?>
-
+<?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
index fb885ff..3b2472d 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -1,30 +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.';
-?>
-
-
+<?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
index 7fbe733..355d89e 100644
--- a/interface/web/admin/lib/lang/pl_users_list.lng
+++ b/interface/web/admin/lib/lang/pl_users_list.lng
@@ -1,9 +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';
-?><div></div>
-
+<?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 bcc8202..83d1ecf 100644
--- a/interface/web/client/lib/lang/br.lng
+++ b/interface/web/client/lib/lang/br.lng
@@ -10,4 +10,3 @@
 $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 c47751c..2d1d575 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -87,4 +87,3 @@
 $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 7ff1817..5d58451 100644
--- a/interface/web/client/lib/lang/br_client_template.lng
+++ b/interface/web/client/lib/lang/br_client_template.lng
@@ -50,4 +50,3 @@
 $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_list.lng b/interface/web/client/lib/lang/br_client_template_list.lng
index 3f9dd52..231f7fd 100644
--- a/interface/web/client/lib/lang/br_client_template_list.lng
+++ b/interface/web/client/lib/lang/br_client_template_list.lng
@@ -3,4 +3,3 @@
 $wb['template_type_txt'] = 'Tipo';
 $wb['template_name_txt'] = 'Nome do Gabarito';
 ?>
-
diff --git a/interface/web/client/lib/lang/br_clients_list.lng b/interface/web/client/lib/lang/br_clients_list.lng
index db70b35..e9ba768 100644
--- a/interface/web/client/lib/lang/br_clients_list.lng
+++ b/interface/web/client/lib/lang/br_clients_list.lng
@@ -7,4 +7,3 @@
 $wb['country_txt'] = 'Pais';
 $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
index 85d1c2e..9f54775 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -88,4 +88,3 @@
 $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
index e8849fe..053d722 100644
--- a/interface/web/client/lib/lang/br_resellers_list.lng
+++ b/interface/web/client/lib/lang/br_resellers_list.lng
@@ -7,4 +7,3 @@
 $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 136d3ea..0a4f978 100644
--- a/interface/web/client/lib/lang/de.lng
+++ b/interface/web/client/lib/lang/de.lng
@@ -1,13 +1,12 @@
-<?php
-$wb['Client'] = 'Kunden';
-$wb['Address'] = 'Adresse';
-$wb['Limits'] = 'Limits';
-$wb['Add Client'] = 'Kunde hinzufügen';
-$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';
-?>
-
+<?php
+$wb['Client'] = 'Kunden';
+$wb['Address'] = 'Adresse';
+$wb['Limits'] = 'Limits';
+$wb['Add Client'] = 'Kunde hinzufügen';
+$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 3d54d25..34db3a8 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -1,90 +1,89 @@
-<?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['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_client_txt'] = 'Max. Anzahl an Kunden';
-$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['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['password_strength_txt'] = 'Passwortkomplexität';
-$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.';
-?>
-
+<?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['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_client_txt'] = 'Max. Anzahl an Kunden';
+$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['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['password_strength_txt'] = 'Passwortkomplexität';
+$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.';
+?>
diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng
index 5277cd9..03a5909 100644
--- a/interface/web/client/lib/lang/de_client_template.lng
+++ b/interface/web/client/lib/lang/de_client_template.lng
@@ -1,53 +1,52 @@
-<?php
-$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 Routen';
-$wb['limit_mailfilter_txt'] = 'Max. Anzahl an Emailfilter';
-$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_user_txt'] = 'Max. Anzahl Spamfilter Benutzer';
-$wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
-$wb['limit_client_txt'] = 'Max. Anzahl an Kunden';
-$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 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';
-$wb['limit_web_aliasdomain_txt'] = 'Max. Anzahl an Web Aliasdomains';
-$wb['limit_web_subdomain_txt'] = 'Max. Anzahl an Web Subdomains';
-$wb['limit_ftp_user_txt'] = 'Max. Anzahl an FTP Benutzer';
-$wb['limit_dns_zone_txt'] = 'Max. Anzahl an DNS Zonen';
-$wb['limit_dns_record_txt'] = 'Max. Anzahl an DNS Einträgen';
-$wb['limit_shell_user_txt'] = 'Max. Anzahl an Shellbenutzer';
-$wb['limit_maildomain_error_notint'] = 'Das Emaildomain 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 Webseiten Aliasdomain Limit muss eine Nummer sein.';
-$wb['limit_web_subdomain_error_notint'] = 'Das Webseiten 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['limit_database_error_notint'] = 'Das Datenbanken 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['error_template_name_empty'] = 'Bitte geben sie einen Vorlagenamen ein';
-?>
-
+<?php
+$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 Routen';
+$wb['limit_mailfilter_txt'] = 'Max. Anzahl an Emailfilter';
+$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_user_txt'] = 'Max. Anzahl Spamfilter Benutzer';
+$wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
+$wb['limit_client_txt'] = 'Max. Anzahl an Kunden';
+$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 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';
+$wb['limit_web_aliasdomain_txt'] = 'Max. Anzahl an Web Aliasdomains';
+$wb['limit_web_subdomain_txt'] = 'Max. Anzahl an Web Subdomains';
+$wb['limit_ftp_user_txt'] = 'Max. Anzahl an FTP Benutzer';
+$wb['limit_dns_zone_txt'] = 'Max. Anzahl an DNS Zonen';
+$wb['limit_dns_record_txt'] = 'Max. Anzahl an DNS Einträgen';
+$wb['limit_shell_user_txt'] = 'Max. Anzahl an Shellbenutzer';
+$wb['limit_maildomain_error_notint'] = 'Das Emaildomain 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 Webseiten Aliasdomain Limit muss eine Nummer sein.';
+$wb['limit_web_subdomain_error_notint'] = 'Das Webseiten 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['limit_database_error_notint'] = 'Das Datenbanken 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['error_template_name_empty'] = 'Bitte geben sie einen Vorlagenamen ein';
+?>
diff --git a/interface/web/client/lib/lang/de_client_template_list.lng b/interface/web/client/lib/lang/de_client_template_list.lng
index 6bb2e8a..98195fe 100644
--- a/interface/web/client/lib/lang/de_client_template_list.lng
+++ b/interface/web/client/lib/lang/de_client_template_list.lng
@@ -1,6 +1,5 @@
-<?php
-$wb['list_head_txt'] = 'Kundenvorlagen';
-$wb['template_type_txt'] = 'Typ';
-$wb['template_name_txt'] = 'Vorlagenname';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Kundenvorlagen';
+$wb['template_type_txt'] = 'Typ';
+$wb['template_name_txt'] = 'Vorlagenname';
+?>
diff --git a/interface/web/client/lib/lang/de_clients_list.lng b/interface/web/client/lib/lang/de_clients_list.lng
index d4b1722..515d7db 100644
--- a/interface/web/client/lib/lang/de_clients_list.lng
+++ b/interface/web/client/lib/lang/de_clients_list.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['list_head_txt'] = 'Kunden';
-$wb['client_id_txt'] = 'ID';
-$wb['company_name_txt'] = 'Firmenname';
-$wb['contact_name_txt'] = 'Kontaktname';
-$wb['city_txt'] = 'Ort';
-$wb['country_txt'] = 'Land';
-$wb['add_new_record_txt'] = 'Kunden Eintrag hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Kunden';
+$wb['client_id_txt'] = 'ID';
+$wb['company_name_txt'] = 'Firmenname';
+$wb['contact_name_txt'] = 'Kontaktname';
+$wb['city_txt'] = 'Ort';
+$wb['country_txt'] = 'Land';
+$wb['add_new_record_txt'] = 'Kunden Eintrag hinzufügen';
+?>
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index fef48ec..6c3c31d 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -1,91 +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';
-?>
-
+<?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
index 417251a..f6f736c 100644
--- a/interface/web/client/lib/lang/de_resellers_list.lng
+++ b/interface/web/client/lib/lang/de_resellers_list.lng
@@ -1,10 +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';
-?>
-
+<?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/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..3a0b28b 100644
--- a/interface/web/client/lib/lang/nl.lng
+++ b/interface/web/client/lib/lang/nl.lng
@@ -6,4 +6,7 @@
 $wb['Edit Client'] = 'Wijzigen klant';
 $wb['Clients'] = 'Klanten';
 $wb['Edit Client-Templates'] = 'Wijzigen Klant-templates';
+$wb['Add Reseller'] = 'Add Reseller';
+$wb['Edit Reseller'] = 'Edit Reseller';
+$wb['Resellers'] = 'Resellers';
 ?>
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..906fd44
--- /dev/null
+++ b/interface/web/client/lib/lang/nl_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/nl_resellers_list.lng b/interface/web/client/lib/lang/nl_resellers_list.lng
new file mode 100644
index 0000000..523a467
--- /dev/null
+++ b/interface/web/client/lib/lang/nl_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/pl.lng b/interface/web/client/lib/lang/pl.lng
index a3b4997..2c0324a 100644
--- a/interface/web/client/lib/lang/pl.lng
+++ b/interface/web/client/lib/lang/pl.lng
@@ -1,13 +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';
-?>
-
+<?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
index ec3e7db..4d3746e 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -1,94 +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"] = 'limit_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["ip_address_txt"] = 'adres_ip';
-$wb["limit_client_error_notint"] = 'Limit klienta nie jest 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 stref DNS musi być liczbą.';
-$wb["limit_dns_zone_error_notint"] = 'Limit wpisów DNS musi być liczbą.';
-$wb["limit_client_error_notint"] = 'Limit subklientów musi być liczbą.';
-$wb["default_dbserver_txt"] = 'Domyślny serwer bazy danych';
-$wb["limit_database_txt"] = 'Maksymalna ilość 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.';
-?>
-
-
+<?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
index fa971a5..888d92c 100644
--- a/interface/web/client/lib/lang/pl_client_template.lng
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -1,56 +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"] = 'limit_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 stref DNS musi być liczbą.';
-$wb["limit_dns_zone_error_notint"] = 'Limit wpisów DNS musi być liczbą.';
-$wb["limit_database_txt"] = 'Maksymalna ilość baz 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["error_template_name_empty"] = 'Proszę wpisać nazwę szablonu';
-?>
-
+<?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
index 9648314..06a3976 100644
--- a/interface/web/client/lib/lang/pl_client_template_list.lng
+++ b/interface/web/client/lib/lang/pl_client_template_list.lng
@@ -1,7 +1,5 @@
-<?php
-$wb["list_head_txt"] = 'Szablon klienta';
-$wb["template_type_txt"] = 'Typ';
-$wb["template_name_txt"] = 'Nazwa szablonu';
-?>
-
-
+<?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
index 0d43b83..09b6699 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -1,95 +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"] = 'limit_baz_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"] = 'Limik klienta nie jest 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 stref DNS musi być liczbą.';
-$wb["limit_dns_zone_error_notint"] = 'Limit wpisów DNS musi być liczbą.';
-$wb["limit_client_error_notint"] = 'Ilość klientów musi być liczbą.';
-$wb["default_dbserver_txt"] = 'Domyślny serwer bazy danych';
-$wb["limit_database_txt"] = 'Maksymalna ilość 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';
-?>
-
-
+<?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
index 0932f47..51abc41 100644
--- a/interface/web/client/lib/lang/pl_resellers_list.lng
+++ b/interface/web/client/lib/lang/pl_resellers_list.lng
@@ -1,10 +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';
-?>
-
+<?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 29f4a51..acb6c35 100644
--- a/interface/web/designer/lib/lang/br.lng
+++ b/interface/web/designer/lib/lang/br.lng
@@ -1,3 +1,2 @@
 <?php
 ?>
-
diff --git a/interface/web/designer/lib/lang/br_form_edit.lng b/interface/web/designer/lib/lang/br_form_edit.lng
index afd97e0..7d7534a 100644
--- a/interface/web/designer/lib/lang/br_form_edit.lng
+++ b/interface/web/designer/lib/lang/br_form_edit.lng
@@ -22,4 +22,3 @@
 $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 01d0f28..b16ce55 100644
--- a/interface/web/designer/lib/lang/br_form_list.lng
+++ b/interface/web/designer/lib/lang/br_form_list.lng
@@ -5,4 +5,3 @@
 $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 32fede2..5b68a31 100644
--- a/interface/web/designer/lib/lang/br_form_show.lng
+++ b/interface/web/designer/lib/lang/br_form_show.lng
@@ -16,4 +16,3 @@
 $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 e80d725..34471ac 100644
--- a/interface/web/designer/lib/lang/br_module_edit.lng
+++ b/interface/web/designer/lib/lang/br_module_edit.lng
@@ -20,4 +20,3 @@
 <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 8b8f247..822263a 100644
--- a/interface/web/designer/lib/lang/br_module_list.lng
+++ b/interface/web/designer/lib/lang/br_module_list.lng
@@ -3,4 +3,3 @@
 $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 b147dce..c5e3266 100644
--- a/interface/web/designer/lib/lang/br_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/br_module_nav_edit.lng
@@ -4,4 +4,3 @@
 $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 0421cea..5eafa77 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
@@ -6,4 +6,3 @@
 $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 e5fffaf..1fb1800 100644
--- a/interface/web/designer/lib/lang/br_module_show.lng
+++ b/interface/web/designer/lib/lang/br_module_show.lng
@@ -14,4 +14,3 @@
 $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/de.lng b/interface/web/designer/lib/lang/de.lng
index 75c42c8..acb6c35 100644
--- a/interface/web/designer/lib/lang/de.lng
+++ b/interface/web/designer/lib/lang/de.lng
@@ -1,3 +1,2 @@
-<?php
-?>
-
+<?php
+?>
diff --git a/interface/web/designer/lib/lang/de_form_edit.lng b/interface/web/designer/lib/lang/de_form_edit.lng
index 12cbb3e..74bf458 100644
--- a/interface/web/designer/lib/lang/de_form_edit.lng
+++ b/interface/web/designer/lib/lang/de_form_edit.lng
@@ -1,25 +1,24 @@
-<?php
-$wb['name_txt'] = 'Formularname';
-$wb['title_txt'] = 'Formulartitel';
-$wb['template_txt'] = 'Vorlage';
-$wb['navframe_txt'] = 'Navigationsframe';
-$wb['startpage_txt'] = 'Startseite';
-$wb['tab_width_txt'] = 'Tab Breite';
-$wb['save_txt'] = 'Speichern';
-$wb['cancel_txt'] = 'Abbrechen';
-$wb['header_txt'] = 'Formular Eigenschaften';
-$wb['description_txt'] = 'Beschreibung';
-$wb['action_txt'] = 'Aktion (Skript)';
-$wb['db_table_txt'] = 'DB Tabelle';
-$wb['db_table_idx_txt'] = 'DB Tabellenindex';
-$wb['db_history_txt'] = 'Undo Log';
-$wb['tab_default_txt'] = 'Standard Tab';
-$wb['list_default_txt'] = 'Standard Liste';
-$wb['auth_txt'] = 'Berechtigungen';
-$wb['auth_preset_userid_txt'] = 'Benutzer ID';
-$wb['auth_preset_groupid_txt'] = 'Gruppen ID';
-$wb['auth_preset_perm_user_txt'] = 'Benutzerberechtigungen';
-$wb['auth_preset_perm_group_txt'] = 'Gruppenberechtigungen';
-$wb['auth_preset_perm_other_txt'] = 'andere Berechtigungen';
-?>
-
+<?php
+$wb['name_txt'] = 'Formularname';
+$wb['title_txt'] = 'Formulartitel';
+$wb['template_txt'] = 'Vorlage';
+$wb['navframe_txt'] = 'Navigationsframe';
+$wb['startpage_txt'] = 'Startseite';
+$wb['tab_width_txt'] = 'Tab Breite';
+$wb['save_txt'] = 'Speichern';
+$wb['cancel_txt'] = 'Abbrechen';
+$wb['header_txt'] = 'Formular Eigenschaften';
+$wb['description_txt'] = 'Beschreibung';
+$wb['action_txt'] = 'Aktion (Skript)';
+$wb['db_table_txt'] = 'DB Tabelle';
+$wb['db_table_idx_txt'] = 'DB Tabellenindex';
+$wb['db_history_txt'] = 'Undo Log';
+$wb['tab_default_txt'] = 'Standard Tab';
+$wb['list_default_txt'] = 'Standard Liste';
+$wb['auth_txt'] = 'Berechtigungen';
+$wb['auth_preset_userid_txt'] = 'Benutzer ID';
+$wb['auth_preset_groupid_txt'] = 'Gruppen ID';
+$wb['auth_preset_perm_user_txt'] = 'Benutzerberechtigungen';
+$wb['auth_preset_perm_group_txt'] = 'Gruppenberechtigungen';
+$wb['auth_preset_perm_other_txt'] = 'andere Berechtigungen';
+?>
diff --git a/interface/web/designer/lib/lang/de_form_list.lng b/interface/web/designer/lib/lang/de_form_list.lng
index b838f3c..998a64f 100644
--- a/interface/web/designer/lib/lang/de_form_list.lng
+++ b/interface/web/designer/lib/lang/de_form_list.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['list_head_txt'] = 'Backend Formulare';
-$wb['form_txt'] = 'Formular';
-$wb['module_txt'] = 'Modul';
-$wb['title_txt'] = 'Bezeichnung';
-$wb['description_txt'] = 'Beschreibung';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Backend Formulare';
+$wb['form_txt'] = 'Formular';
+$wb['module_txt'] = 'Modul';
+$wb['title_txt'] = 'Bezeichnung';
+$wb['description_txt'] = 'Beschreibung';
+?>
diff --git a/interface/web/designer/lib/lang/de_form_show.lng b/interface/web/designer/lib/lang/de_form_show.lng
index 07a42f9..b19fd34 100644
--- a/interface/web/designer/lib/lang/de_form_show.lng
+++ b/interface/web/designer/lib/lang/de_form_show.lng
@@ -1,19 +1,18 @@
-<?php
-$wb['header_txt'] = 'Formulareditor';
-$wb['title_txt'] = 'Formulartitel';
-$wb['name_txt'] = 'Formularname';
-$wb['delete_txt'] = 'X';
-$wb['properties_txt'] = 'Eigenschaften';
-$wb['new_tab_txt'] = 'neuer Reiter';
-$wb['edit_txt'] = 'Bearbeiten';
-$wb['new_txt'] = 'Neu';
-$wb['up_txt'] = '^';
-$wb['down_txt'] = 'v';
-$wb['module_txt'] = 'Modul';
-$wb['form_txt'] = 'Formular';
-$wb['description_txt'] = 'Beschreibung';
-$wb['module_del_txt'] = 'Modul und alle Unterverzeichnisse löschen?';
-$wb['menu_del_txt'] = 'Menü samt Menüeinträgen löschen?';
-$wb['item_del_txt'] = 'Menüeintrag löschen?';
-?>
-
+<?php
+$wb['header_txt'] = 'Formulareditor';
+$wb['title_txt'] = 'Formulartitel';
+$wb['name_txt'] = 'Formularname';
+$wb['delete_txt'] = 'X';
+$wb['properties_txt'] = 'Eigenschaften';
+$wb['new_tab_txt'] = 'neuer Reiter';
+$wb['edit_txt'] = 'Bearbeiten';
+$wb['new_txt'] = 'Neu';
+$wb['up_txt'] = '^';
+$wb['down_txt'] = 'v';
+$wb['module_txt'] = 'Modul';
+$wb['form_txt'] = 'Formular';
+$wb['description_txt'] = 'Beschreibung';
+$wb['module_del_txt'] = 'Modul und alle Unterverzeichnisse löschen?';
+$wb['menu_del_txt'] = 'Menü samt Menüeinträgen löschen?';
+$wb['item_del_txt'] = 'Menüeintrag löschen?';
+?>
diff --git a/interface/web/designer/lib/lang/de_module_edit.lng b/interface/web/designer/lib/lang/de_module_edit.lng
index d69faf0..6eacd64 100644
--- a/interface/web/designer/lib/lang/de_module_edit.lng
+++ b/interface/web/designer/lib/lang/de_module_edit.lng
@@ -1,13 +1,12 @@
-<?php
-$wb['name_txt'] = 'Modulname';
-$wb['title_txt'] = 'Modulbezeichnung';
-$wb['template_txt'] = 'Vorlage';
-$wb['navframe_txt'] = 'Navigationsframe';
-$wb['startpage_txt'] = 'Startseite';
-$wb['tab_width_txt'] = 'Reiterkartenbreite';
-$wb['save_txt'] = 'Speichern';
-$wb['cancel_txt'] = 'Abbrechen';
-$wb['header_txt'] = 'Moduleigenschaften';
-$wb['description_txt'] = 'Beschreibung';
-?>
-
+<?php
+$wb['name_txt'] = 'Modulname';
+$wb['title_txt'] = 'Modulbezeichnung';
+$wb['template_txt'] = 'Vorlage';
+$wb['navframe_txt'] = 'Navigationsframe';
+$wb['startpage_txt'] = 'Startseite';
+$wb['tab_width_txt'] = 'Reiterkartenbreite';
+$wb['save_txt'] = 'Speichern';
+$wb['cancel_txt'] = 'Abbrechen';
+$wb['header_txt'] = 'Moduleigenschaften';
+$wb['description_txt'] = 'Beschreibung';
+?>
diff --git a/interface/web/designer/lib/lang/de_module_nav_edit.lng b/interface/web/designer/lib/lang/de_module_nav_edit.lng
index 0247c67..d5142f0 100644
--- a/interface/web/designer/lib/lang/de_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/de_module_nav_edit.lng
@@ -1,7 +1,6 @@
-<?php
-$wb['title_txt'] = 'Überschrift';
-$wb['header_txt'] = 'Navigation Eigenschaften';
-$wb['save_txt'] = 'Speichern';
-$wb['cancel_txt'] = 'Abbrechen';
-?>
-
+<?php
+$wb['title_txt'] = 'Überschrift';
+$wb['header_txt'] = 'Navigation Eigenschaften';
+$wb['save_txt'] = 'Speichern';
+$wb['cancel_txt'] = 'Abbrechen';
+?>
diff --git a/interface/web/designer/lib/lang/de_module_nav_item_edit.lng b/interface/web/designer/lib/lang/de_module_nav_item_edit.lng
index f17a4a1..8c0c33c 100644
--- a/interface/web/designer/lib/lang/de_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/de_module_nav_item_edit.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['title_txt'] = 'Überschrift';
-$wb['target_txt'] = 'Ziel';
-$wb['link_txt'] = 'Link';
-$wb['header_txt'] = 'Navigation Eigenschaften';
-$wb['save_txt'] = 'Speichern';
-$wb['cancel_txt'] = 'Abbrechen';
-?>
-
+<?php
+$wb['title_txt'] = 'Überschrift';
+$wb['target_txt'] = 'Ziel';
+$wb['link_txt'] = 'Link';
+$wb['header_txt'] = 'Navigation Eigenschaften';
+$wb['save_txt'] = 'Speichern';
+$wb['cancel_txt'] = 'Abbrechen';
+?>
diff --git a/interface/web/designer/lib/lang/de_module_show.lng b/interface/web/designer/lib/lang/de_module_show.lng
index 0789bb6..f4b2ad1 100644
--- a/interface/web/designer/lib/lang/de_module_show.lng
+++ b/interface/web/designer/lib/lang/de_module_show.lng
@@ -1,17 +1,16 @@
-<?php
-$wb['header_txt'] = 'Menüeditor';
-$wb['title_txt'] = 'Titel';
-$wb['name_txt'] = 'Modul';
-$wb['delete_txt'] = 'Löschen';
-$wb['properties_txt'] = 'Eigenschaften';
-$wb['new_menu_txt'] = 'Menü hinzufügen';
-$wb['edit_txt'] = 'Bearbeiten';
-$wb['new_txt'] = 'Neu';
-$wb['up_txt'] = 'nach oben';
-$wb['down_txt'] = 'nach unten';
-$wb['module_txt'] = 'Modul';
-$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?';
-?>
-
+<?php
+$wb['header_txt'] = 'Menüeditor';
+$wb['title_txt'] = 'Titel';
+$wb['name_txt'] = 'Modul';
+$wb['delete_txt'] = 'Löschen';
+$wb['properties_txt'] = 'Eigenschaften';
+$wb['new_menu_txt'] = 'Menü hinzufügen';
+$wb['edit_txt'] = 'Bearbeiten';
+$wb['new_txt'] = 'Neu';
+$wb['up_txt'] = 'nach oben';
+$wb['down_txt'] = 'nach unten';
+$wb['module_txt'] = 'Modul';
+$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/pl.lng b/interface/web/designer/lib/lang/pl.lng
index 6c07af2..acb6c35 100644
--- a/interface/web/designer/lib/lang/pl.lng
+++ b/interface/web/designer/lib/lang/pl.lng
@@ -1,4 +1,2 @@
-<?php
-
-?>
-
+<?php
+?>
diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng
index 412632a..ee4f4c4 100644
--- a/interface/web/designer/lib/lang/pl_form_edit.lng
+++ b/interface/web/designer/lib/lang/pl_form_edit.lng
@@ -1,27 +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["tab_width_txt"] = 'Szerokość zakładki';
-$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';
-
-?>
-
+<?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
index c915c85..ac85722 100644
--- a/interface/web/designer/lib/lang/pl_form_list.lng
+++ b/interface/web/designer/lib/lang/pl_form_list.lng
@@ -1,8 +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';
-?>
-
+<?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
index fd191b1..db62af1 100644
--- a/interface/web/designer/lib/lang/pl_form_show.lng
+++ b/interface/web/designer/lib/lang/pl_form_show.lng
@@ -1,19 +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?";
-?>
-
+<?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
index fb7aaa1..691e550 100644
--- a/interface/web/designer/lib/lang/pl_module_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_edit.lng
@@ -1,14 +1,14 @@
-<?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"] = '
+<?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>
@@ -18,7 +18,5 @@
 <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
index d4e1879..308d1c6 100644
--- a/interface/web/designer/lib/lang/pl_module_list.lng
+++ b/interface/web/designer/lib/lang/pl_module_list.lng
@@ -1,6 +1,5 @@
-<?php
-$wb["list_head_txt"] = 'Nazwa modułu';
-$wb["module_txt"] = 'Moduł';
-$wb["title_txt"] = 'Tytuł';
-?>
-
+<?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
index cf9240c..5ace229 100644
--- a/interface/web/designer/lib/lang/pl_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_nav_edit.lng
@@ -1,7 +1,6 @@
-<?php
-$wb["title_txt"] = 'Tytuł';
-$wb["header_txt"] = 'Paramtery nawigacyjne';
-$wb["save_txt"] = 'Zapisz';
-$wb["cancel_txt"] = 'Usuń';
-?>
-
+<?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
index a08a60e..779b3b4 100644
--- a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
@@ -1,9 +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ń';
-?>
-
+<?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
index 060ebbe..9b98c49 100644
--- a/interface/web/designer/lib/lang/pl_module_show.lng
+++ b/interface/web/designer/lib/lang/pl_module_show.lng
@@ -1,18 +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["delete_txt"] = 'Usuń';
-$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?";
-?>
-
+<?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_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/lib/lang/br.lng b/interface/web/dns/lib/lang/br.lng
index 88ac863..4d815a6 100644
--- a/interface/web/dns/lib/lang/br.lng
+++ b/interface/web/dns/lib/lang/br.lng
@@ -15,4 +15,3 @@
 $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 41fb94a..137af7c 100644
--- a/interface/web/dns/lib/lang/br_dns_a.lng
+++ b/interface/web/dns/lib/lang/br_dns_a.lng
@@ -14,4 +14,3 @@
 $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 8436bae..b231c83 100644
--- a/interface/web/dns/lib/lang/br_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/br_dns_a_list.lng
@@ -12,4 +12,3 @@
 $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 9ce9a54..918b855 100644
--- a/interface/web/dns/lib/lang/br_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/br_dns_aaaa.lng
@@ -13,4 +13,3 @@
 $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 5b60d3a..d026ddf 100644
--- a/interface/web/dns/lib/lang/br_dns_alias.lng
+++ b/interface/web/dns/lib/lang/br_dns_alias.lng
@@ -13,4 +13,3 @@
 $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 9a72ba8..881cb63 100644
--- a/interface/web/dns/lib/lang/br_dns_cname.lng
+++ b/interface/web/dns/lib/lang/br_dns_cname.lng
@@ -13,4 +13,3 @@
 $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 2fe82da..ac6e13b 100644
--- a/interface/web/dns/lib/lang/br_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/br_dns_hinfo.lng
@@ -13,4 +13,3 @@
 $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 966eb04..0dfd536 100644
--- a/interface/web/dns/lib/lang/br_dns_mx.lng
+++ b/interface/web/dns/lib/lang/br_dns_mx.lng
@@ -14,4 +14,3 @@
 $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 f2caae1..ef9966f 100644
--- a/interface/web/dns/lib/lang/br_dns_ns.lng
+++ b/interface/web/dns/lib/lang/br_dns_ns.lng
@@ -13,4 +13,3 @@
 $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 a4fdfc1..728ea07 100644
--- a/interface/web/dns/lib/lang/br_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/br_dns_ptr.lng
@@ -13,4 +13,3 @@
 $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 fcf021e..d185470 100644
--- a/interface/web/dns/lib/lang/br_dns_rp.lng
+++ b/interface/web/dns/lib/lang/br_dns_rp.lng
@@ -13,4 +13,3 @@
 $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 089dae6..3b46c6b 100644
--- a/interface/web/dns/lib/lang/br_dns_soa.lng
+++ b/interface/web/dns/lib/lang/br_dns_soa.lng
@@ -22,4 +22,3 @@
 $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 0533882..ef0c93f 100644
--- a/interface/web/dns/lib/lang/br_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/br_dns_soa_list.lng
@@ -7,4 +7,3 @@
 $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 3f657c5..406f468 100644
--- a/interface/web/dns/lib/lang/br_dns_srv.lng
+++ b/interface/web/dns/lib/lang/br_dns_srv.lng
@@ -13,4 +13,3 @@
 $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 c4810ec..9d7331b 100644
--- a/interface/web/dns/lib/lang/br_dns_template.lng
+++ b/interface/web/dns/lib/lang/br_dns_template.lng
@@ -4,4 +4,3 @@
 $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 ae5bc25..a4602ae 100644
--- a/interface/web/dns/lib/lang/br_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/br_dns_template_list.lng
@@ -4,4 +4,3 @@
 $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 664fd2f..f73ada3 100644
--- a/interface/web/dns/lib/lang/br_dns_txt.lng
+++ b/interface/web/dns/lib/lang/br_dns_txt.lng
@@ -13,4 +13,3 @@
 $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 2d72f0b..84ea73c 100644
--- a/interface/web/dns/lib/lang/br_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/br_dns_wizard.lng
@@ -23,4 +23,3 @@
 $wb['error_ns2_empty'] = 'NS2 vazio.';
 $wb['error_email_empty'] = 'Correio vazio.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng
index 76072fb..406bb86 100644
--- a/interface/web/dns/lib/lang/de.lng
+++ b/interface/web/dns/lib/lang/de.lng
@@ -1,18 +1,17 @@
-<?php
-$wb['DNS'] = 'DNS';
-$wb['Zones'] = 'Zonen';
-$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'] = 'Einträge';
-$wb['DNS SRV'] = 'DNS SRV';
-$wb['DNS TXT Record'] = 'DNS TXT Eintrag';
-$wb['DNS TXT'] = 'DNS TXT';
-?>
-
+<?php
+$wb['DNS'] = 'DNS';
+$wb['Zones'] = 'Zonen';
+$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'] = 'Einträge';
+$wb['DNS SRV'] = 'DNS SRV';
+$wb['DNS TXT Record'] = 'DNS TXT Eintrag';
+$wb['DNS TXT'] = 'DNS TXT';
+?>
diff --git a/interface/web/dns/lib/lang/de_dns_a.lng b/interface/web/dns/lib/lang/de_dns_a.lng
index bc95c5f..ea6d021 100644
--- a/interface/web/dns/lib/lang/de_dns_a.lng
+++ b/interface/web/dns/lib/lang/de_dns_a.lng
@@ -1,17 +1,16 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'IP Adresse';
-$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'] = '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'] = 'Doppelter A-Eintrag';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'IP Adresse';
+$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'] = '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'] = '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 6710005..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,15 +1,14 @@
-<?php
-$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'] = '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?';
-?>
-
+<?php
+$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'] = '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 46d78cb..768e670 100644
--- a/interface/web/dns/lib/lang/de_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/de_dns_aaaa.lng
@@ -1,16 +1,15 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'IPv6-Adresse';
-$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'] = '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';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'IPv6-Adresse';
+$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'] = '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 c833fd7..9475644 100644
--- a/interface/web/dns/lib/lang/de_dns_alias.lng
+++ b/interface/web/dns/lib/lang/de_dns_alias.lng
@@ -1,16 +1,15 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Ziel Hostname';
-$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'] = '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';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Ziel Hostname';
+$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'] = '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 848900a..4c3d5a0 100644
--- a/interface/web/dns/lib/lang/de_dns_cname.lng
+++ b/interface/web/dns/lib/lang/de_dns_cname.lng
@@ -1,16 +1,15 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Ziel Hostname';
-$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'] = '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';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Ziel Hostname';
+$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'] = '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 c5dae16..245480f 100644
--- a/interface/web/dns/lib/lang/de_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/de_dns_hinfo.lng
@@ -1,16 +1,15 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Host Information';
-$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'] = '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';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Host Information';
+$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'] = '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 f08da50..ab21cc4 100644
--- a/interface/web/dns/lib/lang/de_dns_mx.lng
+++ b/interface/web/dns/lib/lang/de_dns_mx.lng
@@ -1,17 +1,16 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Mailserver Hostname';
-$wb['aux_txt'] = 'Priorität';
-$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'] = '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';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Mailserver Hostname';
+$wb['aux_txt'] = 'Priorität';
+$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'] = '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 7cb6c99..845da9d 100644
--- a/interface/web/dns/lib/lang/de_dns_ns.lng
+++ b/interface/web/dns/lib/lang/de_dns_ns.lng
@@ -1,16 +1,15 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Zone';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Nameserver Hostname';
-$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'] = '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';
-$wb['data_error_regex'] = 'Nameserver Format ist ungültig';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Zone';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Nameserver Hostname';
+$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'] = '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';
+$wb['data_error_regex'] = 'Nameserver Format ist ungültig';
+?>
diff --git a/interface/web/dns/lib/lang/de_dns_ptr.lng b/interface/web/dns/lib/lang/de_dns_ptr.lng
index bf37a58..78b289f 100644
--- a/interface/web/dns/lib/lang/de_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/de_dns_ptr.lng
@@ -1,16 +1,15 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Name';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Kanonischer Hostname';
-$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'] = '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';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Name';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Kanonischer Hostname';
+$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'] = '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 738162f..86f3fc0 100644
--- a/interface/web/dns/lib/lang/de_dns_rp.lng
+++ b/interface/web/dns/lib/lang/de_dns_rp.lng
@@ -1,16 +1,15 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Kontaktperson';
-$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'] = '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';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Kontaktperson';
+$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'] = '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 cf26266..16b7f5e 100644
--- a/interface/web/dns/lib/lang/de_dns_soa.lng
+++ b/interface/web/dns/lib/lang/de_dns_soa.lng
@@ -1,25 +1,24 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'Zone (SOA)';
-$wb['ns_txt'] = 'NS';
-$wb['mbox_txt'] = 'Email';
-$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'] = '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.';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['origin_txt'] = 'Zone (SOA)';
+$wb['ns_txt'] = 'NS';
+$wb['mbox_txt'] = 'Email';
+$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'] = '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 11a8491..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,10 +1,9 @@
-<?php
-$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'] = 'Neue DNS Zone (SOA) hinzufügen';
-?>
-
+<?php
+$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'] = '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 e0fd2ff..2ce5968 100644
--- a/interface/web/dns/lib/lang/de_dns_srv.lng
+++ b/interface/web/dns/lib/lang/de_dns_srv.lng
@@ -1,16 +1,15 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Servereintrag';
-$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'] = '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'] = 'Servereintrag ist leer';
-$wb['data_error_regex'] = 'Servereintrag Format ungültig';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Servereintrag';
+$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'] = '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'] = 'Servereintrag ist leer';
+$wb['data_error_regex'] = 'Servereintrag Format ungültig';
+?>
diff --git a/interface/web/dns/lib/lang/de_dns_template.lng b/interface/web/dns/lib/lang/de_dns_template.lng
index 753b890..33d1090 100644
--- a/interface/web/dns/lib/lang/de_dns_template.lng
+++ b/interface/web/dns/lib/lang/de_dns_template.lng
@@ -1,7 +1,6 @@
-<?php
-$wb['name_txt'] = 'Name';
-$wb['fields_txt'] = 'Felder';
-$wb['template_txt'] = 'Vorlage';
-$wb['visible_txt'] = 'Sichtbar';
-?>
-
+<?php
+$wb['name_txt'] = 'Name';
+$wb['fields_txt'] = 'Felder';
+$wb['template_txt'] = 'Vorlage';
+$wb['visible_txt'] = 'Sichtbar';
+?>
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 dd92dca..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,7 +1,6 @@
-<?php
-$wb['list_head_txt'] = 'DNS Wizard Vorlage';
-$wb['visible_txt'] = 'Sichtbar';
-$wb['name_txt'] = 'Name';
-$wb['add_new_record_txt'] = 'Neuen Eintrag hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'DNS Wizard Vorlage';
+$wb['visible_txt'] = 'Sichtbar';
+$wb['name_txt'] = 'Name';
+$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 fea254f..182e994 100644
--- a/interface/web/dns/lib/lang/de_dns_txt.lng
+++ b/interface/web/dns/lib/lang/de_dns_txt.lng
@@ -1,16 +1,15 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Text';
-$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'] = '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';
-$wb['data_error_regex'] = 'Textformat ungültig';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'Typ';
+$wb['data_txt'] = 'Text';
+$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'] = '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';
+$wb['data_error_regex'] = 'Textformat ungültig';
+?>
diff --git a/interface/web/dns/lib/lang/de_dns_wizard.lng b/interface/web/dns/lib/lang/de_dns_wizard.lng
index 14b39a7..b2eb9a0 100644
--- a/interface/web/dns/lib/lang/de_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/de_dns_wizard.lng
@@ -1,26 +1,25 @@
-<?php
-$wb['template_id_txt'] = 'Vorlage';
-$wb['server_id_txt'] = 'Server';
-$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 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.';
-?>
-
+<?php
+$wb['template_id_txt'] = 'Vorlage';
+$wb['server_id_txt'] = 'Server';
+$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 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/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_dns_aaaa.lng b/interface/web/dns/lib/lang/nl_dns_aaaa.lng
index c56d558..31ef0da 100644
--- a/interface/web/dns/lib/lang/nl_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/nl_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/pl.lng b/interface/web/dns/lib/lang/pl.lng
index ad34f6d..de0d46d 100644
--- a/interface/web/dns/lib/lang/pl.lng
+++ b/interface/web/dns/lib/lang/pl.lng
@@ -1,20 +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';
-
-?>
-
+<?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
index a7b709e..5742c40 100644
--- a/interface/web/dns/lib/lang/pl_dns_a.lng
+++ b/interface/web/dns/lib/lang/pl_dns_a.lng
@@ -1,17 +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';
-?>
-
+<?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
index d3223ab..3d0db05 100644
--- a/interface/web/dns/lib/lang/pl_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_a_list.lng
@@ -1,15 +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?';
-?>
-
+<?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
index 23ec99f..983fae1 100644
--- a/interface/web/dns/lib/lang/pl_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_aaaa.lng
@@ -1,16 +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';
-?>
-
+<?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
index 5a7c981..a950805 100644
--- a/interface/web/dns/lib/lang/pl_dns_alias.lng
+++ b/interface/web/dns/lib/lang/pl_dns_alias.lng
@@ -1,16 +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.';
-?>
-
+<?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
index 2399096..92cb4ac 100644
--- a/interface/web/dns/lib/lang/pl_dns_cname.lng
+++ b/interface/web/dns/lib/lang/pl_dns_cname.lng
@@ -1,16 +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';
-?>
-
+<?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
index bf95456..53b6da2 100644
--- a/interface/web/dns/lib/lang/pl_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/pl_dns_hinfo.lng
@@ -1,16 +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';
-?>
-
+<?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
index 5a3f0c7..f8a6c0f 100644
--- a/interface/web/dns/lib/lang/pl_dns_mx.lng
+++ b/interface/web/dns/lib/lang/pl_dns_mx.lng
@@ -1,17 +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.';
-?>
-
+<?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
index 3347cf4..18d7efd 100644
--- a/interface/web/dns/lib/lang/pl_dns_ns.lng
+++ b/interface/web/dns/lib/lang/pl_dns_ns.lng
@@ -1,16 +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.';
-?>
-
+<?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
index 87418e2..eae3981 100644
--- a/interface/web/dns/lib/lang/pl_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/pl_dns_ptr.lng
@@ -1,16 +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';
-?>
-
+<?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
index f4639d0..d38efd1 100644
--- a/interface/web/dns/lib/lang/pl_dns_rp.lng
+++ b/interface/web/dns/lib/lang/pl_dns_rp.lng
@@ -1,16 +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';
-?>
-
+<?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
index 1048799..ce00327 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa.lng
@@ -1,25 +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.';
-?>
-
+<?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
index edbbce2..126209e 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
@@ -1,10 +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)';
-?>
-
+<?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
index 0053cf9..80661b5 100644
--- a/interface/web/dns/lib/lang/pl_dns_srv.lng
+++ b/interface/web/dns/lib/lang/pl_dns_srv.lng
@@ -1,16 +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';
-?>
-
+<?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
index 42ef5f5..f3e7563 100644
--- a/interface/web/dns/lib/lang/pl_dns_template.lng
+++ b/interface/web/dns/lib/lang/pl_dns_template.lng
@@ -1,7 +1,6 @@
-<?php
-$wb["name_txt"] = 'Nazwa';
-$wb["fields_txt"] = 'Pola';
-$wb["template_txt"] = 'Szablon';
-$wb["visible_txt"] = 'Widoczność';
-?>
-
+<?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
index c5c22e2..7deac3b 100644
--- a/interface/web/dns/lib/lang/pl_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_template_list.lng
@@ -1,7 +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';
-?>
-
+<?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
index 8eac8f4..628d5c0 100644
--- a/interface/web/dns/lib/lang/pl_dns_txt.lng
+++ b/interface/web/dns/lib/lang/pl_dns_txt.lng
@@ -1,16 +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';
-?>
-
+<?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
index 304c89f..f2da42a 100644
--- a/interface/web/dns/lib/lang/pl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng
@@ -1,28 +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.';
-
-?>
-
+<?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/br.lng b/interface/web/help/lib/lang/br.lng
index 0fc39c4..ab0a1a4 100644
--- a/interface/web/help/lib/lang/br.lng
+++ b/interface/web/help/lib/lang/br.lng
@@ -5,4 +5,3 @@
 $wb['View messages'] = 'Ver Mensagem';
 $wb['Support'] = 'Suporte';
 ?>
-
diff --git a/interface/web/help/lib/lang/br_support_message.lng b/interface/web/help/lib/lang/br_support_message.lng
index ce48ca9..99dcf30 100644
--- a/interface/web/help/lib/lang/br_support_message.lng
+++ b/interface/web/help/lib/lang/br_support_message.lng
@@ -5,4 +5,3 @@
 $wb['message_txt'] = 'Mensagem';
 $wb['tstamp_txt'] = 'Data';
 ?>
-
diff --git a/interface/web/help/lib/lang/br_support_message_list.lng b/interface/web/help/lib/lang/br_support_message_list.lng
index ffd7d85..d5ba958 100644
--- a/interface/web/help/lib/lang/br_support_message_list.lng
+++ b/interface/web/help/lib/lang/br_support_message_list.lng
@@ -4,4 +4,3 @@
 $wb['subject_txt'] = 'Assunto';
 $wb['add_new_record_txt'] = 'Crie uma nova mensagem de suporte';
 ?>
-
diff --git a/interface/web/help/lib/lang/de.lng b/interface/web/help/lib/lang/de.lng
index 826a5a3..0ceb0de 100644
--- a/interface/web/help/lib/lang/de.lng
+++ b/interface/web/help/lib/lang/de.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['Support Message'] = 'Supportnachricht';
-$wb['Message'] = 'Nachricht';
-$wb['Send message'] = 'Nachricht senden';
-$wb['View messages'] = 'Nachricht ansehen';
-$wb['Support'] = 'Support';
-?>
-
+<?php
+$wb['Support Message'] = 'Supportnachricht';
+$wb['Message'] = 'Nachricht';
+$wb['Send message'] = 'Nachricht senden';
+$wb['View messages'] = 'Nachricht ansehen';
+$wb['Support'] = 'Support';
+?>
diff --git a/interface/web/help/lib/lang/de_support_message.lng b/interface/web/help/lib/lang/de_support_message.lng
index 6da2476..b026b17 100644
--- a/interface/web/help/lib/lang/de_support_message.lng
+++ b/interface/web/help/lib/lang/de_support_message.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['recipient_id_txt'] = 'Empfänger ID';
-$wb['sender_id_txt'] = 'Absender ID';
-$wb['subject_txt'] = 'Betreff';
-$wb['message_txt'] = 'Nachricht';
-$wb['tstamp_txt'] = 'Zeitpunkt';
-?>
-
+<?php
+$wb['recipient_id_txt'] = 'Empfänger ID';
+$wb['sender_id_txt'] = 'Absender ID';
+$wb['subject_txt'] = 'Betreff';
+$wb['message_txt'] = 'Nachricht';
+$wb['tstamp_txt'] = 'Zeitpunkt';
+?>
diff --git a/interface/web/help/lib/lang/de_support_message_list.lng b/interface/web/help/lib/lang/de_support_message_list.lng
index 7e822c5..7273475 100644
--- a/interface/web/help/lib/lang/de_support_message_list.lng
+++ b/interface/web/help/lib/lang/de_support_message_list.lng
@@ -1,7 +1,6 @@
-<?php
-$wb['list_head_txt'] = 'Supportnachricht';
-$wb['sender_id_txt'] = 'Absender';
-$wb['subject_txt'] = 'Betreff';
-$wb['add_new_record_txt'] = 'Neue Supportnachricht erstellen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Supportnachricht';
+$wb['sender_id_txt'] = 'Absender';
+$wb['subject_txt'] = 'Betreff';
+$wb['add_new_record_txt'] = 'Neue Supportnachricht erstellen';
+?>
diff --git a/interface/web/help/lib/lang/pl.lng b/interface/web/help/lib/lang/pl.lng
index 8e7811c..b45521b 100644
--- a/interface/web/help/lib/lang/pl.lng
+++ b/interface/web/help/lib/lang/pl.lng
@@ -1,10 +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';
-
-?>
-
-
+<?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
index cc32349..b21539a 100644
--- a/interface/web/help/lib/lang/pl_support_message.lng
+++ b/interface/web/help/lib/lang/pl_support_message.lng
@@ -1,9 +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';
-?>
-
-
+<?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
index a954607..4b87a82 100644
--- a/interface/web/help/lib/lang/pl_support_message_list.lng
+++ b/interface/web/help/lib/lang/pl_support_message_list.lng
@@ -1,7 +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';
-?>
-
+<?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/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..c518215 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,11 @@
 $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'] = '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/de.lng b/interface/web/login/lib/lang/de.lng
index d0c232f..fb0f19e 100644
--- a/interface/web/login/lib/lang/de.lng
+++ b/interface/web/login/lib/lang/de.lng
@@ -1,15 +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'] = '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'] = 'Benutzername beinhaltet nicht erlaubte Zeichen oder ist länger als 64 Zeichen.';
-$wb['pw_error_length'] = 'Die Passwortlänge ist > 64 Zeichen.';
-?>
-
+<?php
+$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'] = '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'] = '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/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..01eff93 100644
--- a/interface/web/login/lib/lang/nl.lng
+++ b/interface/web/login/lib/lang/nl.lng
@@ -1,8 +1,4 @@
 <?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.';
@@ -11,4 +7,11 @@
 $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['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/pl.lng b/interface/web/login/lib/lang/pl.lng
index b150331..52f31b6 100644
--- a/interface/web/login/lib/lang/pl.lng
+++ b/interface/web/login/lib/lang/pl.lng
@@ -1,19 +1,17 @@
-<?php
-
-$wb[1001]	= "Nazwa użytkownika lub hasło są puste.";
-$wb[1002]	= "Nazwa użytkownika lub hasło są niepoprawne.";
-$wb[1003]	= "Za dużo błednych logowań. Proszę spróbować za 15 minut.";
-$wb[1004]	= "To many wrong login's, Please retry it after 15 minutes";
-$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.';
-
-?>
-
+<?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/lib/lang/br.lng b/interface/web/mail/lib/lang/br.lng
index 3e3a7b0..11b00f6 100644
--- a/interface/web/mail/lib/lang/br.lng
+++ b/interface/web/mail/lib/lang/br.lng
@@ -43,4 +43,3 @@
 $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 8e65298..b3b08e3 100644
--- a/interface/web/mail/lib/lang/br_mail_alias.lng
+++ b/interface/web/mail/lib/lang/br_mail_alias.lng
@@ -9,4 +9,3 @@
 $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 9f508c9..0a44ea4 100644
--- a/interface/web/mail/lib/lang/br_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_alias_list.lng
@@ -6,4 +6,3 @@
 $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 c1113d4..6d2cdb2 100644
--- a/interface/web/mail/lib/lang/br_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/br_mail_blacklist.lng
@@ -7,4 +7,3 @@
 $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 d953286..9395a2c 100644
--- a/interface/web/mail/lib/lang/br_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_blacklist_list.lng
@@ -8,4 +8,3 @@
 $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 d328098..d5cda47 100644
--- a/interface/web/mail/lib/lang/br_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/br_mail_content_filter.lng
@@ -7,4 +7,3 @@
 $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 5cff970..c3a616e 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
@@ -6,4 +6,3 @@
 $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.lng b/interface/web/mail/lib/lang/br_mail_domain.lng
index c8ee61f..a1cab1c 100644
--- a/interface/web/mail/lib/lang/br_mail_domain.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain.lng
@@ -11,4 +11,3 @@
 $wb['policy_txt'] = 'Filtro Anti-Spam';
 $wb['no_policy'] = '- desativado -';
 ?>
-
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 e3ab3b1..1b794de 100644
--- a/interface/web/mail/lib/lang/br_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain_catchall.lng
@@ -7,4 +7,3 @@
 $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 b856152..c4d5481 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
@@ -7,4 +7,3 @@
 $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 f679387..2afb7db 100644
--- a/interface/web/mail/lib/lang/br_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain_list.lng
@@ -5,4 +5,3 @@
 $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 34f25cc..1dab622 100644
--- a/interface/web/mail/lib/lang/br_mail_forward.lng
+++ b/interface/web/mail/lib/lang/br_mail_forward.lng
@@ -5,4 +5,3 @@
 $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 73ba4dd..f9f7ce4 100644
--- a/interface/web/mail/lib/lang/br_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_forward_list.lng
@@ -6,4 +6,3 @@
 $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 c47427b..eb03318 100644
--- a/interface/web/mail/lib/lang/br_mail_get.lng
+++ b/interface/web/mail/lib/lang/br_mail_get.lng
@@ -13,4 +13,3 @@
 $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 d5b1802..9eaf45b 100644
--- a/interface/web/mail/lib/lang/br_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_get_list.lng
@@ -7,4 +7,3 @@
 $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 f85244b..7f8a336 100644
--- a/interface/web/mail/lib/lang/br_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/br_mail_spamfilter.lng
@@ -15,4 +15,3 @@
 $wb['spam_redirect_maildir_purge_txt'] = 'Remover Maildir depois';
 $wb['days_txt'] = 'Dias.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/br_mail_spamfilter_list.lng
index 00b8daf..9b549a9 100644
--- a/interface/web/mail/lib/lang/br_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_spamfilter_list.lng
@@ -6,4 +6,3 @@
 $wb['email_txt'] = 'Correio';
 $wb['add_new_record_txt'] = 'Adcionar novo filtro anti-spam';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_transport.lng b/interface/web/mail/lib/lang/br_mail_transport.lng
index 96ed4ec..51df05d 100644
--- a/interface/web/mail/lib/lang/br_mail_transport.lng
+++ b/interface/web/mail/lib/lang/br_mail_transport.lng
@@ -8,4 +8,3 @@
 $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 20bae01..4c67280 100644
--- a/interface/web/mail/lib/lang/br_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_transport_list.lng
@@ -7,4 +7,3 @@
 $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 3c70396..1999766 100644
--- a/interface/web/mail/lib/lang/br_mail_user.lng
+++ b/interface/web/mail/lib/lang/br_mail_user.lng
@@ -29,4 +29,3 @@
 $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 bfd04d0..d739a15 100644
--- a/interface/web/mail/lib/lang/br_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/br_mail_user_filter.lng
@@ -7,4 +7,3 @@
 $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 62c4d8f..847d72c 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
@@ -5,4 +5,3 @@
 $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 f6d1b41..64f8763 100644
--- a/interface/web/mail/lib/lang/br_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_user_list.lng
@@ -4,4 +4,3 @@
 $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 bb8a6a4..0457c2d 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
@@ -6,4 +6,3 @@
 $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 3df3e36..15db38f 100644
--- a/interface/web/mail/lib/lang/br_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/br_mail_whitelist.lng
@@ -7,4 +7,3 @@
 $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 b5fc640..bd84205 100644
--- a/interface/web/mail/lib/lang/br_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_whitelist_list.lng
@@ -8,4 +8,3 @@
 $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 3da9b50..c282bea 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_blacklist.lng
@@ -7,4 +7,3 @@
 $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 bc114d0..8190653 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_blacklist_list.lng
@@ -7,4 +7,3 @@
 $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.lng b/interface/web/mail/lib/lang/br_spamfilter_config.lng
index 23ffae1..30d0138 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_config.lng
@@ -18,4 +18,3 @@
 $wb['mailbox_size_limit_txt'] = 'Tamanho Caixa de Correio';
 $wb['message_size_limit_txt'] = 'Tamanho da Mensagem';
 ?>
-
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 9857bc7..345903f 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_config_list.lng
@@ -3,4 +3,3 @@
 $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 09f80be..1d0ab9c 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_policy.lng
@@ -36,4 +36,3 @@
 $wb['message_size_limit_txt'] = 'Tamanho limite da mensagem';
 $wb['banned_rulenames_txt'] = 'Banned rulenames';
 ?>
-
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 b2a2b41..002579a 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_policy_list.lng
@@ -7,4 +7,3 @@
 $wb['bad_header_lover_txt'] = 'Bad Header lover';
 $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 aa8eea9..4515009 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_users.lng
@@ -6,4 +6,3 @@
 $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 227b460..1fe408e 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_users_list.lng
@@ -8,4 +8,3 @@
 $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 08c9dcb..951c3f4 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_whitelist.lng
@@ -7,4 +7,3 @@
 $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 e213816..4420bca 100644
--- a/interface/web/mail/lib/lang/br_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/br_spamfilter_whitelist_list.lng
@@ -7,4 +7,3 @@
 $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 d8021df..0cda918 100644
--- a/interface/web/mail/lib/lang/de.lng
+++ b/interface/web/mail/lib/lang/de.lng
@@ -1,46 +1,45 @@
-<?php
-$wb['Email Alias'] = 'Email Alias';
-$wb['Email Blacklist'] = 'Email Blacklist';
-$wb['Blacklist'] = 'Blacklist';
-$wb['Mail Content Filter'] = 'Mail Inhaltsfilter';
-$wb['Filter'] = 'Filter';
-$wb['Mail Domain'] = 'Mail Domain';
-$wb['Domain'] = 'Domain';
-$wb['Email Catchall'] = 'Email Catchall';
-$wb['Email Forward'] = 'Email Weiterleitung';
-$wb['Get Email'] = 'Get Email';
-$wb['Spamfilter'] = 'Spamfilter';
-$wb['Email Routing'] = 'Email Routing';
-$wb['Email transport'] = 'Email Transport';
-$wb['Mailbox'] = 'Mailbox';
-$wb['Autoresponder'] = 'Autoresponder';
-$wb['Mail Filter'] = 'Mail Filter';
-$wb['Custom Rules'] = 'eigene Regeln';
-$wb['Email filter'] = 'Email Filter';
-$wb['Email Whitelist'] = 'Email Whitelist';
-$wb['Whitelist'] = 'Whitelist';
-$wb['Spamfilter blacklist'] = 'Spamfilter Blacklist';
-$wb['Spamfilter Config'] = 'Spamfilter Konfiguration';
-$wb['Server'] = 'Server';
-$wb['Spamfilter policy'] = 'Spamfilter Richtlinie';
-$wb['Policy'] = 'Richtlinie';
-$wb['Quarantine'] = 'Quarantäne';
-$wb['Tag-Level'] = 'Tag-Level';
-$wb['Other'] = 'Andere';
-$wb['Spamfilter users'] = 'Spamfilter Benutzer';
-$wb['Users'] = 'Benutzer';
-$wb['Spamfilter Whitelist'] = 'Spamfilter Whitelist';
-$wb['Email'] = 'Email';
-$wb['Email Mailbox'] = 'Email Mailbox';
-$wb['Email Accounts'] = 'Email Konten';
-$wb['User / Domain'] = 'Benutzer / Domain';
-$wb['Server Settings'] = 'Servereinstellungen';
-$wb['Fetchmail'] = 'Fetchmail';
-$wb['Mailbox traffic'] = 'Mailbox Datenverkehr';
-$wb['Statistics'] = 'Statistiken';
-$wb['Postfix Whitelist'] = 'Postfix Whitelist';
-$wb['Postfix Blacklist'] = 'Postfix Blacklist';
-$wb['Content Filter'] = 'Inhaltsfilter';
-$wb['Global Filters'] = 'globale Filter';
-?>
-
+<?php
+$wb['Email Alias'] = 'Email Alias';
+$wb['Email Blacklist'] = 'Email Blacklist';
+$wb['Blacklist'] = 'Blacklist';
+$wb['Mail Content Filter'] = 'Mail Inhaltsfilter';
+$wb['Filter'] = 'Filter';
+$wb['Mail Domain'] = 'Mail Domain';
+$wb['Domain'] = 'Domain';
+$wb['Email Catchall'] = 'Email Catchall';
+$wb['Email Forward'] = 'Email Weiterleitung';
+$wb['Get Email'] = 'Get Email';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Routing'] = 'Email Routing';
+$wb['Email transport'] = 'Email Transport';
+$wb['Mailbox'] = 'Mailbox';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Mail Filter'] = 'Mail Filter';
+$wb['Custom Rules'] = 'eigene Regeln';
+$wb['Email filter'] = 'Email Filter';
+$wb['Email Whitelist'] = 'Email Whitelist';
+$wb['Whitelist'] = 'Whitelist';
+$wb['Spamfilter blacklist'] = 'Spamfilter Blacklist';
+$wb['Spamfilter Config'] = 'Spamfilter Konfiguration';
+$wb['Server'] = 'Server';
+$wb['Spamfilter policy'] = 'Spamfilter Richtlinie';
+$wb['Policy'] = 'Richtlinie';
+$wb['Quarantine'] = 'Quarantäne';
+$wb['Tag-Level'] = 'Tag-Level';
+$wb['Other'] = 'Andere';
+$wb['Spamfilter users'] = 'Spamfilter Benutzer';
+$wb['Users'] = 'Benutzer';
+$wb['Spamfilter Whitelist'] = 'Spamfilter Whitelist';
+$wb['Email'] = 'Email';
+$wb['Email Mailbox'] = 'Email Mailbox';
+$wb['Email Accounts'] = 'Email Konten';
+$wb['User / Domain'] = 'Benutzer / Domain';
+$wb['Server Settings'] = 'Servereinstellungen';
+$wb['Fetchmail'] = 'Fetchmail';
+$wb['Mailbox traffic'] = 'Mailbox Datenverkehr';
+$wb['Statistics'] = 'Statistiken';
+$wb['Postfix Whitelist'] = 'Postfix Whitelist';
+$wb['Postfix Blacklist'] = 'Postfix Blacklist';
+$wb['Content Filter'] = 'Inhaltsfilter';
+$wb['Global Filters'] = 'globale Filter';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_alias.lng b/interface/web/mail/lib/lang/de_mail_alias.lng
index 6f629da..f9112df 100644
--- a/interface/web/mail/lib/lang/de_mail_alias.lng
+++ b/interface/web/mail/lib/lang/de_mail_alias.lng
@@ -1,12 +1,11 @@
-<?php
-$wb['email_txt'] = 'Emailadresse';
-$wb['destination_txt'] = 'Ziel';
-$wb['active_txt'] = 'Aktiv';
-$wb['email_error_isemail'] = 'Emailadresse ist ungültig';
-$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'] = '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';
-?>
-
+<?php
+$wb['email_txt'] = 'Emailadresse';
+$wb['destination_txt'] = 'Ziel';
+$wb['active_txt'] = 'Aktiv';
+$wb['email_error_isemail'] = 'Emailadresse ist ungültig';
+$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'] = '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 74bbc91..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,9 +1,8 @@
-<?php
-$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'] = 'Neuen Email Alias hinzufügen';
-?>
-
+<?php
+$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'] = '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 fc7b99e..75b20e2 100644
--- a/interface/web/mail/lib/lang/de_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/de_mail_blacklist.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['source_txt'] = 'Blacklist Adresse';
-$wb['recipient_txt'] = 'Empfänger';
-$wb['active_txt'] = 'Aktiv';
-$wb['source_error_notempty'] = 'Adresse ist leer.';
-$wb['type_txt'] = 'Typ';
-$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an Emailfilter für ihr Konto wurde erreicht.';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['source_txt'] = 'Blacklist Adresse';
+$wb['recipient_txt'] = 'Empfänger';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_error_notempty'] = 'Adresse ist leer.';
+$wb['type_txt'] = 'Typ';
+$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_blacklist_list.lng b/interface/web/mail/lib/lang/de_mail_blacklist_list.lng
index d5e0bc3..276d3a6 100644
--- a/interface/web/mail/lib/lang/de_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_blacklist_list.lng
@@ -1,11 +1,10 @@
-<?php
-$wb['list_head_txt'] = 'Email Blacklist';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['source_txt'] = 'Blacklisted Adresse';
-$wb['type_txt'] = 'Typ';
-$wb['recipient_txt'] = 'Empfänger';
-$wb['add_new_record_txt'] = 'Neuen Blacklisteintrag hinzufügen';
-$wb['access_txt'] = 'Zugriff';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Email Blacklist';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['source_txt'] = 'Blacklisted Adresse';
+$wb['type_txt'] = 'Typ';
+$wb['recipient_txt'] = 'Empfänger';
+$wb['add_new_record_txt'] = 'Neuen Blacklisteintrag hinzufügen';
+$wb['access_txt'] = 'Zugriff';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_content_filter.lng b/interface/web/mail/lib/lang/de_mail_content_filter.lng
index 804ea95..9ea5422 100644
--- a/interface/web/mail/lib/lang/de_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/de_mail_content_filter.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['type_txt'] = 'Filter';
-$wb['pattern_txt'] = 'Regexp. Pattern';
-$wb['data_txt'] = 'Daten';
-$wb['action_txt'] = 'Aktion';
-$wb['active_txt'] = 'Aktiv';
-$wb['pattern_error_empty'] = 'Zeichenkette ist leer';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['type_txt'] = 'Filter';
+$wb['pattern_txt'] = 'Regexp. Pattern';
+$wb['data_txt'] = 'Daten';
+$wb['action_txt'] = 'Aktion';
+$wb['active_txt'] = 'Aktiv';
+$wb['pattern_error_empty'] = 'Zeichenkette ist leer';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_content_filter_list.lng b/interface/web/mail/lib/lang/de_mail_content_filter_list.lng
index 0d7e78f..126f23c 100644
--- a/interface/web/mail/lib/lang/de_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_content_filter_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Postfix Header und Body Checks';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['pattern_txt'] = 'Zeichenkette';
-$wb['action_txt'] = 'Aktion';
-$wb['add_new_record_txt'] = 'Neuen Inhaltsfilter hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Postfix Header und Body Checks';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['pattern_txt'] = 'Zeichenkette';
+$wb['action_txt'] = 'Aktion';
+$wb['add_new_record_txt'] = 'Neuen Inhaltsfilter hinzufügen';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng
index bfceec5..e1cf325 100644
--- a/interface/web/mail/lib/lang/de_mail_domain.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain.lng
@@ -1,14 +1,13 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Typ';
-$wb['active_txt'] = 'Aktiv';
-$wb['domain_error_empty'] = 'Domain ist leer';
-$wb['domain_error_unique'] = 'Doppelte Domain.';
-$wb['domain_error_regex'] = 'Ungültiger Domainname.';
-$wb['client_txt'] = 'Kunde';
-$wb['limit_maildomain_txt'] = 'Die maximale Anzahl an Emaildomains für ihr Konto wurde erreicht.';
-$wb['policy_txt'] = 'Spamfilter';
-$wb['no_policy'] = '- nicht aktiviert -';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Typ';
+$wb['active_txt'] = 'Aktiv';
+$wb['domain_error_empty'] = 'Domain ist leer';
+$wb['domain_error_unique'] = 'Doppelte Domain.';
+$wb['domain_error_regex'] = 'Ungültiger Domainname.';
+$wb['client_txt'] = 'Kunde';
+$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 8869562..d67fa10 100644
--- a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['domain_txt'] = 'Domain';
-$wb['destination_txt'] = 'Ziel';
-$wb['active_txt'] = 'Aktiv';
-$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 maximale Anzahl an Catchall Einträgen für ihr Konto wurde erreicht.';
-?>
-
+<?php
+$wb['domain_txt'] = 'Domain';
+$wb['destination_txt'] = 'Ziel';
+$wb['active_txt'] = 'Aktiv';
+$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 maximale Anzahl an Catchall Einträgen für ihr Konto wurde erreicht.';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng
index 261dc11..2c5763f 100644
--- a/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['list_head_txt'] = 'Email Catchall';
-$wb['active_txt'] = 'Aktiv';
-$wb['source_txt'] = 'Quelle';
-$wb['destination_txt'] = 'Ziel Emailadresse';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['add_new_record_txt'] = 'Neue Catchall hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Email Catchall';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_txt'] = 'Quelle';
+$wb['destination_txt'] = 'Ziel Emailadresse';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Neue Catchall hinzufügen';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_domain_list.lng b/interface/web/mail/lib/lang/de_mail_domain_list.lng
index 36a763f..0449bc9 100644
--- a/interface/web/mail/lib/lang/de_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain_list.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['list_head_txt'] = 'Email Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
-$wb['active_txt'] = 'Aktiv';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Email Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
+$wb['active_txt'] = 'Aktiv';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_forward.lng b/interface/web/mail/lib/lang/de_mail_forward.lng
index 754c5ce..7fcf306 100644
--- a/interface/web/mail/lib/lang/de_mail_forward.lng
+++ b/interface/web/mail/lib/lang/de_mail_forward.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['email_txt'] = 'Emailadresse';
-$wb['destination_txt'] = 'Ziel Emailadresse';
-$wb['active_txt'] = 'Aktiv';
-$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';
-?>
-
+<?php
+$wb['email_txt'] = 'Emailadresse';
+$wb['destination_txt'] = 'Ziel Emailadresse';
+$wb['active_txt'] = 'Aktiv';
+$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_forward_list.lng b/interface/web/mail/lib/lang/de_mail_forward_list.lng
index c221abc..2eee574 100644
--- a/interface/web/mail/lib/lang/de_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_forward_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Mailweiterleitung';
-$wb['active_txt'] = 'Aktiv';
-$wb['source_txt'] = 'Quelle';
-$wb['destination_txt'] = 'Ziel';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Neue Mailweiterleitung hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Mailweiterleitung';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_txt'] = 'Quelle';
+$wb['destination_txt'] = 'Ziel';
+$wb['email_txt'] = 'Email';
+$wb['add_new_record_txt'] = 'Neue Mailweiterleitung hinzufügen';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_get.lng b/interface/web/mail/lib/lang/de_mail_get.lng
index 1a2c498..c72f4ab 100644
--- a/interface/web/mail/lib/lang/de_mail_get.lng
+++ b/interface/web/mail/lib/lang/de_mail_get.lng
@@ -1,16 +1,15 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['type_txt'] = 'Typ';
-$wb['source_server_txt'] = 'POP3/IMAP Server';
-$wb['source_username_txt'] = 'Benutzername';
-$wb['source_password_txt'] = 'Passwort';
-$wb['source_delete_txt'] = 'Mails nach Empfang löschen';
-$wb['destination_txt'] = 'Ziel';
-$wb['active_txt'] = 'Aktiv';
-$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'] = 'Kein Ziel gewählt.';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['type_txt'] = 'Typ';
+$wb['source_server_txt'] = 'POP3/IMAP Server';
+$wb['source_username_txt'] = 'Benutzername';
+$wb['source_password_txt'] = 'Passwort';
+$wb['source_delete_txt'] = 'Mails nach Empfang löschen';
+$wb['destination_txt'] = 'Ziel';
+$wb['active_txt'] = 'Aktiv';
+$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'] = 'Kein Ziel gewählt.';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_get_list.lng b/interface/web/mail/lib/lang/de_mail_get_list.lng
index 4d9632a..3f7cf24 100644
--- a/interface/web/mail/lib/lang/de_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_get_list.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['list_head_txt'] = 'Hole Emails von externem POP3 / IMAP Server';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['source_server_txt'] = 'Externer Server';
-$wb['source_username_txt'] = 'Benutzername';
-$wb['destination_txt'] = 'Ziel';
-$wb['add_new_record_txt'] = 'Neues Konto hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Hole Emails von externem POP3 / IMAP Server';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['source_server_txt'] = 'Externer Server';
+$wb['source_username_txt'] = 'Benutzername';
+$wb['destination_txt'] = 'Ziel';
+$wb['add_new_record_txt'] = 'Neues Konto hinzufügen';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_spamfilter.lng b/interface/web/mail/lib/lang/de_mail_spamfilter.lng
index b2deb6b..d411cb1 100644
--- a/interface/web/mail/lib/lang/de_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/de_mail_spamfilter.lng
@@ -1,18 +1,17 @@
-<?php
-$wb['email_txt'] = 'Email';
-$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.';
-?>
-
+<?php
+$wb['email_txt'] = 'Email';
+$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_spamfilter_list.lng b/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng
index d6ac2cb..f0acef3 100644
--- a/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Spamfilter';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['server_name_txt'] = 'Servername';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Neuen Spamfiltereintrag hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Spamfilter';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['server_name_txt'] = 'Servername';
+$wb['email_txt'] = 'Email';
+$wb['add_new_record_txt'] = 'Neuen Spamfiltereintrag hinzufügen';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_transport.lng b/interface/web/mail/lib/lang/de_mail_transport.lng
index 8512483..16d1e64 100644
--- a/interface/web/mail/lib/lang/de_mail_transport.lng
+++ b/interface/web/mail/lib/lang/de_mail_transport.lng
@@ -1,11 +1,10 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['destination_txt'] = 'Ziel';
-$wb['type_txt'] = 'Typ';
-$wb['mx_txt'] = 'Kein MX Lookup';
-$wb['sort_order_txt'] = 'Sortiert nach';
-$wb['active_txt'] = 'Aktiv';
-$wb['limit_mailrouting_txt'] = 'Die maximale Anzahl an Routen für ihr Konto wurde erreicht.';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['destination_txt'] = 'Ziel';
+$wb['type_txt'] = 'Typ';
+$wb['mx_txt'] = 'Kein MX Lookup';
+$wb['sort_order_txt'] = 'Sortiert nach';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_mailrouting_txt'] = 'Die maximale Anzahl an Routen für ihr Konto wurde erreicht.';
+?>
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 058d273..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,10 +1,9 @@
-<?php
-$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';
-?>
-
+<?php
+$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';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index 51396ba..8348ed9 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -1,32 +1,31 @@
-<?php
-$wb['custom_mailfilter_txt'] = 'Benutzerdefiniertes Mail Filter Rezept';
-$wb['email_txt'] = 'Email';
-$wb['cryptpwd_txt'] = 'Passwort';
-$wb['active_txt'] = 'Aktiv';
-$wb['email_error_isemail'] = 'Emailadresse ist ungültig.';
-$wb['email_error_unique'] = 'Doppelte Emailadresse.';
-$wb['autoresponder_text_txt'] = 'Text';
-$wb['autoresponder_txt'] = 'Autoresponder';
-$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
-$wb['error_no_pwd'] = 'Passwort ist leer.';
-$wb['quota_error_isint'] = 'Mailboxgröße muss eine Zahl sein.';
-$wb['quota_txt'] = 'Quota';
-$wb['server_id_txt'] = 'Server ID';
-$wb['password_txt'] = 'Passwort';
-$wb['maildir_txt'] = 'Maildir';
-$wb['postfix_txt'] = 'Aktiviere Empfang';
-$wb['access_txt'] = 'Aktiviere Zugriff';
-$wb['policy_txt'] = 'Spamfilter';
-$wb['no_policy'] = '- nicht aktiviert -';
-$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';
-$wb['disablepop3_txt'] = 'POP3 deaktivieren';
-$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'] = 'Es existiert bereits ein Alias oder eine Weiterleitung mit dieser Email Adresse.';
-?>
-
+<?php
+$wb['custom_mailfilter_txt'] = 'Benutzerdefiniertes Mail Filter Rezept';
+$wb['email_txt'] = 'Email';
+$wb['cryptpwd_txt'] = 'Passwort';
+$wb['active_txt'] = 'Aktiv';
+$wb['email_error_isemail'] = 'Emailadresse ist ungültig.';
+$wb['email_error_unique'] = 'Doppelte Emailadresse.';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
+$wb['error_no_pwd'] = 'Passwort ist leer.';
+$wb['quota_error_isint'] = 'Mailboxgröße muss eine Zahl sein.';
+$wb['quota_txt'] = 'Quota';
+$wb['server_id_txt'] = 'Server ID';
+$wb['password_txt'] = 'Passwort';
+$wb['maildir_txt'] = 'Maildir';
+$wb['postfix_txt'] = 'Aktiviere Empfang';
+$wb['access_txt'] = 'Aktiviere Zugriff';
+$wb['policy_txt'] = 'Spamfilter';
+$wb['no_policy'] = '- nicht aktiviert -';
+$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';
+$wb['disablepop3_txt'] = 'POP3 deaktivieren';
+$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'] = 'Es existiert bereits ein Alias oder eine Weiterleitung mit dieser Email Adresse.';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_user_filter.lng b/interface/web/mail/lib/lang/de_mail_user_filter.lng
index 409dbb3..45e6284 100644
--- a/interface/web/mail/lib/lang/de_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_filter.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['rulename_txt'] = 'Name';
-$wb['action_txt'] = 'Aktion';
-$wb['target_txt'] = 'Ordner';
-$wb['active_txt'] = 'Aktiv';
-$wb['rulename_error_empty'] = 'Name ist leer.';
-$wb['searchterm_is_empty'] = 'Suchbegriff ist leer.';
-$wb['source_txt'] = 'Quelle';
-?>
-
+<?php
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Aktion';
+$wb['target_txt'] = 'Ordner';
+$wb['active_txt'] = 'Aktiv';
+$wb['rulename_error_empty'] = 'Name ist leer.';
+$wb['searchterm_is_empty'] = 'Suchbegriff ist leer.';
+$wb['source_txt'] = 'Quelle';
+?>
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 7ffbfb0..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
@@ -1,8 +1,7 @@
-<?php
-$wb['rulename_txt'] = 'Name';
-$wb['add_new_record_txt'] = 'Neuen Filter hinzufügen';
-$wb['page_txt'] = 'Seite';
-$wb['page_of_txt'] = 'von';
-$wb['delete_confirmation'] = 'Wollen Sie den Mailfilter wirklich löschen?';
-?>
-
+<?php
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Neuen Filter hinzufügen';
+$wb['page_txt'] = 'Seite';
+$wb['page_of_txt'] = 'von';
+$wb['delete_confirmation'] = 'Wollen Sie den Mailfilter wirklich löschen?';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_user_list.lng b/interface/web/mail/lib/lang/de_mail_user_list.lng
index 0ae0fd1..af63109 100644
--- a/interface/web/mail/lib/lang/de_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_list.lng
@@ -1,7 +1,6 @@
-<?php
-$wb['list_head_txt'] = 'Mailbox';
-$wb['email_txt'] = 'Emailadresse';
-$wb['autoresponder_txt'] = 'Autoresponder';
-$wb['add_new_record_txt'] = 'Neue Mailbox hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Mailbox';
+$wb['email_txt'] = 'Emailadresse';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['add_new_record_txt'] = 'Neue Mailbox hinzufügen';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_user_stats_list.lng b/interface/web/mail/lib/lang/de_mail_user_stats_list.lng
index 2073653..88ad07a 100644
--- a/interface/web/mail/lib/lang/de_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_stats_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Mail Datenverkehr';
-$wb['email_txt'] = 'Emailadresse';
-$wb['this_month_txt'] = 'Diesen Monat';
-$wb['last_month_txt'] = 'Letzten Monat';
-$wb['this_year_txt'] = 'Dieses Jahr';
-$wb['last_year_txt'] = 'Letztes Jahr';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Mail Datenverkehr';
+$wb['email_txt'] = 'Emailadresse';
+$wb['this_month_txt'] = 'Diesen Monat';
+$wb['last_month_txt'] = 'Letzten Monat';
+$wb['this_year_txt'] = 'Dieses Jahr';
+$wb['last_year_txt'] = 'Letztes Jahr';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_whitelist.lng b/interface/web/mail/lib/lang/de_mail_whitelist.lng
index 75d5b4b..528c7cf 100644
--- a/interface/web/mail/lib/lang/de_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/de_mail_whitelist.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['source_txt'] = 'Whitelist Emailadresse';
-$wb['recipient_txt'] = 'Empfänger';
-$wb['active_txt'] = 'Aktiv';
-$wb['source_error_notempty'] = 'Emailadresse ist leer.';
-$wb['type_txt'] = 'Typ';
-$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an Emailfilter für ihr Konto wurde erreicht.';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['source_txt'] = 'Whitelist Emailadresse';
+$wb['recipient_txt'] = 'Empfänger';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_error_notempty'] = 'Emailadresse ist leer.';
+$wb['type_txt'] = 'Typ';
+$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 02dceba..cb7f293 100644
--- a/interface/web/mail/lib/lang/de_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_whitelist_list.lng
@@ -1,11 +1,10 @@
-<?php
-$wb['list_head_txt'] = 'Email Whitelist';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['source_txt'] = 'Whitelisted Adressen';
-$wb['type_txt'] = 'Typ';
-$wb['recipient_txt'] = 'Empfänger';
-$wb['add_new_record_txt'] = 'Whitelist Eintrag hinzufügen';
-$wb['access_txt'] = 'Zugriff';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Email Whitelist';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['source_txt'] = 'Whitelisted Adressen';
+$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 959b7ad..89aeae7 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['wb_txt'] = 'wb';
-$wb['rid_txt'] = 'Benutzer';
-$wb['email_txt'] = 'Emailadresse';
-$wb['priority_txt'] = 'Priorität';
-$wb['active_txt'] = 'Aktiv';
-$wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für ihr Konto wurde erreicht.';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Benutzer';
+$wb['email_txt'] = 'Emailadresse';
+$wb['priority_txt'] = 'Priorität';
+$wb['active_txt'] = 'Aktiv';
+$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_blacklist_list.lng b/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng
index 8eaadb0..ca726a9 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['list_head_txt'] = 'Spamfilter Blacklist';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priorität';
-$wb['rid_txt'] = 'Benuzer';
-$wb['email_txt'] = 'Blacklisted Emailadresse';
-$wb['add_new_record_txt'] = 'Blacklist Eintrag hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Spamfilter Blacklist';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['priority_txt'] = 'Priorität';
+$wb['rid_txt'] = 'Benuzer';
+$wb['email_txt'] = 'Blacklisted Emailadresse';
+$wb['add_new_record_txt'] = 'Blacklist Eintrag hinzufügen';
+?>
diff --git a/interface/web/mail/lib/lang/de_spamfilter_config.lng b/interface/web/mail/lib/lang/de_spamfilter_config.lng
index 55aea22..f82f27f 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_config.lng
@@ -1,21 +1,20 @@
-<?php
-$wb['getmail_config_dir_txt'] = 'Getmail Config Path';
-$wb['ip_address_txt'] = 'IP Adresse';
-$wb['netmask_txt'] = 'Netmask';
-$wb['gateway_txt'] = 'Gateway';
-$wb['hostname_txt'] = 'Hostname';
-$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 Gruppe';
-$wb['relayhost_txt'] = 'Relayhost';
-$wb['relayhost_user_txt'] = 'Relayhost User';
-$wb['relayhost_password_txt'] = 'Relayhost Passwort';
-$wb['mailbox_size_limit_txt'] = 'Mailbox Grösse Limit';
-$wb['message_size_limit_txt'] = 'Nachricht Grösse Limit';
-?>
-
+<?php
+$wb['getmail_config_dir_txt'] = 'Getmail Config Path';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$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 Gruppe';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Passwort';
+$wb['mailbox_size_limit_txt'] = 'Mailbox Grösse Limit';
+$wb['message_size_limit_txt'] = 'Nachricht Grösse Limit';
+?>
diff --git a/interface/web/mail/lib/lang/de_spamfilter_config_list.lng b/interface/web/mail/lib/lang/de_spamfilter_config_list.lng
index a4318e2..db92a4b 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_config_list.lng
@@ -1,6 +1,5 @@
-<?php
-$wb['list_head_txt'] = 'Serverkonfiguration';
-$wb['server_name_txt'] = 'Server';
-$wb['server_id_txt'] = 'Server ID';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Serverkonfiguration';
+$wb['server_name_txt'] = 'Server';
+$wb['server_id_txt'] = 'Server ID';
+?>
diff --git a/interface/web/mail/lib/lang/de_spamfilter_policy.lng b/interface/web/mail/lib/lang/de_spamfilter_policy.lng
index 8babfbe..ff2426f 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_policy.lng
@@ -1,39 +1,38 @@
-<?php
-$wb['policy_name_txt'] = 'Richtlinienname';
-$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 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 Richtliniennamen';
-?>
-
+<?php
+$wb['policy_name_txt'] = 'Richtlinienname';
+$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 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 Richtliniennamen';
+?>
diff --git a/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng
index e32d085..35a4606 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['list_head_txt'] = 'Spamfilter Policy';
-$wb['policy_name_txt'] = 'Name';
-$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'] = 'Richtlinien Eintrag hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Spamfilter Policy';
+$wb['policy_name_txt'] = 'Name';
+$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'] = 'Richtlinien Eintrag hinzufügen';
+?>
diff --git a/interface/web/mail/lib/lang/de_spamfilter_users.lng b/interface/web/mail/lib/lang/de_spamfilter_users.lng
index 5e18853..fcb5811 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_users.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priorität';
-$wb['policy_id_txt'] = 'Richtlinie';
-$wb['email_txt'] = 'Email (Zeichenkette)';
-$wb['fullname_txt'] = 'Name';
-$wb['local_txt'] = 'lokal';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['priority_txt'] = 'Priorität';
+$wb['policy_id_txt'] = 'Richtlinie';
+$wb['email_txt'] = 'Email (Zeichenkette)';
+$wb['fullname_txt'] = 'Name';
+$wb['local_txt'] = 'lokal';
+?>
diff --git a/interface/web/mail/lib/lang/de_spamfilter_users_list.lng b/interface/web/mail/lib/lang/de_spamfilter_users_list.lng
index b841931..b85e23d 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_users_list.lng
@@ -1,11 +1,10 @@
-<?php
-$wb['list_head_txt'] = 'Spamfilterbenutzer';
-$wb['local_txt'] = 'Lokal';
-$wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priorität';
-$wb['policy_id_txt'] = 'Richtlinie';
-$wb['fullname_txt'] = 'Name';
-$wb['email_txt'] = 'Emailadresse';
-$wb['add_new_record_txt'] = 'Spamfilterbenutzer hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Spamfilterbenutzer';
+$wb['local_txt'] = 'Lokal';
+$wb['server_id_txt'] = 'Server';
+$wb['priority_txt'] = 'Priorität';
+$wb['policy_id_txt'] = 'Richtlinie';
+$wb['fullname_txt'] = 'Name';
+$wb['email_txt'] = 'Emailadresse';
+$wb['add_new_record_txt'] = 'Spamfilterbenutzer hinzufügen';
+?>
diff --git a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
index 71198e2..fdb514e 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['wb_txt'] = 'wb';
-$wb['rid_txt'] = 'Benutzer';
-$wb['email_txt'] = 'Email';
-$wb['priority_txt'] = 'Priorität';
-$wb['active_txt'] = 'Aktiv';
-$wb['limit_spamfilter_wblist_txt'] = 'The maximale Anzahl an White- oder Blacklist Einträgen für ihr Konto wurde erreicht.';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Benutzer';
+$wb['email_txt'] = 'Email';
+$wb['priority_txt'] = 'Priorität';
+$wb['active_txt'] = 'Aktiv';
+$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/de_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng
index 73bd64c..ea53892 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng
@@ -1,10 +1,9 @@
-<?php
-$wb['list_head_txt'] = 'Spamfilter Whitelist';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priorität';
-$wb['rid_txt'] = 'Benutzer';
-$wb['email_txt'] = 'Whitelisted Email';
-$wb['add_new_record_txt'] = 'Whitelist Eintrag hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Spamfilter Whitelist';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['priority_txt'] = 'Priorität';
+$wb['rid_txt'] = 'Benutzer';
+$wb['email_txt'] = 'Whitelisted Email';
+$wb['add_new_record_txt'] = 'Whitelist Eintrag hinzufügen';
+?>
diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng
index 2de4267..d748c03 100644
--- a/interface/web/mail/lib/lang/pl.lng
+++ b/interface/web/mail/lib/lang/pl.lng
@@ -1,50 +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['Blacklist'] = 'Czarna lista';
-$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['Whitelist'] = 'Biała lista';
-$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['Spamfilter'] = 'Filtr spamu';
-$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';
-
-?>
-
+<?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
index c2c1bf5..8556be8 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias.lng
@@ -1,12 +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';
-?>
-
+<?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
index dc56637..b6ce95d 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index b76dfb5..528f2f7 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
@@ -1,10 +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.';
-?>
-
+<?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
index 0d0fa12..ebef666 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
@@ -1,11 +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';
-?>
-
+<?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
index 8943c07..54efa4f 100644
--- a/interface/web/mail/lib/lang/pl_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_content_filter.lng
@@ -1,10 +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.';
-?>
-
+<?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
index 82d7bde..6b0dd9b 100644
--- a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index a0ab156..6f9c68c 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -1,14 +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-';
-?>
-
+<?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
index 8afae21..c77cc73 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
@@ -1,10 +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.';
-?>
-
+<?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
index 01f50f4..1f0aad1 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
@@ -1,10 +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';
-?>
-
+<?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
index ea14000..ec51e2c 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_list.lng
@@ -1,8 +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';
-?>
-
+<?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
index 300ca08..f5b5fa7 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward.lng
@@ -1,8 +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';
-?>
-
+<?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
index 159bd66..1044bd5 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index 002193b..b2a1b5c 100644
--- a/interface/web/mail/lib/lang/pl_mail_get.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get.lng
@@ -1,16 +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.';
-?>
-
+<?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
index 6ac76c3..cd473d9 100644
--- a/interface/web/mail/lib/lang/pl_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get_list.lng
@@ -1,10 +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';
-?>
-
+<?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
index cae1bf9..3879f24 100644
--- a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
@@ -1,18 +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.';
-?>
-
+<?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
index 14e2950..d6097bb 100644
--- a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index 82a89bd..035a5b0 100644
--- a/interface/web/mail/lib/lang/pl_mail_transport.lng
+++ b/interface/web/mail/lib/lang/pl_mail_transport.lng
@@ -1,11 +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.';
-?>
-
+<?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
index 8069169..fa5c584 100644
--- a/interface/web/mail/lib/lang/pl_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_transport_list.lng
@@ -1,10 +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';
-?>
-
+<?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
index f2fc258..22e2f4c 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -1,33 +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.';
-?>
-
-
+<?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
index 88366a5..b960120 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
@@ -1,10 +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';
-?>
-
+<?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
index 516d6f7..cea7c44 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
@@ -1,8 +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?';
-?>
-
+<?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
index e015536..c8e7a4f 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng
@@ -1,7 +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ą';
-?>
-
+<?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
index 0632262..b978068 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index a3539ce..203c5ba 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
@@ -1,10 +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.';
-?>
-
+<?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
index 2d7cf0f..10e6dfc 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
@@ -1,11 +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';
-?>
-
+<?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
index 7aca2c7..6da8ddc 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
@@ -1,10 +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.';
-?>
-
+<?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
index cd5ff84..c237a7a 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
@@ -1,10 +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';
-?>
-
+<?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
index 2269d2d..c750d95 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config.lng
@@ -1,21 +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';
-?>
-
+<?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
index 1163b08..45b3f31 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
@@ -1,6 +1,5 @@
-<?php
-$wb["list_head_txt"] = 'Konfiguracja serwer';
-$wb["server_name_txt"] = 'Serwer';
-$wb["server_id_txt"] = 'id_serwera';
-?>
-
+<?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
index 903f716..0e4df55 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
@@ -1,39 +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';
-?>
-
+<?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
index cebd80b..43d9d41 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
@@ -1,10 +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';
-?>
-
+<?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
index ccacc1e..573f9be 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users.lng
@@ -1,9 +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';
-?>
-
+<?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
index 7a3fd08..dde2a62 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
@@ -1,11 +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';
-?>
-
+<?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
index d46767c..be83601 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
@@ -1,10 +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.';
-?>
-
+<?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
index 57fbde4..6517cf4 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
@@ -1,10 +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';
-?>
-
+<?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/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/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng
index e04c601..0fcdd99 100644
--- a/interface/web/monitor/lib/lang/br.lng
+++ b/interface/web/monitor/lib/lang/br.lng
@@ -135,4 +135,3 @@
 $wb['monitor_title_rkhunterlog_txt'] = 'Log do RKHunter';
 $wb['monitor_updates_nosupport_txt'] = 'Sua distribuição não suporta este tipo de monitoramento';
 ?>
-
diff --git a/interface/web/monitor/lib/lang/br_datalog_list.lng b/interface/web/monitor/lib/lang/br_datalog_list.lng
index c5bee9b..2987af6 100644
--- a/interface/web/monitor/lib/lang/br_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/br_datalog_list.lng
@@ -6,4 +6,3 @@
 $wb['action_txt'] = 'Ação';
 $wb['status_txt'] = 'Status';
 ?>
-
diff --git a/interface/web/monitor/lib/lang/br_syslog_list.lng b/interface/web/monitor/lib/lang/br_syslog_list.lng
index f8ff04c..23f3c6d 100644
--- a/interface/web/monitor/lib/lang/br_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/br_syslog_list.lng
@@ -5,4 +5,3 @@
 $wb['loglevel_txt'] = 'Nível do Log';
 $wb['message_txt'] = 'Mensagem';
 ?>
-
diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng
index b33f42c..196fa00 100644
--- a/interface/web/monitor/lib/lang/de.lng
+++ b/interface/web/monitor/lib/lang/de.lng
@@ -1,138 +1,137 @@
-<?php
-$wb['Memory usage'] = 'Speicherauslastung';
-$wb['Server online since'] = 'Server ist online seit';
-$wb['Users online'] = 'Benutzer online';
-$wb['System load 1 minute'] = 'Systemlast 1 Minute';
-$wb['System load 5 minutes'] = 'Systemlast 5 Minuten';
-$wb['System load 15 minutes'] = 'Systemlast 15 Minuten';
-$wb['Server Load'] = 'Serverauslastung';
-$wb['Disk usage'] = 'Festplattenbelegung';
-$wb['no_data_serverload_txt'] = 'Derzeit stehen keine Daten über die Serverlast zur Verfügung. Bitte später erneut überprüfen.';
-$wb['no_data_memusage_txt'] = 'Derzeit stehen keine Daten über die Speicherauslastung zur Verfügung. Bitte später erneut überprüfen.';
-$wb['no_data_diskusage_txt'] = 'Derzeit stehen keine Daten über die Festplattenbelegung zur Verfügung. Bitte später erneut überprüfen.';
-$wb['no_data_cpuinfo_txt'] = 'Derzeit stehen keine Daten über die CPU zur Verfügung. Bitte später erneut überprüfen.';
-$wb['no_data_services_txt'] = 'Derzeit stehen keine Daten über die Dienste zur Verfügung. Bitte später erneut überprüfen.';
-$wb['no_logdata_txt'] = 'Derzeit stehen keine Protokolldaten zur Verfügung. Bitte später erneut überprüfen.';
-$wb['Monitoring'] = 'Überwachung';
-$wb['Server to Monitor'] = 'Zu überwachende Server';
-$wb['Logfiles'] = 'Protokolldateien';
-$wb['Status of services'] = 'Dienstatus';
-$wb['No Refresh'] = 'keine Aktualisierung';
-$wb['minutes'] = 'Minuten';
-$wb['Show Overview'] = 'Übersicht zeigen';
-$wb['System State (All Servers)'] = 'Systemstatus (Alle Server)';
-$wb['Hardware-Information'] = 'Hardwareinformationen';
-$wb['Show CPU info'] = 'CPU Informationen';
-$wb['Server State'] = 'Serverstatus';
-$wb['Show Update State'] = 'Updatestatus anzeigen';
-$wb['Show RAID state'] = 'RAID Status anzeigen';
-$wb['Show Server load'] = 'Serverauslastung anzeigen';
-$wb['Show Disk usage'] = 'Festplattenbelegung anzeigen';
-$wb['Show Memory usage'] = 'Speicherauslastung anzeigen';
-$wb['Show Services'] = 'Dienste anzeigen';
-$wb['Show Mail-Queue'] = 'Mailwarteschlange anzeigen';
-$wb['Show Mail-Log'] = 'Mail-Protokoll anzeigen';
-$wb['Show Mail warn-Log'] = 'Mail Warn-Protokoll anzeigen';
-$wb['Show Mail err-Log'] = 'Mail Err-Protokoll anzeigen';
-$wb['Show System-Log'] = 'System-Protokoll anzeigen';
-$wb['Show Freshclam-Log'] = 'Freshclam-Protokoll anzeigen';
-$wb['Show Clamav-Log'] = 'Clamav-Protokoll anzeigen';
-$wb['Show ISPConfig-Log'] = 'ISPConfig-Protokoll anzeigen';
-$wb['Show RKHunter-Log'] = 'RKHunter-Protokoll anzeigen';
-$wb['Show Jobqueue'] = 'Jobwarteschlange anzeigen';
-$wb['Show ISPC Cron-Log'] = 'ISPC Cron-Protokoll anzeigen';
-$wb['no_data_updates_txt'] = 'Derzeit stehen keine Daten über Updates zur Verfügung. Bitte später erneut überprüfen.';
-$wb['no_data_raid_txt'] = 'Derzeit stehen keine Daten über RAID zur Verfügung. Bitte später erneut überprüfen.';
-$wb['no_data_rkhunter_txt'] = 'Derzeit stehen keine Daten von RKHunter zur Verfügung. Bitte später erneut überprüfen.';
-$wb['no_data_mailq_txt'] = 'Derzeit stehen keine Daten der Mailqueue zur Verfügung.Bitte später erneut überprüfen.';
-$wb['monitor_general_serverstate_txt'] = 'Serverstatus';
-$wb['monitor_general_systemstate_txt'] = 'Systemstatus';
-$wb['monitor_diskusage_filesystem_txt'] = 'Dateisystem';
-$wb['monitor_diskusage_type_txt'] = 'Typ';
-$wb['monitor_diskusage_size_txt'] = 'Größe';
-$wb['monitor_diskusage_used_txt'] = 'In Verwendung';
-$wb['monitor_diskusage_available_txt'] = 'verfügbar';
-$wb['monitor_diskusage_usage_txt'] = 'Verwendung in %';
-$wb['monitor_diskusage_mounted_txt'] = 'gemountet unter';
-$wb['monitor_logs_mail_txt'] = 'Mail - Protokoll';
-$wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Protokoll';
-$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Protokoll';
-$wb['monitor_logs_messages_txt'] = 'Systemmeldungen - Protokoll';
-$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Protokoll';
-$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Protokoll';
-$wb['monitor_logs_clamav_txt'] = 'Clamav - Protokoll';
-$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Protokoll';
-$wb['monitor_nomdadm_txt'] = 'mdadm ist auf ihrem Server nicht installiert oder der Server besitzt kein unterstütztes RAID';
-$wb['monitor_norkhunter_txt'] = 'RKHunter ist nicht installiert, deshalb gibt es keine Protokolldatei';
-$wb['monitor_serverstate_server_txt'] = 'Server';
-$wb['monitor_serverstate_state_txt'] = 'Status';
-$wb['monitor_serverstate_unknown_txt'] = 'unbekannt';
-$wb['monitor_serverstate_info_txt'] = 'Info';
-$wb['monitor_serverstate_warning_txt'] = 'Warnung';
-$wb['monitor_serverstate_critical_txt'] = 'kritsch';
-$wb['monitor_serverstate_error_txt'] = 'Fehler';
-$wb['monitor_serverstate_moreinfo_txt'] = 'Mehr Informationen...';
-$wb['monitor_serverstate_more_txt'] = 'mehr...';
-$wb['monitor_serverstate_fclamok_txt'] = 'Ihr Virenschutz ist in Ordnung.';
-$wb['monitor_serverstate_fclamoutdated_txt'] = 'Ihr Virenschutz ist VERALTET!';
-$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!';
-$wb['monitor_serverstate_hdok_txt'] = 'Die Festplattenauslastung ist in Ordnung';
-$wb['monitor_serverstate_hdgoingfull_txt'] = 'Die Festplatte wird bald voll';
-$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Die Festplatte ist fast voll';
-$wb['monitor_serverstate_hdveryfull_txt'] = 'Die Festplatte ist sehr voll';
-$wb['monitor_serverstate_hdfull_txt'] = 'Die Festplatte hat keinen Platz mehr frei';
-$wb['monitor_serverstate_hdunknown_txt'] = 'Festplatte: ???';
-$wb['monitor_serverstate_listok_txt'] = 'in Ordnung';
-$wb['monitor_serverstate_listinfo_txt'] = 'Information';
-$wb['monitor_serverstate_listwarning_txt'] = 'Warnung';
-$wb['monitor_serverstate_listcritical_txt'] = 'kritisch';
-$wb['monitor_serverstate_listerror_txt'] = 'Fehler';
-$wb['monitor_serverstate_listunknown_txt'] = 'unbekannt';
-$wb['monitor_serverstate_loadok_txt'] = 'Die Serverauslastung ist in Ordnung';
-$wb['monitor_serverstate_loadheavy_txt'] = 'Der Server ist extrem ausgelastet';
-$wb['monitor_serverstate_loadhigh_txt'] = 'Der Server ist stark ausgelastet';
-$wb['monitor_serverstate_loaghigher_txt'] = 'Der Server ist stärker ausgelastet';
-$wb['monitor_serverstate_loadhighest_txt'] = 'Der Server ist höchst ausgelastet';
-$wb['monitor_serverstate_loadunknown_txt'] = 'Serverauslastung: ???';
-$wb['monitor_serverstate_mailqok_txt'] = 'Die Mailq Auslastung ist in Ordnung';
-$wb['monitor_serverstate_mailqheavy_txt'] = 'Die Mailq ist extrem ausgelastet';
-$wb['monitor_serverstate_mailqhigh_txt'] = 'Die Mailq ist stark ausgelastet';
-$wb['monitor_serverstate_mailqhigher_txt'] = 'Die Mailq ist stärker ausgelastet';
-$wb['monitor_serverstate_mailqhighest_txt'] = 'Die Mailq ist höchst ausgelastet';
-$wb['monitor_serverstate_mailqunknown_txt'] = 'Mailq: ???';
-$wb['monitor_serverstate_raidok_txt'] = 'Das RAID ist in Ordnung';
-$wb['monitor_serverstate_raidresync_txt'] = 'Das RAID ist im RESYNC Modus';
-$wb['monitor_serverstate_raidfault_txt'] = 'Das RAID hat eine DEFEKTE Festplatte. Bitte schnellstmöglich ersetzen!';
-$wb['monitor_serverstate_raiderror_txt'] = 'Das RAID funktioniert nicht mehr';
-$wb['monitor_serverstate_raidunknown_txt'] = 'RAID Status: ???';
-$wb['monitor_serverstate_servicesonline_txt'] = 'Alle benötigten Dienste sind online';
-$wb['monitor_serverstate_servicesoffline_txt'] = 'Einer oder mehrere benötigte Dienste sind offline';
-$wb['monitor_serverstate_servicesunknown_txt'] = 'Dienste: ???';
-$wb['monitor_serverstate_syslogok_txt'] = 'Das System-Protokoll ist in Ordnung';
-$wb['monitor_serverstate_syslogwarning_txt'] = 'Es gibt Warnungen im System-Protokoll';
-$wb['monitor_serverstate_syslogerror_txt'] = 'Es gibt Fehler im System-Protokoll';
-$wb['monitor_serverstate_syslogunknown_txt'] = 'System-Protokoll: ???';
-$wb['monitor_serverstate_updatesok_txt'] = 'Ihr System ist aktuell';
-$wb['monitor_serverstate_updatesneeded_txt'] = 'Eine oder mehrere Komponenten benötigen ein 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'] = 'Daten vom: ';
-$wb['monitor_settings_datetimeformat_txt'] = 'd-m-Y H:i';
-$wb['monitor_settings_refreshsq_txt'] = 'Aktualisierungsrate:';
-$wb['monitor_settings_server_txt'] = 'Server';
-$wb['monitor_title_cpuinfo_txt'] = 'CPU Informationen';
-$wb['monitor_title_updatestate_txt'] = 'Updatestatus';
-$wb['monitor_title_mailq_txt'] = 'Mailwarteschlange';
-$wb['monitor_title_raidstate_txt'] = 'RAID-Status';
-$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Protokoll';
-$wb['monitor_updates_nosupport_txt'] = 'Ihre Distribution wird für die Überwachung nicht unterstützt';
-?>
-
+<?php
+$wb['Memory usage'] = 'Speicherauslastung';
+$wb['Server online since'] = 'Server ist online seit';
+$wb['Users online'] = 'Benutzer online';
+$wb['System load 1 minute'] = 'Systemlast 1 Minute';
+$wb['System load 5 minutes'] = 'Systemlast 5 Minuten';
+$wb['System load 15 minutes'] = 'Systemlast 15 Minuten';
+$wb['Server Load'] = 'Serverauslastung';
+$wb['Disk usage'] = 'Festplattenbelegung';
+$wb['no_data_serverload_txt'] = 'Derzeit stehen keine Daten über die Serverlast zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_memusage_txt'] = 'Derzeit stehen keine Daten über die Speicherauslastung zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_diskusage_txt'] = 'Derzeit stehen keine Daten über die Festplattenbelegung zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_cpuinfo_txt'] = 'Derzeit stehen keine Daten über die CPU zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_services_txt'] = 'Derzeit stehen keine Daten über die Dienste zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_logdata_txt'] = 'Derzeit stehen keine Protokolldaten zur Verfügung. Bitte später erneut überprüfen.';
+$wb['Monitoring'] = 'Überwachung';
+$wb['Server to Monitor'] = 'Zu überwachende Server';
+$wb['Logfiles'] = 'Protokolldateien';
+$wb['Status of services'] = 'Dienstatus';
+$wb['No Refresh'] = 'keine Aktualisierung';
+$wb['minutes'] = 'Minuten';
+$wb['Show Overview'] = 'Übersicht zeigen';
+$wb['System State (All Servers)'] = 'Systemstatus (Alle Server)';
+$wb['Hardware-Information'] = 'Hardwareinformationen';
+$wb['Show CPU info'] = 'CPU Informationen';
+$wb['Server State'] = 'Serverstatus';
+$wb['Show Update State'] = 'Updatestatus anzeigen';
+$wb['Show RAID state'] = 'RAID Status anzeigen';
+$wb['Show Server load'] = 'Serverauslastung anzeigen';
+$wb['Show Disk usage'] = 'Festplattenbelegung anzeigen';
+$wb['Show Memory usage'] = 'Speicherauslastung anzeigen';
+$wb['Show Services'] = 'Dienste anzeigen';
+$wb['Show Mail-Queue'] = 'Mailwarteschlange anzeigen';
+$wb['Show Mail-Log'] = 'Mail-Protokoll anzeigen';
+$wb['Show Mail warn-Log'] = 'Mail Warn-Protokoll anzeigen';
+$wb['Show Mail err-Log'] = 'Mail Err-Protokoll anzeigen';
+$wb['Show System-Log'] = 'System-Protokoll anzeigen';
+$wb['Show Freshclam-Log'] = 'Freshclam-Protokoll anzeigen';
+$wb['Show Clamav-Log'] = 'Clamav-Protokoll anzeigen';
+$wb['Show ISPConfig-Log'] = 'ISPConfig-Protokoll anzeigen';
+$wb['Show RKHunter-Log'] = 'RKHunter-Protokoll anzeigen';
+$wb['Show Jobqueue'] = 'Jobwarteschlange anzeigen';
+$wb['Show ISPC Cron-Log'] = 'ISPC Cron-Protokoll anzeigen';
+$wb['no_data_updates_txt'] = 'Derzeit stehen keine Daten über Updates zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_raid_txt'] = 'Derzeit stehen keine Daten über RAID zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_rkhunter_txt'] = 'Derzeit stehen keine Daten von RKHunter zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_mailq_txt'] = 'Derzeit stehen keine Daten der Mailqueue zur Verfügung.Bitte später erneut überprüfen.';
+$wb['monitor_general_serverstate_txt'] = 'Serverstatus';
+$wb['monitor_general_systemstate_txt'] = 'Systemstatus';
+$wb['monitor_diskusage_filesystem_txt'] = 'Dateisystem';
+$wb['monitor_diskusage_type_txt'] = 'Typ';
+$wb['monitor_diskusage_size_txt'] = 'Größe';
+$wb['monitor_diskusage_used_txt'] = 'In Verwendung';
+$wb['monitor_diskusage_available_txt'] = 'verfügbar';
+$wb['monitor_diskusage_usage_txt'] = 'Verwendung in %';
+$wb['monitor_diskusage_mounted_txt'] = 'gemountet unter';
+$wb['monitor_logs_mail_txt'] = 'Mail - Protokoll';
+$wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Protokoll';
+$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Protokoll';
+$wb['monitor_logs_messages_txt'] = 'Systemmeldungen - Protokoll';
+$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Protokoll';
+$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Protokoll';
+$wb['monitor_logs_clamav_txt'] = 'Clamav - Protokoll';
+$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Protokoll';
+$wb['monitor_nomdadm_txt'] = 'mdadm ist auf ihrem Server nicht installiert oder der Server besitzt kein unterstütztes RAID';
+$wb['monitor_norkhunter_txt'] = 'RKHunter ist nicht installiert, deshalb gibt es keine Protokolldatei';
+$wb['monitor_serverstate_server_txt'] = 'Server';
+$wb['monitor_serverstate_state_txt'] = 'Status';
+$wb['monitor_serverstate_unknown_txt'] = 'unbekannt';
+$wb['monitor_serverstate_info_txt'] = 'Info';
+$wb['monitor_serverstate_warning_txt'] = 'Warnung';
+$wb['monitor_serverstate_critical_txt'] = 'kritsch';
+$wb['monitor_serverstate_error_txt'] = 'Fehler';
+$wb['monitor_serverstate_moreinfo_txt'] = 'Mehr Informationen...';
+$wb['monitor_serverstate_more_txt'] = 'mehr...';
+$wb['monitor_serverstate_fclamok_txt'] = 'Ihr Virenschutz ist in Ordnung.';
+$wb['monitor_serverstate_fclamoutdated_txt'] = 'Ihr Virenschutz ist VERALTET!';
+$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!';
+$wb['monitor_serverstate_hdok_txt'] = 'Die Festplattenauslastung ist in Ordnung';
+$wb['monitor_serverstate_hdgoingfull_txt'] = 'Die Festplatte wird bald voll';
+$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Die Festplatte ist fast voll';
+$wb['monitor_serverstate_hdveryfull_txt'] = 'Die Festplatte ist sehr voll';
+$wb['monitor_serverstate_hdfull_txt'] = 'Die Festplatte hat keinen Platz mehr frei';
+$wb['monitor_serverstate_hdunknown_txt'] = 'Festplatte: ???';
+$wb['monitor_serverstate_listok_txt'] = 'in Ordnung';
+$wb['monitor_serverstate_listinfo_txt'] = 'Information';
+$wb['monitor_serverstate_listwarning_txt'] = 'Warnung';
+$wb['monitor_serverstate_listcritical_txt'] = 'kritisch';
+$wb['monitor_serverstate_listerror_txt'] = 'Fehler';
+$wb['monitor_serverstate_listunknown_txt'] = 'unbekannt';
+$wb['monitor_serverstate_loadok_txt'] = 'Die Serverauslastung ist in Ordnung';
+$wb['monitor_serverstate_loadheavy_txt'] = 'Der Server ist extrem ausgelastet';
+$wb['monitor_serverstate_loadhigh_txt'] = 'Der Server ist stark ausgelastet';
+$wb['monitor_serverstate_loaghigher_txt'] = 'Der Server ist stärker ausgelastet';
+$wb['monitor_serverstate_loadhighest_txt'] = 'Der Server ist höchst ausgelastet';
+$wb['monitor_serverstate_loadunknown_txt'] = 'Serverauslastung: ???';
+$wb['monitor_serverstate_mailqok_txt'] = 'Die Mailq Auslastung ist in Ordnung';
+$wb['monitor_serverstate_mailqheavy_txt'] = 'Die Mailq ist extrem ausgelastet';
+$wb['monitor_serverstate_mailqhigh_txt'] = 'Die Mailq ist stark ausgelastet';
+$wb['monitor_serverstate_mailqhigher_txt'] = 'Die Mailq ist stärker ausgelastet';
+$wb['monitor_serverstate_mailqhighest_txt'] = 'Die Mailq ist höchst ausgelastet';
+$wb['monitor_serverstate_mailqunknown_txt'] = 'Mailq: ???';
+$wb['monitor_serverstate_raidok_txt'] = 'Das RAID ist in Ordnung';
+$wb['monitor_serverstate_raidresync_txt'] = 'Das RAID ist im RESYNC Modus';
+$wb['monitor_serverstate_raidfault_txt'] = 'Das RAID hat eine DEFEKTE Festplatte. Bitte schnellstmöglich ersetzen!';
+$wb['monitor_serverstate_raiderror_txt'] = 'Das RAID funktioniert nicht mehr';
+$wb['monitor_serverstate_raidunknown_txt'] = 'RAID Status: ???';
+$wb['monitor_serverstate_servicesonline_txt'] = 'Alle benötigten Dienste sind online';
+$wb['monitor_serverstate_servicesoffline_txt'] = 'Einer oder mehrere benötigte Dienste sind offline';
+$wb['monitor_serverstate_servicesunknown_txt'] = 'Dienste: ???';
+$wb['monitor_serverstate_syslogok_txt'] = 'Das System-Protokoll ist in Ordnung';
+$wb['monitor_serverstate_syslogwarning_txt'] = 'Es gibt Warnungen im System-Protokoll';
+$wb['monitor_serverstate_syslogerror_txt'] = 'Es gibt Fehler im System-Protokoll';
+$wb['monitor_serverstate_syslogunknown_txt'] = 'System-Protokoll: ???';
+$wb['monitor_serverstate_updatesok_txt'] = 'Ihr System ist aktuell';
+$wb['monitor_serverstate_updatesneeded_txt'] = 'Eine oder mehrere Komponenten benötigen ein 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'] = 'Daten vom: ';
+$wb['monitor_settings_datetimeformat_txt'] = 'd-m-Y H:i';
+$wb['monitor_settings_refreshsq_txt'] = 'Aktualisierungsrate:';
+$wb['monitor_settings_server_txt'] = 'Server';
+$wb['monitor_title_cpuinfo_txt'] = 'CPU Informationen';
+$wb['monitor_title_updatestate_txt'] = 'Updatestatus';
+$wb['monitor_title_mailq_txt'] = 'Mailwarteschlange';
+$wb['monitor_title_raidstate_txt'] = 'RAID-Status';
+$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Protokoll';
+$wb['monitor_updates_nosupport_txt'] = 'Ihre Distribution wird für die Überwachung nicht unterstützt';
+?>
diff --git a/interface/web/monitor/lib/lang/de_datalog_list.lng b/interface/web/monitor/lib/lang/de_datalog_list.lng
index 2836be8..0b6bf9a 100644
--- a/interface/web/monitor/lib/lang/de_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/de_datalog_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Jobwarteschlange';
-$wb['tstamp_txt'] = 'Datum';
-$wb['server_id_txt'] = 'Server';
-$wb['dbtable_txt'] = 'Datenbanktabelle';
-$wb['action_txt'] = 'Aktion';
-$wb['status_txt'] = 'Status';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Jobwarteschlange';
+$wb['tstamp_txt'] = 'Datum';
+$wb['server_id_txt'] = 'Server';
+$wb['dbtable_txt'] = 'Datenbanktabelle';
+$wb['action_txt'] = 'Aktion';
+$wb['status_txt'] = 'Status';
+?>
diff --git a/interface/web/monitor/lib/lang/de_syslog_list.lng b/interface/web/monitor/lib/lang/de_syslog_list.lng
index f9a02e8..bd879a0 100644
--- a/interface/web/monitor/lib/lang/de_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/de_syslog_list.lng
@@ -1,8 +1,7 @@
-<?php
-$wb['list_head_txt'] = 'ISPConfig Protokoll';
-$wb['tstamp_txt'] = 'Datum';
-$wb['server_id_txt'] = 'Server';
-$wb['loglevel_txt'] = 'Protokolllevel';
-$wb['message_txt'] = 'Nachricht';
-?>
-
+<?php
+$wb['list_head_txt'] = 'ISPConfig Protokoll';
+$wb['tstamp_txt'] = 'Datum';
+$wb['server_id_txt'] = 'Server';
+$wb['loglevel_txt'] = 'Protokolllevel';
+$wb['message_txt'] = 'Nachricht';
+?>
diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng
index 9d99bb1..3b50364 100644
--- a/interface/web/monitor/lib/lang/pl.lng
+++ b/interface/web/monitor/lib/lang/pl.lng
@@ -1,139 +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';
-?>
-
-
+<?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
index c3c5af8..398ca51 100644
--- a/interface/web/monitor/lib/lang/pl_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/pl_datalog_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index 2fb8365..125494b 100644
--- a/interface/web/monitor/lib/lang/pl_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/pl_syslog_list.lng
@@ -1,8 +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ść';
-?>
-
+<?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/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 4a14177..f9c3fd3 100644
--- a/interface/web/sites/lib/lang/br.lng
+++ b/interface/web/sites/lib/lang/br.lng
@@ -15,4 +15,3 @@
 $wb['Websites'] = 'Websites';
 $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 b9d2217..185a780 100644
--- a/interface/web/sites/lib/lang/br_cron.lng
+++ b/interface/web/sites/lib/lang/br_cron.lng
@@ -19,4 +19,3 @@
 $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'] = '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 f5bbe66..b974f0f 100644
--- a/interface/web/sites/lib/lang/br_cron_list.lng
+++ b/interface/web/sites/lib/lang/br_cron_list.lng
@@ -10,4 +10,3 @@
 $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 ccd1075..6121d4c 100644
--- a/interface/web/sites/lib/lang/br_database.lng
+++ b/interface/web/sites/lib/lang/br_database.lng
@@ -21,4 +21,3 @@
 $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 ec5054f..00dfbb3 100644
--- a/interface/web/sites/lib/lang/br_database_list.lng
+++ b/interface/web/sites/lib/lang/br_database_list.lng
@@ -6,4 +6,3 @@
 $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 ebcc5a3..e7e62b1 100644
--- a/interface/web/sites/lib/lang/br_ftp_user.lng
+++ b/interface/web/sites/lib/lang/br_ftp_user.lng
@@ -25,4 +25,3 @@
 $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 9978c60..a9540c9 100644
--- a/interface/web/sites/lib/lang/br_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/br_ftp_user_list.lng
@@ -6,4 +6,3 @@
 $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 939bc76..2a99587 100644
--- a/interface/web/sites/lib/lang/br_shell_user.lng
+++ b/interface/web/sites/lib/lang/br_shell_user.lng
@@ -20,4 +20,3 @@
 $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 8c2e71d..512f9fe 100644
--- a/interface/web/sites/lib/lang/br_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/br_shell_user_list.lng
@@ -6,4 +6,3 @@
 $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 4343b84..f9dbfa2 100644
--- a/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
@@ -9,4 +9,3 @@
 $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 c54854f..7abba78 100644
--- a/interface/web/sites/lib/lang/br_web_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_domain.lng
@@ -47,4 +47,3 @@
 $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 ff4c134..dc52003 100644
--- a/interface/web/sites/lib/lang/br_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_domain_list.lng
@@ -6,4 +6,3 @@
 $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 79b4d68..1a3f0e5 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
@@ -6,4 +6,3 @@
 $wb['this_year_txt'] = 'Este ano';
 $wb['last_year_txt'] = 'Ultimo ano';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_web_subdomain.lng b/interface/web/sites/lib/lang/br_web_subdomain.lng
index 27b9769..0d3ea2f 100644
--- a/interface/web/sites/lib/lang/br_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/br_web_subdomain.lng
@@ -37,4 +37,3 @@
 $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 6949909..3e09b88 100644
--- a/interface/web/sites/lib/lang/br_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_subdomain_list.lng
@@ -6,4 +6,3 @@
 $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 bf15fc3..848c37b 100644
--- a/interface/web/sites/lib/lang/de.lng
+++ b/interface/web/sites/lib/lang/de.lng
@@ -1,18 +1,17 @@
-<?php
-$wb['Database'] = 'Datenbank';
-$wb['Options'] = 'Optionen';
-$wb['Shell User'] = 'Shell Benutzer';
-$wb['Domain'] = 'Domain';
-$wb['Redirect'] = 'Umleitung';
-$wb['SSL'] = 'SSL';
-$wb['Subdomain'] = 'Subdomain';
-$wb['Sites'] = 'Sites';
-$wb['Aliasdomain'] = 'Aliasdomain';
-$wb['FTP-User'] = 'FTP Benutzer';
-$wb['FTP'] = 'FTP';
-$wb['Shell-User'] = 'Shell Benutzer';
-$wb['Shell'] = 'Shell';
-$wb['Websites'] = 'Websites';
-$wb['Stats'] = 'Statistiken';
-?>
-
+<?php
+$wb['Database'] = 'Datenbank';
+$wb['Options'] = 'Optionen';
+$wb['Shell User'] = 'Shell Benutzer';
+$wb['Domain'] = 'Domain';
+$wb['Redirect'] = 'Umleitung';
+$wb['SSL'] = 'SSL';
+$wb['Subdomain'] = 'Subdomain';
+$wb['Sites'] = 'Sites';
+$wb['Aliasdomain'] = 'Aliasdomain';
+$wb['FTP-User'] = 'FTP Benutzer';
+$wb['FTP'] = 'FTP';
+$wb['Shell-User'] = 'Shell Benutzer';
+$wb['Shell'] = 'Shell';
+$wb['Websites'] = 'Websites';
+$wb['Stats'] = 'Statistiken';
+?>
diff --git a/interface/web/sites/lib/lang/de_cron.lng b/interface/web/sites/lib/lang/de_cron.lng
index 82c22a8..bd0c8b7 100644
--- a/interface/web/sites/lib/lang/de_cron.lng
+++ b/interface/web/sites/lib/lang/de_cron.lng
@@ -1,22 +1,21 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Zugeordnete Website';
-$wb['active_txt'] = 'Aktiv';
-$wb['client_txt'] = 'Kunde';
-$wb['run_min_txt'] = 'Minuten';
-$wb['run_hour_txt'] = 'Stunden';
-$wb['run_mday_txt'] = 'Tage des Monats';
-$wb['run_month_txt'] = 'Monate';
-$wb['run_wday_txt'] = 'Tage der Woche';
-$wb['command_txt'] = 'Auszuf&uuml;hrender Befehl (Befehle werden mit sh ausgef&uuml;hrt, urls mit wget)';
-$wb['limit_cron_txt'] = 'Die maximale Anzahl von erlaubten Cron Jobs ist bereits erreicht.';
-$wb['limit_cron_frequency_txt'] = 'Die Ausf&uuml;hrungsh&auml;ufigkeit &uuml;bersteigt Ihr erlaubtes Limit.';
-$wb['run_min_error_format'] = 'Das Format f&uuml;r Minuten ist nicht korrekt.';
-$wb['run_hour_error_format'] = 'Das Format f&uuml;r Stunden ist nicht korrekt.';
-$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. Beachten Sie, dass bei einem URL Aufruf nur http und https erlaubt ist.';
-$wb['unknown_fieldtype_error'] = 'Es wurde ein unbekanntes Feld verwendet.';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Zugeordnete Website';
+$wb['active_txt'] = 'Aktiv';
+$wb['client_txt'] = 'Kunde';
+$wb['run_min_txt'] = 'Minuten';
+$wb['run_hour_txt'] = 'Stunden';
+$wb['run_mday_txt'] = 'Tage des Monats';
+$wb['run_month_txt'] = 'Monate';
+$wb['run_wday_txt'] = 'Tage der Woche';
+$wb['command_txt'] = 'Auszuf&uuml;hrender Befehl (Befehle werden mit sh ausgef&uuml;hrt, urls mit wget)';
+$wb['limit_cron_txt'] = 'Die maximale Anzahl von erlaubten Cron Jobs ist bereits erreicht.';
+$wb['limit_cron_frequency_txt'] = 'Die Ausf&uuml;hrungsh&auml;ufigkeit &uuml;bersteigt Ihr erlaubtes Limit.';
+$wb['run_min_error_format'] = 'Das Format f&uuml;r Minuten ist nicht korrekt.';
+$wb['run_hour_error_format'] = 'Das Format f&uuml;r Stunden ist nicht korrekt.';
+$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. 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 98c7eff..9778e9f 100644
--- a/interface/web/sites/lib/lang/de_cron_list.lng
+++ b/interface/web/sites/lib/lang/de_cron_list.lng
@@ -1,13 +1,12 @@
-<?php
-$wb['list_head_txt'] = 'Cron Jobs';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['run_min_txt'] = 'Minute';
-$wb['run_hour_txt'] = 'Stunde';
-$wb['run_mday_txt'] = 'Tag des Monats';
-$wb['run_month_txt'] = 'Monat';
-$wb['run_wday_txt'] = 'Tag der Woche';
-$wb['command_txt'] = 'Befehl';
-$wb['add_new_cron_txt'] = 'Neuen Cron Job anlegen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Cron Jobs';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['run_min_txt'] = 'Minute';
+$wb['run_hour_txt'] = 'Stunde';
+$wb['run_mday_txt'] = 'Tag des Monats';
+$wb['run_month_txt'] = 'Monat';
+$wb['run_wday_txt'] = 'Tag der Woche';
+$wb['command_txt'] = 'Befehl';
+$wb['add_new_cron_txt'] = 'Neuen Cron Job anlegen';
+?>
diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng
index ac1fbee..5415acd 100644
--- a/interface/web/sites/lib/lang/de_database.lng
+++ b/interface/web/sites/lib/lang/de_database.lng
@@ -1,24 +1,23 @@
-<?php
-$wb['server_id_txt'] = 'Server';
-$wb['type_txt'] = 'Typ';
-$wb['database_name_txt'] = 'Datenbankname';
-$wb['database_user_txt'] = 'Datenbank Benutzer';
-$wb['database_password_txt'] = 'Datenbank Passwort';
-$wb['database_charset_txt'] = 'Datenbank Zeichensatz';
-$wb['remote_access_txt'] = 'Remotezugang';
-$wb['remote_ips_txt'] = 'Remotezugang-IPs (mit Komma trennen, keine Eingabe f&uuml;r <i>alle</i>)';
-$wb['database_remote_error_ips'] = 'Mindestens eine der eingegebenen IP Adressen ist ung&uuml;ltig.';
-$wb['client_txt'] = 'Kunde';
-$wb['active_txt'] = 'Aktiv';
-$wb['database_name_error_empty'] = 'Datenbankname ist leer.';
-$wb['database_name_error_unique'] = 'Es existiert bereits eine Datenbank mit diesem Namen am Server. Um einen eindeutigen Namen zu erhalten können sie z.B. den Domainnamen vor dem Datenbanknamen verwenden.';
-$wb['database_name_error_regex'] = 'Ungültiger Datenbankname. Der Datenbankname darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.';
-$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 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';
-?>
-
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['type_txt'] = 'Typ';
+$wb['database_name_txt'] = 'Datenbankname';
+$wb['database_user_txt'] = 'Datenbank Benutzer';
+$wb['database_password_txt'] = 'Datenbank Passwort';
+$wb['database_charset_txt'] = 'Datenbank Zeichensatz';
+$wb['remote_access_txt'] = 'Remotezugang';
+$wb['remote_ips_txt'] = 'Remotezugang-IPs (mit Komma trennen, keine Eingabe f&uuml;r <i>alle</i>)';
+$wb['database_remote_error_ips'] = 'Mindestens eine der eingegebenen IP Adressen ist ung&uuml;ltig.';
+$wb['client_txt'] = 'Kunde';
+$wb['active_txt'] = 'Aktiv';
+$wb['database_name_error_empty'] = 'Datenbankname ist leer.';
+$wb['database_name_error_unique'] = 'Es existiert bereits eine Datenbank mit diesem Namen am Server. Um einen eindeutigen Namen zu erhalten können sie z.B. den Domainnamen vor dem Datenbanknamen verwenden.';
+$wb['database_name_error_regex'] = 'Ungültiger Datenbankname. Der Datenbankname darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.';
+$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 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_database_list.lng b/interface/web/sites/lib/lang/de_database_list.lng
index 5821573..b34ac4e 100644
--- a/interface/web/sites/lib/lang/de_database_list.lng
+++ b/interface/web/sites/lib/lang/de_database_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Datenbank';
-$wb['active_txt'] = 'Aktiv';
-$wb['remote_access_txt'] = 'Remotezugang';
-$wb['server_id_txt'] = 'Server';
-$wb['database_name_txt'] = 'Datenbankname';
-$wb['add_new_record_txt'] = 'Neue Datenbank hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Datenbank';
+$wb['active_txt'] = 'Aktiv';
+$wb['remote_access_txt'] = 'Remotezugang';
+$wb['server_id_txt'] = 'Server';
+$wb['database_name_txt'] = 'Datenbankname';
+$wb['add_new_record_txt'] = 'Neue Datenbank hinzufügen';
+?>
diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng
index 0e1f577..02449e3 100644
--- a/interface/web/sites/lib/lang/de_ftp_user.lng
+++ b/interface/web/sites/lib/lang/de_ftp_user.lng
@@ -1,28 +1,27 @@
-<?php
-$wb['uid_txt'] = 'UID';
-$wb['gid_txt'] = 'GID';
-$wb['dir_txt'] = 'Verzeichnis';
-$wb['quota_files_txt'] = 'Dateiquota';
-$wb['quota_files_unity_txt'] = 'Dateien';
-$wb['ul_ratio_txt'] = 'Uploadrate';
-$wb['dl_ratio_txt'] = 'Downloadrate';
-$wb['ul_bandwidth_txt'] = 'Uploadbandbreite';
-$wb['dl_bandwidth_txt'] = 'Downloadbandbreite';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Benutzername';
-$wb['password_txt'] = 'Passwort';
-$wb['quota_size_txt'] = 'Harddiskquota';
-$wb['active_txt'] = 'Aktiv';
-$wb['limit_ftp_user_txt'] = 'Die maximale Anzahl an FTP Benutzer für ihr Konto wurde erreicht.';
-$wb['username_error_empty'] = 'Benutzername ist leer.';
-$wb['username_error_unique'] = 'Der Benutzername muss eindeutig sein.';
-$wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.';
-$wb['quota_size_error_empty'] = 'Quota ist leer.';
-$wb['uid_error_empty'] = 'GID ist leer.';
-$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.';
-?>
-
+<?php
+$wb['uid_txt'] = 'UID';
+$wb['gid_txt'] = 'GID';
+$wb['dir_txt'] = 'Verzeichnis';
+$wb['quota_files_txt'] = 'Dateiquota';
+$wb['quota_files_unity_txt'] = 'Dateien';
+$wb['ul_ratio_txt'] = 'Uploadrate';
+$wb['dl_ratio_txt'] = 'Downloadrate';
+$wb['ul_bandwidth_txt'] = 'Uploadbandbreite';
+$wb['dl_bandwidth_txt'] = 'Downloadbandbreite';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['username_txt'] = 'Benutzername';
+$wb['password_txt'] = 'Passwort';
+$wb['quota_size_txt'] = 'Harddiskquota';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_ftp_user_txt'] = 'Die maximale Anzahl an FTP Benutzer für ihr Konto wurde erreicht.';
+$wb['username_error_empty'] = 'Benutzername ist leer.';
+$wb['username_error_unique'] = 'Der Benutzername muss eindeutig sein.';
+$wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.';
+$wb['quota_size_error_empty'] = 'Quota ist leer.';
+$wb['uid_error_empty'] = 'GID ist leer.';
+$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_ftp_user_list.lng b/interface/web/sites/lib/lang/de_ftp_user_list.lng
index 4d50fa9..a2d162c 100644
--- a/interface/web/sites/lib/lang/de_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/de_ftp_user_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'FTP Benutzer';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Benutzername';
-$wb['add_new_record_txt'] = 'Neuen FTP Benutzer hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'FTP Benutzer';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['username_txt'] = 'Benutzername';
+$wb['add_new_record_txt'] = 'Neuen FTP Benutzer hinzufügen';
+?>
diff --git a/interface/web/sites/lib/lang/de_shell_user.lng b/interface/web/sites/lib/lang/de_shell_user.lng
index d4fbd5a..92589ee 100644
--- a/interface/web/sites/lib/lang/de_shell_user.lng
+++ b/interface/web/sites/lib/lang/de_shell_user.lng
@@ -1,23 +1,22 @@
-<?php
-$wb['uid_txt'] = 'Web Benutzername';
-$wb['gid_txt'] = 'Gruppe';
-$wb['shell_txt'] = 'Shell';
-$wb['dir_txt'] = 'Verzeichnis';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Site';
-$wb['username_txt'] = 'Benutzername';
-$wb['password_txt'] = 'Passwort';
-$wb['chroot_txt'] = 'Chroot Shell';
-$wb['quota_size_txt'] = 'Quota';
-$wb['active_txt'] = 'Aktiv';
-$wb['username_error_empty'] = 'Benutzername ist leer.';
-$wb['username_error_unique'] = 'Der Benutzername muss eindeutig sein.';
-$wb['username_error_regex'] = 'Der Benutzername enthält ungültige Zeichen.';
-$wb['quota_size_error_empty'] = 'Quota ist leer';
-$wb['uid_error_empty'] = 'GID ist leer.';
-$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.';
-?>
-
+<?php
+$wb['uid_txt'] = 'Web Benutzername';
+$wb['gid_txt'] = 'Gruppe';
+$wb['shell_txt'] = 'Shell';
+$wb['dir_txt'] = 'Verzeichnis';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Site';
+$wb['username_txt'] = 'Benutzername';
+$wb['password_txt'] = 'Passwort';
+$wb['chroot_txt'] = 'Chroot Shell';
+$wb['quota_size_txt'] = 'Quota';
+$wb['active_txt'] = 'Aktiv';
+$wb['username_error_empty'] = 'Benutzername ist leer.';
+$wb['username_error_unique'] = 'Der Benutzername muss eindeutig sein.';
+$wb['username_error_regex'] = 'Der Benutzername enthält ungültige Zeichen.';
+$wb['quota_size_error_empty'] = 'Quota ist leer';
+$wb['uid_error_empty'] = 'GID ist leer.';
+$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_shell_user_list.lng b/interface/web/sites/lib/lang/de_shell_user_list.lng
index 1b0792a..cd82289 100644
--- a/interface/web/sites/lib/lang/de_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/de_shell_user_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Shellbenutzer';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Site';
-$wb['username_txt'] = 'Benutzername';
-$wb['add_new_record_txt'] = 'Neuen Shellbenutzer hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Shellbenutzer';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Site';
+$wb['username_txt'] = 'Benutzername';
+$wb['add_new_record_txt'] = 'Neuen Shellbenutzer hinzufügen';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
index 6d282a4..98fb1a3 100644
--- a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
@@ -1,12 +1,11 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Neue Aliasdomain hinzufügen';
-$wb['domain_error_empty'] = 'Domain ist leer.';
-$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
-$wb['domain_error_regex'] = 'Domainname ist ungültig.';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Aliasdomain';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['add_new_record_txt'] = 'Neue Aliasdomain hinzufügen';
+$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/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
index 4969e26..229fcf2 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -1,50 +1,49 @@
-<?php
-$wb['ssl_state_txt'] = 'Bundesland';
-$wb['ssl_locality_txt'] = 'Lokalität';
-$wb['ssl_organisation_txt'] = 'Firma';
-$wb['ssl_organisation_unit_txt'] = 'Abteilung';
-$wb['ssl_country_txt'] = 'Land';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Zertifikat';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Aktion';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Typ';
-$wb['redirect_path_txt'] = 'Redirect Pfad';
-$wb['active_txt'] = 'Aktiv';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux Benutzer';
-$wb['system_group_txt'] = 'Linux Gruppe';
-$wb['ip_address_txt'] = 'IP-Adresse';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Kunde';
-$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['errordocs_txt'] = 'Eigene Fehlerseiten';
-$wb['error_ssl_state_empty'] = 'SSL Status ist leer.';
-$wb['error_ssl_locality_empty'] = 'SSL Lokalität ist leer.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation ist leer.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Abteilung ist leer.';
-$wb['error_ssl_country_empty'] = 'SSL Land ist leer.';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['client_group_id_txt'] = 'Kunde';
-$wb['stats_password_txt'] = 'Webstatistik Passwort';
-?>
-
+<?php
+$wb['ssl_state_txt'] = 'Bundesland';
+$wb['ssl_locality_txt'] = 'Lokalität';
+$wb['ssl_organisation_txt'] = 'Firma';
+$wb['ssl_organisation_unit_txt'] = 'Abteilung';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Zertifikat';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Aktion';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'Redirect Typ';
+$wb['redirect_path_txt'] = 'Redirect Pfad';
+$wb['active_txt'] = 'Aktiv';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux Benutzer';
+$wb['system_group_txt'] = 'Linux Gruppe';
+$wb['ip_address_txt'] = 'IP-Adresse';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Kunde';
+$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['errordocs_txt'] = 'Eigene Fehlerseiten';
+$wb['error_ssl_state_empty'] = 'SSL Status ist leer.';
+$wb['error_ssl_locality_empty'] = 'SSL Lokalität ist leer.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation ist leer.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Abteilung ist leer.';
+$wb['error_ssl_country_empty'] = 'SSL Land ist leer.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['client_group_id_txt'] = 'Kunde';
+$wb['stats_password_txt'] = 'Webstatistik Passwort';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_domain_list.lng b/interface/web/sites/lib/lang/de_web_domain_list.lng
index ae761cc..71f0e0a 100644
--- a/interface/web/sites/lib/lang/de_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_domain_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Websites';
-$wb['domain_id_txt'] = 'ID';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['add_new_record_txt'] = 'Neue Website hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Neue Website hinzufügen';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng
index 98bf43d..660abfb 100644
--- a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Web Datenverkehr';
-$wb['domain_txt'] = 'Domain';
-$wb['this_month_txt'] = 'Diesen Monat';
-$wb['last_month_txt'] = 'Letzten Monat';
-$wb['this_year_txt'] = 'Dieses Jahr';
-$wb['last_year_txt'] = 'Letztes Jahr';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Web Datenverkehr';
+$wb['domain_txt'] = 'Domain';
+$wb['this_month_txt'] = 'Diesen Monat';
+$wb['last_month_txt'] = 'Letzten Monat';
+$wb['this_year_txt'] = 'Dieses Jahr';
+$wb['last_year_txt'] = 'Letztes Jahr';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng
index 31e14fe..19ff862 100644
--- a/interface/web/sites/lib/lang/de_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_subdomain.lng
@@ -1,40 +1,39 @@
-<?php
-$wb['ssl_state_txt'] = 'Bundesland';
-$wb['ssl_locality_txt'] = 'Lokalität';
-$wb['ssl_organisation_txt'] = 'Unternehmen';
-$wb['ssl_organisation_unit_txt'] = 'Abteilung';
-$wb['ssl_country_txt'] = 'Land';
-$wb['ssl_request_txt'] = 'SSL Anfrage';
-$wb['ssl_cert_txt'] = 'SSL Zertifikat';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Aktion';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Typ';
-$wb['redirect_path_txt'] = 'Redirect Pfad';
-$wb['active_txt'] = 'Aktiv';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux Benutzer';
-$wb['system_group_txt'] = 'Linux Gruppe';
-$wb['ip_address_txt'] = 'IP-Adresse';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Kunde';
-$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 Direktiven';
-$wb['domain_error_empty'] = 'Domain ist leer.';
-$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
-$wb['domain_error_regex'] = 'Domainname ist ungültig.';
-$wb['host_txt'] = 'Host';
-?>
-
+<?php
+$wb['ssl_state_txt'] = 'Bundesland';
+$wb['ssl_locality_txt'] = 'Lokalität';
+$wb['ssl_organisation_txt'] = 'Unternehmen';
+$wb['ssl_organisation_unit_txt'] = 'Abteilung';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_request_txt'] = 'SSL Anfrage';
+$wb['ssl_cert_txt'] = 'SSL Zertifikat';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Aktion';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'Redirect Typ';
+$wb['redirect_path_txt'] = 'Redirect Pfad';
+$wb['active_txt'] = 'Aktiv';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux Benutzer';
+$wb['system_group_txt'] = 'Linux Gruppe';
+$wb['ip_address_txt'] = 'IP-Adresse';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Kunde';
+$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 Direktiven';
+$wb['domain_error_empty'] = 'Domain ist leer.';
+$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
+$wb['domain_error_regex'] = 'Domainname ist ungültig.';
+$wb['host_txt'] = 'Host';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_subdomain_list.lng
index 1174f6c..042b9f0 100644
--- a/interface/web/sites/lib/lang/de_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_subdomain_list.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webseite';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Webseite';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
+?>
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/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_cron.lng b/interface/web/sites/lib/lang/nl_cron.lng
index 8cb7f08..fecb4ab 100644
--- a/interface/web/sites/lib/lang/nl_cron.lng
+++ b/interface/web/sites/lib/lang/nl_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/nl_cron_list.lng b/interface/web/sites/lib/lang/nl_cron_list.lng
index b5c8d15..ad56ea9 100644
--- a/interface/web/sites/lib/lang/nl_cron_list.lng
+++ b/interface/web/sites/lib/lang/nl_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/nl_ftp_user.lng b/interface/web/sites/lib/lang/nl_ftp_user.lng
index ed5cce6..53bd883 100644
--- a/interface/web/sites/lib/lang/nl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/nl_ftp_user.lng
@@ -23,4 +23,5 @@
 $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['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_shell_user.lng b/interface/web/sites/lib/lang/nl_shell_user.lng
index d525d2c..e1a8a1a 100644
--- a/interface/web/sites/lib/lang/nl_shell_user.lng
+++ b/interface/web/sites/lib/lang/nl_shell_user.lng
@@ -18,4 +18,5 @@
 $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['parent_domain_id_error_empty'] = 'No website selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng
index 7919646..9135cbb 100644
--- a/interface/web/sites/lib/lang/pl.lng
+++ b/interface/web/sites/lib/lang/pl.lng
@@ -1,18 +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';
-?>
-
+<?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
index d54dee0..fecb4ab 100644
--- a/interface/web/sites/lib/lang/pl_cron.lng
+++ b/interface/web/sites/lib/lang/pl_cron.lng
@@ -1,22 +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.';
-?>
-
+<?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
index 8e0e146..ad56ea9 100644
--- a/interface/web/sites/lib/lang/pl_cron_list.lng
+++ b/interface/web/sites/lib/lang/pl_cron_list.lng
@@ -1,13 +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';
-?>
-
+<?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
index 317dfae..8fda3d1 100644
--- a/interface/web/sites/lib/lang/pl_database.lng
+++ b/interface/web/sites/lib/lang/pl_database.lng
@@ -1,25 +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';
-?>
-
-
+<?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
index e0d6866..ca92d98 100644
--- a/interface/web/sites/lib/lang/pl_database_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index b5d5613..9270b25 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user.lng
@@ -1,30 +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"] = 'UID jest puste';
-$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.';
-?>
-
-
+<?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
index 1619df8..fecbba3 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index c6abcae..b2e518d 100644
--- a/interface/web/sites/lib/lang/pl_shell_user.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user.lng
@@ -1,25 +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"] = 'UID 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.';
-?>
-
-
+<?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
index 6bb70c4..850c0eb 100644
--- a/interface/web/sites/lib/lang/pl_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index dbb32ad..6dd8022 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
@@ -1,12 +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.';
-?>
-
+<?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
index bf2a2c2..7fdc305 100644
--- a/interface/web/sites/lib/lang/pl_web_domain.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain.lng
@@ -1,51 +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';
-?>
-
-
+<?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
index 3ba51c6..62b7455 100644
--- a/interface/web/sites/lib/lang/pl_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain_list.lng
@@ -1,9 +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ę';
-?>
-
+<?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
index a6b12aa..b217f80 100644
--- a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
@@ -1,9 +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';
-?>
-
+<?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
index 7283c76..8154c22 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng
@@ -1,40 +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';
-?>
-
+<?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
index 9cb0300..9ccb0a3 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
@@ -1,9 +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';
-?>
-
+<?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_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_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/strengthmeter/lib/lang/br_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/br_strengthmeter.lng
index b7641dd..ba99f97 100644
--- a/interface/web/strengthmeter/lib/lang/br_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/br_strengthmeter.lng
@@ -6,4 +6,3 @@
 $wb['password_strength_4_txt'] = 'Forte';
 $wb['password_strength_5_txt'] = 'Muito Forte';
 ?>
-
diff --git a/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng
index 4ca9ec1..23a6764 100644
--- a/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['password_strength_0_txt'] = 'Zu kurz';
-$wb['password_strength_1_txt'] = 'Leicht';
-$wb['password_strength_2_txt'] = 'Mittel';
-$wb['password_strength_3_txt'] = 'Gut';
-$wb['password_strength_4_txt'] = 'Stark';
-$wb['password_strength_5_txt'] = 'sehr stark';
-?>
-
+<?php
+$wb['password_strength_0_txt'] = 'Zu kurz';
+$wb['password_strength_1_txt'] = 'Leicht';
+$wb['password_strength_2_txt'] = 'Mittel';
+$wb['password_strength_3_txt'] = 'Gut';
+$wb['password_strength_4_txt'] = 'Stark';
+$wb['password_strength_5_txt'] = 'sehr stark';
+?>
diff --git a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
index 9698f65..df85c97 100644
--- a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
@@ -1,10 +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';
-?>
-
-
+<?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/tools/lib/lang/br.lng b/interface/web/tools/lib/lang/br.lng
index 0dab14b..0ea9686 100644
--- a/interface/web/tools/lib/lang/br.lng
+++ b/interface/web/tools/lib/lang/br.lng
@@ -4,4 +4,3 @@
 $wb['ISPConfig Tools'] = 'Ferramentas';
 $wb['Password and Language'] = 'Senha e Idioma';
 ?>
-
diff --git a/interface/web/tools/lib/lang/br_usersettings.lng b/interface/web/tools/lib/lang/br_usersettings.lng
index 8aaa6f1..ad7432d 100644
--- a/interface/web/tools/lib/lang/br_usersettings.lng
+++ b/interface/web/tools/lib/lang/br_usersettings.lng
@@ -6,4 +6,3 @@
 $wb['Form to edit the user password and language.'] = 'Formulário para alterar idioma e senha';
 $wb['Settings'] = 'Configurações';
 ?>
-
diff --git a/interface/web/tools/lib/lang/de.lng b/interface/web/tools/lib/lang/de.lng
index ff225ee..875ba4f 100644
--- a/interface/web/tools/lib/lang/de.lng
+++ b/interface/web/tools/lib/lang/de.lng
@@ -1,7 +1,6 @@
-<?php
-$wb['User Settings'] = 'Benutzereinstellungen';
-$wb['Settings'] = 'Einstellungen';
-$wb['ISPConfig Tools'] = 'ISPConfig Tools';
-$wb['Password and Language'] = 'Passwort und Sprache';
-?>
-
+<?php
+$wb['User Settings'] = 'Benutzereinstellungen';
+$wb['Settings'] = 'Einstellungen';
+$wb['ISPConfig Tools'] = 'ISPConfig Tools';
+$wb['Password and Language'] = 'Passwort und Sprache';
+?>
diff --git a/interface/web/tools/lib/lang/de_usersettings.lng b/interface/web/tools/lib/lang/de_usersettings.lng
index bda3099..2adc821 100644
--- a/interface/web/tools/lib/lang/de_usersettings.lng
+++ b/interface/web/tools/lib/lang/de_usersettings.lng
@@ -1,9 +1,8 @@
-<?php
-$wb['passwort_txt'] = 'Passwort';
-$wb['language_txt'] = 'Sprache';
-$wb['password_mismatch'] = 'Die Passwörter stimmen nicht überein.';
-$wb['password_strength_txt'] = 'Passwortkomplexität';
-$wb['Form to edit the user password and language.'] = 'Formular um das Benutzerpasswort und die Sprache zu bearbeiten.';
-$wb['Settings'] = 'Einstellungen';
-?>
-
+<?php
+$wb['passwort_txt'] = 'Passwort';
+$wb['language_txt'] = 'Sprache';
+$wb['password_mismatch'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['Form to edit the user password and language.'] = 'Formular um das Benutzerpasswort und die Sprache zu bearbeiten.';
+$wb['Settings'] = 'Einstellungen';
+?>
diff --git a/interface/web/tools/lib/lang/pl.lng b/interface/web/tools/lib/lang/pl.lng
index 7447ff8..8aa0391 100644
--- a/interface/web/tools/lib/lang/pl.lng
+++ b/interface/web/tools/lib/lang/pl.lng
@@ -1,7 +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';
-?>
-
+<?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
index 979c855..f8d7665 100644
--- a/interface/web/tools/lib/lang/pl_usersettings.lng
+++ b/interface/web/tools/lib/lang/pl_usersettings.lng
@@ -1,10 +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';
-?>
-
-
+<?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';
+?>

--
Gitblit v1.9.1