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

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

diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index 26abeefd84..70d6652080 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -143,7 +143,7 @@ class listform_actions {
 		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 86c3a4c7ed..1d14775dba 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 b7b378d2e1..04104de512 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -1232,6 +1232,30 @@ class tform {
 			
 			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 2fdb048f16..ad2a97b685 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -21,4 +21,13 @@ $wb['filter_txt'] = 'Filter';
 $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 3aad6e0093..915f11df5d 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -21,5 +21,13 @@ $wb['filter_txt'] = 'Filtrar';
 $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 a586bf6b21..6b660ff869 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 c94811ef41..eb5816101f 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -22,4 +22,13 @@ $wb["filter_txt"] = 'Filter';
 $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 ced7227965..f6f64ac3c8 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -21,4 +21,13 @@ $wb['filter_txt'] = 'Filter';
 $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 dde8150032..abdfa3dc07 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -21,4 +21,13 @@ $wb['filter_txt'] = 'Suodatin';
 $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 60f38b8fbe..db0c35ba8e 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -21,4 +21,13 @@ $wb['filter_txt'] = 'Filter';
 $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 404edb6de4..cf7324bb4f 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -21,4 +21,13 @@ $wb['filter_txt'] = 'Filtro';
 $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 0a1ec3d77c..16f2855f18 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -21,4 +21,13 @@ $wb['filter_txt'] = 'Filter';
 $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 13b7cb83b8..74dff0c9e4 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 dc81b7d4e5..7493dbe56a 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -21,4 +21,13 @@ $wb['filter_txt'] = 'Filter';
 $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 820dd8f6de..65a1c37852 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -21,4 +21,13 @@ $wb['filter_txt'] = 'Filter';
 $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 67c31ca733..e626345d3c 100644
--- a/interface/web/admin/lib/lang/bg_firewall.lng
+++ b/interface/web/admin/lib/lang/bg_firewall.lng
@@ -6,4 +6,6 @@ $wb['tcp_port_help_txt'] = 'Separated by comma';
 $wb['udp_port_help_txt'] = 'Separated by comma';
 $wb['active_txt'] = 'Active';
 $wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
+$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 f3a7a95804..ed933880b1 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['init_script_txt'] = 'Cron init script name';
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['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 53fc640d88..0130841ef2 100644
--- a/interface/web/admin/lib/lang/br.lng
+++ b/interface/web/admin/lib/lang/br.lng
@@ -32,4 +32,3 @@ $wb['Language Editor'] = 'Editor de Idiomas';
 $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 8bc8cdb8ac..40a7496af0 100644
--- a/interface/web/admin/lib/lang/br_firewall.lng
+++ b/interface/web/admin/lib/lang/br_firewall.lng
@@ -9,4 +9,3 @@ $wb['firewall_error_unique'] = 'JÃ¡ existe uma regra de firewall para este servi
 $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 c3429c7a1e..d299957124 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['tcp_port_txt'] = 'Portas TCP abertas';
 $wb['udp_port_txt'] = 'Portas UDP abertas';
 $wb['add_new_record_txt'] = 'Adcionar registro de firewall';
 ?>
-
diff --git a/interface/web/admin/lib/lang/br_groups.lng b/interface/web/admin/lib/lang/br_groups.lng
index ee75776272..41afadbfef 100644
--- a/interface/web/admin/lib/lang/br_groups.lng
+++ b/interface/web/admin/lib/lang/br_groups.lng
@@ -3,4 +3,3 @@ $wb['description_txt'] = 'DescriÃ§Ã£o';
 $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 68a49ce6c7..bf2a28626c 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['description_txt'] = 'DescriÃ§Ã£o';
 $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 d31fb97407..064b9eaf0a 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['language_new_hint_txt'] = '2 letras cÃ³digo ISO 639-1 (Veja http://en.wikip
 $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 4a6795eebd..c4c0b1453e 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['language_select_txt'] = 'Selecionar Idioma';
 $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 f023e9c00c..2a3f572d19 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['lang_file_txt'] = 'Arquivo de Idioma';
 $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 f7f924c878..d484661389 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['language_select_txt'] = 'Selecione o idioma';
 $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 215ae6404f..bcc33daa1f 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['btn_save_txt'] = 'Importar Arquivo de Idioma Selecionado';
 $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 fe3d2a48ad..348b94aaf1 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['module_txt'] = 'MÃ³dulo';
 $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 ce97f76054..0a9184a3af 100644
--- a/interface/web/admin/lib/lang/br_server.lng
+++ b/interface/web/admin/lib/lang/br_server.lng
@@ -9,4 +9,3 @@ $wb['db_server_txt'] = 'Servidor de Banco de Dados';
 $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 e39e6405ef..4112755253 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['crontab_dir_txt'] = 'Caminho para crontabs individuais';
 $wb['wget_txt'] = 'Caminho para o wget';
 $wb['web_user_txt'] = 'UsuÃ¡rio Apache';
 $wb['web_group_txt'] = 'Grupo Apache';
-$wb['security_level'] = '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 551867db8e..60047d5c18 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 b1bbc8eb47..36805c25f6 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['ip_address_txt'] = 'EndereÃ§o IP';
 $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 6b137cc957..864464e22f 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['server_id_txt'] = 'Servidor';
 $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 011e47e97f..5a1266c645 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['db_server_txt'] = 'Banco de Dados';
 $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 2faa815f9f..893cc4cc37 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_title_txt'] = 'Pacote';
 $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 9d09727699..5b54c3080a 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_username_txt'] = 'UsuÃ¡rio (opcional)';
 $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 1b8d7eb0fd..6941c7f147 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['active_txt'] = 'Ativo';
 $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 6cc6a559dc..e6af8ec634 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['update_title_txt'] = 'Atualizar';
 $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 bc22ce6253..0e2b172d35 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['shelluser_prefix_error_regex'] = 'Caractere nÃ£o permitido para o prefixo d
 $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 a63a2f4b9b..28369f7a65 100644
--- a/interface/web/admin/lib/lang/br_users.lng
+++ b/interface/web/admin/lib/lang/br_users.lng
@@ -26,4 +26,3 @@ $wb['groups_txt'] = 'Grupos';
 $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 95224f7f79..dc27c806e2 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['vorname_txt'] = 'Sobrenome';
 $wb['ort_txt'] = 'cidade';
 $wb['add_new_record_txt'] = 'Adcionar novo usuÃ¡rio';
 ?>
-
diff --git a/interface/web/admin/lib/lang/de.lng b/interface/web/admin/lib/lang/de.lng
index ae0fc3d4f6..c7f33ed686 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 612bd88de6..0f58d7c3d7 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 7e31e9205d..aefad619ba 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 f6ab5f0926..25f81b1f39 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 609ce0b048..8f312e4a62 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 cb9782e9fd..118bdee049 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 c23bd4d731..1376e0c8a2 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 25a72afeeb..30ab21b28d 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 b254dd2654..70eb466d4c 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 c6e37ccb66..ac148d5c41 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 e37863f2f8..074eab9e80 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 eed573256b..4193d9b424 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 f22e356b22..2ed5c682c4 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 46a90e2507..191b2c8d32 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 b641cfb310..6553d0d642 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 0349f5a818..0d0727cd15 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 97359ba123..332a603ccb 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 7ccb33e7fe..ca797d3cc7 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 8875be9d30..6e54c4a6b3 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 0607a4e4ab..db6f49fd4e 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 dab68bdc9c..6f01c1f081 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 390cf91d39..88197d4c3b 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 deb28ddbf6..b8b80fc9f1 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 06b327f475..523efb4267 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 978c8fe05b..4b19e6557f 100644
--- a/interface/web/admin/lib/lang/es_firewall.lng
+++ b/interface/web/admin/lib/lang/es_firewall.lng
@@ -6,4 +6,6 @@ $wb['tcp_port_help_txt'] = 'Separados por coma';
 $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 d27976837b..e8b396bf24 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['init_script_txt'] = 'Cron init script name';
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['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 d47d21de03..6eb44c139c 100755
--- a/interface/web/admin/lib/lang/fi_firewall.lng
+++ b/interface/web/admin/lib/lang/fi_firewall.lng
@@ -6,4 +6,6 @@ $wb['tcp_port_help_txt'] = 'Pilkulla erotettu lista';
 $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 ec4a7a79cc..e51d9ddb88 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['init_script_txt'] = 'Cron init script name';
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['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 67c31ca733..e626345d3c 100644
--- a/interface/web/admin/lib/lang/fr_firewall.lng
+++ b/interface/web/admin/lib/lang/fr_firewall.lng
@@ -6,4 +6,6 @@ $wb['tcp_port_help_txt'] = 'Separated by comma';
 $wb['udp_port_help_txt'] = 'Separated by comma';
 $wb['active_txt'] = 'Active';
 $wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
+$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 f3a7a95804..ed933880b1 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['init_script_txt'] = 'Cron init script name';
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['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 0218e6798e..c58341df89 100644
--- a/interface/web/admin/lib/lang/it_firewall.lng
+++ b/interface/web/admin/lib/lang/it_firewall.lng
@@ -6,4 +6,6 @@ $wb['tcp_port_help_txt'] = 'Separate dalla virgola';
 $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 ab6a29b08f..519029c021 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['init_script_txt'] = 'Cron init script name';
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['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 6a8a53af09..57ec2afacf 100644
--- a/interface/web/admin/lib/lang/nl_firewall.lng
+++ b/interface/web/admin/lib/lang/nl_firewall.lng
@@ -6,4 +6,6 @@ $wb['tcp_port_help_txt'] = 'Gescheiden door komma';
 $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 fe73f16497..50b089ec50 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['init_script_txt'] = 'Cron init script name';
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['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 69aba415e6..d3b0c94fa2 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 6f1c7b909f..6628fd8b95 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 2b6aa26ab2..f7e1640404 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 e908583d55..b3c8b9ca77 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 8f8601ff94..2470a03d4b 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 3f7272593b..82e42ef720 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 56b7ce85d3..0096c69efa 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 d96a3dc5e6..3a5e706939 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 2f3543c162..82666fcb78 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 f414dfb1a9..f3d631e048 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 c7a0e02914..68f710be04 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 09dc2cdd92..23d6043d6d 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 a72b437625..eb5720232a 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 db95019b80..f9e8dcf1b5 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 d836e6b8d5..c24d0a37d8 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 b51e7a96fa..6ab81c1e5b 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 d4b65f7d33..f61ba5fc87 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 b98d95673f..9549333b1a 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 3ee2dd4d10..d11a1b3b33 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 c20873ef7b..7ca6af9f9f 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 10f353ed3b..e38bdf8a31 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 b82ba16985..09a9ed0a1a 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 fb885ffd0e..3b2472dfeb 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 7fbe733fa2..355d89ed1f 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 e190234a8a..d146c40f6e 100644
--- a/interface/web/admin/lib/lang/ru_firewall.lng
+++ b/interface/web/admin/lib/lang/ru_firewall.lng
@@ -6,4 +6,6 @@ $wb['tcp_port_help_txt'] = 'ÐŸÐµÑ€ÐµÑ‡Ð¸ÑÐ»Ð¸Ñ‚ÑŒ Ñ‡ÐµÑ€ÐµÐ· Ð·Ð°Ð¿ÑÑ‚ÑƒÑŽ';
 $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 d84a211dfc..1d9c96ffe6 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['init_script_txt'] = 'Cron init script name';
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['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 67c31ca733..e626345d3c 100644
--- a/interface/web/admin/lib/lang/se_firewall.lng
+++ b/interface/web/admin/lib/lang/se_firewall.lng
@@ -6,4 +6,6 @@ $wb['tcp_port_help_txt'] = 'Separated by comma';
 $wb['udp_port_help_txt'] = 'Separated by comma';
 $wb['active_txt'] = 'Active';
 $wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
+$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 f3a7a95804..ed933880b1 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['init_script_txt'] = 'Cron init script name';
 $wb['crontab_dir_txt'] = 'Path for individual crontabs';
 $wb['wget_txt'] = 'Path to wget program';
 $wb['security_level_txt'] = 'Security level';
+$wb['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 909545e97c..3e48d5eaee 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 f6a1b923f4..cc31de5643 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 06b12e0ffc..1f5f51dd05 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 6fc1d0896d..104ea4f8ed 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 3407c9b4e9..ee1686efd7 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 d85e6f14a4..f16dcb921b 100644
--- a/interface/web/client/lib/lang/bg.lng
+++ b/interface/web/client/lib/lang/bg.lng
@@ -6,4 +6,7 @@ $wb['Add Client'] = 'Ð”Ð¾Ð±Ð°Ð²ÑÐ½Ðµ Ð½Ð° ÐºÐ»Ð¸ÐµÐ½Ñ‚';
 $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 0000000000..906fd44bcb
--- /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 0000000000..523a467c58
--- /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 bcc82023e6..83d1ecf6a6 100644
--- a/interface/web/client/lib/lang/br.lng
+++ b/interface/web/client/lib/lang/br.lng
@@ -10,4 +10,3 @@ $wb['Add Reseller'] = 'Adcionar Revendedor';
 $wb['Edit Reseller'] = 'Editar Revendedor';
 $wb['Resellers'] = 'Revendedores';
 ?>
-
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index c47751c46a..2d1d57512c 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_frequency_txt'] = 'Intervalo mÃnimo entre as execuÃ§Ãµes';
 $wb['limit_cron_error_notint'] = 'O limite do cron deve ser um nÃºmero.';
 $wb['limit_cron_error_frequency'] = 'O limite de frequÃªncia do cron deve ser um nÃºmero.';
 ?>
-
diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng
index 7ff18178dc..5d58451f74 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_frequency_txt'] = 'Intervalo mÃnimo entre as execuÃ§Ãµes';
 $wb['limit_cron_error_notint'] = 'O limite do cron deve ser um nÃºmero.';
 $wb['limit_cron_error_frequency'] = 'O limite de frequÃªncia do cron deve ser um nÃºmero.';
 ?>
-
diff --git a/interface/web/client/lib/lang/br_client_template_list.lng b/interface/web/client/lib/lang/br_client_template_list.lng
index 3f9dd5226b..231f7fdea0 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['list_head_txt'] = 'Gabarito de Cliente ';
 $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 db70b3556e..e9ba7683f7 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['city_txt'] = 'Cidade';
 $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 85d1c2ecd1..9f547751da 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -88,4 +88,3 @@ $wb['web_php_options_txt'] = 'OpÃ§Ãµes do PHP';
 $wb['limit_client_error'] = 'O nÃºmero mÃ¡ximo de clientes foi atingido.';
 $wb['limit_client_error_positive'] = 'O nÃºmero de clientes precisa ser > 0';
 ?>
-
diff --git a/interface/web/client/lib/lang/br_resellers_list.lng b/interface/web/client/lib/lang/br_resellers_list.lng
index e8849fe758..053d7229d4 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['city_txt'] = 'Cidade';
 $wb['country_txt'] = 'PaÃs';
 $wb['add_new_record_txt'] = 'Adcionar um novo revendedor';
 ?>
-
diff --git a/interface/web/client/lib/lang/de.lng b/interface/web/client/lib/lang/de.lng
index 136d3eafe2..0a4f978e3f 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 3d54d255ff..34db3a893c 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 5277cd9459..03a590982d 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 6bb2e8a26b..98195fed1b 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 d4b1722b41..515d7dbe0f 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 fef48ecc5e..6c3c31d0bc 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 417251a461..f6f736cf3a 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 95a0dc8d9a..1bec133350 100644
--- a/interface/web/client/lib/lang/es.lng
+++ b/interface/web/client/lib/lang/es.lng
@@ -6,4 +6,7 @@ $wb['Add Client'] = 'AÃ±adir cliente';
 $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 0000000000..906fd44bcb
--- /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 0000000000..523a467c58
--- /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 a06bfe8dfa..a65324956b 100755
--- a/interface/web/client/lib/lang/fi.lng
+++ b/interface/web/client/lib/lang/fi.lng
@@ -6,4 +6,7 @@ $wb['Add Client'] = 'LisÃ¤Ã¤ asiakas';
 $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 0000000000..906fd44bcb
--- /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 0000000000..523a467c58
--- /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 6f2810851a..0d86355fec 100644
--- a/interface/web/client/lib/lang/fr.lng
+++ b/interface/web/client/lib/lang/fr.lng
@@ -6,4 +6,7 @@ $wb['Add Client'] = 'Add Client';
 $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 0000000000..906fd44bcb
--- /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 0000000000..523a467c58
--- /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 ca3b55a7ab..228cd0ccaa 100644
--- a/interface/web/client/lib/lang/it.lng
+++ b/interface/web/client/lib/lang/it.lng
@@ -6,4 +6,7 @@ $wb['Add Client'] = 'Aggiungi cliente';
 $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 0000000000..906fd44bcb
--- /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 0000000000..523a467c58
--- /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 4ba5907778..3a0b28b2a0 100644
--- a/interface/web/client/lib/lang/nl.lng
+++ b/interface/web/client/lib/lang/nl.lng
@@ -6,4 +6,7 @@ $wb['Add Client'] = 'Toevoegen klant';
 $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 0000000000..906fd44bcb
--- /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 0000000000..523a467c58
--- /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 a3b499700b..2c0324a8ca 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 ec3e7db3ac..4d3746e3bd 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 fa971a50c6..888d92c63a 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 9648314627..06a39761f9 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 0000000000..86671aef4f
--- /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 0d43b83e72..09b6699369 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 0932f47c97..51abc411a5 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 6f2810851a..0d86355fec 100644
--- a/interface/web/client/lib/lang/ru.lng
+++ b/interface/web/client/lib/lang/ru.lng
@@ -6,4 +6,7 @@ $wb['Add Client'] = 'Add Client';
 $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 0000000000..906fd44bcb
--- /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 0000000000..523a467c58
--- /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 6f2810851a..0d86355fec 100644
--- a/interface/web/client/lib/lang/se.lng
+++ b/interface/web/client/lib/lang/se.lng
@@ -6,4 +6,7 @@ $wb['Add Client'] = 'Add Client';
 $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 0000000000..906fd44bcb
--- /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 0000000000..523a467c58
--- /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 ee5ab6782d..839627e8f7 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 b2943d4ddd..f59916a8a4 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 534d586e8e..2f081e71a3 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 c8dc08366d..d3326635bb 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 29f4a51efe..acb6c3546c 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 afd97e0eb1..7d7534a4ee 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_user_txt'] = 'Perm. UsuÃ¡rio';
 $wb['auth_preset_perm_group_txt'] = 'Perm. Grupo';
 $wb['auth_preset_perm_other_txt'] = 'Perm. Outros';
 ?>
-
diff --git a/interface/web/designer/lib/lang/br_form_list.lng b/interface/web/designer/lib/lang/br_form_list.lng
index 01d0f28e9b..b16ce554b0 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['module_txt'] = 'MÃ³dulo';
 $wb['title_txt'] = 'TÃtulo';
 $wb['description_txt'] = 'DescriÃ§Ã£o';
 ?>
-
diff --git a/interface/web/designer/lib/lang/br_form_show.lng b/interface/web/designer/lib/lang/br_form_show.lng
index 32fede295b..5b68a31651 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['module_del_txt'] = 'Remover o mÃ³dulo e todos seus sub-diretÃ³rios?';
 $wb['menu_del_txt'] = 'Remover o menu e todos os seus itens?';
 $wb['item_del_txt'] = 'Remover o item de menu?';
 ?>
-
diff --git a/interface/web/designer/lib/lang/br_module_edit.lng b/interface/web/designer/lib/lang/br_module_edit.lng
index e80d725bd8..34471acd29 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 @@ $wb['description_txt'] = '
 <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 8b8f247755..822263a4ad 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['list_head_txt'] = 'MÃ³dulo do Backend';
 $wb['module_txt'] = 'MÃ³dulo';
 $wb['title_txt'] = 'TÃtulo';
 ?>
-
diff --git a/interface/web/designer/lib/lang/br_module_nav_edit.lng b/interface/web/designer/lib/lang/br_module_nav_edit.lng
index b147dcecf7..c5e3266a7b 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['header_txt'] = 'Propriedades de NavegaÃ§Ã£o';
 $wb['save_txt'] = 'Salvar';
 $wb['cancel_txt'] = 'Cancelar';
 ?>
-
diff --git a/interface/web/designer/lib/lang/br_module_nav_item_edit.lng b/interface/web/designer/lib/lang/br_module_nav_item_edit.lng
index 0421ceae72..5eafa775af 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['header_txt'] = 'Propriedades de NavegaÃ§Ã£o';
 $wb['save_txt'] = 'Salvar';
 $wb['cancel_txt'] = 'Cancelar';
 ?>
-
diff --git a/interface/web/designer/lib/lang/br_module_show.lng b/interface/web/designer/lib/lang/br_module_show.lng
index e5fffaff61..1fb1800714 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['module_del_txt'] = 'Deseja eliminar este mÃ³dulo e todos os arquivos contid
 $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 75c42c807a..acb6c3546c 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 12cbb3e9f4..74bf458d90 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 b838f3c6a1..998a64f702 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 07a42f97c1..b19fd34457 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 d69faf01ba..6eacd64b1d 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 0247c671d0..d5142f03cb 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 f17a4a1afa..8c0c33c1a6 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 0789bb6fab..f4b2ad11f8 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 6c07af26c4..acb6c3546c 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 412632a82b..ee4f4c4100 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 c915c85443..ac8572277c 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 fd191b1df2..db62af16b9 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 fb7aaa1b62..691e55052f 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 @@ $wb["description_txt"] = '
 <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 d4e18792c4..308d1c688b 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 cf9240cd70..5ace229a90 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 a08a60e69b..779b3b4b3b 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 060ebbe7cf..9b98c49482 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 3f120db26f..877bf98ae8 100644
--- a/interface/web/dns/dns_soa_edit.php
+++ b/interface/web/dns/dns_soa_edit.php
@@ -139,6 +139,7 @@ class page_action extends tform_actions {
 		$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 @@ class page_action extends tform_actions {
 			// 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 @@ class page_action extends tform_actions {
 				$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 88ac863cc6..4d815a6668 100644
--- a/interface/web/dns/lib/lang/br.lng
+++ b/interface/web/dns/lib/lang/br.lng
@@ -15,4 +15,3 @@ $wb['DNS SRV'] = 'SRV DNS';
 $wb['DNS TXT Record'] = 'Registro TXT DNS';
 $wb['DNS TXT'] = 'TXT DNS';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_a.lng b/interface/web/dns/lib/lang/br_dns_a.lng
index 41fb94a5be..137af7c187 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_empty'] = 'EndereÃ§o-IP em branco';
 $wb['data_error_regex'] = 'EndereÃ§o-IP formato invÃ¡lido';
 $wb['data_error_duplicate'] = 'Registro-A duplicado';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_a_list.lng b/interface/web/dns/lib/lang/br_dns_a_list.lng
index 8436baee4a..b231c8342d 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_txt'] = 'PÃ¡gina';
 $wb['page_of_txt'] = 'de';
 $wb['delete_confirmation'] = 'Tem certeza que deseja remover este registro?';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_aaaa.lng b/interface/web/dns/lib/lang/br_dns_aaaa.lng
index 9ce9a540ac..918b8558d5 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['name_error_regex'] = 'O Hostname estÃ¡ com formato invÃ¡lido.';
 $wb['data_error_empty'] = 'EndereÃ§o-IP em branco';
 $wb['data_error_regex'] = 'EndereÃ§o-IP com formato invÃ¡lido';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_alias.lng b/interface/web/dns/lib/lang/br_dns_alias.lng
index 5b60d3a925..d026ddfaa5 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['name_error_regex'] = 'O hostname estÃ¡ em um formato invÃ¡lido.';
 $wb['data_error_empty'] = 'Hostname de destino estÃ¡ em branco';
 $wb['data_error_regex'] = 'O hostname de destino estÃ¡ em um formato invÃ¡lido.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_cname.lng b/interface/web/dns/lib/lang/br_dns_cname.lng
index 9a72ba838f..881cb63761 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['name_error_regex'] = 'O hostname estÃ¡ em um formato invÃ¡lido.';
 $wb['data_error_empty'] = 'Hostname de destino estÃ¡ em branco';
 $wb['data_error_regex'] = 'O hostname de destino estÃ¡ em um formato invÃ¡lido.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_hinfo.lng b/interface/web/dns/lib/lang/br_dns_hinfo.lng
index 2fe82da970..ac6e13b065 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['name_error_regex'] = 'Hostname tem um formato invÃ¡lido.';
 $wb['data_error_empty'] = 'EndereÃ§o-IP em branco';
 $wb['data_error_regex'] = 'EndereÃ§o-IP formato invÃ¡lido';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_mx.lng b/interface/web/dns/lib/lang/br_dns_mx.lng
index 966eb046bc..0dfd536a27 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['name_error_regex'] = 'Hostname tem um formato invÃ¡lido.';
 $wb['data_error_empty'] = 'Hostname do servidor de correio em branco';
 $wb['data_error_regex'] = 'Hostname do servidor de correio formato invÃ¡lido';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_ns.lng b/interface/web/dns/lib/lang/br_dns_ns.lng
index f2caae1b07..ef9966fca1 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['name_error_regex'] = 'A zona estÃ¡ com formato invÃ¡lido.';
 $wb['data_error_empty'] = 'Servidor de nomes em branco';
 $wb['data_error_regex'] = 'Servidor de nomes com formato invÃ¡lido';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_ptr.lng b/interface/web/dns/lib/lang/br_dns_ptr.lng
index a4fdfc12d7..728ea0731a 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['name_error_regex'] = 'Hostname tem um formato invÃ¡lido.';
 $wb['data_error_empty'] = 'EndereÃ§o-IP em branco';
 $wb['data_error_regex'] = 'EndereÃ§o-IP formato invÃ¡lido';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_rp.lng b/interface/web/dns/lib/lang/br_dns_rp.lng
index fcf021ef90..d1854700f5 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['name_error_regex'] = 'O Hostname estÃ¡ com formato invÃ¡lido.';
 $wb['data_error_empty'] = 'Pessoa responsÃ¡vel em branco';
 $wb['data_error_regex'] = 'Pessoa responsÃ¡vel formato invÃ¡lido';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_soa.lng b/interface/web/dns/lib/lang/br_dns_soa.lng
index 089dae6e39..3b46c6b233 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['ns_error_regex'] = 'NS tem um formato invÃ¡lido.';
 $wb['mbox_error_empty'] = 'Correio estÃ¡ em branco.';
 $wb['mbox_error_regex'] = 'Correio com formato invÃ¡lido.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_soa_list.lng b/interface/web/dns/lib/lang/br_dns_soa_list.lng
index 05338821e9..ef0c93fa2f 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['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Correio';
 $wb['add_new_record_txt'] = 'Adcionar uma nova zona dns (SOA)';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_srv.lng b/interface/web/dns/lib/lang/br_dns_srv.lng
index 3f657c5348..406f468ebb 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['name_error_regex'] = 'O Hostname estÃ¡ com formato invÃ¡lido.';
 $wb['data_error_empty'] = 'Registro do Servidor em branco';
 $wb['data_error_regex'] = 'Registro do Servidor com formato invÃ¡lido';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_template.lng b/interface/web/dns/lib/lang/br_dns_template.lng
index c4810ec126..9d7331b795 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['fields_txt'] = 'Campos';
 $wb['template_txt'] = 'Gabarito';
 $wb['visible_txt'] = 'VisÃvel';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_template_list.lng b/interface/web/dns/lib/lang/br_dns_template_list.lng
index ae5bc25aef..a4602aec97 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['visible_txt'] = 'VisÃvel';
 $wb['name_txt'] = 'Nome';
 $wb['add_new_record_txt'] = 'Adcionar novo registro';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_txt.lng b/interface/web/dns/lib/lang/br_dns_txt.lng
index 664fd2ff58..f73ada31df 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['name_error_regex'] = 'Hostname tem um formato invÃ¡lido.';
 $wb['data_error_empty'] = 'EndereÃ§o-IP em branco';
 $wb['data_error_regex'] = 'EndereÃ§o-IP formato invÃ¡lido';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_wizard.lng b/interface/web/dns/lib/lang/br_dns_wizard.lng
index 2d72f0b706..84ea73c24a 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_ns1_empty'] = 'NS1 vazio.';
 $wb['error_ns2_empty'] = 'NS2 vazio.';
 $wb['error_email_empty'] = 'Correio vazio.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng
index 76072fb174..406bb86ddb 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 bc95c5fa9e..ea6d021781 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 6710005c59..0481c2b67a 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 46d78cb762..768e670568 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 c833fd7de5..9475644b21 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 848900a364..4c3d5a0a5c 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 c5dae169d5..245480f3b7 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 f08da50848..ab21cc4987 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 7cb6c9995c..845da9dc1e 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 bf37a5830f..78b289fe56 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 738162f42f..86f3fc02bf 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 cf26266637..16b7f5e2f3 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 11a84915e8..92f098c844 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 e0fd2ff16c..2ce5968c3f 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 753b890078..33d1090cba 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 dd92dca7ca..45f0c5c5af 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 fea254f158..182e9945ab 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 14b39a7075..b2eb9a005b 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 c56d55863b..31ef0da150 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 c56d55863b..31ef0da150 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 c56d55863b..31ef0da150 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 c56d55863b..31ef0da150 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 ad34f6d1ab..de0d46d8e6 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 a7b709ed87..5742c402c9 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 d3223aba04..3d0db059b0 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 23ec99f7d3..983fae1a8c 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 5a7c9813e8..a950805e3b 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 2399096805..92cb4ac97d 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 bf954562a0..53b6da2265 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 5a3f0c7ebd..f8a6c0fbdb 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 3347cf4b62..18d7efd6cd 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 87418e2e77..eae39817a0 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 f4639d0935..d38efd1633 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 1048799cca..ce00327120 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 edbbce2c6a..126209edae 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 0053cf925d..80661b5a65 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 42ef5f5291..f3e7563577 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 c5c22e2b3a..7deac3b2fa 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 8eac8f4b5c..628d5c047e 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 304c89fad6..f2da42aee9 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 c56d55863b..31ef0da150 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 c56d55863b..31ef0da150 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 6069c7b8de..96922c5416 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 14c4903bed..c2ebfd8b0f 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 83b38bcc5b..91a62f5cb7 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 0fc39c4b57..ab0a1a4080 100644
--- a/interface/web/help/lib/lang/br.lng
+++ b/interface/web/help/lib/lang/br.lng
@@ -5,4 +5,3 @@ $wb['Send message'] = 'Enviar Mensagem';
 $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 ce48ca9d28..99dcf309fa 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['subject_txt'] = 'Assunto';
 $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 ffd7d85cec..d5ba958293 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['sender_id_txt'] = 'De';
 $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 826a5a3030..0ceb0de41a 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 6da24762b0..b026b17a87 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 7e822c5a99..72734756a0 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 8e7811ce9a..b45521b112 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 cc323495f0..b21539af2f 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 a954607bac..4b87a8209e 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 524766c165..0bced24586 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 77fdf493ed..2f841a691c 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 1b7971b77b..9a91034173 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_msg'] = 'ÐÐ¾Ð²Ð°Ñ‚Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð° Ð·Ð° Ð²Ð°ÑˆÐ¸Ñ ISPConfig
 $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 01d32b2781..c5182150b8 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_msg'] = 'Sua senha do painel de controle foi restabelecida. A
 $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 d0c232fc5d..fb0f19e85d 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 9f93331b8c..d5bcbdcab2 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 5782b2190e..feeb815214 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_msg'] = 'La contraseÃ±a de su cuenta de panel de control ISPC
 $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 06fc0883f4..d5c0a1c858 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_msg'] = 'KÃ¤yttÃ¤jÃ¤tunnuksesi salasana ISPConfi3 Hallintapan
 $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 7791bd4f26..24fbbe1e09 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_msg'] = 'The password to your ISPConfig 3 control panel accou
 $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 3ca4305a5d..23940d3f29 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_msg'] = 'La password nel tuo pannello di controllo ISPConfig
 $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 f8eb3cd7f3..01eff9360c 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_msg'] = 'Het wachtwoord dat toegang biedt tot ISPConfig 3 is
 $wb['pw_reset_mail_title'] = 'Het wachtwoord dat toegang biedt tot ISPConfig 3 is gereset.';
 $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
 $wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['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 b15033128a..52f31b61b2 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 4c96e749a0..24fbbe1e09 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_msg'] = 'The password to your ISPConfig 3 control panel accou
 $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 2b1a23a597..24fbbe1e09 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_msg'] = 'The password to your ISPConfig 3 control panel accou
 $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 d08148d9c0..0581b93c07 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 3e3a7b04c9..11b00f66ba 100644
--- a/interface/web/mail/lib/lang/br.lng
+++ b/interface/web/mail/lib/lang/br.lng
@@ -43,4 +43,3 @@ $wb['Postfix Blacklist'] = 'Postfix (Lista Negra)';
 $wb['Content Filter'] = 'Filtros de ConteÃºdo';
 $wb['Global Filters'] = 'Filtros Globais';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_alias.lng b/interface/web/mail/lib/lang/br_mail_alias.lng
index 8e65298298..b3b08e349e 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['destination_error_isemail'] = 'EndereÃ§o de destino invÃ¡lido';
 $wb['limit_mailalias_txt'] = 'O nÃºmero mÃ¡ximo de aliases para sua conta foi atingido.';
 $wb['duplicate_mailbox_txt'] = 'JÃ¡ existe uma caixa de correio com este endereÃ§o.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_alias_list.lng b/interface/web/mail/lib/lang/br_mail_alias_list.lng
index 9f508c9d62..0a44ea4f72 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['destination_txt'] = 'Destination';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Add new Email alias';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_blacklist.lng b/interface/web/mail/lib/lang/br_mail_blacklist.lng
index c1113d4b8f..6d2cdb2a2f 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['source_error_notempty'] = 'EndereÃ§o em branco.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'O nÃºmero mÃ¡ximo de filtros de correio para sua conta foi atingido..';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_blacklist_list.lng b/interface/web/mail/lib/lang/br_mail_blacklist_list.lng
index d95328682c..9395a2ccb3 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['recipient_txt'] = 'Recipiente';
 $wb['add_new_record_txt'] = 'Adcionar novo registro a lista';
 $wb['access_txt'] = 'acesso';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_content_filter.lng b/interface/web/mail/lib/lang/br_mail_content_filter.lng
index d3280989f8..d5cda471fc 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['action_txt'] = 'AÃ§Ã£o';
 $wb['active_txt'] = 'Ativo';
 $wb['pattern_error_empty'] = 'PadrÃ£o em branco';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_content_filter_list.lng b/interface/web/mail/lib/lang/br_mail_content_filter_list.lng
index 5cff970a7e..c3a616ef31 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['pattern_txt'] = 'PadrÃ£o';
 $wb['action_txt'] = 'AÃ§Ã£o';
 $wb['add_new_record_txt'] = 'Adcionar um novo filtro de conteÃºdo';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_domain.lng b/interface/web/mail/lib/lang/br_mail_domain.lng
index c8ee61f9bd..a1cab1cfae 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['limit_maildomain_txt'] = 'O nÃºmero mÃ¡ximo de contas de correio eletrÃ´nic
 $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 e3ab3b1067..1b794de61a 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['no_domain_perm'] = 'VocÃª nÃ£o tem permissÃ£o para este domÃnio.';
 $wb['domain_error_regex'] = 'O nome do domÃnio contÃ©m caracteres invÃ¡lidos';
 $wb['limit_mailcatchall_txt'] = 'O nÃºmero mÃ¡ximo de catchall para este domÃnio foi atingido.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/br_mail_domain_catchall_list.lng
index b85615216c..c4d5481734 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['server_id_txt'] = 'Servidor';
 $wb['domain_txt'] = 'DomÃnio';
 $wb['add_new_record_txt'] = 'Adcionar novo Catchall';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_domain_list.lng b/interface/web/mail/lib/lang/br_mail_domain_list.lng
index f679387e9d..2afb7db7f6 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['domain_txt'] = 'DomÃnio';
 $wb['add_new_record_txt'] = 'Adcionar novo domÃnio';
 $wb['active_txt'] = 'Ativo';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_forward.lng b/interface/web/mail/lib/lang/br_mail_forward.lng
index 34f25cc0a5..1dab622ddc 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['active_txt'] = 'Ativo';
 $wb['limit_mailforward_txt'] = 'O nÃºmero mÃ¡ximo de encaminhamentos para sua conta foi atingido.';
 $wb['duplicate_mailbox_txt'] = 'JÃ¡ existe uma caixa de correio com este endereÃ§o.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_forward_list.lng b/interface/web/mail/lib/lang/br_mail_forward_list.lng
index 73ba4dd83c..f9f7ce406c 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['destination_txt'] = 'Destino';
 $wb['email_txt'] = 'Correio';
 $wb['add_new_record_txt'] = 'Adcionar novo encaminhamento';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_get.lng b/interface/web/mail/lib/lang/br_mail_get.lng
index c47427bde4..eb03318098 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_username_error_isempty'] = 'UsuÃ¡rio em branco.';
 $wb['source_password_error_isempty'] = 'Senha em branco.';
 $wb['destination_error_isemail'] = 'Destino nÃ£o selecionado.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_get_list.lng b/interface/web/mail/lib/lang/br_mail_get_list.lng
index d5b18029f8..9eaf45b737 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['source_username_txt'] = 'UsuÃ¡rio';
 $wb['destination_txt'] = 'Destino';
 $wb['add_new_record_txt'] = 'Adcionar nova Conta';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_spamfilter.lng b/interface/web/mail/lib/lang/br_mail_spamfilter.lng
index f85244b9d8..7f8a336420 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['email_error_unique'] = 'JÃ¡ existem registros de spamfilter para esta caixa
 $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 00b8daf287..9b549a9390 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['server_name_txt'] = 'nome_servidor';
 $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 96ed4ec1be..51df05db41 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['sort_order_txt'] = 'Ordenar por';
 $wb['active_txt'] = 'Ativo';
 $wb['limit_mailrouting_txt'] = 'O nÃºmero mÃ¡ximo de rotas para sua conta foi atingido.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_transport_list.lng b/interface/web/mail/lib/lang/br_mail_transport_list.lng
index 20bae01240..4c67280561 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['transport_txt'] = 'Transporte';
 $wb['sort_order_txt'] = 'Ordenar por';
 $wb['add_new_record_txt'] = 'Adcionar um novo transporte';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng
index 3c703961d9..19997662b4 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['disableimap_txt'] = 'Desativar IMAP';
 $wb['disablepop3_txt'] = 'Disativar POP3';
 $wb['duplicate_alias_or_forward_txt'] = 'JÃ¡ existe um aliase o encaminhamento com este endereÃ§o de correio.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_user_filter.lng b/interface/web/mail/lib/lang/br_mail_user_filter.lng
index bfd04d0daa..d739a15880 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['rulename_error_empty'] = 'Nome estÃ¡ em branco.';
 $wb['searchterm_is_empty'] = 'Termo de busca em branco.';
 $wb['source_txt'] = 'Origem';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_user_filter_list.lng b/interface/web/mail/lib/lang/br_mail_user_filter_list.lng
index 62c4d8fe03..847d72c3ab 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_txt'] = 'PÃ¡gina';
 $wb['page_of_txt'] = 'de';
 $wb['delete_confirmation'] = 'EstÃ¡ certo que quer remover este mailfilter?';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_user_list.lng b/interface/web/mail/lib/lang/br_mail_user_list.lng
index f6d1b412af..64f876393a 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['email_txt'] = 'Correio';
 $wb['autoresponder_txt'] = 'Autoresponder';
 $wb['add_new_record_txt'] = 'Adcionar nova caixa de correio';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_user_stats_list.lng b/interface/web/mail/lib/lang/br_mail_user_stats_list.lng
index bb8a6a4cde..0457c2da54 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['last_month_txt'] = 'Ãšltimo MÃªs';
 $wb['this_year_txt'] = 'Este Ano';
 $wb['last_year_txt'] = 'Ãšltimo Ano';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_whitelist.lng b/interface/web/mail/lib/lang/br_mail_whitelist.lng
index 3df3e3638d..15db38f28c 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['source_error_notempty'] = 'EndereÃ§o em Branco.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'O nÃºmero mÃ¡ximo de filtros para sua conta foi atingido.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_mail_whitelist_list.lng b/interface/web/mail/lib/lang/br_mail_whitelist_list.lng
index b5fc640649..bd84205e40 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['recipient_txt'] = 'Recipiente';
 $wb['add_new_record_txt'] = 'Adcionar um novo registro a lista';
 $wb['access_txt'] = 'acesso';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/br_spamfilter_blacklist.lng
index 3da9b50eda..c282beab91 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['priority_txt'] = 'Prioridade';
 $wb['active_txt'] = 'Ativo';
 $wb['limit_spamfilter_wblist_txt'] = 'O nÃºmero mÃ¡ximo de registros de lista negra /  branca foi atingido para esta conta.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/br_spamfilter_blacklist_list.lng
index bc114d0676..81906532ae 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['rid_txt'] = 'UsuÃ¡rio';
 $wb['email_txt'] = 'Correio na Lista Negra';
 $wb['add_new_record_txt'] = 'Adcionar novo registro a lista';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_spamfilter_config.lng b/interface/web/mail/lib/lang/br_spamfilter_config.lng
index 23ffae1c80..30d01386c9 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['relayhost_password_txt'] = 'Senha Host Relay';
 $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 9857bc7599..345903fe5c 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['list_head_txt'] = 'ConfiguraÃ§Ãµes do Servidor';
 $wb['server_name_txt'] = 'Servidor';
 $wb['server_id_txt'] = 'id_servidor';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_spamfilter_policy.lng b/interface/web/mail/lib/lang/br_spamfilter_policy.lng
index 09f80bed35..1d0ab9c3da 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['spam_admin_txt'] = 'SPAM admin';
 $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 b2a2b41a5a..002579a13f 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['banned_files_lover_txt'] = 'Banned Files lover';
 $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 aa8eea9d19..4515009408 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['email_txt'] = 'Correio (PadrÃ£o)';
 $wb['fullname_txt'] = 'Nome';
 $wb['local_txt'] = 'Local';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_spamfilter_users_list.lng b/interface/web/mail/lib/lang/br_spamfilter_users_list.lng
index 227b46093c..1fe408eb4e 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['fullname_txt'] = 'Nome';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Adcionar UsuÃ¡rio';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/br_spamfilter_whitelist.lng
index 08c9dcbb51..951c3f4686 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['priority_txt'] = 'Prioridade';
 $wb['active_txt'] = 'Ativo';
 $wb['limit_spamfilter_wblist_txt'] = 'O nÃºmero mÃ¡ximo de registros da lista branca / negra foi atingido para esta conta.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/br_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/br_spamfilter_whitelist_list.lng
index e2138160ce..4420bca63b 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['rid_txt'] = 'UsuÃ¡rio';
 $wb['email_txt'] = 'Correio na lista branca';
 $wb['add_new_record_txt'] = 'Adcionar um novo correio';
 ?>
-
diff --git a/interface/web/mail/lib/lang/de.lng b/interface/web/mail/lib/lang/de.lng
index d8021df4c2..0cda918b47 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 6f629daa64..f9112df59e 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 74bbc91bbb..f249060240 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 fc7b99ead1..75b20e201e 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 d5e0bc3d40..276d3a62d7 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 804ea959b1..9ea5422498 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 0d7e78fc0d..126f23ce4e 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 bfceec507c..e1cf325dc8 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 88695621db..d67fa10d9a 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 261dc112a2..2c5763f05c 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 36a763f679..0449bc9a98 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 754c5ce43e..7fcf306c13 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 c221abc251..2eee574b05 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 1a2c4987b9..c72f4ab4d4 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 4d9632a021..3f7cf24860 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 b2deb6b0d3..d411cb14c6 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 d6ac2cbb5e..f0acef3c27 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 8512483190..16d1e64055 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 058d273b8d..3efda20ee0 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 51396ba792..8348ed93cc 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 409dbb3c02..45e62840ae 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 7ffbfb0379..3d9fd82db6 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 0ae0fd1b05..af63109ba1 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 2073653984..88ad07a60f 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 75d5b4b981..528c7cfce8 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 02dcebacb2..cb7f293b36 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 959b7adc7b..89aeae7f2f 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 8eaadb0960..ca726a90d7 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 55aea22166..f82f27f5ce 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 a4318e22a0..db92a4bd07 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 8babfbe652..ff2426f700 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 e32d085d4b..35a46065d1 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 5e188539c7..fcb58114f0 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 b841931c6b..b85e23de3e 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 71198e2ed1..fdb514ecda 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 73bd64c58b..ea53892ffc 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 2de4267184..d748c036ed 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 c2c1bf55ca..8556be818f 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 dc566376a4..b6ce95d0c7 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 b76dfb5157..528f2f741a 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 0d0fa124bc..ebef66657b 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 8943c07112..54efa4fed0 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 82d7bdeb36..6b0dd9bb8e 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 a0ab15672e..6f9c68cdc6 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 8afae2172c..c77cc73ba2 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 01f50f4e67..1f0aad197d 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 ea14000fd0..ec51e2cdb5 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 300ca08aef..f5b5fa7e75 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 159bd6682a..1044bd5121 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 002193b9d2..b2a1b5c0c2 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 6ac76c3448..cd473d9ded 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 cae1bf9c89..3879f24247 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 14e295084a..d6097bb336 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 82a89bdbb1..035a5b0499 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 8069169c97..fa5c584318 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 f2fc2589e7..22e2f4cf74 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 88366a5ca6..b960120d06 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 516d6f7bdd..cea7c44db5 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 e015536174..c8e7a4ffc8 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 0632262743..b9780687d7 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 a3539cedd0..203c5bae73 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 2d7cf0f69e..10e6dfcf0b 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 7aca2c735c..6da8ddc9d9 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 cd5ff84018..c237a7a778 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 2269d2d496..c750d95937 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 1163b08a81..45b3f315cd 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 903f716756..0e4df55a37 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 cebd80b1c2..43d9d414d6 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 ccacc1e727..573f9bec08 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 7a3fd08f39..dde2a62c6a 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 d46767ced6..be836015db 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 57fbde4c87..6517cf41a1 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 671a0fbe9d..c884a672a0 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 29ad203099..afbc695ea0 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 9548b88936..bbc1f6c22a 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 7bf6381abe..50f289afbd 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 1039d5fdb8..487cfb462d 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 7d0313a6aa..d90de08530 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 1072e416c0..0a66b476fa 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 d7d56e42d1..a9ad450c30 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 a2c7d152d5..be85427d96 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 8ed1360c25..fc0440690c 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 4a3fc1a294..75ad06a9a5 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 38b47dfd9e..81ee455fee 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 7ff6e67453..cb16ef4226 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 20cf2ffeae..40b3ba44dc 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 43296c01c5..e949c8bc19 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 3a7942257f..417e34d9da 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 e04c6018b5..0fcdd994aa 100644
--- a/interface/web/monitor/lib/lang/br.lng
+++ b/interface/web/monitor/lib/lang/br.lng
@@ -135,4 +135,3 @@ $wb['monitor_title_raidstate_txt'] = 'Estado do RAID';
 $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 c5bee9b06c..2987af622d 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['dbtable_txt'] = 'Tabela BD';
 $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 f8ff04ce03..23f3c6d5da 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['server_id_txt'] = 'Servidor';
 $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 b33f42c445..196fa0037c 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 2836be81a5..0b6bf9a4bb 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 f9a02e8455..bd879a0061 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 9d99bb10b9..3b5036452a 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 c3c5af8cd3..398ca51edd 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 2fb8365dfb..125494bf8c 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 1b7d4aa1fc..7627ad7d65 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['uid_error_empty'] = 'ÐÐµ Ðµ Ð¿Ð¾ÑÐ¾Ñ‡ÐµÐ½Ð¾ GID.';
 $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 38e1318e92..5e75413207 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['quota_size_error_empty'] = 'Quota is empty.';
 $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 4a14177f6f..f9c3fd3267 100644
--- a/interface/web/sites/lib/lang/br.lng
+++ b/interface/web/sites/lib/lang/br.lng
@@ -15,4 +15,3 @@ $wb['Shell'] = 'Shell';
 $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 b9d221760e..185a780720 100644
--- a/interface/web/sites/lib/lang/br_cron.lng
+++ b/interface/web/sites/lib/lang/br_cron.lng
@@ -19,4 +19,3 @@ $wb['run_wday_error_format'] = 'Formato dos dias da semana invÃ¡lido.';
 $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 f5bbe66ae0..b974f0fb14 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['run_wday_txt'] = 'Dia da semana';
 $wb['command_txt'] = 'Comando';
 $wb['add_new_cron_txt'] = 'Adcionar uma nova tarefa no cron';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_database.lng b/interface/web/sites/lib/lang/br_database.lng
index ccd1075c0d..6121d4cde4 100644
--- a/interface/web/sites/lib/lang/br_database.lng
+++ b/interface/web/sites/lib/lang/br_database.lng
@@ -21,4 +21,3 @@ $wb['database_charset_change_txt'] = 'O charset do banco nÃ£o pode ser mudado';
 $wb['remote_ips_txt'] = 'EndereÃ§os IP Remotos (separados por , deixe em branco para <i>quaisquer ips</i>)';
 $wb['database_remote_error_ips'] = 'Pelo menos um dos endereÃ§os ip informados nÃ£o Ã© vÃ¡lido.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_database_list.lng b/interface/web/sites/lib/lang/br_database_list.lng
index ec5054fd5f..00dfbb3bc4 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['server_id_txt'] = 'Servidor';
 $wb['database_name_txt'] = 'Nome do banco';
 $wb['add_new_record_txt'] = 'Adcionar um novo banco';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_ftp_user.lng b/interface/web/sites/lib/lang/br_ftp_user.lng
index ebcc5a3f09..e7e62b1640 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_empty'] = 'DiretÃ³rio vazio.';
 $wb['directory_error_notinweb'] = 'O diretÃ³rio nÃ£o esta dentro do diretÃ³rio web principal.';
 $wb['parent_domain_id_error_empty'] = 'Nenhum website selecionado.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_ftp_user_list.lng b/interface/web/sites/lib/lang/br_ftp_user_list.lng
index 9978c60143..a9540c9cda 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['parent_domain_id_txt'] = 'Site';
 $wb['username_txt'] = 'UsuÃ¡rio';
 $wb['add_new_record_txt'] = 'Adcionar um novo UsuÃ¡rio FTP';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_shell_user.lng b/interface/web/sites/lib/lang/br_shell_user.lng
index 939bc7682c..2a99587eb6 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['directory_error_empty'] = 'DiretÃ³rio vazio.';
 $wb['limit_shell_user_txt'] = 'O nÃºmero mÃ¡ximo de usuÃ¡rios shell para sua conta foi atingido.';
 $wb['parent_domain_id_error_empty'] = 'Nenhum website selecionado.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_shell_user_list.lng b/interface/web/sites/lib/lang/br_shell_user_list.lng
index 8c2e71d0e7..512f9fe837 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['parent_domain_id_txt'] = 'Site';
 $wb['username_txt'] = 'UsuÃ¡rio';
 $wb['add_new_record_txt'] = 'Adcionar novo usuÃ¡rio de Shell';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
index 4343b84991..f9dbfa2771 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_empty'] = 'DomÃnio em branco.';
 $wb['domain_error_unique'] = 'O domÃnio deve ser Ãºnico.';
 $wb['domain_error_regex'] = 'Nome de domÃnio invÃ¡lido.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng
index c54854f673..7abba786bd 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['error_ssl_country_empty'] = 'Pais do SSL em branco.';
 $wb['client_group_id_txt'] = 'Cliente';
 $wb['stats_password_txt'] = 'Senha do diretÃ³rio de estatÃsticas';
 ?>
-
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 ff4c13447f..dc52003875 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['server_id_txt'] = 'Servidor';
 $wb['domain_txt'] = 'DomÃnio';
 $wb['add_new_record_txt'] = 'Adcionar um novo site';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_web_sites_stats_list.lng b/interface/web/sites/lib/lang/br_web_sites_stats_list.lng
index 79b4d68b05..1a3f0e585e 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['last_month_txt'] = 'Ãšltimo mÃªs';
 $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 27b9769071..0d3ea2f38f 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_unique'] = 'JÃ¡ existe alias ou sub-domÃnio com este nome.';
 $wb['domain_error_regex'] = 'Nome de domÃnio invÃ¡lido.';
 $wb['host_txt'] = 'Host';
 ?>
-
diff --git a/interface/web/sites/lib/lang/br_web_subdomain_list.lng b/interface/web/sites/lib/lang/br_web_subdomain_list.lng
index 6949909553..3e09b886cc 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['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Sub=domÃnio';
 $wb['add_new_record_txt'] = 'Adcionar um novo sub-domÃnio';
 ?>
-
diff --git a/interface/web/sites/lib/lang/de.lng b/interface/web/sites/lib/lang/de.lng
index bf15fc35c3..848c37bafe 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 82c22a8bbc..bd0c8b7c7a 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 98c7eff368..9778e9fa98 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 ac1fbeef9f..5415acdfde 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 5821573a4e..b34ac4e691 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 0e1f577794..02449e37cc 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 4d50fa927c..a2d162c0b0 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 d4fbd5ab2e..92589ee77a 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 1b0792a3ce..cd822899c0 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 6d282a40d8..98fb1a3e71 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 4969e26d60..229fcf2d3e 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 ae761ccf62..71f0e0ae6d 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 98bf43d59e..660abfb25e 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 31e14fe746..19ff862c44 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 1174f6c02b..042b9f02c5 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 8cb7f08e6d..fecb4ab45a 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_month_error_format'] = 'Invalid format for months.';
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/es_cron_list.lng b/interface/web/sites/lib/lang/es_cron_list.lng
index b5c8d1566e..ad56ea9561 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 148cdc9a6b..550fa1831b 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['uid_error_empty'] = 'GID vacÃo';
 $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 8edb9d914b..e9548cfbed 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['quota_size_error_empty'] = 'Cuota vacÃa';
 $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 8cb7f08e6d..fecb4ab45a 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_month_error_format'] = 'Invalid format for months.';
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/fi_cron_list.lng b/interface/web/sites/lib/lang/fi_cron_list.lng
index b5c8d1566e..ad56ea9561 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 9cdfa08021..c4167177e4 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['directory_error_empty'] = 'Kotihakemisto-kenttÃ¤ on tyhjÃ¤.';
 $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 de3365f6f6..a925c4cc04 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['uid_error_empty'] = 'KÃ¤yttÃ¤jÃ¤-ID-kenttÃ¤ on tyhjÃ¤.';
 $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 df48d9a334..190f4a397d 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['uid_error_empty'] = 'GID empty.';
 $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 31a6aa7544..0f2ea6c846 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['quota_size_error_empty'] = 'Quota is empty.';
 $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 8cb7f08e6d..fecb4ab45a 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_month_error_format'] = 'Invalid format for months.';
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/it_cron_list.lng b/interface/web/sites/lib/lang/it_cron_list.lng
index b5c8d1566e..ad56ea9561 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 4a5893cea5..9da271951b 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['uid_error_empty'] = 'GID empty.';
 $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 31a6aa7544..0f2ea6c846 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['quota_size_error_empty'] = 'Quota is empty.';
 $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 8cb7f08e6d..fecb4ab45a 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_month_error_format'] = 'Invalid format for months.';
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/nl_cron_list.lng b/interface/web/sites/lib/lang/nl_cron_list.lng
index b5c8d1566e..ad56ea9561 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 ed5cce6a38..53bd88351b 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['uid_error_empty'] = 'GID is leeg.';
 $wb['directory_error_empty'] = 'Directorie is leeg.';
 $wb['quota_files_unity_txt'] = 'Files';
 $wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
+$wb['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 d525d2c26e..e1a8a1aa43 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['quota_size_error_empty'] = 'Quota is leeg.';
 $wb['uid_error_empty'] = 'GID leeg.';
 $wb['directory_error_empty'] = 'Directorie leeg.';
 $wb['limit_shell_user_txt'] = 'Het maximum aantal aan shell gebruikers is bereikt.';
+$wb['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 7919646a33..9135cbbcda 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 d54dee0175..fecb4ab45a 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 8e0e146319..ad56ea9561 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 317dfae4ff..8fda3d1d11 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 e0d686638b..ca92d98837 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 b5d5613a71..9270b25040 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 1619df8701..fecbba355a 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 c6abcae121..b2e518da07 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 6bb70c4c0f..850c0eb912 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 dbb32ad3f3..6dd8022e93 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 bf2a2c2023..7fdc305f7f 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 3ba51c6d8a..62b7455ff3 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 a6b12aadd7..b217f80cca 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 7283c76bb5..8154c227b1 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 9cb030017f..9ccb0a3c77 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 8cb7f08e6d..fecb4ab45a 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_month_error_format'] = 'Invalid format for months.';
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/ru_cron_list.lng b/interface/web/sites/lib/lang/ru_cron_list.lng
index b5c8d1566e..ad56ea9561 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 7c89c2e75c..e96e4c3b9b 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['directory_error_empty'] = 'Directory empty.';
 $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 2d8939f9c1..085d7de54e 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['uid_error_empty'] = 'GID Ð¿ÑƒÑÑ‚Ð¾Ð¹.';
 $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 8cb7f08e6d..fecb4ab45a 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_month_error_format'] = 'Invalid format for months.';
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/se_cron_list.lng b/interface/web/sites/lib/lang/se_cron_list.lng
index b5c8d1566e..ad56ea9561 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 df48d9a334..190f4a397d 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['uid_error_empty'] = 'GID empty.';
 $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 31a6aa7544..0f2ea6c846 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['quota_size_error_empty'] = 'Quota is empty.';
 $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 e2e8ca9d55..00418757a0 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 bf6530df31..4e98200273 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 534cd0bdf1..1fbda08edc 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 531740ad6a..dd44149225 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 408c553396..b90fc29318 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 a7126ed405..e96df5b2a4 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 3dbc0c6bbb..a0aab0d2c2 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 b7641ddaca..ba99f97684 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_3_txt'] = 'Bom';
 $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 4ca9ec1401..23a6764929 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 9698f65b71..df85c97124 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 0dab14b892..0ea96868b5 100644
--- a/interface/web/tools/lib/lang/br.lng
+++ b/interface/web/tools/lib/lang/br.lng
@@ -4,4 +4,3 @@ $wb['Settings'] = 'ConfiguraÃ§Ãµes';
 $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 8aaa6f1f63..ad7432df78 100644
--- a/interface/web/tools/lib/lang/br_usersettings.lng
+++ b/interface/web/tools/lib/lang/br_usersettings.lng
@@ -6,4 +6,3 @@ $wb['password_mismatch'] = 'As senhas nÃ£o conhecidem';
 $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 ff225ee9a3..875ba4fb2b 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 bda3099e05..2adc8210d4 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 7447ff88ce..8aa0391e17 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 979c85520c..f8d76658a7 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';
+?>
-- 
GitLab