From 3f478f7b37eb314c7dba33af10e8d32d5f2fa579 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 19 Apr 2013 09:35:57 +0000
Subject: [PATCH] Merged revisions 3922-3958 from stable branch.
---
install/dist/lib/fedora.lib.php | 43 ++++++++++-----
install/dist/lib/opensuse.lib.php | 40 +++++++++-----
install/sql/incremental/upd_0050.sql | 2 +
install/sql/ispconfig3.sql | 4 +-
install/tpl/apache_ispconfig.conf.master | 2 +-
install/tpl/apache_ispconfig.vhost.master | 1 +
install/tpl/config.inc.php.master | 2 +-
interface/lib/lang/cz.lng | 2 -
interface/lib/lang/pl.lng | 1 -
.../web/admin/form/system_config.tform.php | 2 +-
interface/web/admin/language_complete.php | 2 +-
.../web/admin/lib/lang/ar_server_config.lng | 1 +
.../web/admin/lib/lang/bg_server_config.lng | 1 +
.../web/admin/lib/lang/br_server_config.lng | 1 +
interface/web/admin/lib/lang/cz.lng | 2 -
.../admin/lib/lang/cz_directive_snippets.lng | 2 -
.../lib/lang/cz_directive_snippets_list.lng | 2 -
interface/web/admin/lib/lang/cz_firewall.lng | 2 -
.../web/admin/lib/lang/cz_firewall_list.lng | 2 -
interface/web/admin/lib/lang/cz_groups.lng | 2 -
.../web/admin/lib/lang/cz_groups_list.lng | 2 -
interface/web/admin/lib/lang/cz_iptables.lng | 2 -
.../web/admin/lib/lang/cz_iptables_list.lng | 2 -
.../web/admin/lib/lang/cz_language_add.lng | 2 -
.../admin/lib/lang/cz_language_complete.lng | 2 -
.../web/admin/lib/lang/cz_language_edit.lng | 2 -
.../web/admin/lib/lang/cz_language_export.lng | 2 -
.../web/admin/lib/lang/cz_language_import.lng | 2 -
.../web/admin/lib/lang/cz_language_list.lng | 2 -
interface/web/admin/lib/lang/cz_login_as.lng | 2 -
.../web/admin/lib/lang/cz_package_install.lng | 2 -
.../web/admin/lib/lang/cz_remote_action.lng | 6 +--
.../web/admin/lib/lang/cz_remote_user.lng | 2 -
.../admin/lib/lang/cz_remote_user_list.lng | 2 -
interface/web/admin/lib/lang/cz_server.lng | 2 -
.../web/admin/lib/lang/cz_server_config.lng | 3 +-
.../admin/lib/lang/cz_server_config_list.lng | 2 -
interface/web/admin/lib/lang/cz_server_ip.lng | 2 -
.../web/admin/lib/lang/cz_server_ip_list.lng | 2 -
.../web/admin/lib/lang/cz_server_list.lng | 2 -
.../web/admin/lib/lang/cz_server_php.lng | 2 -
.../web/admin/lib/lang/cz_server_php_list.lng | 2 -
.../lib/lang/cz_software_package_install.lng | 2 -
.../lib/lang/cz_software_package_list.lng | 2 -
.../web/admin/lib/lang/cz_software_repo.lng | 2 -
.../admin/lib/lang/cz_software_repo_list.lng | 2 -
.../lib/lang/cz_software_update_list.lng | 2 -
.../web/admin/lib/lang/cz_system_config.lng | 2 -
.../admin/lib/lang/cz_tpl_default_admin.lng | 2 -
interface/web/admin/lib/lang/cz_users.lng | 2 -
.../web/admin/lib/lang/cz_users_list.lng | 2 -
.../web/admin/lib/lang/de_server_config.lng | 1 +
.../web/admin/lib/lang/de_system_config.lng | 2 +-
.../web/admin/lib/lang/el_server_config.lng | 1 +
.../web/admin/lib/lang/en_system_config.lng | 1 +
.../web/admin/lib/lang/es_server_config.lng | 1 +
.../web/admin/lib/lang/fi_server_config.lng | 1 +
.../web/admin/lib/lang/fr_server_config.lng | 1 +
.../web/admin/lib/lang/hr_server_config.lng | 1 +
.../web/admin/lib/lang/hu_server_config.lng | 1 +
.../web/admin/lib/lang/id_server_config.lng | 1 +
.../web/admin/lib/lang/it_server_config.lng | 1 +
.../web/admin/lib/lang/ja_server_config.lng | 1 +
.../web/admin/lib/lang/nl_server_config.lng | 1 +
interface/web/admin/lib/lang/pl.lng | 1 -
.../admin/lib/lang/pl_directive_snippets.lng | 1 -
.../lib/lang/pl_directive_snippets_list.lng | 1 -
interface/web/admin/lib/lang/pl_firewall.lng | 1 -
.../web/admin/lib/lang/pl_firewall_list.lng | 1 -
interface/web/admin/lib/lang/pl_groups.lng | 1 -
.../web/admin/lib/lang/pl_groups_list.lng | 1 -
interface/web/admin/lib/lang/pl_iptables.lng | 1 -
.../web/admin/lib/lang/pl_iptables_list.lng | 1 -
.../web/admin/lib/lang/pl_language_add.lng | 1 -
.../admin/lib/lang/pl_language_complete.lng | 1 -
.../web/admin/lib/lang/pl_language_edit.lng | 1 -
.../web/admin/lib/lang/pl_language_export.lng | 1 -
.../web/admin/lib/lang/pl_language_import.lng | 1 -
.../web/admin/lib/lang/pl_language_list.lng | 1 -
interface/web/admin/lib/lang/pl_login_as.lng | 1 -
.../web/admin/lib/lang/pl_package_install.lng | 1 -
.../web/admin/lib/lang/pl_remote_action.lng | 1 -
.../web/admin/lib/lang/pl_remote_user.lng | 1 -
.../admin/lib/lang/pl_remote_user_list.lng | 1 -
interface/web/admin/lib/lang/pl_server.lng | 1 -
.../web/admin/lib/lang/pl_server_config.lng | 2 +-
.../admin/lib/lang/pl_server_config_list.lng | 1 -
interface/web/admin/lib/lang/pl_server_ip.lng | 1 -
.../web/admin/lib/lang/pl_server_ip_list.lng | 1 -
.../web/admin/lib/lang/pl_server_list.lng | 1 -
.../web/admin/lib/lang/pl_server_php.lng | 1 -
.../web/admin/lib/lang/pl_server_php_list.lng | 1 -
.../lib/lang/pl_software_package_install.lng | 1 -
.../lib/lang/pl_software_package_list.lng | 1 -
.../web/admin/lib/lang/pl_software_repo.lng | 1 -
.../admin/lib/lang/pl_software_repo_list.lng | 1 -
.../lib/lang/pl_software_update_list.lng | 1 -
.../web/admin/lib/lang/pl_system_config.lng | 1 -
.../admin/lib/lang/pl_tpl_default_admin.lng | 1 -
interface/web/admin/lib/lang/pl_users.lng | 1 -
.../web/admin/lib/lang/pl_users_list.lng | 1 -
.../web/admin/lib/lang/pt_server_config.lng | 1 +
.../web/admin/lib/lang/ro_server_config.lng | 1 +
.../web/admin/lib/lang/ru_server_config.lng | 1 +
.../web/admin/lib/lang/se_server_config.lng | 1 +
.../web/admin/lib/lang/sk_server_config.lng | 1 +
.../web/admin/templates/server_ip_list.htm | 6 +--
interface/web/client/lib/lang/cz.lng | 2 -
interface/web/client/lib/lang/cz_client.lng | 2 -
.../web/client/lib/lang/cz_client_circle.lng | 2 -
.../client/lib/lang/cz_client_circle_list.lng | 2 -
.../web/client/lib/lang/cz_client_del.lng | 2 -
.../web/client/lib/lang/cz_client_message.lng | 2 -
.../client/lib/lang/cz_client_template.lng | 2 -
.../lib/lang/cz_client_template_list.lng | 2 -
.../web/client/lib/lang/cz_clients_list.lng | 2 -
interface/web/client/lib/lang/cz_domain.lng | 2 -
.../web/client/lib/lang/cz_domain_list.lng | 2 -
interface/web/client/lib/lang/cz_reseller.lng | 2 -
.../web/client/lib/lang/cz_resellers_list.lng | 2 -
interface/web/client/lib/lang/de_client.lng | 2 +-
interface/web/client/lib/lang/de_reseller.lng | 2 +-
interface/web/client/lib/lang/pl.lng | 1 -
interface/web/client/lib/lang/pl_client.lng | 1 -
.../web/client/lib/lang/pl_client_circle.lng | 1 -
.../client/lib/lang/pl_client_circle_list.lng | 1 -
.../web/client/lib/lang/pl_client_del.lng | 1 -
.../web/client/lib/lang/pl_client_message.lng | 1 -
.../client/lib/lang/pl_client_template.lng | 1 -
.../lib/lang/pl_client_template_list.lng | 1 -
.../web/client/lib/lang/pl_clients_list.lng | 1 -
interface/web/client/lib/lang/pl_domain.lng | 1 -
.../web/client/lib/lang/pl_domain_list.lng | 1 -
interface/web/client/lib/lang/pl_reseller.lng | 1 -
.../web/client/lib/lang/pl_resellers_list.lng | 1 -
interface/web/dashboard/lib/lang/cz.lng | 2 -
.../dashboard/lib/lang/cz_dashlet_limits.lng | 2 -
.../dashboard/lib/lang/cz_dashlet_modules.lng | 2 -
interface/web/dashboard/lib/lang/pl.lng | 1 -
.../dashboard/lib/lang/pl_dashlet_limits.lng | 1 -
.../dashboard/lib/lang/pl_dashlet_modules.lng | 1 -
interface/web/designer/lib/lang/cz.lng | 2 -
.../web/designer/lib/lang/cz_form_edit.lng | 2 -
.../web/designer/lib/lang/cz_form_list.lng | 2 -
.../web/designer/lib/lang/cz_form_show.lng | 2 -
.../web/designer/lib/lang/cz_module_edit.lng | 2 -
.../web/designer/lib/lang/cz_module_list.lng | 2 -
.../designer/lib/lang/cz_module_nav_edit.lng | 2 -
.../lib/lang/cz_module_nav_item_edit.lng | 2 -
.../web/designer/lib/lang/cz_module_show.lng | 2 -
interface/web/designer/lib/lang/pl.lng | 1 -
.../web/designer/lib/lang/pl_form_edit.lng | 1 -
.../web/designer/lib/lang/pl_form_list.lng | 1 -
.../web/designer/lib/lang/pl_form_show.lng | 1 -
.../web/designer/lib/lang/pl_module_edit.lng | 1 -
.../web/designer/lib/lang/pl_module_list.lng | 1 -
.../designer/lib/lang/pl_module_nav_edit.lng | 1 -
.../lib/lang/pl_module_nav_item_edit.lng | 1 -
.../web/designer/lib/lang/pl_module_show.lng | 1 -
interface/web/dns/dns_mx_edit.php | 11 ++++
interface/web/dns/dns_slave_edit.php | 11 ++++
interface/web/dns/form/dns_slave.tform.php | 4 +-
interface/web/dns/lib/lang/ar_dns_mx.lng | 1 +
interface/web/dns/lib/lang/bg_dns_mx.lng | 1 +
interface/web/dns/lib/lang/br_dns_mx.lng | 1 +
interface/web/dns/lib/lang/cz.lng | 2 -
interface/web/dns/lib/lang/cz_dns_a.lng | 2 -
interface/web/dns/lib/lang/cz_dns_a_list.lng | 2 -
interface/web/dns/lib/lang/cz_dns_aaaa.lng | 2 -
interface/web/dns/lib/lang/cz_dns_alias.lng | 2 -
interface/web/dns/lib/lang/cz_dns_cname.lng | 2 -
interface/web/dns/lib/lang/cz_dns_hinfo.lng | 2 -
interface/web/dns/lib/lang/cz_dns_import.lng | 2 -
interface/web/dns/lib/lang/cz_dns_mx.lng | 3 +-
interface/web/dns/lib/lang/cz_dns_ns.lng | 2 -
interface/web/dns/lib/lang/cz_dns_ptr.lng | 2 -
interface/web/dns/lib/lang/cz_dns_rp.lng | 2 -
interface/web/dns/lib/lang/cz_dns_slave.lng | 2 -
.../web/dns/lib/lang/cz_dns_slave_list.lng | 2 -
interface/web/dns/lib/lang/cz_dns_soa.lng | 2 -
.../web/dns/lib/lang/cz_dns_soa_list.lng | 2 -
interface/web/dns/lib/lang/cz_dns_srv.lng | 2 -
.../web/dns/lib/lang/cz_dns_template.lng | 2 -
.../web/dns/lib/lang/cz_dns_template_list.lng | 2 -
interface/web/dns/lib/lang/cz_dns_txt.lng | 2 -
interface/web/dns/lib/lang/cz_dns_wizard.lng | 2 -
interface/web/dns/lib/lang/de.lng | 4 +-
interface/web/dns/lib/lang/de_dns_mx.lng | 2 +-
interface/web/dns/lib/lang/de_dns_slave.lng | 4 +-
.../web/dns/lib/lang/de_dns_slave_list.lng | 4 +-
interface/web/dns/lib/lang/el_dns_mx.lng | 1 +
interface/web/dns/lib/lang/es_dns_mx.lng | 1 +
interface/web/dns/lib/lang/fi_dns_mx.lng | 1 +
interface/web/dns/lib/lang/fr_dns_mx.lng | 1 +
interface/web/dns/lib/lang/hr_dns_mx.lng | 1 +
interface/web/dns/lib/lang/hu_dns_mx.lng | 1 +
interface/web/dns/lib/lang/id_dns_mx.lng | 1 +
interface/web/dns/lib/lang/it_dns_mx.lng | 1 +
interface/web/dns/lib/lang/ja_dns_mx.lng | 1 +
interface/web/dns/lib/lang/nl_dns_mx.lng | 1 +
interface/web/dns/lib/lang/pl.lng | 1 -
interface/web/dns/lib/lang/pl_dns_a.lng | 1 -
interface/web/dns/lib/lang/pl_dns_a_list.lng | 1 -
interface/web/dns/lib/lang/pl_dns_aaaa.lng | 1 -
interface/web/dns/lib/lang/pl_dns_alias.lng | 1 -
interface/web/dns/lib/lang/pl_dns_cname.lng | 1 -
interface/web/dns/lib/lang/pl_dns_hinfo.lng | 1 -
interface/web/dns/lib/lang/pl_dns_import.lng | 1 -
interface/web/dns/lib/lang/pl_dns_mx.lng | 2 +-
interface/web/dns/lib/lang/pl_dns_ns.lng | 1 -
interface/web/dns/lib/lang/pl_dns_ptr.lng | 1 -
interface/web/dns/lib/lang/pl_dns_rp.lng | 1 -
interface/web/dns/lib/lang/pl_dns_slave.lng | 1 -
.../web/dns/lib/lang/pl_dns_slave_list.lng | 1 -
interface/web/dns/lib/lang/pl_dns_soa.lng | 1 -
.../web/dns/lib/lang/pl_dns_soa_list.lng | 1 -
interface/web/dns/lib/lang/pl_dns_srv.lng | 1 -
.../web/dns/lib/lang/pl_dns_template.lng | 1 -
.../web/dns/lib/lang/pl_dns_template_list.lng | 1 -
interface/web/dns/lib/lang/pl_dns_txt.lng | 1 -
interface/web/dns/lib/lang/pl_dns_wizard.lng | 1 -
interface/web/dns/lib/lang/pt_dns_mx.lng | 1 +
interface/web/dns/lib/lang/ro_dns_mx.lng | 1 +
interface/web/dns/lib/lang/ru_dns_mx.lng | 1 +
interface/web/dns/lib/lang/se_dns_mx.lng | 1 +
interface/web/dns/lib/lang/sk_dns_mx.lng | 1 +
interface/web/help/lib/lang/cz.lng | 2 -
interface/web/help/lib/lang/cz_faq_form.lng | 2 -
.../lib/lang/cz_faq_manage_questions_list.lng | 2 -
.../web/help/lib/lang/cz_help_faq_list.lng | 2 -
.../lib/lang/cz_help_faq_sections_list.lng | 2 -
.../web/help/lib/lang/cz_support_message.lng | 2 -
.../help/lib/lang/cz_support_message_list.lng | 2 -
interface/web/help/lib/lang/pl.lng | 1 -
interface/web/help/lib/lang/pl_faq_form.lng | 1 -
.../lib/lang/pl_faq_manage_questions_list.lng | 1 -
.../help/lib/lang/pl_faq_sections_form.lng | 1 -
.../web/help/lib/lang/pl_help_faq_list.lng | 1 -
.../lib/lang/pl_help_faq_sections_list.lng | 1 -
.../web/help/lib/lang/pl_support_message.lng | 1 -
.../help/lib/lang/pl_support_message_list.lng | 1 -
interface/web/js/jquery.tipsy.js | 3 --
interface/web/login/lib/lang/cz.lng | 2 -
interface/web/login/lib/lang/pl.lng | 1 -
interface/web/mail/lib/lang/cz.lng | 2 -
interface/web/mail/lib/lang/cz_mail_alias.lng | 2 -
.../web/mail/lib/lang/cz_mail_alias_list.lng | 2 -
.../web/mail/lib/lang/cz_mail_aliasdomain.lng | 2 -
.../lib/lang/cz_mail_aliasdomain_list.lng | 2 -
.../web/mail/lib/lang/cz_mail_blacklist.lng | 2 -
.../mail/lib/lang/cz_mail_blacklist_list.lng | 2 -
.../mail/lib/lang/cz_mail_content_filter.lng | 2 -
.../lib/lang/cz_mail_content_filter_list.lng | 2 -
.../web/mail/lib/lang/cz_mail_domain.lng | 2 -
.../lib/lang/cz_mail_domain_admin_list.lng | 2 -
.../mail/lib/lang/cz_mail_domain_catchall.lng | 2 -
.../lib/lang/cz_mail_domain_catchall_list.lng | 2 -
.../web/mail/lib/lang/cz_mail_domain_list.lng | 2 -
.../web/mail/lib/lang/cz_mail_forward.lng | 2 -
.../mail/lib/lang/cz_mail_forward_list.lng | 2 -
interface/web/mail/lib/lang/cz_mail_get.lng | 2 -
.../web/mail/lib/lang/cz_mail_get_list.lng | 2 -
.../web/mail/lib/lang/cz_mail_mailinglist.lng | 2 -
.../lib/lang/cz_mail_mailinglist_list.lng | 2 -
.../mail/lib/lang/cz_mail_relay_recipient.lng | 2 -
.../lib/lang/cz_mail_relay_recipient_list.lng | 2 -
.../web/mail/lib/lang/cz_mail_spamfilter.lng | 2 -
.../mail/lib/lang/cz_mail_spamfilter_list.lng | 2 -
.../web/mail/lib/lang/cz_mail_transport.lng | 2 -
.../mail/lib/lang/cz_mail_transport_list.lng | 2 -
interface/web/mail/lib/lang/cz_mail_user.lng | 2 -
.../web/mail/lib/lang/cz_mail_user_filter.lng | 2 -
.../lib/lang/cz_mail_user_filter_list.lng | 2 -
.../web/mail/lib/lang/cz_mail_user_list.lng | 2 -
.../mail/lib/lang/cz_mail_user_stats_list.lng | 2 -
.../web/mail/lib/lang/cz_mail_whitelist.lng | 2 -
.../mail/lib/lang/cz_mail_whitelist_list.lng | 2 -
.../mail/lib/lang/cz_spamfilter_blacklist.lng | 2 -
.../lib/lang/cz_spamfilter_blacklist_list.lng | 2 -
.../mail/lib/lang/cz_spamfilter_config.lng | 2 -
.../lib/lang/cz_spamfilter_config_list.lng | 2 -
.../mail/lib/lang/cz_spamfilter_policy.lng | 2 -
.../lib/lang/cz_spamfilter_policy_list.lng | 2 -
.../web/mail/lib/lang/cz_spamfilter_users.lng | 2 -
.../lib/lang/cz_spamfilter_users_list.lng | 2 -
.../mail/lib/lang/cz_spamfilter_whitelist.lng | 2 -
.../lib/lang/cz_spamfilter_whitelist_list.lng | 2 -
.../lib/lang/cz_user_quota_stats_list.lng | 2 -
interface/web/mail/lib/lang/pl.lng | 1 -
interface/web/mail/lib/lang/pl_mail_alias.lng | 1 -
.../web/mail/lib/lang/pl_mail_alias_list.lng | 1 -
.../web/mail/lib/lang/pl_mail_aliasdomain.lng | 1 -
.../lib/lang/pl_mail_aliasdomain_list.lng | 1 -
.../web/mail/lib/lang/pl_mail_blacklist.lng | 1 -
.../mail/lib/lang/pl_mail_blacklist_list.lng | 1 -
.../mail/lib/lang/pl_mail_content_filter.lng | 1 -
.../lib/lang/pl_mail_content_filter_list.lng | 1 -
.../web/mail/lib/lang/pl_mail_domain.lng | 1 -
.../lib/lang/pl_mail_domain_admin_list.lng | 1 -
.../mail/lib/lang/pl_mail_domain_catchall.lng | 1 -
.../lib/lang/pl_mail_domain_catchall_list.lng | 1 -
.../web/mail/lib/lang/pl_mail_domain_list.lng | 1 -
.../web/mail/lib/lang/pl_mail_forward.lng | 1 -
.../mail/lib/lang/pl_mail_forward_list.lng | 1 -
interface/web/mail/lib/lang/pl_mail_get.lng | 1 -
.../web/mail/lib/lang/pl_mail_get_list.lng | 1 -
.../web/mail/lib/lang/pl_mail_mailinglist.lng | 1 -
.../lib/lang/pl_mail_mailinglist_list.lng | 1 -
.../mail/lib/lang/pl_mail_relay_recipient.lng | 1 -
.../lib/lang/pl_mail_relay_recipient_list.lng | 1 -
.../web/mail/lib/lang/pl_mail_spamfilter.lng | 1 -
.../mail/lib/lang/pl_mail_spamfilter_list.lng | 1 -
.../web/mail/lib/lang/pl_mail_transport.lng | 1 -
.../mail/lib/lang/pl_mail_transport_list.lng | 1 -
interface/web/mail/lib/lang/pl_mail_user.lng | 1 -
.../web/mail/lib/lang/pl_mail_user_filter.lng | 1 -
.../lib/lang/pl_mail_user_filter_list.lng | 1 -
.../web/mail/lib/lang/pl_mail_user_list.lng | 1 -
.../mail/lib/lang/pl_mail_user_stats_list.lng | 1 -
.../web/mail/lib/lang/pl_mail_whitelist.lng | 1 -
.../mail/lib/lang/pl_mail_whitelist_list.lng | 1 -
.../mail/lib/lang/pl_spamfilter_blacklist.lng | 1 -
.../lib/lang/pl_spamfilter_blacklist_list.lng | 1 -
.../mail/lib/lang/pl_spamfilter_config.lng | 1 -
.../lib/lang/pl_spamfilter_config_list.lng | 1 -
.../mail/lib/lang/pl_spamfilter_policy.lng | 1 -
.../lib/lang/pl_spamfilter_policy_list.lng | 1 -
.../web/mail/lib/lang/pl_spamfilter_users.lng | 1 -
.../lib/lang/pl_spamfilter_users_list.lng | 1 -
.../mail/lib/lang/pl_spamfilter_whitelist.lng | 1 -
.../lib/lang/pl_spamfilter_whitelist_list.lng | 1 -
.../lib/lang/pl_user_quota_stats_list.lng | 1 -
interface/web/mail/mail_domain_del.php | 4 +-
interface/web/mailuser/lib/lang/cz.lng | 2 -
interface/web/mailuser/lib/lang/cz_index.lng | 2 -
.../lib/lang/cz_mail_user_autoresponder.lng | 2 -
.../web/mailuser/lib/lang/cz_mail_user_cc.lng | 2 -
.../mailuser/lib/lang/cz_mail_user_filter.lng | 2 -
.../lib/lang/cz_mail_user_filter_list.lng | 2 -
.../lib/lang/cz_mail_user_password.lng | 2 -
.../lib/lang/cz_mail_user_spamfilter.lng | 2 -
interface/web/mailuser/lib/lang/pl.lng | 1 -
interface/web/mailuser/lib/lang/pl_index.lng | 1 -
.../lib/lang/pl_mail_user_autoresponder.lng | 1 -
.../web/mailuser/lib/lang/pl_mail_user_cc.lng | 1 -
.../mailuser/lib/lang/pl_mail_user_filter.lng | 1 -
.../lib/lang/pl_mail_user_filter_list.lng | 1 -
.../lib/lang/pl_mail_user_password.lng | 1 -
.../lib/lang/pl_mail_user_spamfilter.lng | 1 -
interface/web/monitor/lib/lang/cz.lng | 2 -
.../web/monitor/lib/lang/cz_datalog_list.lng | 2 -
.../web/monitor/lib/lang/cz_syslog_list.lng | 2 -
interface/web/monitor/lib/lang/pl.lng | 1 -
.../web/monitor/lib/lang/pl_datalog_list.lng | 1 -
.../web/monitor/lib/lang/pl_syslog_list.lng | 1 -
.../web/sites/lib/lang/ar_web_domain.lng | 1 +
.../web/sites/lib/lang/bg_web_domain.lng | 1 +
.../web/sites/lib/lang/br_web_domain.lng | 1 +
interface/web/sites/lib/lang/cz.lng | 2 -
interface/web/sites/lib/lang/cz_aps.lng | 2 -
.../sites/lib/lang/cz_aps_instances_list.lng | 2 -
.../sites/lib/lang/cz_aps_packages_list.lng | 2 -
interface/web/sites/lib/lang/cz_cron.lng | 2 -
interface/web/sites/lib/lang/cz_cron_list.lng | 2 -
interface/web/sites/lib/lang/cz_database.lng | 2 -
.../sites/lib/lang/cz_database_admin_list.lng | 2 -
.../web/sites/lib/lang/cz_database_list.lng | 2 -
.../web/sites/lib/lang/cz_database_user.lng | 2 -
.../lib/lang/cz_database_user_admin_list.lng | 2 -
.../sites/lib/lang/cz_database_user_list.lng | 2 -
interface/web/sites/lib/lang/cz_ftp_user.lng | 2 -
.../web/sites/lib/lang/cz_ftp_user_list.lng | 2 -
.../web/sites/lib/lang/cz_shell_user.lng | 2 -
.../web/sites/lib/lang/cz_shell_user_list.lng | 2 -
.../lib/lang/cz_user_quota_stats_list.lng | 2 -
.../web/sites/lib/lang/cz_web_aliasdomain.lng | 2 -
.../lib/lang/cz_web_aliasdomain_list.lng | 2 -
.../web/sites/lib/lang/cz_web_backup_list.lng | 2 -
.../web/sites/lib/lang/cz_web_domain.lng | 3 +-
.../lib/lang/cz_web_domain_admin_list.lng | 2 -
.../web/sites/lib/lang/cz_web_domain_list.lng | 2 -
.../web/sites/lib/lang/cz_web_folder.lng | 2 -
.../web/sites/lib/lang/cz_web_folder_list.lng | 2 -
.../web/sites/lib/lang/cz_web_folder_user.lng | 2 -
.../lib/lang/cz_web_folder_user_list.lng | 2 -
.../lib/lang/cz_web_sites_stats_list.lng | 2 -
.../web/sites/lib/lang/cz_web_subdomain.lng | 2 -
.../sites/lib/lang/cz_web_subdomain_list.lng | 2 -
.../sites/lib/lang/cz_web_vhost_subdomain.lng | 2 -
.../lib/lang/cz_web_vhost_subdomain_list.lng | 2 -
.../web/sites/lib/lang/cz_webdav_user.lng | 2 -
.../sites/lib/lang/cz_webdav_user_list.lng | 2 -
.../web/sites/lib/lang/de_web_domain.lng | 1 +
.../web/sites/lib/lang/el_web_domain.lng | 1 +
.../web/sites/lib/lang/es_web_domain.lng | 1 +
.../web/sites/lib/lang/fi_web_domain.lng | 1 +
.../web/sites/lib/lang/fr_web_domain.lng | 1 +
.../web/sites/lib/lang/hr_web_domain.lng | 1 +
.../web/sites/lib/lang/hu_web_domain.lng | 1 +
.../web/sites/lib/lang/id_web_domain.lng | 1 +
.../web/sites/lib/lang/it_web_domain.lng | 1 +
.../web/sites/lib/lang/ja_web_domain.lng | 1 +
.../web/sites/lib/lang/nl_web_domain.lng | 1 +
interface/web/sites/lib/lang/pl.lng | 1 -
interface/web/sites/lib/lang/pl_aps.lng | 1 -
.../sites/lib/lang/pl_aps_instances_list.lng | 1 -
.../sites/lib/lang/pl_aps_packages_list.lng | 1 -
interface/web/sites/lib/lang/pl_cron.lng | 1 -
interface/web/sites/lib/lang/pl_cron_list.lng | 1 -
interface/web/sites/lib/lang/pl_database.lng | 1 -
.../sites/lib/lang/pl_database_admin_list.lng | 1 -
.../web/sites/lib/lang/pl_database_list.lng | 1 -
.../web/sites/lib/lang/pl_database_user.lng | 1 -
.../lib/lang/pl_database_user_admin_list.lng | 1 -
.../sites/lib/lang/pl_database_user_list.lng | 1 -
interface/web/sites/lib/lang/pl_ftp_user.lng | 1 -
.../web/sites/lib/lang/pl_ftp_user_list.lng | 1 -
.../web/sites/lib/lang/pl_shell_user.lng | 1 -
.../web/sites/lib/lang/pl_shell_user_list.lng | 1 -
.../lib/lang/pl_user_quota_stats_list.lng | 1 -
.../web/sites/lib/lang/pl_web_aliasdomain.lng | 1 -
.../lib/lang/pl_web_aliasdomain_list.lng | 1 -
.../web/sites/lib/lang/pl_web_backup_list.lng | 1 -
.../web/sites/lib/lang/pl_web_domain.lng | 2 +-
.../lib/lang/pl_web_domain_admin_list.lng | 1 -
.../web/sites/lib/lang/pl_web_domain_list.lng | 1 -
.../web/sites/lib/lang/pl_web_folder.lng | 1 -
.../web/sites/lib/lang/pl_web_folder_list.lng | 1 -
.../web/sites/lib/lang/pl_web_folder_user.lng | 1 -
.../lib/lang/pl_web_folder_user_list.lng | 1 -
.../lib/lang/pl_web_sites_stats_list.lng | 1 -
.../web/sites/lib/lang/pl_web_subdomain.lng | 1 -
.../sites/lib/lang/pl_web_subdomain_list.lng | 1 -
.../sites/lib/lang/pl_web_vhost_subdomain.lng | 1 -
.../lib/lang/pl_web_vhost_subdomain_list.lng | 1 -
.../web/sites/lib/lang/pl_webdav_user.lng | 1 -
.../sites/lib/lang/pl_webdav_user_list.lng | 1 -
.../web/sites/lib/lang/pt_web_domain.lng | 1 +
.../web/sites/lib/lang/ro_web_domain.lng | 1 +
.../web/sites/lib/lang/ru_web_domain.lng | 1 +
.../web/sites/lib/lang/se_web_domain.lng | 1 +
.../web/sites/lib/lang/sk_web_domain.lng | 1 +
.../lib/lang/cz_strengthmeter.lng | 2 -
.../lib/lang/pl_strengthmeter.lng | 1 -
interface/web/tools/import_ispconfig.php | 13 +++++
interface/web/tools/lib/lang/cz.lng | 2 -
.../tools/lib/lang/cz_import_ispconfig.lng | 2 -
interface/web/tools/lib/lang/cz_index.lng | 2 -
interface/web/tools/lib/lang/cz_interface.lng | 2 -
interface/web/tools/lib/lang/cz_resync.lng | 2 -
.../web/tools/lib/lang/cz_tpl_default.lng | 2 -
.../web/tools/lib/lang/cz_usersettings.lng | 2 -
interface/web/tools/lib/lang/pl.lng | 1 -
.../tools/lib/lang/pl_import_ispconfig.lng | 1 -
interface/web/tools/lib/lang/pl_index.lng | 1 -
interface/web/tools/lib/lang/pl_interface.lng | 1 -
interface/web/tools/lib/lang/pl_resync.lng | 1 -
.../web/tools/lib/lang/pl_tpl_default.lng | 1 -
.../web/tools/lib/lang/pl_usersettings.lng | 1 -
interface/web/vm/lib/lang/cz.lng | 2 -
.../web/vm/lib/lang/cz_openvz_action.lng | 2 -
interface/web/vm/lib/lang/cz_openvz_ip.lng | 2 -
.../web/vm/lib/lang/cz_openvz_ip_list.lng | 2 -
.../web/vm/lib/lang/cz_openvz_ostemplate.lng | 2 -
.../vm/lib/lang/cz_openvz_ostemplate_list.lng | 2 -
.../web/vm/lib/lang/cz_openvz_template.lng | 2 -
.../vm/lib/lang/cz_openvz_template_list.lng | 2 -
interface/web/vm/lib/lang/cz_openvz_vm.lng | 2 -
.../web/vm/lib/lang/cz_openvz_vm_list.lng | 2 -
interface/web/vm/lib/lang/pl.lng | 1 -
.../web/vm/lib/lang/pl_openvz_action.lng | 1 -
interface/web/vm/lib/lang/pl_openvz_ip.lng | 1 -
.../web/vm/lib/lang/pl_openvz_ip_list.lng | 1 -
.../web/vm/lib/lang/pl_openvz_ostemplate.lng | 1 -
.../vm/lib/lang/pl_openvz_ostemplate_list.lng | 1 -
.../web/vm/lib/lang/pl_openvz_template.lng | 1 -
.../vm/lib/lang/pl_openvz_template_list.lng | 1 -
interface/web/vm/lib/lang/pl_openvz_vm.lng | 1 -
.../web/vm/lib/lang/pl_openvz_vm_list.lng | 1 -
server/cron_daily.php | 54 ++++++++++++++-----
server/lib/classes/system.inc.php | 52 ++++++++++++++++++
.../plugins-available/apache2_plugin.inc.php | 2 +-
.../plugins-available/mailman_plugin.inc.php | 2 +-
server/plugins-available/nginx_plugin.inc.php | 2 +-
.../shelluser_base_plugin.inc.php | 4 +-
485 files changed, 280 insertions(+), 671 deletions(-)
create mode 100644 install/sql/incremental/upd_0050.sql
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 6993782181..aa83141c64 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -59,22 +59,8 @@ class installer_dist extends installer_base {
}
}
- $config_dir = $conf['mailman']['config_dir'].'/';
- $full_file_name = $config_dir.'virtual_to_transport.sh';
-
- //* Backup exiting virtual_to_transport.sh script
- if(is_file($full_file_name)) {
- copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
- }
-
- copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
- chgrp($full_file_name,'mailman');
- chmod($full_file_name,0750);
-
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
-
- exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
$virtual_domains = '';
if($status == 'update')
@@ -101,6 +87,25 @@ class installer_dist extends installer_base {
$content = str_replace('{virtual_domains}', $virtual_domains, $content);
wf($full_file_name, $content);
+
+ //* Write virtual_to_transport.sh script
+ $config_dir = $conf['mailman']['config_dir'].'/';
+ $full_file_name = $config_dir.'virtual_to_transport.sh';
+
+ //* Backup exiting virtual_to_transport.sh script
+ if(is_file($full_file_name)) {
+ copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
+ }
+
+ if(is_dir('/etc/mailman')) {
+ copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
+ chgrp($full_file_name,'mailman');
+ chmod($full_file_name,0750);
+ }
+
+ //* Create aliasaes
+ exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
+
}
function configure_postfix($options = '')
@@ -204,6 +209,16 @@ class installer_dist extends installer_base {
touch($config_dir.'/nested_header_checks');
touch($config_dir.'/body_checks');
+ //* Create the mailman files
+ if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
+ //if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
+ if(is_file('/var/lib/mailman/data/aliases')) unlink('/var/lib/mailman/data/aliases');
+ if(!is_link('/var/lib/mailman/data/aliases')) symlink('/etc/mailman/aliases','/var/lib/mailman/data/aliases');
+ exec('postalias /var/lib/mailman/data/aliases');
+ if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
+ exec('postmap /var/lib/mailman/data/virtual-mailman');
+ if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
+ exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
//* Make a backup copy of the main.cf file
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 0a16f483aa..197aa15322 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -59,22 +59,8 @@ class installer_dist extends installer_base {
}
}
- $config_dir = $conf['mailman']['config_dir'].'/';
- $full_file_name = $config_dir.'virtual_to_transport.sh';
-
- //* Backup exiting virtual_to_transport.sh script
- if(is_file($full_file_name)) {
- copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
- }
-
- copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
- chgrp($full_file_name,'mailman');
- chmod($full_file_name,0750);
-
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
-
- exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
$virtual_domains = '';
if($status == 'update')
@@ -101,6 +87,24 @@ class installer_dist extends installer_base {
$content = str_replace('{virtual_domains}', $virtual_domains, $content);
wf($full_file_name, $content);
+
+ //* Write virtual_to_transport.sh script
+ $config_dir = $conf['mailman']['config_dir'].'/';
+ $full_file_name = $config_dir.'virtual_to_transport.sh';
+
+ //* Backup exiting virtual_to_transport.sh script
+ if(is_file($full_file_name)) {
+ copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
+ }
+
+ if(is_dir('/etc/mailman')) {
+ copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
+ chgrp($full_file_name,'mailman');
+ chmod($full_file_name,0750);
+ }
+
+ //* Create aliasaes
+ exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
}
function configure_postfix($options = '')
@@ -218,6 +222,14 @@ class installer_dist extends installer_base {
touch($config_dir.'/nested_header_checks');
touch($config_dir.'/body_checks');
+ //* Create the mailman files
+ if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
+ if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
+ exec('postalias /var/lib/mailman/data/aliases');
+ if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
+ exec('postmap /var/lib/mailman/data/virtual-mailman');
+ if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
+ exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
//* Make a backup copy of the main.cf file
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
diff --git a/install/sql/incremental/upd_0050.sql b/install/sql/incremental/upd_0050.sql
new file mode 100644
index 0000000000..d0caf4273a
--- /dev/null
+++ b/install/sql/incremental/upd_0050.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `dns_slave` DROP INDEX `origin`;
+ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);
\ No newline at end of file
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 6849418823..a159ba67e7 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -418,7 +418,7 @@ CREATE TABLE `dns_slave` (
`active` enum('N','Y') NOT NULL,
`xfer` varchar(255) NOT NULL,
PRIMARY KEY (`id`),
- UNIQUE KEY `origin` (`origin`),
+ UNIQUE KEY `slave` (`origin`,`server_id`),
KEY `active` (`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -2169,6 +2169,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.1');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.2');
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index f5b2a91d8e..0745c28aa9 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -51,4 +51,4 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
Alias /awstats-icon "/usr/share/awstats/icon"
NameVirtualHost *:80
-NameVirtualHost *:443
\ No newline at end of file
+NameVirtualHost *:443
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 4410b8533d..15b2956032 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -26,6 +26,7 @@ NameVirtualHost *:{vhost_port}
Allow from all
</Directory>
IPCCommTimeout 7200
+ MaxRequestLen 15728640
</IfModule>
<IfModule mpm_itk_module>
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 2af243d92d..1c967327b5 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.5.1');
+define('ISPC_APP_VERSION', '3.0.5.2');
define('DEVSYSTEM', 0);
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 03e7bd8269..185b7fb004 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -132,5 +132,3 @@ $wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavenà uživatele pro
$wb['datalog_status_d_web_folder_user'] = 'Odstraněnà uživatele pro adresáře chráněné heslem';
$wb['login_as_txt'] = 'Přihlaste se jako';
?>
-
-
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index 5d8ec6f790..7374ab6b88 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -132,4 +132,3 @@ $wb['datalog_status_u_web_folder_user'] = 'Edytuj konto zabezpieczonego folderu'
$wb['datalog_status_d_web_folder_user'] = 'Usuń konto zabezpieczonego folderu';
$wb['login_as_txt'] = 'Zaloguj jako';
?>
-
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 0d64014cf0..d44b6ad736 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -214,7 +214,7 @@ $form["tabs"]['mail'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
+ 'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}(\?.+)?$/',
'errmsg'=> 'webmail_url_error_regex'),
),
'default' => '',
diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php
index 5c071a3803..75343bd82d 100644
--- a/interface/web/admin/language_complete.php
+++ b/interface/web/admin/language_complete.php
@@ -138,7 +138,7 @@ function merge_langfile($langfile,$masterfile) {
$file_content = "<?php\n";
foreach($wb as $key => $val) {
$val = str_replace("'","\\'",$val);
- $val = str_replace('"','\\"',$val);
+ $val = str_replace('"','\"',$val);
$file_content .= '$wb['."'$key'".'] = '."'$val';\n";
}
$file_content .= "?>\n";
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index ef609bb052..618b69e47a 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 5c2b5f6c5d..18cae75259 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -170,4 +170,5 @@ $wb['website_autoalias_txt'] = 'Website auto alias';
$wb['website_autoalias_note_txt'] = 'Placeholders:';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index c7237996be..1f8e3f7622 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng
index 8c80d1292d..bc1c9bb83f 100644
--- a/interface/web/admin/lib/lang/cz.lng
+++ b/interface/web/admin/lib/lang/cz.lng
@@ -48,5 +48,3 @@ $wb['Do OS-Update'] = 'Aktualizovat operaÄnà systém';
$wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig';
$wb['Directive Snippets'] = 'Directive Snippets';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets.lng b/interface/web/admin/lib/lang/cz_directive_snippets.lng
index 9a579d25e3..c6a89099c6 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng
@@ -7,5 +7,3 @@ $wb['active_txt'] = 'AktivnÃ';
$wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
index cf1bb28c77..c6f444b660 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
@@ -5,5 +5,3 @@ $wb['name_txt'] = 'Name of Snippet';
$wb['type_txt'] = 'Verze';
$wb['add_new_record_txt'] = 'Add Directive Snippet';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_firewall.lng b/interface/web/admin/lib/lang/cz_firewall.lng
index df9386ae66..c6146ae93d 100644
--- a/interface/web/admin/lib/lang/cz_firewall.lng
+++ b/interface/web/admin/lib/lang/cz_firewall.lng
@@ -9,5 +9,3 @@ $wb['firewall_error_unique'] = 'Pro tento server již existuje záznam firewallu
$wb['tcp_ports_error_regex'] = 'Znak nenà povole v definici TCP portu. Povolené symboly jsou ÄÃsla, : a ,.';
$wb['udp_ports_error_regex'] = 'Znak nenà povole v definici UDP portu. Povolené symboly jsou ÄÃsla, : a ,.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_firewall_list.lng b/interface/web/admin/lib/lang/cz_firewall_list.lng
index da1af438de..aecc4cf06a 100644
--- a/interface/web/admin/lib/lang/cz_firewall_list.lng
+++ b/interface/web/admin/lib/lang/cz_firewall_list.lng
@@ -6,5 +6,3 @@ $wb['tcp_port_txt'] = 'Otevřené TCP porty';
$wb['udp_port_txt'] = 'Otevřené UDP porty';
$wb['add_new_record_txt'] = 'Přidat záznam';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_groups.lng b/interface/web/admin/lib/lang/cz_groups.lng
index 0f1a6be926..a6281be247 100644
--- a/interface/web/admin/lib/lang/cz_groups.lng
+++ b/interface/web/admin/lib/lang/cz_groups.lng
@@ -3,5 +3,3 @@ $wb['description_txt'] = 'Popis';
$wb['name_txt'] = 'Skupina';
$wb['name_err'] = 'Skupina musà mÃt min. 1, max. 30 znaků.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_groups_list.lng b/interface/web/admin/lib/lang/cz_groups_list.lng
index f285b382b9..c1d7ef9a8b 100644
--- a/interface/web/admin/lib/lang/cz_groups_list.lng
+++ b/interface/web/admin/lib/lang/cz_groups_list.lng
@@ -5,5 +5,3 @@ $wb['name_txt'] = 'Skupina';
$wb['add_new_record_txt'] = 'Přidat skupinu';
$wb['warning_txt'] = '<b>VAROVÃNÃ:</b> Zde neupravujte uživatelská nastavenÃ. Užijte klientská a distributorská nastavenà v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_iptables.lng b/interface/web/admin/lib/lang/cz_iptables.lng
index 6a57b7ce8e..a40fc0490f 100644
--- a/interface/web/admin/lib/lang/cz_iptables.lng
+++ b/interface/web/admin/lib/lang/cz_iptables.lng
@@ -11,5 +11,3 @@ $wb['source_ip_txt'] = 'Zdrojové adresy';
$wb['active_txt'] = 'AktivnÃ';
$wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng
index 3dbc9061a5..65cef7507e 100644
--- a/interface/web/admin/lib/lang/cz_iptables_list.lng
+++ b/interface/web/admin/lib/lang/cz_iptables_list.lng
@@ -13,5 +13,3 @@ $wb['source_ip_txt'] = 'Zdrojové adresy';
$wb['active_txt'] = 'AktivnÃ';
$wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng
index d95f12eb35..285dff2761 100644
--- a/interface/web/admin/lib/lang/cz_language_add.lng
+++ b/interface/web/admin/lib/lang/cz_language_add.lng
@@ -6,5 +6,3 @@ $wb['language_new_hint_txt'] = '2 znakové ISO 639-1 jazykové kódy (Viz: http:
$wb['btn_save_txt'] = 'Vytvořit novou jazykovou sadu souborů';
$wb['btn_cancel_txt'] = 'Zpět';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_complete.lng b/interface/web/admin/lib/lang/cz_language_complete.lng
index eb222b3bd0..f1e6f4924e 100644
--- a/interface/web/admin/lib/lang/cz_language_complete.lng
+++ b/interface/web/admin/lib/lang/cz_language_complete.lng
@@ -5,5 +5,3 @@ $wb['language_select_txt'] = 'Vybrat jazyk k doplnÄ›nÃ';
$wb['btn_save_txt'] = 'SlouÄit / doplnit jazykový soubor';
$wb['btn_cancel_txt'] = 'Zpět';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_edit.lng b/interface/web/admin/lib/lang/cz_language_edit.lng
index f880e6dbe7..2a71ed0a77 100644
--- a/interface/web/admin/lib/lang/cz_language_edit.lng
+++ b/interface/web/admin/lib/lang/cz_language_edit.lng
@@ -6,5 +6,3 @@ $wb['lang_file_txt'] = 'Jazykový soubor';
$wb['btn_save_txt'] = 'Uložit';
$wb['btn_cancel_txt'] = 'Zpět';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_export.lng b/interface/web/admin/lib/lang/cz_language_export.lng
index 7ffdccf522..7998eea017 100644
--- a/interface/web/admin/lib/lang/cz_language_export.lng
+++ b/interface/web/admin/lib/lang/cz_language_export.lng
@@ -4,5 +4,3 @@ $wb['language_select_txt'] = 'Vybrat jazykovou sadu';
$wb['btn_save_txt'] = 'Uložit vybranou jazykovou sadu do souboru';
$wb['btn_cancel_txt'] = 'Zpět';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_import.lng b/interface/web/admin/lib/lang/cz_language_import.lng
index 17dfa89aaf..838c325f7f 100644
--- a/interface/web/admin/lib/lang/cz_language_import.lng
+++ b/interface/web/admin/lib/lang/cz_language_import.lng
@@ -6,5 +6,3 @@ $wb['language_overwrite_txt'] = 'Přepsat soubor, pokud existuje.';
$wb['btn_cancel_txt'] = 'Zpět';
$wb['ignore_version_txt'] = 'PÅ™eskoÄit kontrolu verze ISPConfigu.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_list.lng b/interface/web/admin/lib/lang/cz_language_list.lng
index 77810e0a75..b2a7863715 100644
--- a/interface/web/admin/lib/lang/cz_language_list.lng
+++ b/interface/web/admin/lib/lang/cz_language_list.lng
@@ -5,5 +5,3 @@ $wb['module_txt'] = 'Modul';
$wb['lang_file_txt'] = 'Jazykový soubor';
$wb['lang_file_date_txt'] = 'Poslednà úprava';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_login_as.lng b/interface/web/admin/lib/lang/cz_login_as.lng
index dd409d358d..3f8e8491fc 100644
--- a/interface/web/admin/lib/lang/cz_login_as.lng
+++ b/interface/web/admin/lib/lang/cz_login_as.lng
@@ -9,5 +9,3 @@ $wb['firewall_error_unique'] = 'There is already a firewall record for this serv
$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/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng
index f48a2c4a36..64a190d9a1 100644
--- a/interface/web/admin/lib/lang/cz_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_package_install.lng
@@ -5,5 +5,3 @@ $wb['repo_username_txt'] = 'Uživatel (volitelné)';
$wb['repo_password_txt'] = 'Heslo (volitelné)';
$wb['active_txt'] = 'AktivnÃ';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng
index 11747ab9ce..68da1c065d 100644
--- a/interface/web/admin/lib/lang/cz_remote_action.lng
+++ b/interface/web/admin/lib/lang/cz_remote_action.lng
@@ -2,13 +2,11 @@
$wb['select_server_txt'] = 'Zvolit server';
$wb['btn_do_txt'] = 'Provést akci';
$wb['do_osupdate_caption'] = 'Aktualizace operaÄnÃho systému na vzdáleném serveru.';
-$wb['do_osupdate_desc'] = 'Tato akce provede "aptitude -y" aktualizaci na vybraném serveru.<br><br><strong>POUŽITà TÉTO AKCE NA VLASTNà NEBEZPEČà !</strong>';
+$wb['do_osupdate_desc'] = 'Tato akce provede \"aptitude -y\" aktualizaci na vybraném serveru.<br><br><strong>POUŽITà TÉTO AKCE NA VLASTNà NEBEZPEČà !</strong>';
$wb['do_ispcupdate_caption'] = 'Provedenà ISPConfig 3 - aktualizace na vzdáleném serveru';
-$wb['do_ispcupdate_desc'] = 'Tato akce provede "ISPConfig 3" aktualizaci na vašem vybraném serveru.<br><br><strong>POUŽITà TÉTO AKCE NA VLASTNà NEBEZPEČà !</strong>';
+$wb['do_ispcupdate_desc'] = 'Tato akce provede \"ISPConfig 3\" aktualizaci na vašem vybraném serveru.<br><br><strong>POUŽITà TÉTO AKCE NA VLASTNà NEBEZPEČà !</strong>';
$wb['action_scheduled'] = 'Akce je naplánována na provedenÃ';
$wb['select_all_server'] = 'VÅ¡echny servery';
$wb['ispconfig_update_title'] = 'ISPConfig pokyny k aktualizaci';
$wb['ispconfig_update_text'] = 'PÅ™ihlaste se jako uživatel root na terminal (shell) serveru a proveÄte pÅ™Ãkaz<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />spustà se ISPConfig aktualizace.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>KliknÄ›te zde pro podrobnÄ›jÅ¡Ã informace o provedenà aktualizace</a>';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng
index a34b3d74de..17c4f05b56 100644
--- a/interface/web/admin/lib/lang/cz_remote_user.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user.lng
@@ -45,5 +45,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_remote_user_list.lng b/interface/web/admin/lib/lang/cz_remote_user_list.lng
index 1b40308735..66b64946e4 100644
--- a/interface/web/admin/lib/lang/cz_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng
@@ -5,5 +5,3 @@ $wb['add_new_record_txt'] = 'Přidat uživatele';
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Uživatel';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server.lng b/interface/web/admin/lib/lang/cz_server.lng
index 9d44fd27c8..a087656a1c 100644
--- a/interface/web/admin/lib/lang/cz_server.lng
+++ b/interface/web/admin/lib/lang/cz_server.lng
@@ -13,5 +13,3 @@ $wb['- None -'] = '- Žádný -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index 0e58bf2bac..c0e42402e3 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -170,6 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Aktivovat IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'PÅ™i pÅ™ekroÄenà limitu pÅ™enesených dat, poslat oznámenà adminovi';
$wb['overtraffic_notify_client_txt'] = 'PÅ™i pÅ™ekroÄenà limitu pÅ™enesených dat, poslat oznámenà klientovi';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_config_list.lng b/interface/web/admin/lib/lang/cz_server_config_list.lng
index 8589dbc9d1..2118c35357 100644
--- a/interface/web/admin/lib/lang/cz_server_config_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_config_list.lng
@@ -2,5 +2,3 @@
$wb['list_head_txt'] = 'Konfigurace serveru';
$wb['server_name_txt'] = 'Server';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_ip.lng b/interface/web/admin/lib/lang/cz_server_ip.lng
index a948939fe2..43a382a646 100644
--- a/interface/web/admin/lib/lang/cz_server_ip.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip.lng
@@ -9,5 +9,3 @@ $wb['ip_type_txt'] = 'Verze';
$wb['virtualhost_port_txt'] = 'HTTP Porty';
$wb['error_port_syntax'] = 'Neplatné znaky ve volbÄ› HTTP Portů. ProsÃm, zadejte pouze ÄÃselné hodnoty oddÄ›lené Äárkami. PÅ™Ãklad: 80,443';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_ip_list.lng b/interface/web/admin/lib/lang/cz_server_ip_list.lng
index 2a47ca7591..93b0b77c9b 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng
@@ -8,5 +8,3 @@ $wb['virtualhost_txt'] = 'HTTP Vhost';
$wb['virtualhost_port_txt'] = 'HTTP Ports';
$wb['ip_type_txt'] = 'Verze';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_list.lng b/interface/web/admin/lib/lang/cz_server_list.lng
index e7a2efd805..ecddbf28e8 100644
--- a/interface/web/admin/lib/lang/cz_server_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_list.lng
@@ -11,5 +11,3 @@ $wb['add_new_record_txt'] = 'Přidat server';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
index 59cf3c7365..10aba05dd7 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -14,5 +14,3 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_php_list.lng b/interface/web/admin/lib/lang/cz_server_php_list.lng
index e0b43a4a99..36b28fe411 100644
--- a/interface/web/admin/lib/lang/cz_server_php_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_php_list.lng
@@ -5,5 +5,3 @@ $wb['add_new_record_txt'] = 'Přidat novou verzi PHP';
$wb['client_id_txt'] = 'Klient';
$wb['name_txt'] = 'Verze PHP';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng
index 83440257f2..0d079ef6d3 100644
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_install.lng
@@ -4,5 +4,3 @@ $wb['install_key_txt'] = 'Enter install key';
$wb['btn_save_txt'] = 'Spustit instalaci';
$wb['btn_cancel_txt'] = 'Zrušit';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng
index 1a59b58e10..7df837f0c1 100644
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_list.lng
@@ -9,5 +9,3 @@ $wb['repoupdate_txt'] = 'Aktualizace seznamu balÃků';
$wb['package_id_txt'] = 'mÃstnà App-ID';
$wb['no_packages_txt'] = 'Žádné balÃÄky nejsou k dispozici';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng
index f48a2c4a36..64a190d9a1 100644
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo.lng
@@ -5,5 +5,3 @@ $wb['repo_username_txt'] = 'Uživatel (volitelné)';
$wb['repo_password_txt'] = 'Heslo (volitelné)';
$wb['active_txt'] = 'AktivnÃ';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng
index 4ae3c662d8..5c82d4c41f 100644
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng
@@ -4,5 +4,3 @@ $wb['active_txt'] = 'AktivnÃ';
$wb['repo_name_txt'] = 'Repozitář';
$wb['repo_url_txt'] = 'URL';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng
index 4e7d161bbe..c48ad8ce30 100644
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_update_list.lng
@@ -7,5 +7,3 @@ $wb['version_txt'] = 'Verze';
$wb['action_txt'] = 'Akce';
$wb['no_updates_txt'] = 'Žádné aktualizace nejsou k dispozici';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 67253c63d8..8073830ebd 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -50,5 +50,3 @@ $wb['mailbox_show_autoresponder_tab_txt'] = 'Show Autoresponder tab in Mailbox d
$wb['mailbox_show_mail_filter_tab_txt'] = 'Show Mail Filter tab in Mailbox detail';
$wb['mailbox_show_custom_rules_tab_txt'] = 'Show Custom Rules tab in Mailbox detail';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
index edf66963d4..480d504421 100644
--- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
@@ -16,5 +16,3 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng
index 1f3cb59e87..16f4812d68 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -31,5 +31,3 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
$wb['username_error_collision'] = 'Uživatelské jméno nesmà být web nebo web a ÄÃslo.\\"';
?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng
index a4915a4ca0..e5a7d1e4de 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -7,5 +7,3 @@ $wb['add_new_record_txt'] = 'Přidat uživatele';
$wb['warning_txt'] = '<b>VAROVÃNÃ:</b> Zde neupravujte uživatelská nastavenÃ. Užijte klientská a distributorská nastavenà v klientském modulu. Úprava uživatelů nebo skupin zde může způsobit ztrátu dat!';
$wb['groups_txt'] = 'Skupiny';
?>
-
-
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 2c852ede07..3611969733 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -170,6 +170,7 @@ $wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren';
$wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)';
$wb['overtraffic_notify_admin_txt'] = 'Ãœberschreiten des Transfer Limits an den Administrator senden';
$wb['overtraffic_notify_client_txt'] = 'Ãœberschreiten des Transfer Limits an den Kunden senden';
+$wb['rbl_error_regex'] = 'Bitte geben Sie gültige RBL-Hostnamen an.';
$wb['php_ini_check_minutes_txt'] = 'Prüfe System php.ini Dateien auf Änderungen alle';
$wb['php_ini_check_minutes_info_txt'] = 'Minute(n) (0 deaktiviert diese Funktion)';
$wb['php_ini_check_minutes_error_empty'] = 'Der Wert für die Einstellung der php.ini Prüfung ist ungültig.';
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index a3cd4a90fd..ca37e07f67 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -48,6 +48,6 @@ $wb['phpmyadmin_url_error_regex'] = 'Falsche phpMyAdmin URL';
$wb['client_username_web_check_disabled_txt'] = 'Deaktiviere die Kunden Benutzernamen Überprüfung für den Begriff <b>web<b>.';
$wb['mailbox_show_autoresponder_tab_txt'] = 'Zeige Autoresponder Reiter in E-Mail Kontodetails';
$wb['mailbox_show_mail_filter_tab_txt'] = 'Zeige E-Mail Filter Reiter in E-Mail Kontodetails';
-$wb['mailbox_show_custom_rules_tab_txt'] = 'Zeige Benutzerregel Reiter in E-Mail Kontodetails';
+$wb['mailbox_show_custom_rules_tab_txt'] = 'Zeige Benutzerregel Reiter in E-Mail Kontodetails';$wb['webmail_url_error_regex'] = 'Falsche Webmail URL';
$wb['reseller_can_use_options_txt'] = 'Reseller können den Optionen Reiter bei Webseiten verwenden';
?>
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 5768d3f79c..b9913e65ee 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index ba061de90a..a6bf4cb902 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -52,5 +52,6 @@ $wb['client_username_web_check_disabled_txt'] = 'Disable client username check f
$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
+$wb['webmail_url_error_regex'] = 'Invalid webmail URL';
$wb['reseller_can_use_options_txt'] = 'Reseller can use options tab in web sites config';
?>
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 4310764088..92d9b45bd8 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index d56ca7508d..0bddcc7d86 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index 595596c60a..c74d89ec1c 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index 5c9e7d0ed9..27168f2c4d 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index c3a6806a84..53496080fb 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 34ea127fe8..39217c392f 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 9a32425b42..6bea4d2ecf 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 2cd8c38a31..ce8803643e 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index 4cb3092562..c3b3ce0499 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng
index 40c35945aa..e06fba34e8 100644
--- a/interface/web/admin/lib/lang/pl.lng
+++ b/interface/web/admin/lib/lang/pl.lng
@@ -48,4 +48,3 @@ $wb['Interface'] = 'Interfejs';
$wb['Domains'] = 'Domeny';
$wb['Misc'] = 'Różne';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets.lng b/interface/web/admin/lib/lang/pl_directive_snippets.lng
index e4c5572293..acd6451107 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets.lng
@@ -7,4 +7,3 @@ $wb['active_txt'] = 'Aktywne';
$wb['directive_snippets_name_empty'] = 'Wybierz nazwÄ™ dla zestawu dyrektyw';
$wb['directive_snippets_name_error_unique'] = 'Istnieje już zestaw dyrektyw o podanej nazwie';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
index 41c6364f97..8d731021bb 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Nazwa zestawu';
$wb['type_txt'] = 'Rodzaj';
$wb['add_new_record_txt'] = 'Dodaj nowy zestaw dyrektyw';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_firewall.lng b/interface/web/admin/lib/lang/pl_firewall.lng
index 8098fcc61b..5681789506 100644
--- a/interface/web/admin/lib/lang/pl_firewall.lng
+++ b/interface/web/admin/lib/lang/pl_firewall.lng
@@ -9,4 +9,3 @@ $wb['firewall_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
$wb['tcp_ports_error_regex'] = 'Znak nie jest dozwolony w formacie portu TCP. Dozwolone znaki to liczby, : oraz ,.';
$wb['udp_ports_error_regex'] = 'Znak nie jest dozwolony w formacie portu UDP. Dozwolone znaki to liczby, : oraz ,.';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_firewall_list.lng b/interface/web/admin/lib/lang/pl_firewall_list.lng
index fe80e430ca..6a4b8388f7 100644
--- a/interface/web/admin/lib/lang/pl_firewall_list.lng
+++ b/interface/web/admin/lib/lang/pl_firewall_list.lng
@@ -6,4 +6,3 @@ $wb['tcp_port_txt'] = 'Otwarte porty TCP';
$wb['udp_port_txt'] = 'Otwarte porty UDP';
$wb['add_new_record_txt'] = 'Dodaj wpis Firewalla';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_groups.lng b/interface/web/admin/lib/lang/pl_groups.lng
index a97ac3f301..b3c8b9ca77 100644
--- a/interface/web/admin/lib/lang/pl_groups.lng
+++ b/interface/web/admin/lib/lang/pl_groups.lng
@@ -3,4 +3,3 @@ $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 9409d32c9c..75756bca7b 100644
--- a/interface/web/admin/lib/lang/pl_groups_list.lng
+++ b/interface/web/admin/lib/lang/pl_groups_list.lng
@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Grupa';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… grupÄ™';
$wb['warning_txt'] = '<b>OSTRZEŻENIE:</b> Nie modyfikuj żadnych ustawień użytkownika w tym miejscu. Użyj ustawień Klienta lub Resellera w module Klient. Modyfikacja ustawień użytkownika lub grupy tutaj grozi utratą danych!';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_iptables.lng b/interface/web/admin/lib/lang/pl_iptables.lng
index 8073e5d008..f6be566c4f 100644
--- a/interface/web/admin/lib/lang/pl_iptables.lng
+++ b/interface/web/admin/lib/lang/pl_iptables.lng
@@ -11,4 +11,3 @@ $wb['source_ip_txt'] = 'Adres źródłowy';
$wb['active_txt'] = 'Aktywny';
$wb['iptables_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_iptables_list.lng b/interface/web/admin/lib/lang/pl_iptables_list.lng
index 255a82925c..2f74b180c6 100644
--- a/interface/web/admin/lib/lang/pl_iptables_list.lng
+++ b/interface/web/admin/lib/lang/pl_iptables_list.lng
@@ -13,4 +13,3 @@ $wb['source_ip_txt'] = 'Adres źródłowy';
$wb['active_txt'] = 'Aktywny';
$wb['iptables_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_language_add.lng b/interface/web/admin/lib/lang/pl_language_add.lng
index df1a5f31fc..82e42ef720 100644
--- a/interface/web/admin/lib/lang/pl_language_add.lng
+++ b/interface/web/admin/lib/lang/pl_language_add.lng
@@ -6,4 +6,3 @@ $wb['language_new_hint_txt'] = '2 znakowe kodowanie języka ISO 639-1 (Zobacz ht
$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 6d6d8ec36d..0096c69efa 100644
--- a/interface/web/admin/lib/lang/pl_language_complete.lng
+++ b/interface/web/admin/lib/lang/pl_language_complete.lng
@@ -5,4 +5,3 @@ $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 b4ec35d9b4..3a5e706939 100644
--- a/interface/web/admin/lib/lang/pl_language_edit.lng
+++ b/interface/web/admin/lib/lang/pl_language_edit.lng
@@ -6,4 +6,3 @@ $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 0b38a48701..e58dbf072a 100644
--- a/interface/web/admin/lib/lang/pl_language_export.lng
+++ b/interface/web/admin/lib/lang/pl_language_export.lng
@@ -4,4 +4,3 @@ $wb['language_select_txt'] = 'Wybierz język';
$wb['btn_save_txt'] = 'Eksportuj 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 e78238adaa..077d0c00ea 100644
--- a/interface/web/admin/lib/lang/pl_language_import.lng
+++ b/interface/web/admin/lib/lang/pl_language_import.lng
@@ -6,4 +6,3 @@ $wb['language_overwrite_txt'] = 'Nadpisz plik jeśli istnieje.';
$wb['btn_cancel_txt'] = 'Wróć';
$wb['ignore_version_txt'] = 'Pomiń sprawdzanie wersji ISPConfig';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_language_list.lng b/interface/web/admin/lib/lang/pl_language_list.lng
index 14b7cdb507..05fd6e39ac 100644
--- a/interface/web/admin/lib/lang/pl_language_list.lng
+++ b/interface/web/admin/lib/lang/pl_language_list.lng
@@ -5,4 +5,3 @@ $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_login_as.lng b/interface/web/admin/lib/lang/pl_login_as.lng
index a505494494..f00e042478 100644
--- a/interface/web/admin/lib/lang/pl_login_as.lng
+++ b/interface/web/admin/lib/lang/pl_login_as.lng
@@ -9,4 +9,3 @@ $wb['firewall_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
$wb['tcp_ports_error_regex'] = 'Niedozwolony znam w definicji portu TCP. Dozwolone sÄ… liczby, dwukropek i przecinek (: i ,)';
$wb['udp_ports_error_regex'] = 'Niedozwolony znam w definicji portu UDP. Dozwolone sÄ… liczby, dwukropek i przecinek (: i ,)';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_package_install.lng b/interface/web/admin/lib/lang/pl_package_install.lng
index ce5c73c814..30439086ab 100644
--- a/interface/web/admin/lib/lang/pl_package_install.lng
+++ b/interface/web/admin/lib/lang/pl_package_install.lng
@@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'Użytkownik (opcjonalnie)';
$wb['repo_password_txt'] = 'Hasło (opcjonalnie)';
$wb['active_txt'] = 'Aktywne';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_remote_action.lng b/interface/web/admin/lib/lang/pl_remote_action.lng
index 36b0383c4e..83fbc9e282 100644
--- a/interface/web/admin/lib/lang/pl_remote_action.lng
+++ b/interface/web/admin/lib/lang/pl_remote_action.lng
@@ -10,4 +10,3 @@ $wb['select_all_server'] = 'Wszystkie serwery';
$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructions</a>';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_remote_user.lng b/interface/web/admin/lib/lang/pl_remote_user.lng
index 6c55771f6c..b456de8401 100644
--- a/interface/web/admin/lib/lang/pl_remote_user.lng
+++ b/interface/web/admin/lib/lang/pl_remote_user.lng
@@ -45,4 +45,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
$wb['password_match_txt'] = 'Hasła pasują';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_remote_user_list.lng b/interface/web/admin/lib/lang/pl_remote_user_list.lng
index 976e3130ad..6dd12ae97c 100644
--- a/interface/web/admin/lib/lang/pl_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/pl_remote_user_list.lng
@@ -5,4 +5,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika';
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Nazwa użytkownika';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_server.lng b/interface/web/admin/lib/lang/pl_server.lng
index 2ebbeb2198..5e9c411720 100644
--- a/interface/web/admin/lib/lang/pl_server.lng
+++ b/interface/web/admin/lib/lang/pl_server.lng
@@ -13,4 +13,3 @@ $wb['- None -'] = '- Żaden -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index 05836f62f6..175c9bedc3 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -170,5 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Prześlij informacje o przekroczeniu transferu do admina';
$wb['overtraffic_notify_client_txt'] = 'Prześlij informacje o przekroczeniu transferu do klienta';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
-
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 e700889bf8..f9e8dcf1b5 100644
--- a/interface/web/admin/lib/lang/pl_server_config_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_config_list.lng
@@ -2,4 +2,3 @@
$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 2c107d05a9..cb16e104d5 100644
--- a/interface/web/admin/lib/lang/pl_server_ip.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip.lng
@@ -9,4 +9,3 @@ $wb['ip_type_txt'] = 'Typ';
$wb['virtualhost_port_txt'] = 'Porty HTTP';
$wb['error_port_syntax'] = 'Nieprawidłowe wartości w polu portów, proszę wpisać tylko liczby oddzielone przecinkiem. Przykładowo: 80,443';
?>
-
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 dcf8951ac9..64b004dc78 100644
--- a/interface/web/admin/lib/lang/pl_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip_list.lng
@@ -8,4 +8,3 @@ $wb['virtualhost_txt'] = 'HTTP Vhost';
$wb['virtualhost_port_txt'] = 'Porty HTTP';
$wb['ip_type_txt'] = 'Typ';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_list.lng b/interface/web/admin/lib/lang/pl_server_list.lng
index 9ca9eb8715..81356acf77 100644
--- a/interface/web/admin/lib/lang/pl_server_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_list.lng
@@ -11,4 +11,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowy serwer';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng
index 54d0ef2775..298eca6511 100644
--- a/interface/web/admin/lib/lang/pl_server_php.lng
+++ b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -14,4 +14,3 @@ $wb['php_fpm_init_script_txt'] = 'Ścieżka do skryptu inicjującego PHP-FPM';
$wb['php_fpm_ini_dir_txt'] = 'Ścieżka do katalogu php.ini';
$wb['php_fpm_pool_dir_txt'] = 'Ścieżka do katalogu pool PHP-FPM';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_php_list.lng b/interface/web/admin/lib/lang/pl_server_php_list.lng
index dc697ae1ff..b402fd1ed1 100644
--- a/interface/web/admin/lib/lang/pl_server_php_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_php_list.lng
@@ -5,4 +5,3 @@ $wb['add_new_record_txt'] = 'Add new PHP version';
$wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_software_package_install.lng b/interface/web/admin/lib/lang/pl_software_package_install.lng
index ea9290bd39..fd2f2930dd 100644
--- a/interface/web/admin/lib/lang/pl_software_package_install.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_install.lng
@@ -4,4 +4,3 @@ $wb['install_key_txt'] = 'Podaj klucz instalacyjny';
$wb['btn_save_txt'] = 'Start instalacji';
$wb['btn_cancel_txt'] = 'Przerwij';
?>
-
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 e1ffd2c3df..78c412c344 100644
--- a/interface/web/admin/lib/lang/pl_software_package_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_list.lng
@@ -9,4 +9,3 @@ $wb['repoupdate_txt'] = 'Aktualizuj listę pakietów';
$wb['package_id_txt'] = 'lokalny App-ID';
$wb['no_packages_txt'] = 'Brak dostępnych pakietów';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng
index 84d9c9e61b..d11a1b3b33 100644
--- a/interface/web/admin/lib/lang/pl_software_repo.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo.lng
@@ -5,4 +5,3 @@ $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 85a54b06b4..7ca6af9f9f 100644
--- a/interface/web/admin/lib/lang/pl_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo_list.lng
@@ -4,4 +4,3 @@ $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 31a3dd0131..aa49fba4e7 100644
--- a/interface/web/admin/lib/lang/pl_software_update_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_update_list.lng
@@ -7,4 +7,3 @@ $wb['version_txt'] = 'Wersja';
$wb['action_txt'] = 'Akcja';
$wb['no_updates_txt'] = 'Nie ma dostępnych aktualizacji';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index 42da3d1357..dbcd61ffa1 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -50,4 +50,3 @@ $wb['mailbox_show_autoresponder_tab_txt'] = 'Pokaż zakładkę autorespondera w
$wb['mailbox_show_mail_filter_tab_txt'] = 'Pokaż zakładkę filtra email w szczegółach konta email.';
$wb['mailbox_show_custom_rules_tab_txt'] = 'Pokaż zakładkę własnych filtrów email w szczegółach konta email.';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_tpl_default_admin.lng b/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
index ed5fe51542..eee3af5fe4 100644
--- a/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
@@ -16,4 +16,3 @@ $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
$wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
$wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng
index f645401a26..586e9ff66a 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -31,4 +31,3 @@ $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
$wb['password_match_txt'] = 'Hasła pasują';
$wb['username_error_collision'] = 'Nazwa użytkownika nie może być web lub web z numerem.';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_users_list.lng b/interface/web/admin/lib/lang/pl_users_list.lng
index 16e1804a06..7def4022bf 100644
--- a/interface/web/admin/lib/lang/pl_users_list.lng
+++ b/interface/web/admin/lib/lang/pl_users_list.lng
@@ -7,4 +7,3 @@ $wb['client_id_txt'] = 'User ID';
$wb['active_txt'] = 'Aktywny';
$wb['groups_txt'] = 'Grupy';
?>
-
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 3470e28a72..25d19f302b 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index 56ce46cc5a..d3247ac82c 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index fd76bf6db6..f9cea0ca26 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index 0d16cedb90..df557e2069 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index d2f27c7cbe..0ea3647f24 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index 713e1e97bc..d83724c19f 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -18,7 +18,7 @@
<thead>
<tr class="caption">
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
+ <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
<th class="tbl_col_ip_type" scope="col"><tmpl_var name="ip_type_txt"></th>
<th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
<th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
@@ -27,7 +27,7 @@
</tr>
<tr class="filter">
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+ <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
<td class="tbl_col_ip_type"><select name="search_ip_type">{tmpl_var name='search_ip_type'}</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_virtualhost"><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
@@ -41,7 +41,7 @@
<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_client_pid"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+ <td class="tbl_col_client_id"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
<td class="tbl_col_ip_type"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_type"}</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_virtualhost"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost"}</a></td>
diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng
index 9c1d91cc20..8efa987cfa 100644
--- a/interface/web/client/lib/lang/cz.lng
+++ b/interface/web/client/lib/lang/cz.lng
@@ -23,5 +23,3 @@ $wb['error_domain_in webuse'] = 'Tato doména nelze odstranit, protože je v pou
$wb['error_client_can_not_add_domain'] = 'Nemůžete přidat novou doménu';
$wb['error_client_group_id_empty'] = 'MusÃte vybrat zákaznÃka<br>';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index bb885e966d..eb1273fdef 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -144,5 +144,3 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng
index cb4b143b11..f26e2d6d4b 100644
--- a/interface/web/client/lib/lang/cz_client_circle.lng
+++ b/interface/web/client/lib/lang/cz_client_circle.lng
@@ -7,5 +7,3 @@ $wb['client_ids_txt'] = 'Klienti/Distributoři';
$wb['description_txt'] = 'Popis';
$wb['active_txt'] = 'AktivnÃ';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_circle_list.lng b/interface/web/client/lib/lang/cz_client_circle_list.lng
index 24025510de..e827605400 100644
--- a/interface/web/client/lib/lang/cz_client_circle_list.lng
+++ b/interface/web/client/lib/lang/cz_client_circle_list.lng
@@ -8,5 +8,3 @@ $wb['filter_txt'] = 'Filtr';
$wb['delete_txt'] = 'Smazat';
$wb['active_txt'] = 'AktivnÃ';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng
index a759ab6a94..4515806be5 100644
--- a/interface/web/client/lib/lang/cz_client_del.lng
+++ b/interface/web/client/lib/lang/cz_client_del.lng
@@ -4,5 +4,3 @@ $wb['delete_explanation'] = 'Tato akce smaže následujÃcà poÄet záznamů p
$wb['btn_save_txt'] = 'Smazat klienta';
$wb['btn_cancel_txt'] = 'Zrušit bez smazánà klienta';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_message.lng b/interface/web/client/lib/lang/cz_client_message.lng
index f1c3870bca..d980d55012 100644
--- a/interface/web/client/lib/lang/cz_client_message.lng
+++ b/interface/web/client/lib/lang/cz_client_message.lng
@@ -16,5 +16,3 @@ $wb['all_clients_resellers_txt'] = 'Všichni klienti a distributoři (prodejci)'
$wb['all_clients_txt'] = 'VÅ¡ichni klienti';
$wb['variables_txt'] = 'Výběr (možnosti):';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng
index 94ee886d72..5c8406915e 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -88,5 +88,3 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_template_list.lng b/interface/web/client/lib/lang/cz_client_template_list.lng
index 7d9e9238d4..c3faae17c7 100644
--- a/interface/web/client/lib/lang/cz_client_template_list.lng
+++ b/interface/web/client/lib/lang/cz_client_template_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Klientské šablony';
$wb['template_type_txt'] = 'Typ';
$wb['template_name_txt'] = 'Název šablony';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng
index ffd1b8e82a..9657cb71e8 100644
--- a/interface/web/client/lib/lang/cz_clients_list.lng
+++ b/interface/web/client/lib/lang/cz_clients_list.lng
@@ -9,5 +9,3 @@ $wb['add_new_record_txt'] = 'Přidat klienta';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['customer_no_txt'] = 'Zákaznické ÄÃslo';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng
index 26117aef5f..34ba70c11e 100644
--- a/interface/web/client/lib/lang/cz_domain.lng
+++ b/interface/web/client/lib/lang/cz_domain.lng
@@ -4,5 +4,3 @@ $wb['domain_error_unique'] = 'The domain already exists';
$wb['domain_error_regex'] = 'This domain-name is not allowed';
$wb['Domain'] = 'Doména';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng
index 9b52d04ddd..6cf7376bd4 100644
--- a/interface/web/client/lib/lang/cz_domain_list.lng
+++ b/interface/web/client/lib/lang/cz_domain_list.lng
@@ -4,5 +4,3 @@ $wb['add_new_record_txt'] = 'Přidat novou doménu';
$wb['domain_txt'] = 'Doména';
$wb['user_txt'] = 'Klient';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index 53f079edb0..6e7fec6c02 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -143,5 +143,3 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
-
-
diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng
index fb23672a88..8e72797b4d 100644
--- a/interface/web/client/lib/lang/cz_resellers_list.lng
+++ b/interface/web/client/lib/lang/cz_resellers_list.lng
@@ -9,5 +9,3 @@ $wb['add_new_record_txt'] = 'Přidat distributora';
$wb['customer_no_txt'] = 'Zákaznické ÄÃslo';
$wb['username_txt'] = 'Uživatelské jméno';
?>
-
-
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 8cf55223e7..46afed5f87 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -143,4 +143,4 @@ $wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert,
$wb['aps_limits_txt'] = 'APS Installationsassistent Limits';
$wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen';
$wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index fa38a8e4ab..14cd58a0c4 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -142,4 +142,4 @@ $wb['bank_account_swift_txt'] = 'BIC';
$wb['aps_limits_txt'] = 'APS Installationsassistent Limits';
$wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen';
$wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.';
-?>
\ 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 7ecf6400ff..2727435154 100644
--- a/interface/web/client/lib/lang/pl.lng
+++ b/interface/web/client/lib/lang/pl.lng
@@ -23,4 +23,3 @@ $wb['error_domain_in webuse'] = 'Ta domena nie może zostać usunięta ponieważ
$wb['error_client_can_not_add_domain'] = 'Nie możesz dodać nowej domeny';
$wb['error_client_group_id_empty'] = 'Musisz wybrać klienta<br>';
?>
-
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index 8cda7bd5d4..3607bff171 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -144,4 +144,3 @@ $wb['aps_limits_txt'] = 'Limity Instalatora APS';
$wb['limit_aps_txt'] = 'Maks. liczba instalacji APS';
$wb['limit_aps_error_notint'] = 'Limit instalacji APS musi być liczbą';
?>
-
diff --git a/interface/web/client/lib/lang/pl_client_circle.lng b/interface/web/client/lib/lang/pl_client_circle.lng
index 061276809c..f98a1447fc 100644
--- a/interface/web/client/lib/lang/pl_client_circle.lng
+++ b/interface/web/client/lib/lang/pl_client_circle.lng
@@ -7,4 +7,3 @@ $wb['client_ids_txt'] = 'Clients/Resellers';
$wb['description_txt'] = 'Description';
$wb['active_txt'] = 'Active';
?>
-
diff --git a/interface/web/client/lib/lang/pl_client_circle_list.lng b/interface/web/client/lib/lang/pl_client_circle_list.lng
index b4244484c6..00fd0b3998 100644
--- a/interface/web/client/lib/lang/pl_client_circle_list.lng
+++ b/interface/web/client/lib/lang/pl_client_circle_list.lng
@@ -8,4 +8,3 @@ $wb['filter_txt'] = 'Filter';
$wb['delete_txt'] = 'Delete';
$wb['active_txt'] = 'Active';
?>
-
diff --git a/interface/web/client/lib/lang/pl_client_del.lng b/interface/web/client/lib/lang/pl_client_del.lng
index aab69a43b3..666e12a24c 100644
--- a/interface/web/client/lib/lang/pl_client_del.lng
+++ b/interface/web/client/lib/lang/pl_client_del.lng
@@ -4,4 +4,3 @@ $wb['delete_explanation'] = 'Ta akcja usunie następującą liczbę rekordów po
$wb['btn_save_txt'] = 'Usuń klienta';
$wb['btn_cancel_txt'] = 'Anuluj bez usuwania klienta';
?>
-
diff --git a/interface/web/client/lib/lang/pl_client_message.lng b/interface/web/client/lib/lang/pl_client_message.lng
index 726f388cc6..d156f318d0 100644
--- a/interface/web/client/lib/lang/pl_client_message.lng
+++ b/interface/web/client/lib/lang/pl_client_message.lng
@@ -16,4 +16,3 @@ $wb['all_clients_resellers_txt'] = 'Wszyscy klienci i resellerzy';
$wb['all_clients_txt'] = 'Wszyscy klienci';
$wb['variables_txt'] = 'Zmienne:';
?>
-
diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng
index cd017fb828..cbcf1a3f92 100644
--- a/interface/web/client/lib/lang/pl_client_template.lng
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -88,4 +88,3 @@ $wb['aps_limits_txt'] = 'Limit Instalatora APS';
$wb['limit_aps_txt'] = 'Maks. liczba instancji APS';
$wb['limit_aps_error_notint'] = 'Limit instancji APS musi być liczbą';
?>
-
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 76204419e6..06a39761f9 100644
--- a/interface/web/client/lib/lang/pl_client_template_list.lng
+++ b/interface/web/client/lib/lang/pl_client_template_list.lng
@@ -3,4 +3,3 @@ $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
index aa07671641..c790271f5a 100644
--- a/interface/web/client/lib/lang/pl_clients_list.lng
+++ b/interface/web/client/lib/lang/pl_clients_list.lng
@@ -9,4 +9,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowego klienta';
$wb['username_txt'] = 'Login';
$wb['customer_no_txt'] = 'Nr klienta';
?>
-
diff --git a/interface/web/client/lib/lang/pl_domain.lng b/interface/web/client/lib/lang/pl_domain.lng
index 9854e8904f..9f3e80ff64 100644
--- a/interface/web/client/lib/lang/pl_domain.lng
+++ b/interface/web/client/lib/lang/pl_domain.lng
@@ -4,4 +4,3 @@ $wb['domain_error_unique'] = 'Domena o podanej nazwie już istnieje';
$wb['domain_error_regex'] = 'Nazwa domeny jest niedopuszczalna';
$wb['Domain'] = 'Domena';
?>
-
diff --git a/interface/web/client/lib/lang/pl_domain_list.lng b/interface/web/client/lib/lang/pl_domain_list.lng
index d31e7dfdcc..e2cac3b934 100644
--- a/interface/web/client/lib/lang/pl_domain_list.lng
+++ b/interface/web/client/lib/lang/pl_domain_list.lng
@@ -4,4 +4,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowÄ… domenÄ™';
$wb['domain_txt'] = 'Domena';
$wb['user_txt'] = 'Client';
?>
-
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index 8c2dd696f8..64bd813253 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -143,4 +143,3 @@ $wb['aps_limits_txt'] = 'Limit instalacji APS';
$wb['limit_aps_txt'] = 'Maks. liczba instancji APS';
$wb['limit_aps_error_notint'] = 'Limit instancji APS musi być liczbą';
?>
-
diff --git a/interface/web/client/lib/lang/pl_resellers_list.lng b/interface/web/client/lib/lang/pl_resellers_list.lng
index 6b277bfdd3..176c73e415 100644
--- a/interface/web/client/lib/lang/pl_resellers_list.lng
+++ b/interface/web/client/lib/lang/pl_resellers_list.lng
@@ -9,4 +9,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowego resellera';
$wb['customer_no_txt'] = 'Nr klienta';
$wb['username_txt'] = 'Login';
?>
-
diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng
index 297b6397fa..9d2a3211cb 100644
--- a/interface/web/dashboard/lib/lang/cz.lng
+++ b/interface/web/dashboard/lib/lang/cz.lng
@@ -2,5 +2,3 @@
$wb['welcome_user_txt'] = 'VÃtejte %s';
$wb['available_modules_txt'] = 'Dostupné moduly';
?>
-
-
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
index 9810ba9808..bedb98f865 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
@@ -28,5 +28,3 @@ $wb['limit_client_txt'] = 'PoÄet klientů';
$wb['limit_database_txt'] = 'PoÄet databázÃ';
$wb['limit_mailmailinglist_txt'] = 'PoÄet e-mailových konferencÃ';
?>
-
-
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
index a25ba21fc3..66275f1d05 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
@@ -1,5 +1,3 @@
<?php
$wb['available_modules_txt'] = 'Dostupné moduly';
?>
-
-
diff --git a/interface/web/dashboard/lib/lang/pl.lng b/interface/web/dashboard/lib/lang/pl.lng
index 9a8b6694f1..5ef320a86e 100644
--- a/interface/web/dashboard/lib/lang/pl.lng
+++ b/interface/web/dashboard/lib/lang/pl.lng
@@ -2,4 +2,3 @@
$wb['welcome_user_txt'] = 'Witaj %s';
$wb['available_modules_txt'] = 'Dostępne moduły';
?>
-
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
index b0c28ec7e2..d69a551bd0 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
@@ -28,4 +28,3 @@ $wb['limit_client_txt'] = 'Liczba klientów';
$wb['limit_database_txt'] = 'Liczba baz danych';
$wb['limit_mailmailinglist_txt'] = 'Liczba list mailingowych';
?>
-
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
index e329a2517d..fafcc61480 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
@@ -1,4 +1,3 @@
<?php
$wb['available_modules_txt'] = 'Dostępne moduły';
?>
-
diff --git a/interface/web/designer/lib/lang/cz.lng b/interface/web/designer/lib/lang/cz.lng
index dd815ad751..acb6c3546c 100644
--- a/interface/web/designer/lib/lang/cz.lng
+++ b/interface/web/designer/lib/lang/cz.lng
@@ -1,4 +1,2 @@
<?php
?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng
index 2b04eb968d..75bf5a5606 100644
--- a/interface/web/designer/lib/lang/cz_form_edit.lng
+++ b/interface/web/designer/lib/lang/cz_form_edit.lng
@@ -22,5 +22,3 @@ $wb['auth_preset_perm_user_txt'] = 'Opr. Uživatel';
$wb['auth_preset_perm_group_txt'] = 'Opr. Skupina';
$wb['auth_preset_perm_other_txt'] = 'Opr. OstatnÃ';
?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_form_list.lng b/interface/web/designer/lib/lang/cz_form_list.lng
index 46241cfd5e..1e677f2410 100644
--- a/interface/web/designer/lib/lang/cz_form_list.lng
+++ b/interface/web/designer/lib/lang/cz_form_list.lng
@@ -5,5 +5,3 @@ $wb['module_txt'] = 'Modul';
$wb['title_txt'] = 'Titulek';
$wb['description_txt'] = 'Popis';
?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_form_show.lng b/interface/web/designer/lib/lang/cz_form_show.lng
index 45829d54de..381414bdf0 100644
--- a/interface/web/designer/lib/lang/cz_form_show.lng
+++ b/interface/web/designer/lib/lang/cz_form_show.lng
@@ -16,5 +16,3 @@ $wb['module_del_txt'] = 'Delete the module and all subdirectories?';
$wb['menu_del_txt'] = 'Delete menu with all menuitems?';
$wb['item_del_txt'] = 'Delete menuitem?';
?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_module_edit.lng b/interface/web/designer/lib/lang/cz_module_edit.lng
index f6da04e2e7..847896d302 100644
--- a/interface/web/designer/lib/lang/cz_module_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_edit.lng
@@ -20,5 +20,3 @@ $wb['description_txt'] = '
<b>Rada:</b> Všechny cesty jsou relativně k adresáři web web.
';
?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_module_list.lng b/interface/web/designer/lib/lang/cz_module_list.lng
index b37872cedc..b568f69d63 100644
--- a/interface/web/designer/lib/lang/cz_module_list.lng
+++ b/interface/web/designer/lib/lang/cz_module_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Backend modul';
$wb['module_txt'] = 'Modul';
$wb['title_txt'] = 'Titulek';
?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_module_nav_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
index 8c21ea4a7d..01f5df68fb 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
@@ -4,5 +4,3 @@ $wb['header_txt'] = 'Navi vlastnosti';
$wb['save_txt'] = 'Uložit';
$wb['cancel_txt'] = 'Zrušit';
?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
index 65f6c765a6..17e31319d7 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
@@ -6,5 +6,3 @@ $wb['header_txt'] = 'Navi properties';
$wb['save_txt'] = 'Uložit';
$wb['cancel_txt'] = 'Zrušit';
?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_module_show.lng b/interface/web/designer/lib/lang/cz_module_show.lng
index 605d11de08..95c2d85723 100644
--- a/interface/web/designer/lib/lang/cz_module_show.lng
+++ b/interface/web/designer/lib/lang/cz_module_show.lng
@@ -14,5 +14,3 @@ $wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Datei
$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 29f4a51efe..acb6c3546c 100644
--- a/interface/web/designer/lib/lang/pl.lng
+++ b/interface/web/designer/lib/lang/pl.lng
@@ -1,3 +1,2 @@
<?php
?>
-
diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng
index cff6b51b22..ee4f4c4100 100644
--- a/interface/web/designer/lib/lang/pl_form_edit.lng
+++ b/interface/web/designer/lib/lang/pl_form_edit.lng
@@ -22,4 +22,3 @@ $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 a0aacc35bd..ac8572277c 100644
--- a/interface/web/designer/lib/lang/pl_form_list.lng
+++ b/interface/web/designer/lib/lang/pl_form_list.lng
@@ -5,4 +5,3 @@ $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 fbb82a426b..db62af16b9 100644
--- a/interface/web/designer/lib/lang/pl_form_show.lng
+++ b/interface/web/designer/lib/lang/pl_form_show.lng
@@ -16,4 +16,3 @@ $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 d05cb9fadf..b87d04b182 100644
--- a/interface/web/designer/lib/lang/pl_module_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_edit.lng
@@ -20,4 +20,3 @@ $wb['description_txt'] = '
<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 2751633fa2..308d1c688b 100644
--- a/interface/web/designer/lib/lang/pl_module_list.lng
+++ b/interface/web/designer/lib/lang/pl_module_list.lng
@@ -3,4 +3,3 @@ $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 54095f906d..fe8edabf66 100644
--- a/interface/web/designer/lib/lang/pl_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_nav_edit.lng
@@ -4,4 +4,3 @@ $wb['header_txt'] = 'Parametry 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 1e2fde46f0..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
@@ -6,4 +6,3 @@ $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 6daf82e396..9b98c49482 100644
--- a/interface/web/designer/lib/lang/pl_module_show.lng
+++ b/interface/web/designer/lib/lang/pl_module_show.lng
@@ -14,4 +14,3 @@ $wb['module_del_txt'] = 'Czy na pewno chcesz usunąć moduł wraz z wszystkimi p
$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_mx_edit.php b/interface/web/dns/dns_mx_edit.php
index 73483f7ca3..8ce9b872b5 100644
--- a/interface/web/dns/dns_mx_edit.php
+++ b/interface/web/dns/dns_mx_edit.php
@@ -119,6 +119,17 @@ class page_action extends tform_actions {
parent::onInsert();
}
+ function onUpdate() {
+ global $app, $conf;
+
+ // Check if record is existing already
+ $duplicate_mx = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ".$app->functions->intval($this->dataRecord["zone"])." AND name = '".$this->dataRecord["name"]."' AND type = '".$this->dataRecord["type"]."' AND data = '".$this->dataRecord["data"]."' AND id != ".$app->functions->intval($this->dataRecord["id"])." AND ".$app->tform->getAuthSQL('r'));
+
+ if(is_array($duplicate_mx) && !empty($duplicate_mx)) $app->error($app->tform->wordbook["duplicate_mx_record_txt"]);
+
+ parent::onUpdate();
+ }
+
function onAfterInsert() {
global $app, $conf;
diff --git a/interface/web/dns/dns_slave_edit.php b/interface/web/dns/dns_slave_edit.php
index 82d62b401a..2a5247a4c6 100644
--- a/interface/web/dns/dns_slave_edit.php
+++ b/interface/web/dns/dns_slave_edit.php
@@ -158,6 +158,17 @@ class page_action extends tform_actions {
parent::onSubmit();
}
+ function onInsert() {
+ global $app, $conf;
+
+ // Check if record is existing already
+ $duplicate_slave = $app->db->queryOneRecord("SELECT * FROM dns_slave WHERE origin = '".$this->dataRecord["origin"]."' AND server_id = ".$app->functions->intval($this->dataRecord["server_id"])." AND ".$app->tform->getAuthSQL('r'));
+
+ if(is_array($duplicate_slave) && !empty($duplicate_slave)) $app->error($app->tform->wordbook["origin_error_unique"]);
+
+ parent::onInsert();
+ }
+
function onAfterInsert() {
global $app, $conf;
diff --git a/interface/web/dns/form/dns_slave.tform.php b/interface/web/dns/form/dns_slave.tform.php
index 744aa87f99..0ff6a5e941 100644
--- a/interface/web/dns/form/dns_slave.tform.php
+++ b/interface/web/dns/form/dns_slave.tform.php
@@ -91,9 +91,11 @@ $form["tabs"]['dns_slave'] = array (
),
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'origin_error_empty'),
+ /*
1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'origin_error_unique'),
- 2 => array ( 'type' => 'REGEX',
+ */
+ 1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,10}[\.]{0,1}$/',
'errmsg'=> 'origin_error_regex'),
),
diff --git a/interface/web/dns/lib/lang/ar_dns_mx.lng b/interface/web/dns/lib/lang/ar_dns_mx.lng
index 648827f04e..68bf48a5e4 100644
--- a/interface/web/dns/lib/lang/ar_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ar_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'The hostname is empty.';
$wb['name_error_regex'] = 'The hostname has the wrong format.';
$wb['data_error_empty'] = 'Mailserver hostname empty';
$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/bg_dns_mx.lng b/interface/web/dns/lib/lang/bg_dns_mx.lng
index 5f61437a79..f5369c7a4a 100644
--- a/interface/web/dns/lib/lang/bg_dns_mx.lng
+++ b/interface/web/dns/lib/lang/bg_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Полето Ñ Ð¸Ð¼ÐµÐ¹Ð»Ð° е празно.';
$wb['name_error_regex'] = 'The hostname has the wrong format.';
$wb['data_error_empty'] = 'Mailserver hostname empty';
$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/br_dns_mx.lng b/interface/web/dns/lib/lang/br_dns_mx.lng
index 0dfd536a27..0f173a7c01 100644
--- a/interface/web/dns/lib/lang/br_dns_mx.lng
+++ b/interface/web/dns/lib/lang/br_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Hostname em branco.';
$wb['name_error_regex'] = 'Hostname tem um formato inválido.';
$wb['data_error_empty'] = 'Hostname do servidor de correio em branco';
$wb['data_error_regex'] = 'Hostname do servidor de correio formato inválido';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng
index 876a5751e2..f143b0b922 100644
--- a/interface/web/dns/lib/lang/cz.lng
+++ b/interface/web/dns/lib/lang/cz.lng
@@ -20,5 +20,3 @@ $wb['Templates'] = 'Å ablony DNS';
$wb['Secondary Zones'] = 'Sekundárnà DNS zóny';
$wb['Import Zone File'] = 'Importovat vybraný DNS zonový soubor';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_a.lng b/interface/web/dns/lib/lang/cz_dns_a.lng
index 6d9a24d64c..8b8c206b63 100644
--- a/interface/web/dns/lib/lang/cz_dns_a.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'IP adresa je prázdná';
$wb['data_error_regex'] = 'IP adresa má chybný formát';
$wb['data_error_duplicate'] = 'Duplikace A záznamu';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_a_list.lng b/interface/web/dns/lib/lang/cz_dns_a_list.lng
index 9f16d3c36c..a61265a595 100644
--- a/interface/web/dns/lib/lang/cz_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng
@@ -13,5 +13,3 @@ $wb['page_txt'] = 'Stránka';
$wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'SkuteÄnÄ› chcete smazat tento záznam ?';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_aaaa.lng b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
index 143885f969..26c6ae9064 100644
--- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
@@ -13,5 +13,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'IP adresa je prázdná';
$wb['data_error_regex'] = 'IP adresa má chybný formát';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_alias.lng b/interface/web/dns/lib/lang/cz_dns_alias.lng
index c25dc7b3eb..572478a98b 100644
--- a/interface/web/dns/lib/lang/cz_dns_alias.lng
+++ b/interface/web/dns/lib/lang/cz_dns_alias.lng
@@ -13,5 +13,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'CÃlový Hostname je prázdný';
$wb['data_error_regex'] = 'CÃlový Hostname má chybný formát';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_cname.lng b/interface/web/dns/lib/lang/cz_dns_cname.lng
index 29587c8b15..8494b7c293 100644
--- a/interface/web/dns/lib/lang/cz_dns_cname.lng
+++ b/interface/web/dns/lib/lang/cz_dns_cname.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'CÃlový hostname je prázdný';
$wb['data_error_regex'] = 'CÃlový hostname má chybný formát';
$wb['data_error_duplicate'] = 'Duplikace A záznamu nebo CNAME-záznamu';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_hinfo.lng b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
index 3633fdb80b..5f67d5e826 100644
--- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
@@ -13,5 +13,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'Informace o hostovi je prázdná';
$wb['data_error_regex'] = 'Informace o hostovi má chybný formát';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng
index 9734b3e947..8b25ebac2d 100644
--- a/interface/web/dns/lib/lang/cz_dns_import.lng
+++ b/interface/web/dns/lib/lang/cz_dns_import.lng
@@ -12,5 +12,3 @@ $wb['title'] = 'Importovat soubory zón';
$wb['no_file_uploaded_error'] = 'Nelze odeslat DNS zonový soubor';
$wb['zone_file_import_txt'] = 'Importovat vybraný DNS zonový soubor';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_mx.lng b/interface/web/dns/lib/lang/cz_dns_mx.lng
index e0e475bf14..228d9d6cc6 100644
--- a/interface/web/dns/lib/lang/cz_dns_mx.lng
+++ b/interface/web/dns/lib/lang/cz_dns_mx.lng
@@ -13,6 +13,5 @@ $wb['name_error_empty'] = 'Hostname je prázdný.';
$wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'Hostname e-mailového serveru je prázdný';
$wb['data_error_regex'] = 'Hostname e-mailového serveru má chybný formát';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng
index 4b011849f8..ba38e2a65e 100644
--- a/interface/web/dns/lib/lang/cz_dns_ns.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ns.lng
@@ -13,5 +13,3 @@ $wb['name_error_regex'] = 'Zóna má chybný formát.';
$wb['data_error_empty'] = 'Jmenný server je prázdný';
$wb['data_error_regex'] = 'Jmenný server má chybný formát';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_ptr.lng b/interface/web/dns/lib/lang/cz_dns_ptr.lng
index 33f116631e..9617ea5852 100644
--- a/interface/web/dns/lib/lang/cz_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng
@@ -13,5 +13,3 @@ $wb['name_error_regex'] = 'Název má chybný formát.';
$wb['data_error_empty'] = 'Kanonický hostname je prázdný';
$wb['data_error_regex'] = 'Kanonického hostname má chybný formát';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_rp.lng b/interface/web/dns/lib/lang/cz_dns_rp.lng
index bcebed3ef3..8b1e7e442e 100644
--- a/interface/web/dns/lib/lang/cz_dns_rp.lng
+++ b/interface/web/dns/lib/lang/cz_dns_rp.lng
@@ -13,5 +13,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'Odpovědná osoba je prázdná';
$wb['data_error_regex'] = 'Odpovědná osoba má chybný formát';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_slave.lng b/interface/web/dns/lib/lang/cz_dns_slave.lng
index b8cc5f139f..16617f6c59 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave.lng
@@ -15,5 +15,3 @@ $wb['eg_domain_tld'] = 'napÅ™. domena.cz';
$wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4';
$wb['secondary_zone_txt'] = 'Sekundárnà DNS zóna';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_slave_list.lng b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
index eead22a8b7..1e0a3d0106 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
@@ -7,5 +7,3 @@ $wb['ns_txt'] = 'NS';
$wb['add_new_record_txt'] = 'Přidat sekundárnà DNS zónu';
$wb['eg_domain_tld'] = 'napÅ™. domena.cz';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng
index 8bc1eb8c53..c98cb6d3bd 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa.lng
@@ -36,5 +36,3 @@ $wb['minimum_range_error'] = 'Minimálnà doba je 60 sekund.';
$wb['ttl_range_error'] = 'Min. TTL Äas je 60 sekund.';
$wb['xfer_error_regex'] = 'Také oznámÃ: ProsÃm, použijte IP adresu.';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_soa_list.lng b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
index 999e5bd68d..beba8a22b2 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
@@ -8,5 +8,3 @@ $wb['mbox_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Přidat DNS zónu (SOA záznam)';
$wb['add_new_record_wizard_txt'] = 'Přidat DNS zónu (dle šablony)';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_srv.lng b/interface/web/dns/lib/lang/cz_dns_srv.lng
index 60d844ac9b..6b6708fc01 100644
--- a/interface/web/dns/lib/lang/cz_dns_srv.lng
+++ b/interface/web/dns/lib/lang/cz_dns_srv.lng
@@ -17,5 +17,3 @@ $wb['data_error_regex'] = 'Záznam serveru má chybný formát';
$wb['srv_error_regex'] = 'Neplatný formát záznamu serveru. Záznam serveru musàobsahovat 3 textové Å™etÄ›zce oddÄ›lené mezerami.';
$wb['aux_txt'] = 'Priority';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_template.lng b/interface/web/dns/lib/lang/cz_dns_template.lng
index b91b3ae257..be4ac0e949 100644
--- a/interface/web/dns/lib/lang/cz_dns_template.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template.lng
@@ -4,5 +4,3 @@ $wb['fields_txt'] = 'Pole';
$wb['template_txt'] = 'Å ablona';
$wb['visible_txt'] = 'Viditelný';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_template_list.lng b/interface/web/dns/lib/lang/cz_dns_template_list.lng
index a7218a4976..bdd6e18204 100644
--- a/interface/web/dns/lib/lang/cz_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng
@@ -4,5 +4,3 @@ $wb['visible_txt'] = 'Viditelný';
$wb['name_txt'] = 'Název';
$wb['add_new_record_txt'] = 'Přidat záznam';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_txt.lng b/interface/web/dns/lib/lang/cz_dns_txt.lng
index 8784c7e2b4..76047b0ceb 100644
--- a/interface/web/dns/lib/lang/cz_dns_txt.lng
+++ b/interface/web/dns/lib/lang/cz_dns_txt.lng
@@ -13,5 +13,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'Text je prázdný';
$wb['data_error_regex'] = 'Text má chybný formát';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng
index 2c54eaf228..1b2e5f7600 100644
--- a/interface/web/dns/lib/lang/cz_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng
@@ -36,5 +36,3 @@ $wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
$wb['list_head_txt'] = 'Průvodce vytvoÅ™enÃm DNS zóny';
$wb['list_desc_txt'] = 'Vytvořenà DNS zóny pomocà průvodce';
?>
-
-
diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng
index de5e1e9bf4..822fcd6a79 100644
--- a/interface/web/dns/lib/lang/de.lng
+++ b/interface/web/dns/lib/lang/de.lng
@@ -17,6 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT';
$wb['DNS Wizard'] = 'DNS Assistent';
$wb['Add DNS Zone'] = 'DNS Zone hinzufügen';
$wb['Templates'] = 'Vorlagen';
-$wb['Secondary Zones'] = 'Zweiter DNS Zonen';
-$wb['Import Zone File'] = 'Zonen Datei Import';
+$wb['Secondary Zones'] = 'Slave DNS-Zonen';
+$wb['Import Zone File'] = 'Zonen-Datei-Import';
?>
diff --git a/interface/web/dns/lib/lang/de_dns_mx.lng b/interface/web/dns/lib/lang/de_dns_mx.lng
index f229c2cc6e..4920806ad5 100644
--- a/interface/web/dns/lib/lang/de_dns_mx.lng
+++ b/interface/web/dns/lib/lang/de_dns_mx.lng
@@ -13,5 +13,5 @@ $wb['name_error_empty'] = 'Der Hostname ist leer.';
$wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
$wb['data_error_empty'] = 'Mailserver Hostname ist leer';
$wb['data_error_regex'] = 'Mailserver Hostname Format ist ungültig';
-$wb["duplicate_mx_record_txt"] = 'Doppelter MX-Eintrag.';
+$wb['duplicate_mx_record_txt'] = 'Doppelter MX-Eintrag.';
?>
diff --git a/interface/web/dns/lib/lang/de_dns_slave.lng b/interface/web/dns/lib/lang/de_dns_slave.lng
index a1677b6b7f..1b58088317 100644
--- a/interface/web/dns/lib/lang/de_dns_slave.lng
+++ b/interface/web/dns/lib/lang/de_dns_slave.lng
@@ -1,7 +1,7 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'DNS Zone';
-$wb['secondary_zone_txt'] = 'Zweiter DNS Zone';
+$wb['origin_txt'] = 'DNS-Zone';
+$wb['secondary_zone_txt'] = 'Slave DNS-Zone';
$wb['ns_txt'] = 'NS (IP Adresse)';
$wb['active_txt'] = 'Aktiv';
$wb['limit_dns_slave_zone_txt'] = 'Die maximale Anzahl an Zweiter DNS Zonen für Ihr Konto wurde erreicht.';
diff --git a/interface/web/dns/lib/lang/de_dns_slave_list.lng b/interface/web/dns/lib/lang/de_dns_slave_list.lng
index f06b45197e..dc60207d98 100644
--- a/interface/web/dns/lib/lang/de_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_slave_list.lng
@@ -1,9 +1,9 @@
<?php
-$wb['list_head_txt'] = 'Zweiter DNS Zonen';
+$wb['list_head_txt'] = 'Slave DNS-Zonen';
$wb['active_txt'] = 'Aktiv';
$wb['server_id_txt'] = 'Server';
$wb['origin_txt'] = 'Zone';
$wb['ns_txt'] = 'NS';
-$wb['add_new_record_txt'] = 'Neue Zweiter DNS Zone hinzufügen';
+$wb['add_new_record_txt'] = 'Neue Slave DNS-Zone hinzufügen';
$wb['eg_domain_tld'] = 'Format: domain.tld.';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng
index 890cfc921f..37c967bda4 100644
--- a/interface/web/dns/lib/lang/el_dns_mx.lng
+++ b/interface/web/dns/lib/lang/el_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Το hostname δεν Îχει οÏιστεί.';
$wb['name_error_regex'] = 'Το hostname δεν Îχει σωστή μοÏφοποίηση.';
$wb['data_error_empty'] = 'Το hostname Mailserver δεν Îχει οÏιστεί';
$wb['data_error_regex'] = 'Mailserver hostname με μη ÎγκυÏη μοÏφοποίηση';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/es_dns_mx.lng b/interface/web/dns/lib/lang/es_dns_mx.lng
index e7c377d665..f51a325630 100644
--- a/interface/web/dns/lib/lang/es_dns_mx.lng
+++ b/interface/web/dns/lib/lang/es_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'El nombre de la máquina está vacÃo.';
$wb['name_error_regex'] = 'El formato del nombre de la máquina es incorrecto.';
$wb['data_error_empty'] = 'El nombre del servidor de correo está vacÃo.';
$wb['data_error_regex'] = 'El nombre del servidor de correo no es válido.';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/fi_dns_mx.lng b/interface/web/dns/lib/lang/fi_dns_mx.lng
index e4b4a60d56..14640711ad 100755
--- a/interface/web/dns/lib/lang/fi_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fi_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Verkkotunnus on tyhjä.';
$wb['name_error_regex'] = 'Verkkotunnus on väärän muotoinen.';
$wb['data_error_empty'] = 'Tekstikenttä on tyhjä';
$wb['data_error_regex'] = 'Tekstikenttä on vääränlainen';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/fr_dns_mx.lng b/interface/web/dns/lib/lang/fr_dns_mx.lng
index b625c124cf..4db3567511 100644
--- a/interface/web/dns/lib/lang/fr_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fr_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
$wb['data_error_empty'] = 'Le nom d\'hôte du serveur mail est vide';
$wb['data_error_regex'] = 'Le format du nom d\'hôte du serveur mail est invalide';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_mx.lng b/interface/web/dns/lib/lang/hr_dns_mx.lng
index 8375fe82a1..9667adb0a0 100644
--- a/interface/web/dns/lib/lang/hr_dns_mx.lng
+++ b/interface/web/dns/lib/lang/hr_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Naziv hosta nije upisan.';
$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
$wb['data_error_empty'] = 'Naziv mail hosta polje je prazno';
$wb['data_error_regex'] = 'Neispravan format naziva mail host zapisa';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/hu_dns_mx.lng b/interface/web/dns/lib/lang/hu_dns_mx.lng
index 67232f3e55..4de9b34bed 100644
--- a/interface/web/dns/lib/lang/hu_dns_mx.lng
+++ b/interface/web/dns/lib/lang/hu_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'The hostname is empty.';
$wb['name_error_regex'] = 'The hostname has the wrong format.';
$wb['data_error_empty'] = 'Mailserver hostname empty';
$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/id_dns_mx.lng b/interface/web/dns/lib/lang/id_dns_mx.lng
index e483d77e73..e085e27150 100644
--- a/interface/web/dns/lib/lang/id_dns_mx.lng
+++ b/interface/web/dns/lib/lang/id_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Nama Host kosong.';
$wb['name_error_regex'] = 'Format Nama Host salah.';
$wb['data_error_empty'] = 'Nama Host Server Mail kosong';
$wb['data_error_regex'] = 'Format Nama Host Server Mail tidak valid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/it_dns_mx.lng b/interface/web/dns/lib/lang/it_dns_mx.lng
index 648827f04e..68bf48a5e4 100644
--- a/interface/web/dns/lib/lang/it_dns_mx.lng
+++ b/interface/web/dns/lib/lang/it_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'The hostname is empty.';
$wb['name_error_regex'] = 'The hostname has the wrong format.';
$wb['data_error_empty'] = 'Mailserver hostname empty';
$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/ja_dns_mx.lng b/interface/web/dns/lib/lang/ja_dns_mx.lng
index 648827f04e..68bf48a5e4 100644
--- a/interface/web/dns/lib/lang/ja_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ja_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'The hostname is empty.';
$wb['name_error_regex'] = 'The hostname has the wrong format.';
$wb['data_error_empty'] = 'Mailserver hostname empty';
$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/nl_dns_mx.lng b/interface/web/dns/lib/lang/nl_dns_mx.lng
index a1482325d0..86be0856ed 100644
--- a/interface/web/dns/lib/lang/nl_dns_mx.lng
+++ b/interface/web/dns/lib/lang/nl_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'De hostnaam is niet ingvuld.';
$wb['name_error_regex'] = 'De hostnaam heeft een onjuist formaat.';
$wb['data_error_empty'] = 'Mailserver hostnaam is niet ingvuld';
$wb['data_error_regex'] = 'Mailserver hostnaam formaat ongeldig';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng
index 6fca5921ab..46f691ea39 100644
--- a/interface/web/dns/lib/lang/pl.lng
+++ b/interface/web/dns/lib/lang/pl.lng
@@ -20,4 +20,3 @@ $wb['Templates'] = 'Szablony';
$wb['Secondary Zones'] = 'Strefy Zapasowe';
$wb['Import Zone File'] = 'Import pliku Strefy';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_a.lng b/interface/web/dns/lib/lang/pl_dns_a.lng
index 3aa2d6855e..f9b0997731 100644
--- a/interface/web/dns/lib/lang/pl_dns_a.lng
+++ b/interface/web/dns/lib/lang/pl_dns_a.lng
@@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'Adres IP jest pusty.';
$wb['data_error_regex'] = 'Adres IP ma niepoprawny format.';
$wb['data_error_duplicate'] = 'Duplikat wpisu A.';
?>
-
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 2fe8fbd6c7..63a4df49da 100644
--- a/interface/web/dns/lib/lang/pl_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_a_list.lng
@@ -13,4 +13,3 @@ $wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'Czy jesteś pewny, że chcesz usunąć ten wpis?';
$wb['ttl_txt'] = 'TTL';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_aaaa.lng b/interface/web/dns/lib/lang/pl_dns_aaaa.lng
index 8c90e3fe5f..f8e44e58f3 100644
--- a/interface/web/dns/lib/lang/pl_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_aaaa.lng
@@ -13,4 +13,3 @@ $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 44c377e38f..a950805e3b 100644
--- a/interface/web/dns/lib/lang/pl_dns_alias.lng
+++ b/interface/web/dns/lib/lang/pl_dns_alias.lng
@@ -13,4 +13,3 @@ $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 5fbe693566..c007ea6f4c 100644
--- a/interface/web/dns/lib/lang/pl_dns_cname.lng
+++ b/interface/web/dns/lib/lang/pl_dns_cname.lng
@@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta.';
$wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format.';
$wb['data_error_duplicate'] = 'Zdublowany rekord A lub CNAME.';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_hinfo.lng b/interface/web/dns/lib/lang/pl_dns_hinfo.lng
index 18f3b9f4f6..d408e14328 100644
--- a/interface/web/dns/lib/lang/pl_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/pl_dns_hinfo.lng
@@ -13,4 +13,3 @@ $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_import.lng b/interface/web/dns/lib/lang/pl_dns_import.lng
index b6941851c0..62cfb4f8cd 100644
--- a/interface/web/dns/lib/lang/pl_dns_import.lng
+++ b/interface/web/dns/lib/lang/pl_dns_import.lng
@@ -12,4 +12,3 @@ $wb['title'] = 'Importuj pliki strefy';
$wb['no_file_uploaded_error'] = 'Nie załadowany żaden plik';
$wb['zone_file_import_txt'] = 'Import pliku strefy';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_mx.lng b/interface/web/dns/lib/lang/pl_dns_mx.lng
index d244013dec..8c612a5dab 100644
--- a/interface/web/dns/lib/lang/pl_dns_mx.lng
+++ b/interface/web/dns/lib/lang/pl_dns_mx.lng
@@ -13,5 +13,5 @@ $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.';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_ns.lng b/interface/web/dns/lib/lang/pl_dns_ns.lng
index d82dc4887f..18d7efd6cd 100644
--- a/interface/web/dns/lib/lang/pl_dns_ns.lng
+++ b/interface/web/dns/lib/lang/pl_dns_ns.lng
@@ -13,4 +13,3 @@ $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 eeb03d6524..eae39817a0 100644
--- a/interface/web/dns/lib/lang/pl_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/pl_dns_ptr.lng
@@ -13,4 +13,3 @@ $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 587c7353a7..43cbc51225 100644
--- a/interface/web/dns/lib/lang/pl_dns_rp.lng
+++ b/interface/web/dns/lib/lang/pl_dns_rp.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
$wb['data_error_empty'] = 'Musisz podać osobę odpowiedzialna.';
$wb['data_error_regex'] = 'Nazwa osoby odpowiedzialnej ma niepoprawny format.';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_slave.lng b/interface/web/dns/lib/lang/pl_dns_slave.lng
index 115dfc6215..42dea7cd19 100644
--- a/interface/web/dns/lib/lang/pl_dns_slave.lng
+++ b/interface/web/dns/lib/lang/pl_dns_slave.lng
@@ -15,4 +15,3 @@ $wb['eg_domain_tld'] = 'np. domena.pl.';
$wb['ipv4_form_txt'] = 'notacja IPv4 - np. 127.0.0.1';
$wb['secondary_zone_txt'] = 'Zapasowa Strefa DNS';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_slave_list.lng b/interface/web/dns/lib/lang/pl_dns_slave_list.lng
index 010d78f36e..bbdb368f1d 100644
--- a/interface/web/dns/lib/lang/pl_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_slave_list.lng
@@ -7,4 +7,3 @@ $wb['ns_txt'] = 'NS';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… zapasowÄ… strefÄ™ DNS';
$wb['eg_domain_tld'] = 'np. domena.pl.';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng
index c30b17be58..b5471dbb9e 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa.lng
@@ -36,4 +36,3 @@ $wb['expire_range_error'] = 'Min. czas przedawnienia wynosi 60 sekund';
$wb['minimum_range_error'] = 'Min. czas minimalny wynosi 60 sekund';
$wb['ttl_range_error'] = 'Min. czas TTL wynosi 60 sekund';
?>
-
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 0b17c903f1..d440e05469 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
@@ -8,4 +8,3 @@ $wb['mbox_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… strefÄ™ DNS (SOA)';
$wb['add_new_record_wizard_txt'] = 'Dodaj nowÄ… strefÄ™ DNS za pomocÄ… Kreatora';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_srv.lng b/interface/web/dns/lib/lang/pl_dns_srv.lng
index 228df530f3..eec182bf52 100644
--- a/interface/web/dns/lib/lang/pl_dns_srv.lng
+++ b/interface/web/dns/lib/lang/pl_dns_srv.lng
@@ -17,4 +17,3 @@ $wb['target_txt'] = 'Cel';
$wb['weight_txt'] = 'Waga';
$wb['port_txt'] = 'Port';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_template.lng b/interface/web/dns/lib/lang/pl_dns_template.lng
index fc7a0d6f92..f3e7563577 100644
--- a/interface/web/dns/lib/lang/pl_dns_template.lng
+++ b/interface/web/dns/lib/lang/pl_dns_template.lng
@@ -4,4 +4,3 @@ $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 a74e0c52f4..7deac3b2fa 100644
--- a/interface/web/dns/lib/lang/pl_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_template_list.lng
@@ -4,4 +4,3 @@ $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 324bf06aa1..f84620ed3a 100644
--- a/interface/web/dns/lib/lang/pl_dns_txt.lng
+++ b/interface/web/dns/lib/lang/pl_dns_txt.lng
@@ -13,4 +13,3 @@ $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 8bf1cfa254..52ab37d403 100644
--- a/interface/web/dns/lib/lang/pl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng
@@ -36,4 +36,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 wyników';
$wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
$wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
?>
-
diff --git a/interface/web/dns/lib/lang/pt_dns_mx.lng b/interface/web/dns/lib/lang/pt_dns_mx.lng
index 723f9d0947..bd00da3661 100644
--- a/interface/web/dns/lib/lang/pt_dns_mx.lng
+++ b/interface/web/dns/lib/lang/pt_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Hostname em branco.';
$wb['name_error_regex'] = 'Hostname tem um formato inválido.';
$wb['data_error_empty'] = 'Hostname do servidor de correio em branco';
$wb['data_error_regex'] = 'Hostname do servidor de correio formato inválido';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/ro_dns_mx.lng b/interface/web/dns/lib/lang/ro_dns_mx.lng
index 3c5b548927..b04e8f1168 100644
--- a/interface/web/dns/lib/lang/ro_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ro_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Hostname este vid';
$wb['name_error_regex'] = 'Hostname format gresit.';
$wb['data_error_empty'] = 'Mailserver hostname necompletat.';
$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/ru_dns_mx.lng b/interface/web/dns/lib/lang/ru_dns_mx.lng
index d4ec0ade4f..f82e6d2280 100644
--- a/interface/web/dns/lib/lang/ru_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ru_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Ð˜Ð¼Ñ ÑƒÐ·Ð»Ð° пуÑтое';
$wb['name_error_regex'] = 'Ð˜Ð¼Ñ ÑƒÐ·Ð»Ð° имеет неправильный формат.';
$wb['data_error_empty'] = 'Mailserver Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð° пуÑтое';
$wb['data_error_regex'] = 'Mailserver Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð° в неправильном формате';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/se_dns_mx.lng b/interface/web/dns/lib/lang/se_dns_mx.lng
index 648827f04e..68bf48a5e4 100644
--- a/interface/web/dns/lib/lang/se_dns_mx.lng
+++ b/interface/web/dns/lib/lang/se_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'The hostname is empty.';
$wb['name_error_regex'] = 'The hostname has the wrong format.';
$wb['data_error_empty'] = 'Mailserver hostname empty';
$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/sk_dns_mx.lng b/interface/web/dns/lib/lang/sk_dns_mx.lng
index 3647ee966a..488a8aa1d8 100644
--- a/interface/web/dns/lib/lang/sk_dns_mx.lng
+++ b/interface/web/dns/lib/lang/sk_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Hostname je prázdny.';
$wb['name_error_regex'] = 'Hostname má zlý formát.';
$wb['data_error_empty'] = 'Hostname mailserveru je prázdny';
$wb['data_error_regex'] = 'Hostname mailserveru má neplatný formát';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng
index 721aaf388e..18f8f210b7 100644
--- a/interface/web/help/lib/lang/cz.lng
+++ b/interface/web/help/lib/lang/cz.lng
@@ -12,5 +12,3 @@ $wb['Manage Sections'] = 'Spravovat sekce';
$wb['Manage Questions'] = 'Spravovat dotazy';
$wb['Add a Question & Answer Pair'] = 'PÅ™idat otázku a odpovÄ›Ä';
?>
-
-
diff --git a/interface/web/help/lib/lang/cz_faq_form.lng b/interface/web/help/lib/lang/cz_faq_form.lng
index dc951a40ab..73feee6955 100644
--- a/interface/web/help/lib/lang/cz_faq_form.lng
+++ b/interface/web/help/lib/lang/cz_faq_form.lng
@@ -4,5 +4,3 @@ $wb['faq_question_txt'] = 'Otázka';
$wb['faq_answer_txt'] = 'OdpovÄ›Ä';
$wb['faq_section_txt'] = 'Sekce';
?>
-
-
diff --git a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
index ab5d07c4e1..a9488445ca 100644
--- a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
@@ -7,5 +7,3 @@ $wb['faq_sections_txt'] = 'Sekce';
$wb['faq_faq_questions_txt'] = 'Často kladené dotazy';
$wb['faq_new_question_txt'] = 'Přidat nový dotaz';
?>
-
-
diff --git a/interface/web/help/lib/lang/cz_help_faq_list.lng b/interface/web/help/lib/lang/cz_help_faq_list.lng
index 15eb20ad58..b6c7b460b9 100644
--- a/interface/web/help/lib/lang/cz_help_faq_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_list.lng
@@ -1,5 +1,3 @@
<?php
$wb['edit_txt'] = 'Edit';
?>
-
-
diff --git a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
index 60906e5d3e..967b0abfcd 100644
--- a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
@@ -6,5 +6,3 @@ $wb['faq_sections_txt'] = 'Sekce';
$wb['faq_faq_sections_txt'] = 'Sekce FAQ';
$wb['faq_new_section_txt'] = 'Přidat novou sekci';
?>
-
-
diff --git a/interface/web/help/lib/lang/cz_support_message.lng b/interface/web/help/lib/lang/cz_support_message.lng
index 63bce28898..6c27284432 100644
--- a/interface/web/help/lib/lang/cz_support_message.lng
+++ b/interface/web/help/lib/lang/cz_support_message.lng
@@ -6,5 +6,3 @@ $wb['message_txt'] = 'Zpráva';
$wb['tstamp_txt'] = 'ÄŒasové razÃtko';
$wb['reply_txt'] = 'Odpovědět';
?>
-
-
diff --git a/interface/web/help/lib/lang/cz_support_message_list.lng b/interface/web/help/lib/lang/cz_support_message_list.lng
index 3a2c9a90d9..8629a2f8a1 100644
--- a/interface/web/help/lib/lang/cz_support_message_list.lng
+++ b/interface/web/help/lib/lang/cz_support_message_list.lng
@@ -4,5 +4,3 @@ $wb['sender_id_txt'] = 'OdesÃlatel';
$wb['subject_txt'] = 'Předmět';
$wb['add_new_record_txt'] = 'Vytvořit zprávu pro podporu';
?>
-
-
diff --git a/interface/web/help/lib/lang/pl.lng b/interface/web/help/lib/lang/pl.lng
index 3120f36cb8..5f4ec6d3ac 100644
--- a/interface/web/help/lib/lang/pl.lng
+++ b/interface/web/help/lib/lang/pl.lng
@@ -12,4 +12,3 @@ $wb['Manage Sections'] = 'ZarzÄ…dzaj sekcjami';
$wb['Add a Question & Answer Pair'] = 'Dodaj nowe pytanie i odpowiedź';
$wb['Manage Questions'] = 'ZarzÄ…dzaj pytaniami';
?>
-
diff --git a/interface/web/help/lib/lang/pl_faq_form.lng b/interface/web/help/lib/lang/pl_faq_form.lng
index 6495e6352d..a39383e99e 100644
--- a/interface/web/help/lib/lang/pl_faq_form.lng
+++ b/interface/web/help/lib/lang/pl_faq_form.lng
@@ -4,4 +4,3 @@ $wb['faq_question_txt'] = 'Pytanie';
$wb['faq_answer_txt'] = 'Odpowiedź';
$wb['faq_section_txt'] = 'Sekcja';
?>
-
diff --git a/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng b/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
index c50ff019ac..4c07503eee 100644
--- a/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
@@ -7,4 +7,3 @@ $wb['faq_sections_txt'] = 'Sekcja';
$wb['faq_faq_questions_txt'] = 'Pomoc Techniczna';
$wb['faq_new_question_txt'] = 'Dodaj nowe pytanie i odpowiedź';
?>
-
diff --git a/interface/web/help/lib/lang/pl_faq_sections_form.lng b/interface/web/help/lib/lang/pl_faq_sections_form.lng
index 21615bd07c..d4bb7ef944 100644
--- a/interface/web/help/lib/lang/pl_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/pl_faq_sections_form.lng
@@ -1,4 +1,3 @@
<?php
$wb['faq_section_name_txt'] = 'Nazwa sekcji';
?>
-
diff --git a/interface/web/help/lib/lang/pl_help_faq_list.lng b/interface/web/help/lib/lang/pl_help_faq_list.lng
index 10a98c50cf..072e3edbd2 100644
--- a/interface/web/help/lib/lang/pl_help_faq_list.lng
+++ b/interface/web/help/lib/lang/pl_help_faq_list.lng
@@ -1,4 +1,3 @@
<?php
$wb['edit_txt'] = 'Edycja';
?>
-
diff --git a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng
index 53a56a9289..e21792dfd7 100644
--- a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng
@@ -6,4 +6,3 @@ $wb['faq_sections_txt'] = 'Sekcje';
$wb['faq_faq_sections_txt'] = 'Sekcje FAQ';
$wb['faq_new_section_txt'] = 'Dodaj nowÄ… sekcjÄ™';
?>
-
diff --git a/interface/web/help/lib/lang/pl_support_message.lng b/interface/web/help/lib/lang/pl_support_message.lng
index 63f2feb2ae..7482e3515c 100644
--- a/interface/web/help/lib/lang/pl_support_message.lng
+++ b/interface/web/help/lib/lang/pl_support_message.lng
@@ -6,4 +6,3 @@ $wb['message_txt'] = 'Wiadomość';
$wb['tstamp_txt'] = 'Kalendarz';
$wb['reply_txt'] = 'Odpowiedź';
?>
-
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 13c678e3b9..bc3285694b 100644
--- a/interface/web/help/lib/lang/pl_support_message_list.lng
+++ b/interface/web/help/lib/lang/pl_support_message_list.lng
@@ -4,4 +4,3 @@ $wb['sender_id_txt'] = 'Nadawca';
$wb['subject_txt'] = 'Temat';
$wb['add_new_record_txt'] = 'Wyślij wiadomość';
?>
-
diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js
index 735d72eeb7..1484a01b47 100644
--- a/interface/web/js/jquery.tipsy.js
+++ b/interface/web/js/jquery.tipsy.js
@@ -352,9 +352,6 @@
return;
}
- // work around a bug (likely same cause as #5265)
- $( this ).blur();
-
// pass empty string as value to search for, displaying all results
input.autocomplete( "search", "" );
input.focus();
diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng
index a65862acc0..cf659346a9 100644
--- a/interface/web/login/lib/lang/cz.lng
+++ b/interface/web/login/lib/lang/cz.lng
@@ -22,5 +22,3 @@ $wb['pw_button_txt'] = 'Znovu odeslat heslo';
$wb['email_txt'] = 'E-mail';
$wb['theme_not_compatible'] = 'Zvolené téma nenà kompatibilnà s aktuálnà verzà ISPConfig. Zkontrolujte prosÃm, zda nenà nová verze tématu.<br />Výchozà motiv byl aktivován automaticky.';
?>
-
-
diff --git a/interface/web/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng
index 109af558f2..29bd8b2298 100644
--- a/interface/web/login/lib/lang/pl.lng
+++ b/interface/web/login/lib/lang/pl.lng
@@ -22,4 +22,3 @@ $wb['email_txt'] = 'E-mail';
$wb['error_maintenance_mode'] = 'Ta instalacja ISPConfig jest aktualnie w trakcje modernizacji. Wracamy niebawem - proszę o cierpliwość.';
$wb['theme_not_compatible'] = 'Wybrany temat nie jest kompatybilny z aktualną wersją ISPConfig. Proszę wybrać nową wersję tematu.<br />Został aktywowany automatycznie domyślny temat.';
?>
-
diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng
index 6b5f3fc131..6a5afe0685 100644
--- a/interface/web/mail/lib/lang/cz.lng
+++ b/interface/web/mail/lib/lang/cz.lng
@@ -46,5 +46,3 @@ $wb['Relay Recipients'] = 'Relay adresáti';
$wb['Statistics'] = 'Statistiky';
$wb['Mailbox quota'] = 'Mailbox kvóta';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng
index 414e1023c8..605e06b3c8 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias.lng
@@ -12,5 +12,3 @@ $wb['domain_txt'] = 'Doména';
$wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.';
$wb['source_txt'] = 'Alias';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_alias_list.lng b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
index 0d8f779c33..de8cc2ef2a 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
@@ -6,5 +6,3 @@ $wb['destination_txt'] = 'CÃl';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Přidat nový e-mailový alias';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
index e0cde68350..74611c2de0 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
@@ -9,5 +9,3 @@ $wb['source_error_empty'] = 'Zdrojová doména je prázdná.';
$wb['source_error_unique'] = 'Duplikovánà zdrojové domény.';
$wb['source_error_regex'] = 'Chybná zdrojová doména.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
index cfc0154d84..fd850d6f5f 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
@@ -5,5 +5,3 @@ $wb['source_txt'] = 'Zdroj';
$wb['destination_txt'] = 'CÃl';
$wb['add_new_record_txt'] = 'Přidat doménový alias';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
index 4719142aff..e1e6dab48f 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Dosažen maximálnà poÄet email filtrů pro Váš úÄet.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
index fbf6e2d230..0ef1d3417c 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
@@ -8,5 +8,3 @@ $wb['recipient_txt'] = 'PÅ™Ãjemce (adresát)';
$wb['add_new_record_txt'] = 'PÅ™idat záznam na Äernou listinu';
$wb['access_txt'] = 'PÅ™Ãstup';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter.lng b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
index 1405881fbb..459ca228a2 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
@@ -7,5 +7,3 @@ $wb['action_txt'] = 'Akce';
$wb['active_txt'] = 'AktivnÃ';
$wb['pattern_error_empty'] = 'Vzor je prázdný.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
index 6e7ebf5186..da9709e7f9 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
@@ -6,5 +6,3 @@ $wb['pattern_txt'] = 'Vzor';
$wb['action_txt'] = 'Akce';
$wb['add_new_record_txt'] = 'Přidat obsahový filtr';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng
index be20bce450..026a2f1d27 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -11,5 +11,3 @@ $wb['limit_maildomain_txt'] = 'Dosažen maximálnà poÄet email domén pro Vá
$wb['policy_txt'] = 'Spamový filtr';
$wb['no_policy'] = '- nepovoleno -';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
index da42190fac..b579d2de08 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
@@ -6,5 +6,3 @@ $wb['add_new_record_txt'] = 'Přidat doménu';
$wb['active_txt'] = 'AktivnÃ';
$wb['sys_groupid_txt'] = 'Klient';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
index 75efd56218..488d0d5176 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
@@ -9,5 +9,3 @@ $wb['limit_mailcatchall_txt'] = 'Dosažen maximálnà poÄet košů úÄtů pro
$wb['source_txt'] = 'Zdroj';
$wb['destination_error_isemail'] = 'CÃlová e-mailová adresa nenà platná.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
index aa0b76df8c..3b24645ec8 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
@@ -7,5 +7,3 @@ $wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'E-malová doména';
$wb['add_new_record_txt'] = 'Přidat e-mailový koš';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
index 05bb747530..2abb05cf74 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
@@ -5,5 +5,3 @@ $wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Přidat doménu';
$wb['active_txt'] = 'AktivnÃ';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_forward.lng b/interface/web/mail/lib/lang/cz_mail_forward.lng
index ba79e1a2ff..a59bd9b52b 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward.lng
@@ -7,5 +7,3 @@ $wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
$wb['domain_txt'] = 'Doména';
$wb['source_txt'] = 'Zdrojový e-mail';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_forward_list.lng b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
index bdbff701e1..e5381fe5f8 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
@@ -6,5 +6,3 @@ $wb['destination_txt'] = 'CÃl';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'PÅ™idat nové pÅ™esmÄ›rovánÃ';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng
index 6fc9101699..51b9f3403e 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -16,5 +16,3 @@ $wb['source_server_error_regex'] = 'POP3/IMAP server nenà validnà doménový n
$wb['source_read_all_txt'] = 'NaÄÃst vÅ¡echny e-maily (vÄetnÄ› již pÅ™eÄtené poÅ¡ty)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_get_list.lng b/interface/web/mail/lib/lang/cz_mail_get_list.lng
index 824205f00a..9ca8b86dcb 100644
--- a/interface/web/mail/lib/lang/cz_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get_list.lng
@@ -7,5 +7,3 @@ $wb['source_username_txt'] = 'Uživatelské jméno';
$wb['destination_txt'] = 'CÃl';
$wb['add_new_record_txt'] = 'PÅ™idat úÄet';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
index 406df72ad9..2d2278526e 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
@@ -20,5 +20,3 @@ $wb['listname_error_unique'] = 'Na serveru je již shodný \\"název seznamu\\".
$wb['email_error_isemail'] = 'E-mailová adresa je neplatná.';
$wb['mailinglist_txt'] = 'Mailing list';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
index b3e2cf85ac..db31273f59 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'E-mailové konference';
$wb['domain_txt'] = 'Doména';
$wb['listname_txt'] = 'Název seznamu';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
index b64c3113bc..0c07059c34 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Dosažen maximálnà poÄet email filtrů pro Váš úÄet.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
index bf34af6ec3..1af959966c 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
@@ -7,5 +7,3 @@ $wb['recipient_txt'] = 'PÅ™Ãjemce (adresát)';
$wb['add_new_record_txt'] = 'Přidat relay adresáta';
$wb['access_txt'] = 'PÅ™Ãstup';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
index f19706dc3a..4b6cc2b5d8 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
@@ -15,5 +15,3 @@ $wb['email_error_unique'] = 'Pro tuto email adresu již existuje filtrovacà zá
$wb['spam_redirect_maildir_purge_txt'] = 'VyÄistit poté mailový adresář';
$wb['days_txt'] = 'Dny.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
index f6170c6355..7560b570da 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
@@ -6,5 +6,3 @@ $wb['server_name_txt'] = 'server_name';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Přidat nový záznam spamfiltru';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_transport.lng b/interface/web/mail/lib/lang/cz_mail_transport.lng
index 710e577eca..dfe1855084 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport.lng
@@ -9,5 +9,3 @@ $wb['active_txt'] = 'AktivnÃ';
$wb['limit_mailrouting_txt'] = 'Dosažen maximálnà poÄet email smÄ›rovánà pro Váš úÄet.';
$wb['transport_txt'] = 'Transport';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_transport_list.lng b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
index 9fb61fd886..e833293a2f 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
@@ -7,5 +7,3 @@ $wb['transport_txt'] = 'Transport';
$wb['sort_order_txt'] = 'TÅ™Ãdit podle';
$wb['add_new_record_txt'] = 'Přidat transport';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index d8805f0fab..2c441f2aba 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -48,5 +48,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter.lng b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
index 0973856843..6cd8ed7e89 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
@@ -18,5 +18,3 @@ $wb['ends_with_txt'] = 'KonÄÃ na';
$wb['move_to_txt'] = 'Přesunout do';
$wb['delete_txt'] = 'Smazat';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
index d9f6748c19..60229ce3b5 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
@@ -5,5 +5,3 @@ $wb['page_txt'] = 'Stránka';
$wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'Opravdu smazat mailový filtr?';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user_list.lng b/interface/web/mail/lib/lang/cz_mail_user_list.lng
index 08d28fbc02..e6dfd006ed 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng
@@ -6,5 +6,3 @@ $wb['add_new_record_txt'] = 'Přidat e-mailovou schránku';
$wb['name_txt'] = 'SkuteÄný název';
$wb['login_txt'] = 'PÅ™ihlášenÃ';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
index 92600a17d9..50cbc31d5c 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
@@ -6,5 +6,3 @@ $wb['last_month_txt'] = 'Minulý mÄ›sÃc';
$wb['this_year_txt'] = 'Tento rok';
$wb['last_year_txt'] = 'Minulý rok';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
index cd5d032953..db55c18a0b 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Dosažen maximálnà poÄet email filtrů pro Váš úÄet.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
index 042cd71c57..7fae368999 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
@@ -8,5 +8,3 @@ $wb['recipient_txt'] = 'PÅ™Ãjemce (adresát)';
$wb['add_new_record_txt'] = 'PÅ™idat záznam na bÃlou listinu';
$wb['access_txt'] = 'PÅ™Ãstup';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
index 98e7649ba5..5e0c6b7799 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
@@ -7,5 +7,3 @@ $wb['priority_txt'] = 'Priorita';
$wb['active_txt'] = 'AktivnÃ';
$wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximálnà poÄet záznamů pro bÃlou / Äernou listinu pro Váš úÄet.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
index 76ab17ec17..83a732d6f3 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
@@ -7,5 +7,3 @@ $wb['rid_txt'] = 'Uživatel';
$wb['email_txt'] = 'Emaily na Äerné listinÄ›';
$wb['add_new_record_txt'] = 'PÅ™idat záznam na Äernou listinu';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config.lng b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
index d0ebcc4bf6..0f878cc7d8 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
@@ -18,5 +18,3 @@ $wb['relayhost_password_txt'] = 'Relayhost heslo';
$wb['mailbox_size_limit_txt'] = 'Limit velikosti e-mailové schránky';
$wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
index 8b5b1e758d..fe2ee8d51c 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Konfigurace serveru';
$wb['server_name_txt'] = 'Server';
$wb['server_id_txt'] = 'server_id';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
index 1a778301eb..54d0155d74 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
@@ -36,5 +36,3 @@ $wb['spam_admin_txt'] = 'SPAM admin';
$wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
$wb['banned_rulenames_txt'] = 'Název pravidel zabanované';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
index 37f41d3ace..9a0c361997 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
@@ -7,5 +7,3 @@ $wb['banned_files_lover_txt'] = 'Zabanované soubory';
$wb['bad_header_lover_txt'] = 'Å patné hlaviÄky';
$wb['add_new_record_txt'] = 'Přidat záznam politiky';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users.lng b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
index d795af11df..914304c58b 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
@@ -6,5 +6,3 @@ $wb['email_txt'] = 'Email (vzor)';
$wb['fullname_txt'] = 'Název';
$wb['local_txt'] = 'LokálnÃ';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
index 26c4df143f..36bf3409e3 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
@@ -8,5 +8,3 @@ $wb['fullname_txt'] = 'Jméno';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Přidat spamfiltr uživatele';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
index 98e7649ba5..5e0c6b7799 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
@@ -7,5 +7,3 @@ $wb['priority_txt'] = 'Priorita';
$wb['active_txt'] = 'AktivnÃ';
$wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximálnà poÄet záznamů pro bÃlou / Äernou listinu pro Váš úÄet.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
index 3b74159b99..ad13897004 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
@@ -7,5 +7,3 @@ $wb['rid_txt'] = 'Uživatel';
$wb['email_txt'] = 'Emaily na bÃlé listinÄ›';
$wb['add_new_record_txt'] = 'PÅ™idat záznam na bÃlou listinu';
?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
index 0c30e7574e..c8b73a9e8e 100755
--- a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
@@ -5,5 +5,3 @@ $wb['name_txt'] = 'Jméno';
$wb['email_txt'] = 'E-mailová adresa';
$wb['used_txt'] = 'Využité mÃsto';
?>
-
-
diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng
index afa99d7d4e..93861b784d 100644
--- a/interface/web/mail/lib/lang/pl.lng
+++ b/interface/web/mail/lib/lang/pl.lng
@@ -46,4 +46,3 @@ $wb['Domain Alias'] = 'Alias domeny';
$wb['Relay Recipients'] = 'Odbiorcy przekierowania';
$wb['Mailbox quota'] = 'Użycie skrzynek email';
?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng
index bf8e41e28f..ee50d0fccc 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias.lng
@@ -12,4 +12,3 @@ $wb['domain_txt'] = 'Domena';
$wb['duplicate_email_alias_txt'] = 'Istnieje już taki alias email.';
$wb['source_txt'] = 'Alias';
?>
-
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 f5567ce92a..b6ce95d0c7 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias_list.lng
@@ -6,4 +6,3 @@ $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_aliasdomain.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
index ebbc0d0203..7735a4e87d 100644
--- a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
@@ -9,4 +9,3 @@ $wb['source_error_empty'] = 'Domena źródłowa jest pusta.';
$wb['source_error_unique'] = 'Duplikat źródłowej domeny.';
$wb['source_error_regex'] = 'Nieprawidłowa nazwa domeny źródłowej.';
?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
index bdccec7d67..ba2e3b9575 100644
--- a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
@@ -5,4 +5,3 @@ $wb['source_txt'] = 'Źródło';
$wb['destination_txt'] = 'Cel';
$wb['add_new_record_txt'] = 'Dodaj nowy alias domeny';
?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
index 448658d832..528f2f741a 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
@@ -7,4 +7,3 @@ $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 8351885ca0..ebef66657b 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
@@ -8,4 +8,3 @@ $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 6ca25bccd1..54efa4fed0 100644
--- a/interface/web/mail/lib/lang/pl_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_content_filter.lng
@@ -7,4 +7,3 @@ $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 fe5a78fd65..9fc964cf57 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
@@ -6,4 +6,3 @@ $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 0e76cd0f01..6f9c68cdc6 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -11,4 +11,3 @@ $wb['limit_maildomain_txt'] = 'Maksymalna ilość domen e-mail dla Twojego konta
$wb['policy_txt'] = 'Filtr spamu';
$wb['no_policy'] = '-nie używane-';
?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
index de3a6654f4..e214d92a92 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
@@ -6,4 +6,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowÄ… domenÄ™';
$wb['active_txt'] = 'Aktywne';
$wb['sys_groupid_txt'] = 'Klient';
?>
-
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 c9667c519a..3630b954bf 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
@@ -9,4 +9,3 @@ $wb['limit_mailcatchall_txt'] = 'Maksymalna ilość kont e-mail catchall dla Two
$wb['source_txt'] = 'Źródło';
$wb['destination_error_isemail'] = 'Cel nie jest poprawnym adresem email.';
?>
-
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 304bc3d9a4..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
@@ -7,4 +7,3 @@ $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 e14f2f0889..ec51e2cdb5 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_list.lng
@@ -5,4 +5,3 @@ $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 cc84d34b8b..d975d5e81a 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward.lng
@@ -7,4 +7,3 @@ $wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa o podanym adresi
$wb['domain_txt'] = 'Domena';
$wb['source_txt'] = 'E-mail źródłowy';
?>
-
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 3f27975cf7..1044bd5121 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward_list.lng
@@ -6,4 +6,3 @@ $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 ca27711e98..fdac040bf9 100644
--- a/interface/web/mail/lib/lang/pl_mail_get.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get.lng
@@ -16,4 +16,3 @@ $wb['source_server_error_regex'] = 'Serwer Pop3/Imap nie jest poprawnÄ… nazwÄ… d
$wb['source_read_all_txt'] = 'Pobierz wszystkie maile (razem z przeczytanymi)';
$wb['error_delete_read_all_combination'] = 'Nieprawidłowa kombinacja opcji. Nie możesz użyć jednocześnie opcji Delete emails after retrieval = no razem z Retrieve all emails = yes';
?>
-
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 cf5844f0d6..cd473d9ded 100644
--- a/interface/web/mail/lib/lang/pl_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get_list.lng
@@ -7,4 +7,3 @@ $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_mailinglist.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
index 774da1802e..f285b1eaea 100644
--- a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
@@ -20,4 +20,3 @@ $wb['password_match_txt'] = 'Hasła pasują';
$wb['listname_error_unique'] = 'Isnieje już lista mailingowa o tej nazwie, wybierz inną nazwę listy.';
$wb['email_error_isemail'] = 'Adres e-mail jest nieprawidłowy';
?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
index 96cd9604d7..649db47bd0 100644
--- a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Lista mailingowa';
$wb['domain_txt'] = 'Domena';
$wb['listname_txt'] = 'Nazwa listy';
?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
index ab7926f899..594aba1f2a 100644
--- a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
@@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Adres jest pusty.';
$wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta została przekroczona.';
?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
index 84d08ba619..310e27ca30 100644
--- a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
@@ -7,4 +7,3 @@ $wb['recipient_txt'] = 'Odbiorca';
$wb['add_new_record_txt'] = 'Dodaj nowego odbiorcÄ™ przekierowania';
$wb['access_txt'] = 'dostęp';
?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
index 2849430c6d..3879f24247 100644
--- a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
@@ -15,4 +15,3 @@ $wb['email_error_unique'] = 'Istnieje już wpis z filtrem spamu dla tego adresu
$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 a6959a26e2..d6097bb336 100644
--- a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
@@ -6,4 +6,3 @@ $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 364eba9445..514fc263a5 100644
--- a/interface/web/mail/lib/lang/pl_mail_transport.lng
+++ b/interface/web/mail/lib/lang/pl_mail_transport.lng
@@ -9,4 +9,3 @@ $wb['active_txt'] = 'Aktywny';
$wb['limit_mailrouting_txt'] = 'Maksymalna ilość ścieżek dla Twojego konta została przekroczona.';
$wb['transport_txt'] = 'Transport';
?>
-
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 837972c4f2..fa5c584318 100644
--- a/interface/web/mail/lib/lang/pl_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_transport_list.lng
@@ -7,4 +7,3 @@ $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 4ccab2e93e..5fc7a38cf9 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -48,4 +48,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
$wb['password_match_txt'] = 'Hasła pasują';
?>
-
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 1e1a7fd895..99ac6a9e78 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
@@ -18,4 +18,3 @@ $wb['ends_with_txt'] = 'Kończy się na';
$wb['move_to_txt'] = 'PrzenieÅ› do';
$wb['delete_txt'] = 'Usuń';
?>
-
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 4d45c5d23b..ce235b892f 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
@@ -5,4 +5,3 @@ $wb['page_txt'] = 'Strona';
$wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'Czy na pewno chcesz skasować filtr?';
?>
-
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 8e47f96dcb..7c13db38d1 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng
@@ -6,4 +6,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowÄ… skrzynkÄ™ pocztowÄ…';
$wb['name_txt'] = 'Nazwa rzeczywista';
$wb['login_txt'] = 'Login';
?>
-
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 9e876805ba..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
@@ -6,4 +6,3 @@ $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 4aa2f05609..203c5bae73 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
@@ -7,4 +7,3 @@ $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 a7239ca95c..10e6dfcf0b 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
@@ -8,4 +8,3 @@ $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 6c4c8d78fd..6da8ddc9d9 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
@@ -7,4 +7,3 @@ $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 65a9d37fda..c237a7a778 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
@@ -7,4 +7,3 @@ $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 43fab4d4f3..c750d95937 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config.lng
@@ -18,4 +18,3 @@ $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 d31d7857eb..45b3f315cd 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
@@ -3,4 +3,3 @@ $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 b7bc37de8b..8a825b5594 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
@@ -36,4 +36,3 @@ $wb['spam_admin_txt'] = 'Admin obsługi spamu';
$wb['message_size_limit_txt'] = 'Limit wielkości wiadomości';
$wb['banned_rulenames_txt'] = 'Zabronione 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 906006e75f..43d9d414d6 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
@@ -7,4 +7,3 @@ $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 8529e455c4..656c29ea1a 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users.lng
@@ -6,4 +6,3 @@ $wb['email_txt'] = 'E-mail (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 0951df528f..dde2a62c6a 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
@@ -8,4 +8,3 @@ $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 a6f2e4306d..be836015db 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
@@ -7,4 +7,3 @@ $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 425a6fe35a..6517cf41a1 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
@@ -7,4 +7,3 @@ $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/lib/lang/pl_user_quota_stats_list.lng b/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
index 2cffcf1d16..2b33b10402 100755
--- a/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Nazwa';
$wb['email_txt'] = 'Adres e-mail';
$wb['used_txt'] = 'Użycie dysku';
?>
-
diff --git a/interface/web/mail/mail_domain_del.php b/interface/web/mail/mail_domain_del.php
index 0f00dd919c..806996aa31 100644
--- a/interface/web/mail/mail_domain_del.php
+++ b/interface/web/mail/mail_domain_del.php
@@ -59,8 +59,8 @@ class page_action extends tform_actions {
// Before we delete the email domain,
// we will delete all depending records.
- // Delete all forwardings where the osurce or destination belongs to this domain
- $records = $app->db->queryAllRecords("SELECT forwarding_id as id FROM mail_forwarding WHERE source like '%@".$app->db->quote($domain)."' OR (destination like '%@".$app->db->quote($domain)."' AND type != 'forward'");
+ // Delete all forwardings where the source or destination belongs to this domain
+ $records = $app->db->queryAllRecords("SELECT forwarding_id as id FROM mail_forwarding WHERE source like '%@".$app->db->quote($domain)."' OR (destination like '%@".$app->db->quote($domain)."' AND type != 'forward')");
foreach($records as $rec) {
$app->db->datalogDelete('mail_forwarding','forwarding_id',$rec['id']);
}
diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng
index 12f1bd72cc..8b4b58bc42 100644
--- a/interface/web/mailuser/lib/lang/cz.lng
+++ b/interface/web/mailuser/lib/lang/cz.lng
@@ -7,5 +7,3 @@ $wb['Send copy'] = 'Poslat kopii na e-mail';
$wb['Spamfilter'] = 'Spamový filtr';
$wb['Email Filters'] = 'E-mailové filtry';
?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_index.lng b/interface/web/mailuser/lib/lang/cz_index.lng
index 9b820cdee6..45af56ee8d 100644
--- a/interface/web/mailuser/lib/lang/cz_index.lng
+++ b/interface/web/mailuser/lib/lang/cz_index.lng
@@ -10,5 +10,3 @@ $wb['unlimited_txt'] = 'Neomezený';
$wb['mb_txt'] = 'MB';
$wb['none_txt'] = 'Nenastaveno';
?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
index f8d331b557..ef3aeb42da 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
@@ -11,5 +11,3 @@ $wb['autoresponder_active'] = 'Povolit automatický odpovÃdaÄ';
$wb['now_txt'] = 'NynÃ';
$wb['autoresponder_subject_txt'] = 'Předmět e-mailu';
?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
index fc8a0f9df6..36f11a9baa 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
@@ -5,5 +5,3 @@ $wb['email_txt'] = 'E-mail';
$wb['cc_error_isemail'] = 'Vyplněná e-mailová adresa neplatná';
$wb['email_is_cc_error'] = 'Vyplněná e-mailová adresa a poslat kopii na e-mail adresu, nemůžou být stejné.';
?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
index 65300b6d95..3df9d38c72 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
@@ -18,5 +18,3 @@ $wb['ends_with_txt'] = 'KonÄÃ na';
$wb['move_to_txt'] = 'Přesunout do';
$wb['delete_txt'] = 'Smazat';
?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
index 4b64af9205..3c2593d6d4 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
@@ -6,5 +6,3 @@ $wb['page_txt'] = 'Stránka';
$wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'Opravdu chcete odstranit e-mail filter?';
?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
index 44815399dd..36555a2030 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
@@ -8,5 +8,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
index c6345567b0..2a53036be6 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
@@ -5,5 +5,3 @@ $wb['email_txt'] = 'E-mail';
$wb['no_policy'] = '- nepovoleno -';
$wb['policy_txt'] = 'Politika';
?>
-
-
diff --git a/interface/web/mailuser/lib/lang/pl.lng b/interface/web/mailuser/lib/lang/pl.lng
index 5d7166ada3..4002670b61 100644
--- a/interface/web/mailuser/lib/lang/pl.lng
+++ b/interface/web/mailuser/lib/lang/pl.lng
@@ -7,4 +7,3 @@ $wb['Send copy'] = 'Wyślij kopię';
$wb['Spamfilter'] = 'Filtr spamu';
$wb['Email Filters'] = 'Fitry e-mail';
?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_index.lng b/interface/web/mailuser/lib/lang/pl_index.lng
index 368276036a..0774a65bd5 100644
--- a/interface/web/mailuser/lib/lang/pl_index.lng
+++ b/interface/web/mailuser/lib/lang/pl_index.lng
@@ -10,4 +10,3 @@ $wb['unlimited_txt'] = 'Bez limitu';
$wb['mb_txt'] = 'MB';
$wb['none_txt'] = 'Brak';
?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
index c6f3ed67dd..7a28409e5f 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
@@ -11,4 +11,3 @@ $wb['autoresponder_active'] = 'WÅ‚Ä…cz autoresponder';
$wb['now_txt'] = 'Teraz';
$wb['autoresponder_subject_txt'] = 'Temat';
?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng b/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
index a3b48179b9..70becda5bd 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
@@ -5,4 +5,3 @@ $wb['email_txt'] = 'E-mail';
$wb['cc_error_isemail'] = 'Adres e-mail jest niepoprawny w polu -Wyślij kopię do-';
$wb['email_is_cc_error'] = 'Adres e-mail i adres do wysyłki kopii nie mogą być takie same.';
?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
index 9ac57b53cb..2e74ffd4f7 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
@@ -18,4 +18,3 @@ $wb['ends_with_txt'] = 'Ends with';
$wb['move_to_txt'] = 'Move to';
$wb['delete_txt'] = 'Delete';
?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
index 8bea987f51..882d601e7c 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
@@ -6,4 +6,3 @@ $wb['page_txt'] = 'Strona';
$wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'Na pewno chcesz skasować ten filtr poczty?';
?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_password.lng b/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
index 08fd7405dc..48dfd26d94 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
@@ -8,4 +8,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
$wb['password_mismatch_txt'] = 'Błąd, hasła nie pasują';
$wb['password_match_txt'] = 'OK, hasła są jednakowe';
?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
index ed18053d80..b371f3ea75 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
@@ -5,4 +5,3 @@ $wb['email_txt'] = 'E-mail';
$wb['no_policy'] = '- nie włączony -';
$wb['policy_txt'] = 'Polityka';
?>
-
diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng
index 763b7f5cfd..36647b72ab 100644
--- a/interface/web/monitor/lib/lang/cz.lng
+++ b/interface/web/monitor/lib/lang/cz.lng
@@ -147,5 +147,3 @@ $wb['Show fail2ban-Log'] = 'Zobrazit Fail2Ban Log';
$wb['Show IPTables'] = 'Zobrazit IPTables pravidla';
$wb['Show OpenVz VE BeanCounter'] = 'Ukázat OpenVz VE BeanCounter';
?>
-
-
diff --git a/interface/web/monitor/lib/lang/cz_datalog_list.lng b/interface/web/monitor/lib/lang/cz_datalog_list.lng
index 70adcad1ab..c9e9a86555 100644
--- a/interface/web/monitor/lib/lang/cz_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng
@@ -6,5 +6,3 @@ $wb['dbtable_txt'] = 'DB tabulka';
$wb['action_txt'] = 'Akce';
$wb['status_txt'] = 'Stav';
?>
-
-
diff --git a/interface/web/monitor/lib/lang/cz_syslog_list.lng b/interface/web/monitor/lib/lang/cz_syslog_list.lng
index 85cd4b3b01..990662552b 100644
--- a/interface/web/monitor/lib/lang/cz_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng
@@ -5,5 +5,3 @@ $wb['server_id_txt'] = 'Server';
$wb['loglevel_txt'] = 'Logovacà úroveň';
$wb['message_txt'] = 'Zpráva';
?>
-
-
diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng
index 533d8f6fef..f1ce82191c 100644
--- a/interface/web/monitor/lib/lang/pl.lng
+++ b/interface/web/monitor/lib/lang/pl.lng
@@ -147,4 +147,3 @@ $wb['Show fail2ban-Log'] = 'Pokaż log fail2ban';
$wb['Show IPTables'] = 'Pokaż reguły IPTables';
$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter';
?>
-
diff --git a/interface/web/monitor/lib/lang/pl_datalog_list.lng b/interface/web/monitor/lib/lang/pl_datalog_list.lng
index 0b969b1332..398ca51edd 100644
--- a/interface/web/monitor/lib/lang/pl_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/pl_datalog_list.lng
@@ -6,4 +6,3 @@ $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 f5e0645fe0..e37799c474 100644
--- a/interface/web/monitor/lib/lang/pl_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/pl_syslog_list.lng
@@ -5,4 +5,3 @@ $wb['server_id_txt'] = 'Serwer';
$wb['loglevel_txt'] = 'Poziom logowania';
$wb['message_txt'] = 'Wiadomość';
?>
-
diff --git a/interface/web/sites/lib/lang/ar_web_domain.lng b/interface/web/sites/lib/lang/ar_web_domain.lng
index c749fb5028..f10cc42252 100644
--- a/interface/web/sites/lib/lang/ar_web_domain.lng
+++ b/interface/web/sites/lib/lang/ar_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/bg_web_domain.lng b/interface/web/sites/lib/lang/bg_web_domain.lng
index 2b2fa97056..c2816ad350 100644
--- a/interface/web/sites/lib/lang/bg_web_domain.lng
+++ b/interface/web/sites/lib/lang/bg_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng
index dc75b80693..623bc0b210 100644
--- a/interface/web/sites/lib/lang/br_web_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng
index d96c4d546a..71ccd165f6 100644
--- a/interface/web/sites/lib/lang/cz.lng
+++ b/interface/web/sites/lib/lang/cz.lng
@@ -33,5 +33,3 @@ $wb['Update Packagelist'] = 'Aktualizace seznamu balÃÄků';
$wb['Subdomain (Vhost)'] = 'Subdoména (Vhost)';
$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng
index 97bc670013..176d76da5a 100644
--- a/interface/web/sites/lib/lang/cz_aps.lng
+++ b/interface/web/sites/lib/lang/cz_aps.lng
@@ -56,5 +56,3 @@ $wb['btn_install_txt'] = 'Instalovat';
$wb['btn_cancel_txt'] = 'Zrušit';
$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_aps_instances_list.lng b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
index 3d5d3d8650..7b7b6dd6f0 100644
--- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
@@ -11,5 +11,3 @@ $wb['filter_txt'] = 'Hledat';
$wb['delete_txt'] = 'Smazat';
$wb['reinstall_txt'] = 'Přeinstalovat';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_aps_packages_list.lng b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
index b74dfc8882..52ef6ebcd9 100644
--- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
@@ -6,5 +6,3 @@ $wb['category_txt'] = 'Kategorie';
$wb['status_txt'] = 'OdemÄený';
$wb['filter_txt'] = 'Hledat';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng
index 5ea9bb5b7b..d4e6c1767c 100644
--- a/interface/web/sites/lib/lang/cz_cron.lng
+++ b/interface/web/sites/lib/lang/cz_cron.lng
@@ -19,5 +19,3 @@ $wb['run_wday_error_format'] = 'Chybný formát pro dny týdne.';
$wb['command_error_format'] = 'Chybná formát pÅ™Ãkazu. V pÅ™ÃpadÄ› URL je povoleno volánà pouze http/https.';
$wb['unknown_fieldtype_error'] = 'Bylp použito pole neznámého typu.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_cron_list.lng b/interface/web/sites/lib/lang/cz_cron_list.lng
index 0ca6dc3b87..f50dee2faf 100644
--- a/interface/web/sites/lib/lang/cz_cron_list.lng
+++ b/interface/web/sites/lib/lang/cz_cron_list.lng
@@ -11,5 +11,3 @@ $wb['command_txt'] = 'PÅ™Ãkaz';
$wb['add_new_cron_txt'] = 'Přidat novou cron úlohu';
$wb['parent_domain_id_txt'] = 'Webové stránky';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng
index cb7e4ebbe4..c316f0ac97 100644
--- a/interface/web/sites/lib/lang/cz_database.lng
+++ b/interface/web/sites/lib/lang/cz_database.lng
@@ -44,5 +44,3 @@ $wb['no_dbuser_txt'] = 'Žádný';
$wb['database_client_differs_txt'] = 'Klient mateÅ™ského webu a databáze se neshodujÃ.';
$wb['database_user_missing_txt'] = 'Please select a database user for this database.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_admin_list.lng b/interface/web/sites/lib/lang/cz_database_admin_list.lng
index 4eb24c99ca..a0069404d8 100644
--- a/interface/web/sites/lib/lang/cz_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng
@@ -8,5 +8,3 @@ $wb['database_name_txt'] = 'Jméno databáze';
$wb['add_new_record_txt'] = 'Přidat nové databáze';
$wb['sys_groupid_txt'] = 'Klient';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_list.lng b/interface/web/sites/lib/lang/cz_database_list.lng
index 269dc2114d..9bb80dd945 100644
--- a/interface/web/sites/lib/lang/cz_database_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_list.lng
@@ -7,5 +7,3 @@ $wb['database_user_txt'] = 'Uživatel databáze';
$wb['database_name_txt'] = 'Název databáze';
$wb['add_new_record_txt'] = 'Přidat databázi';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_user.lng b/interface/web/sites/lib/lang/cz_database_user.lng
index 4621087b5b..8a64cb5225 100644
--- a/interface/web/sites/lib/lang/cz_database_user.lng
+++ b/interface/web/sites/lib/lang/cz_database_user.lng
@@ -21,5 +21,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 výsledků';
$wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
$wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
index db76d1099e..8703e713e1 100644
--- a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
@@ -4,5 +4,3 @@ $wb['database_user_txt'] = 'Uživatel databáze';
$wb['add_new_record_txt'] = 'Vytvořit nového uživatele databáze';
$wb['sys_groupid_txt'] = 'Klient';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_user_list.lng b/interface/web/sites/lib/lang/cz_database_user_list.lng
index 68cd34d2e4..42cf36d703 100644
--- a/interface/web/sites/lib/lang/cz_database_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Uživatelé databáze';
$wb['database_user_txt'] = 'Uživatelé databáze';
$wb['add_new_record_txt'] = 'Přidat nového uživatele databáze';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_ftp_user.lng b/interface/web/sites/lib/lang/cz_ftp_user.lng
index 2b9dd54505..876ad5108c 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user.lng
@@ -32,5 +32,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_ftp_user_list.lng b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
index 6f6f5021ee..41649df7f9 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webová stránka';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['add_new_record_txt'] = 'Přidat FTP uživatele';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_shell_user.lng b/interface/web/sites/lib/lang/cz_shell_user.lng
index 234b7a5921..97b8a0d088 100644
--- a/interface/web/sites/lib/lang/cz_shell_user.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user.lng
@@ -27,5 +27,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_shell_user_list.lng b/interface/web/sites/lib/lang/cz_shell_user_list.lng
index 6d4a8fe52a..1d6bc198d7 100644
--- a/interface/web/sites/lib/lang/cz_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Stránka';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['add_new_record_txt'] = 'Přidat shell uživatele';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
index dabb73b888..4531944549 100644
--- a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
@@ -7,5 +7,3 @@ $wb['hard_txt'] = 'Tvrdý limit';
$wb['soft_txt'] = 'Měkký limit';
$wb['files_txt'] = 'Jednotlivé soubory';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
index 10b7eee7c5..3a5d150406 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
@@ -113,5 +113,3 @@ $wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
index 6cf247f995..22a4ffe32f 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
@@ -12,5 +12,3 @@ $wb['no_redirect_txt'] = 'Žádné pÅ™esmÄ›rovánÃ';
$wb['no_flag_txt'] = 'Žádný pÅ™Ãznak';
$wb['none_txt'] = 'Žádná';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_backup_list.lng b/interface/web/sites/lib/lang/cz_web_backup_list.lng
index 88e110f75f..3c9cfc8ef5 100644
--- a/interface/web/sites/lib/lang/cz_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng
@@ -13,5 +13,3 @@ $wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng
index 4f5df2935b..f3e31d39a4 100644
--- a/interface/web/sites/lib/lang/cz_web_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain.lng
@@ -111,6 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
index c79a51beb9..e52a794428 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
@@ -7,5 +7,3 @@ $wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Přidat webovou stránku';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_domain_list.lng b/interface/web/sites/lib/lang/cz_web_domain_list.lng
index af0947c9fc..cbf025e79b 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_list.lng
@@ -6,5 +6,3 @@ $wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Přidat webovou stránku';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_folder.lng b/interface/web/sites/lib/lang/cz_web_folder.lng
index 108f7c9527..f9f623dc2b 100644
--- a/interface/web/sites/lib/lang/cz_web_folder.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder.lng
@@ -5,5 +5,3 @@ $wb['path_txt'] = 'Cesta';
$wb['active_txt'] = 'AktivnÃ';
$wb['path_error_regex'] = 'Neplatná cesta ke složce.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_folder_list.lng b/interface/web/sites/lib/lang/cz_web_folder_list.lng
index 2aaaf4c98c..b75c0e80da 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng
@@ -5,5 +5,3 @@ $wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Webové stránky';
$wb['path_txt'] = 'Cesta';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_folder_user.lng b/interface/web/sites/lib/lang/cz_web_folder_user.lng
index a1c6ccf411..48f426089a 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng
@@ -10,5 +10,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
index 0b3f9648d4..99fe62051c 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
@@ -4,5 +4,3 @@ $wb['active_txt'] = 'AktivnÃ';
$wb['web_folder_id_txt'] = 'Složka';
$wb['username_txt'] = 'Uživatelské jméno';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
index ffab544669..ed93596824 100644
--- a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
@@ -7,5 +7,3 @@ $wb['this_year_txt'] = 'Tento rok';
$wb['last_year_txt'] = 'Minulý rok';
$wb['sum_txt'] = 'SouÄet';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng
index 4547f9188d..de1445f5de 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng
@@ -44,5 +44,3 @@ $wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
index 1eab4a8aa4..8a0bafe0f9 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webová stránka';
$wb['domain_txt'] = 'Subdoména';
$wb['add_new_record_txt'] = 'Přidat subdoménu';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
index 3ed649f760..c76dffd07c 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
@@ -116,5 +116,3 @@ $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snipp
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
index bf8a1710bc..a54e19a5ad 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webové stránky';
$wb['domain_txt'] = 'Subdoména';
$wb['add_new_record_txt'] = 'Přidat novou poddoménu';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng
index 523b79f80c..3e89a1e625 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user.lng
@@ -19,5 +19,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_webdav_user_list.lng b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
index c74be89691..0c1148b53e 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webové stránky';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['add_new_record_txt'] = 'Přidat nového WebDAV uživatele';
?>
-
-
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
index 3c64f65c06..dab184fe4d 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache Direktiven
$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx Direktiven Schnipsel:';
$wb['proxy_directives_txt'] = 'Proxy Direktiven';
$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng
index b77cd8a5db..e13af5060e 100644
--- a/interface/web/sites/lib/lang/el_web_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/es_web_domain.lng b/interface/web/sites/lib/lang/es_web_domain.lng
index 3ba7ab9739..db0a0b6bf7 100644
--- a/interface/web/sites/lib/lang/es_web_domain.lng
+++ b/interface/web/sites/lib/lang/es_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_domain.lng
index e7129e1a2f..7c31eeb544 100755
--- a/interface/web/sites/lib/lang/fi_web_domain.lng
+++ b/interface/web/sites/lib/lang/fi_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/fr_web_domain.lng b/interface/web/sites/lib/lang/fr_web_domain.lng
index 05b27ce7ae..d0029908dc 100644
--- a/interface/web/sites/lib/lang/fr_web_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/hr_web_domain.lng b/interface/web/sites/lib/lang/hr_web_domain.lng
index ca300d63b1..37bed82f70 100644
--- a/interface/web/sites/lib/lang/hr_web_domain.lng
+++ b/interface/web/sites/lib/lang/hr_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/hu_web_domain.lng b/interface/web/sites/lib/lang/hu_web_domain.lng
index 2659f9aba1..2bf0127a58 100644
--- a/interface/web/sites/lib/lang/hu_web_domain.lng
+++ b/interface/web/sites/lib/lang/hu_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/id_web_domain.lng b/interface/web/sites/lib/lang/id_web_domain.lng
index 012583e74e..6c464398f5 100644
--- a/interface/web/sites/lib/lang/id_web_domain.lng
+++ b/interface/web/sites/lib/lang/id_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_domain.lng
index a34c576a0e..084b4acf22 100644
--- a/interface/web/sites/lib/lang/it_web_domain.lng
+++ b/interface/web/sites/lib/lang/it_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/ja_web_domain.lng b/interface/web/sites/lib/lang/ja_web_domain.lng
index 9a0eb0eb8e..43162ef3d7 100644
--- a/interface/web/sites/lib/lang/ja_web_domain.lng
+++ b/interface/web/sites/lib/lang/ja_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng
index 3319f46865..785471dce5 100644
--- a/interface/web/sites/lib/lang/nl_web_domain.lng
+++ b/interface/web/sites/lib/lang/nl_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng
index 6d26fb6757..22bbad3ec1 100644
--- a/interface/web/sites/lib/lang/pl.lng
+++ b/interface/web/sites/lib/lang/pl.lng
@@ -33,4 +33,3 @@ $wb['Update Packagelist'] = 'Uaktualnij listę pakietów';
$wb['Subdomain (Vhost)'] = 'Subdomena (Vhost)';
$wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_aps.lng b/interface/web/sites/lib/lang/pl_aps.lng
index aa791fc432..1a2ffad688 100644
--- a/interface/web/sites/lib/lang/pl_aps.lng
+++ b/interface/web/sites/lib/lang/pl_aps.lng
@@ -56,4 +56,3 @@ $wb['btn_install_txt'] = 'Instaluj';
$wb['btn_cancel_txt'] = 'Anuluj';
$wb['limit_aps_txt'] = 'Maksymalna liczba instancji APS dla Twojego konta została wyczerpana.';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_aps_instances_list.lng b/interface/web/sites/lib/lang/pl_aps_instances_list.lng
index f4b849921b..186dc7dc1a 100644
--- a/interface/web/sites/lib/lang/pl_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/pl_aps_instances_list.lng
@@ -11,4 +11,3 @@ $wb['filter_txt'] = 'Szukaj';
$wb['delete_txt'] = 'Usuń';
$wb['reinstall_txt'] = 'Przeinstaluj';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_aps_packages_list.lng b/interface/web/sites/lib/lang/pl_aps_packages_list.lng
index 2e2140d95d..684f4d719b 100644
--- a/interface/web/sites/lib/lang/pl_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/pl_aps_packages_list.lng
@@ -6,4 +6,3 @@ $wb['category_txt'] = 'Kategoria';
$wb['status_txt'] = 'Odblokowany';
$wb['filter_txt'] = 'Szukaj';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng
index a5d3b8b891..a097d0813e 100644
--- a/interface/web/sites/lib/lang/pl_cron.lng
+++ b/interface/web/sites/lib/lang/pl_cron.lng
@@ -19,4 +19,3 @@ $wb['run_wday_error_format'] = 'Niepoprawny format dni w tygodniu.';
$wb['command_error_format'] = 'Niepoprawny format polecenia. W zbiorze url może być tylko adres http/https który ma pozwolenie.';
$wb['unknown_fieldtype_error'] = 'Został użyty niepoprawny format pola.';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_cron_list.lng b/interface/web/sites/lib/lang/pl_cron_list.lng
index 67e2e6fba8..467cae6ed1 100644
--- a/interface/web/sites/lib/lang/pl_cron_list.lng
+++ b/interface/web/sites/lib/lang/pl_cron_list.lng
@@ -11,4 +11,3 @@ $wb['command_txt'] = 'Komenda';
$wb['add_new_cron_txt'] = 'Dodaj nowe zadanie Cron';
$wb['parent_domain_id_txt'] = 'Witryna';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng
index 92af857087..05bd91bf9d 100644
--- a/interface/web/sites/lib/lang/pl_database.lng
+++ b/interface/web/sites/lib/lang/pl_database.lng
@@ -44,4 +44,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 wyników';
$wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
$wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_database_admin_list.lng b/interface/web/sites/lib/lang/pl_database_admin_list.lng
index 653657ee10..5785a779fd 100644
--- a/interface/web/sites/lib/lang/pl_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_admin_list.lng
@@ -8,4 +8,3 @@ $wb['database_name_txt'] = 'Nazwa bazy danych';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… bazÄ™ danych';
$wb['sys_groupid_txt'] = 'Klient';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_database_list.lng b/interface/web/sites/lib/lang/pl_database_list.lng
index 0b419fef48..2162a15a21 100644
--- a/interface/web/sites/lib/lang/pl_database_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_list.lng
@@ -7,4 +7,3 @@ $wb['database_name_txt'] = 'Nazwa bazy danych';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… bazÄ™ danych';
$wb['database_user_txt'] = 'Użytkownik bazy danych';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_database_user.lng b/interface/web/sites/lib/lang/pl_database_user.lng
index 5bf00310f6..66a0718349 100644
--- a/interface/web/sites/lib/lang/pl_database_user.lng
+++ b/interface/web/sites/lib/lang/pl_database_user.lng
@@ -21,4 +21,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_database_user_admin_list.lng b/interface/web/sites/lib/lang/pl_database_user_admin_list.lng
index a44cc7cfa0..d7f88c4c36 100644
--- a/interface/web/sites/lib/lang/pl_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_user_admin_list.lng
@@ -4,4 +4,3 @@ $wb['database_user_txt'] = 'Database user';
$wb['add_new_record_txt'] = 'Add new User';
$wb['sys_groupid_txt'] = 'Client';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_database_user_list.lng b/interface/web/sites/lib/lang/pl_database_user_list.lng
index 522780d246..8c226496a6 100644
--- a/interface/web/sites/lib/lang/pl_database_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_user_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Database user';
$wb['database_user_txt'] = 'Database user';
$wb['add_new_record_txt'] = 'Add new user';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_ftp_user.lng b/interface/web/sites/lib/lang/pl_ftp_user.lng
index 5a97a4bba8..5c91401133 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user.lng
@@ -32,4 +32,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
$wb['password_match_txt'] = 'Hasła pasują';
?>
-
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 9577209363..fecbba355a 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user_list.lng
@@ -6,4 +6,3 @@ $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 2852ccc823..5259aeb2be 100644
--- a/interface/web/sites/lib/lang/pl_shell_user.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user.lng
@@ -27,4 +27,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
$wb['password_match_txt'] = 'Hasła pasują';
?>
-
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 0f179803dd..10f9e433ac 100644
--- a/interface/web/sites/lib/lang/pl_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Strona';
$wb['username_txt'] = 'Nazwa użytkownika';
$wb['add_new_record_txt'] = 'Dodaj nowego użytkownika Shell';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
index f92c3603a2..d8e963de81 100644
--- a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
@@ -7,4 +7,3 @@ $wb['hard_txt'] = 'Limit twardy';
$wb['soft_txt'] = 'Limit miękki';
$wb['files_txt'] = 'Pojedyncze pliki';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
index 62d88d949e..19cd691beb 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
@@ -113,4 +113,3 @@ $wb['proxy_directives_txt'] = 'Dyrektywny Proxy';
$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
$wb['Domain'] = 'Alias domeny';
?>
-
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 a57741558f..5bdd8e8316 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
@@ -12,4 +12,3 @@ $wb['no_redirect_txt'] = 'Bez przekierowania';
$wb['no_flag_txt'] = 'Bez flagi';
$wb['none_txt'] = 'Brak';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_backup_list.lng b/interface/web/sites/lib/lang/pl_web_backup_list.lng
index e7d9aed9ab..401ee655f9 100644
--- a/interface/web/sites/lib/lang/pl_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_backup_list.lng
@@ -13,4 +13,3 @@ $wb['restore_pending_txt'] = 'Trwa już jedno zadanie przywrócenia danych z kop
$wb['backup_type_mysql'] = 'Baza MySQL';
$wb['backup_type_web'] = 'Pliki strony';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng
index 5c02a06abb..4cac25f0bb 100644
--- a/interface/web/sites/lib/lang/pl_web_domain.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain.lng
@@ -111,5 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apa
$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
+$wb['no_server_error'] = 'No server selected.';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
index 1aab019c08..56634eb623 100644
--- a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
@@ -7,4 +7,3 @@ $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_domain_list.lng b/interface/web/sites/lib/lang/pl_web_domain_list.lng
index 8a74d05dd8..62b7455ff3 100644
--- a/interface/web/sites/lib/lang/pl_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain_list.lng
@@ -6,4 +6,3 @@ $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_folder.lng b/interface/web/sites/lib/lang/pl_web_folder.lng
index 053a2c012b..6eec2fd5f0 100644
--- a/interface/web/sites/lib/lang/pl_web_folder.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder.lng
@@ -5,4 +5,3 @@ $wb['path_txt'] = 'Ścieżka';
$wb['active_txt'] = 'Aktywny';
$wb['path_error_regex'] = 'Nieprawidłowa ścieżka katalogu.';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_folder_list.lng b/interface/web/sites/lib/lang/pl_web_folder_list.lng
index cd16721678..87a769008f 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_list.lng
@@ -5,4 +5,3 @@ $wb['server_id_txt'] = 'Serwer';
$wb['parent_domain_id_txt'] = 'Witryna';
$wb['path_txt'] = 'Ścieżka';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_folder_user.lng b/interface/web/sites/lib/lang/pl_web_folder_user.lng
index 48893ba7df..1975ae581d 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_user.lng
@@ -10,4 +10,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
$wb['password_match_txt'] = 'Hasła pasują';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_folder_user_list.lng b/interface/web/sites/lib/lang/pl_web_folder_user_list.lng
index 462d3b9def..81769bd9d0 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_user_list.lng
@@ -4,4 +4,3 @@ $wb['active_txt'] = 'Aktywny';
$wb['web_folder_id_txt'] = 'Katalog';
$wb['username_txt'] = 'Login';
?>
-
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 14319404ae..29985f02f0 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
@@ -7,4 +7,3 @@ $wb['this_year_txt'] = 'Ten rok';
$wb['last_year_txt'] = 'Ostatni rok';
$wb['sum_txt'] = 'Razem';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng
index 4bfc75b5d3..def9efb723 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng
@@ -44,4 +44,3 @@ $wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
$wb['available_proxy_directive_snippets_txt'] = 'Dostępne konfiguracje dodatkowe Proxy';
$wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
?>
-
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 d20a14cb70..9ccb0a3c77 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
@@ -6,4 +6,3 @@ $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/pl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
index fa77cdef54..8420a9d2b7 100644
--- a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
@@ -116,4 +116,3 @@ $wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw ngin
$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
index 58084a63ff..1c16bcda28 100644
--- a/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Website';
$wb['domain_txt'] = 'Subdomain';
$wb['add_new_record_txt'] = 'Add new subdomain';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_webdav_user.lng b/interface/web/sites/lib/lang/pl_webdav_user.lng
index 669c1b3088..8d80f94e4c 100644
--- a/interface/web/sites/lib/lang/pl_webdav_user.lng
+++ b/interface/web/sites/lib/lang/pl_webdav_user.lng
@@ -19,4 +19,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
$wb['password_match_txt'] = 'Hasła pasują do siebie';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_webdav_user_list.lng b/interface/web/sites/lib/lang/pl_webdav_user_list.lng
index f679685e8d..5e7e4b6a58 100644
--- a/interface/web/sites/lib/lang/pl_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_webdav_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Strona';
$wb['username_txt'] = 'Nazwa użytkownika';
$wb['add_new_record_txt'] = 'Dodaj nowego użytkownika Webdav';
?>
-
diff --git a/interface/web/sites/lib/lang/pt_web_domain.lng b/interface/web/sites/lib/lang/pt_web_domain.lng
index b060656a18..e3acc8a29a 100644
--- a/interface/web/sites/lib/lang/pt_web_domain.lng
+++ b/interface/web/sites/lib/lang/pt_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain.lng b/interface/web/sites/lib/lang/ro_web_domain.lng
index 791f67b577..d100895fae 100644
--- a/interface/web/sites/lib/lang/ro_web_domain.lng
+++ b/interface/web/sites/lib/lang/ro_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_domain.lng
index be367c0f62..46f377f942 100644
--- a/interface/web/sites/lib/lang/ru_web_domain.lng
+++ b/interface/web/sites/lib/lang/ru_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng
index 15df484917..a44eee857b 100644
--- a/interface/web/sites/lib/lang/se_web_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/sk_web_domain.lng b/interface/web/sites/lib/lang/sk_web_domain.lng
index 6df5937805..b127ec23b0 100644
--- a/interface/web/sites/lib/lang/sk_web_domain.lng
+++ b/interface/web/sites/lib/lang/sk_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
index 59a146cbfd..cff29d541a 100644
--- a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
@@ -6,5 +6,3 @@ $wb['password_strength_3_txt'] = 'Dobré';
$wb['password_strength_4_txt'] = 'Silné';
$wb['password_strength_5_txt'] = 'Velmi silné';
?>
-
-
diff --git a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
index 79d031777b..df85c97124 100644
--- a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
@@ -6,4 +6,3 @@ $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/import_ispconfig.php b/interface/web/tools/import_ispconfig.php
index a06366448c..432bb3191e 100644
--- a/interface/web/tools/import_ispconfig.php
+++ b/interface/web/tools/import_ispconfig.php
@@ -149,6 +149,12 @@ function start_domain_import($mail_domain) {
if($sys_groupid == 0) $error .= 'Inavlid groupid<br />';
if($sys_userid == 0) $error .= 'Inavlid Userid<br />';
+ //* Get the mail server ID
+ $tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE mail_server = 1 LIMIT 0,1");
+ $server_id = intval($tmp['server_id']);
+ unset($tmp);
+ if($server_id == 0) $server_id = 1;
+
//* get the mail domain record
$mail_domain_rec = $client->mail_domain_get($remote_session_id, array('domain' => $mail_domain));
if(is_array($mail_domain_rec)) {
@@ -160,6 +166,7 @@ function start_domain_import($mail_domain) {
//* Change the record owner and remove the index field
$mail_domain_rec['sys_userid'] = $sys_userid;
$mail_domain_rec['sys_groupid'] = $sys_groupid;
+ $mail_domain_rec['server_id'] = $server_id;
unset($mail_domain_rec['domain_id']);
//* Insert domain if no error occurred
@@ -181,6 +188,7 @@ function start_domain_import($mail_domain) {
//* Prepare record
$mail_user['sys_userid'] = $sys_userid;
$mail_user['sys_groupid'] = $sys_groupid;
+ $mail_user['server_id'] = $server_id;
$remote_mailuser_id = $mail_user['mailuser_id'];
unset($mail_user['mailuser_id']);
if(!isset($_POST['import_user_filter'])) $mail_user['custom_mailfilter'] = '';
@@ -199,6 +207,7 @@ function start_domain_import($mail_domain) {
$mail_user_filter['sys_userid'] = $sys_userid;
$mail_user_filter['sys_groupid'] = $sys_groupid;
$mail_user_filter['mailuser_id'] = $local_mailuser_id;
+ $mail_user_filter['server_id'] = $server_id;
unset($mail_user_filter['filter_id']);
//* Insert record in DB
@@ -224,6 +233,7 @@ function start_domain_import($mail_domain) {
if($tmp['number'] == 0) {
$mail_alias['sys_userid'] = $sys_userid;
$mail_alias['sys_groupid'] = $sys_groupid;
+ $mail_alias['server_id'] = $server_id;
unset($mail_alias['forwarding_id']);
$app->db->datalogInsert('mail_forwarding', $mail_alias, 'forwarding_id');
$msg .= "Imported email alias ".$mail_alias['source']."<br />";
@@ -244,6 +254,7 @@ function start_domain_import($mail_domain) {
if($tmp['number'] == 0) {
$mail_alias['sys_userid'] = $sys_userid;
$mail_alias['sys_groupid'] = $sys_groupid;
+ $mail_alias['server_id'] = $server_id;
unset($mail_alias['forwarding_id']);
$app->db->datalogInsert('mail_forwarding', $mail_alias, 'forwarding_id');
$msg .= "Imported email aliasdomain ".$mail_alias['source']."<br />";
@@ -264,6 +275,7 @@ function start_domain_import($mail_domain) {
if($tmp['number'] == 0) {
$mail_forward['sys_userid'] = $sys_userid;
$mail_forward['sys_groupid'] = $sys_groupid;
+ $mail_forward['server_id'] = $server_id;
unset($mail_forward['forwarding_id']);
$app->db->datalogInsert('mail_forwarding', $mail_forward, 'forwarding_id');
$msg .= "Imported email forward ".$mail_forward['source']."<br />";
@@ -284,6 +296,7 @@ function start_domain_import($mail_domain) {
if($tmp['number'] == 0) {
$mail_spamfilter['sys_userid'] = $sys_userid;
$mail_spamfilter['sys_groupid'] = $sys_groupid;
+ $mail_spamfilter['server_id'] = $server_id;
unset($mail_spamfilter['id']);
$app->db->datalogInsert('spamfilter_users', $mail_spamfilter, 'id');
$msg .= "Imported spamfilter user ".$mail_spamfilter['email']."<br />";
diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng
index 480434e148..66bcaf49ae 100644
--- a/interface/web/tools/lib/lang/cz.lng
+++ b/interface/web/tools/lib/lang/cz.lng
@@ -11,5 +11,3 @@ $wb['ISPConfig 3 mail'] = 'ISPConfig 3 vzdalený e-mail server';
$wb['PDNS Tupa'] = 'PowerDNS Tupa';
$wb['Interface'] = 'RozhranÃ';
?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_import_ispconfig.lng b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
index ba24f58f75..8ebf71795c 100644
--- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
@@ -21,5 +21,3 @@ $wb['import_forward_txt'] = 'Import forward';
$wb['import_user_filter_txt'] = 'Importovat uživatelský filter';
$wb['import_spamfilter_txt'] = 'Importovat spamový filter';
?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_index.lng b/interface/web/tools/lib/lang/cz_index.lng
index b1f32ec119..5ebf1ec341 100644
--- a/interface/web/tools/lib/lang/cz_index.lng
+++ b/interface/web/tools/lib/lang/cz_index.lng
@@ -2,5 +2,3 @@
$wb['page_head_txt'] = 'ISPConfig nástroje';
$wb['page_desc_txt'] = 'ZmÄ›na uživatelského nastavenÃ';
?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_interface.lng b/interface/web/tools/lib/lang/cz_interface.lng
index 1125032b1f..507b7c3cbe 100644
--- a/interface/web/tools/lib/lang/cz_interface.lng
+++ b/interface/web/tools/lib/lang/cz_interface.lng
@@ -5,5 +5,3 @@ $wb['language_txt'] = 'Jazyk';
$wb['startmodule_txt'] = 'Výchozà modul po pÅ™ihlášenÃ';
$wb['app_theme_txt'] = 'Výchozà grafické téma';
?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng
index 3b53ca06a5..96d622e28a 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -11,5 +11,3 @@ $wb['resync_dns_txt'] = 'Resynchronizovat DNS záznamy';
$wb['btn_start_txt'] = 'Zahájit';
$wb['btn_cancel_txt'] = 'Zrušit';
?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_tpl_default.lng b/interface/web/tools/lib/lang/cz_tpl_default.lng
index 53e9bd8442..0f037f1590 100644
--- a/interface/web/tools/lib/lang/cz_tpl_default.lng
+++ b/interface/web/tools/lib/lang/cz_tpl_default.lng
@@ -5,5 +5,3 @@ $wb['no_settings_txt'] = 'Nejsou žádné nastavenà pro výchozà motiv.';
$wb['btn_start_txt'] = 'Uložit';
$wb['btn_cancel_txt'] = 'Zpět';
?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_usersettings.lng b/interface/web/tools/lib/lang/cz_usersettings.lng
index 7490e52f98..dec46b7a06 100644
--- a/interface/web/tools/lib/lang/cz_usersettings.lng
+++ b/interface/web/tools/lib/lang/cz_usersettings.lng
@@ -10,5 +10,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
-
-
diff --git a/interface/web/tools/lib/lang/pl.lng b/interface/web/tools/lib/lang/pl.lng
index a807a75c3d..10bf647c0c 100644
--- a/interface/web/tools/lib/lang/pl.lng
+++ b/interface/web/tools/lib/lang/pl.lng
@@ -11,4 +11,3 @@ $wb['ISPConfig 3 mail'] = 'Poczta ISPConfig 3';
$wb['PDNS Tupa'] = 'PowerDNS Tupa';
$wb['Interface'] = 'Interfejs';
?>
-
diff --git a/interface/web/tools/lib/lang/pl_import_ispconfig.lng b/interface/web/tools/lib/lang/pl_import_ispconfig.lng
index bae9417da1..cba076164a 100644
--- a/interface/web/tools/lib/lang/pl_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/pl_import_ispconfig.lng
@@ -21,4 +21,3 @@ $wb['import_forward_txt'] = 'Import przekierowań';
$wb['import_user_filter_txt'] = 'Import filtrów użytkownika';
$wb['import_spamfilter_txt'] = 'Import filtrów spamu';
?>
-
diff --git a/interface/web/tools/lib/lang/pl_index.lng b/interface/web/tools/lib/lang/pl_index.lng
index 0ff1c84dc4..d69a272bab 100644
--- a/interface/web/tools/lib/lang/pl_index.lng
+++ b/interface/web/tools/lib/lang/pl_index.lng
@@ -2,4 +2,3 @@
$wb['page_head_txt'] = 'Narzędzia ISPConfig';
$wb['page_desc_txt'] = 'Zmiana ustawień użytkownika';
?>
-
diff --git a/interface/web/tools/lib/lang/pl_interface.lng b/interface/web/tools/lib/lang/pl_interface.lng
index 7775fe861f..0256fab376 100644
--- a/interface/web/tools/lib/lang/pl_interface.lng
+++ b/interface/web/tools/lib/lang/pl_interface.lng
@@ -5,4 +5,3 @@ $wb['language_txt'] = 'Język';
$wb['startmodule_txt'] = 'Moduł startowy';
$wb['app_theme_txt'] = 'Temat';
?>
-
diff --git a/interface/web/tools/lib/lang/pl_resync.lng b/interface/web/tools/lib/lang/pl_resync.lng
index e69bec4e93..18b5936ee7 100644
--- a/interface/web/tools/lib/lang/pl_resync.lng
+++ b/interface/web/tools/lib/lang/pl_resync.lng
@@ -11,4 +11,3 @@ $wb['resync_dns_txt'] = 'Resynchronizacja rekordów DNS';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Anuluj';
?>
-
diff --git a/interface/web/tools/lib/lang/pl_tpl_default.lng b/interface/web/tools/lib/lang/pl_tpl_default.lng
index 84c90f6761..c7cd9c44d2 100644
--- a/interface/web/tools/lib/lang/pl_tpl_default.lng
+++ b/interface/web/tools/lib/lang/pl_tpl_default.lng
@@ -5,4 +5,3 @@ $wb['no_settings_txt'] = 'Nie ma ustawień dla domyślnego szablonu';
$wb['btn_start_txt'] = 'Zapisz';
$wb['btn_cancel_txt'] = 'Wróć';
?>
-
diff --git a/interface/web/tools/lib/lang/pl_usersettings.lng b/interface/web/tools/lib/lang/pl_usersettings.lng
index 2dbba9816b..addd42b34e 100644
--- a/interface/web/tools/lib/lang/pl_usersettings.lng
+++ b/interface/web/tools/lib/lang/pl_usersettings.lng
@@ -10,4 +10,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
$wb['password_mismatch_txt'] = 'Hasła się nie zgadzają';
$wb['password_match_txt'] = 'Hasła się zgadzają';
?>
-
diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng
index 21224389a8..4167e14a8a 100644
--- a/interface/web/vm/lib/lang/cz.lng
+++ b/interface/web/vm/lib/lang/cz.lng
@@ -5,5 +5,3 @@ $wb['VM Templates'] = 'VM Templates';
$wb['IP addresses'] = 'IP addresses';
$wb['OpenVZ'] = 'OpenVZ';
?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_action.lng b/interface/web/vm/lib/lang/cz_openvz_action.lng
index 2930fff65c..3e2e3e0b84 100644
--- a/interface/web/vm/lib/lang/cz_openvz_action.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_action.lng
@@ -14,5 +14,3 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte
$wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.';
$wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.';
?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_ip.lng b/interface/web/vm/lib/lang/cz_openvz_ip.lng
index 6afda02718..6016681df8 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng
@@ -7,5 +7,3 @@ $wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
$wb['ip_error_unique'] = 'This IP address does already exist.';
$wb['IP address'] = 'IP address';
?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
index e392e9c970..e6a3a68c2c 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
@@ -5,5 +5,3 @@ $wb['ip_address_txt'] = 'IP address';
$wb['reserved_txt'] = 'Reserved';
$wb['vm_id_txt'] = 'VM';
?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
index 12f22178d0..72838a20de 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
@@ -9,5 +9,3 @@ $wb['template_name_error_empty'] = 'Template name is empty.';
$wb['template_file_error_empty'] = 'Template filename is empty.';
$wb['Template'] = 'Å ablona';
?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
index 264d944d2c..7705a4d18f 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
@@ -6,5 +6,3 @@ $wb['server_id_txt'] = 'Server';
$wb['allservers_txt'] = 'Exists on all servers';
$wb['ostemplate_id_txt'] = 'ID';
?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng
index 6f1f394d87..12c80bd6c1 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template.lng
@@ -91,5 +91,3 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Å ablona';
$wb['Advanced'] = 'PokroÄilý';
?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_template_list.lng b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
index fc3198560b..89c11ef5d1 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
$wb['active_txt'] = 'AktivnÃ';
$wb['template_name_txt'] = 'Název šablony';
?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng
index aeed11933e..adfa56f0d5 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng
@@ -38,5 +38,3 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'PokroÄilý';
?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
index 509764831f..1371c4b70e 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
@@ -8,5 +8,3 @@ $wb['hostname_txt'] = 'Hostname';
$wb['ip_address_txt'] = 'IP address';
$wb['veid_txt'] = 'VEID';
?>
-
-
diff --git a/interface/web/vm/lib/lang/pl.lng b/interface/web/vm/lib/lang/pl.lng
index 5c1ab58229..4167e14a8a 100644
--- a/interface/web/vm/lib/lang/pl.lng
+++ b/interface/web/vm/lib/lang/pl.lng
@@ -5,4 +5,3 @@ $wb['VM Templates'] = 'VM Templates';
$wb['IP addresses'] = 'IP addresses';
$wb['OpenVZ'] = 'OpenVZ';
?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_action.lng b/interface/web/vm/lib/lang/pl_openvz_action.lng
index 71e7263f9d..52f7328582 100644
--- a/interface/web/vm/lib/lang/pl_openvz_action.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_action.lng
@@ -14,4 +14,3 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte
$wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.';
$wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.';
?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_ip.lng b/interface/web/vm/lib/lang/pl_openvz_ip.lng
index 67f688576a..6016681df8 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ip.lng
@@ -7,4 +7,3 @@ $wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
$wb['ip_error_unique'] = 'This IP address does already exist.';
$wb['IP address'] = 'IP address';
?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_ip_list.lng b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
index 365844325e..f675aa57c9 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
@@ -5,4 +5,3 @@ $wb['ip_address_txt'] = 'Adresy IP';
$wb['reserved_txt'] = 'Zarezerwowany';
$wb['vm_id_txt'] = 'VM';
?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng b/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
index bfeb299088..256750f19a 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
@@ -9,4 +9,3 @@ $wb['template_name_error_empty'] = 'Template name is empty.';
$wb['template_file_error_empty'] = 'Template filename is empty.';
$wb['Template'] = 'Template';
?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
index df01680e16..6471ec0e27 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
@@ -6,4 +6,3 @@ $wb['server_id_txt'] = 'Server';
$wb['allservers_txt'] = 'Exists on all servers';
$wb['ostemplate_id_txt'] = 'ID';
?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_template.lng b/interface/web/vm/lib/lang/pl_openvz_template.lng
index 0887164d39..d285512dca 100644
--- a/interface/web/vm/lib/lang/pl_openvz_template.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_template.lng
@@ -91,4 +91,3 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_template_list.lng b/interface/web/vm/lib/lang/pl_openvz_template_list.lng
index 6e4d911c6b..de4045c36a 100644
--- a/interface/web/vm/lib/lang/pl_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_template_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
$wb['active_txt'] = 'Active';
$wb['template_name_txt'] = 'Template name';
?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_vm.lng b/interface/web/vm/lib/lang/pl_openvz_vm.lng
index 4698fe681b..f2be022dd0 100644
--- a/interface/web/vm/lib/lang/pl_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_vm.lng
@@ -38,4 +38,3 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_vm_list.lng b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
index a534a65f20..2238e2b8f4 100644
--- a/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
@@ -8,4 +8,3 @@ $wb['hostname_txt'] = 'Hostname';
$wb['ip_address_txt'] = 'IP address';
$wb['veid_txt'] = 'VEID';
?>
-
diff --git a/server/cron_daily.php b/server/cron_daily.php
index a89468e656..1bcb797ad8 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -272,15 +272,24 @@ function setConfigVar( $filename, $varName, $varValue ) {
}
-$sql = "SELECT domain_id, domain, document_root, web_folder, type FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'webalizer' AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, document_root, web_folder, type, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'webalizer' AND server_id = ".$conf['server_id'];
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
//$yesterday = date('Ymd',time() - 86400);
$yesterday = date('Ymd',strtotime("-1 day", time()));
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
+
+ $log_folder = 'log';
+ if($rec['type'] == 'vhostsubdomain') {
+ $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($rec['parent_domain_id']));
+ $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']);
+ if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id'];
+ $log_folder .= '/' . $subdomain_host;
+ unset($tmp);
+ }
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log');
if(!@is_file($logfile)) {
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log.gz');
if(!@is_file($logfile)) {
continue;
}
@@ -313,7 +322,7 @@ foreach($records as $rec) {
// Create awstats statistics
#######################################################################################################
-$sql = "SELECT domain_id, domain, document_root, web_folder, type, system_user, system_group FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'awstats' AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, document_root, web_folder, type, system_user, system_group, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'awstats' AND server_id = ".$conf['server_id'];
$records = $app->db->queryAllRecords($sql);
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
@@ -321,9 +330,18 @@ $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
foreach($records as $rec) {
//$yesterday = date('Ymd',time() - 86400);
$yesterday = date('Ymd',strtotime("-1 day", time()));
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
+
+ $log_folder = 'log';
+ if($rec['type'] == 'vhostsubdomain') {
+ $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($rec['parent_domain_id']));
+ $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']);
+ if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id'];
+ $log_folder .= '/' . $subdomain_host;
+ unset($tmp);
+ }
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log');
if(!@is_file($logfile)) {
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log.gz');
if(!@is_file($logfile)) {
continue;
}
@@ -428,13 +446,23 @@ if(is_dir('/var/log/ispconfig/httpd')) exec('chmod +r /var/log/ispconfig/httpd/*
// Manage and compress web logfiles and create traffic statistics
#######################################################################################################
-$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, type, document_root, web_folder, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') AND server_id = ".$conf['server_id'];
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
//* create traffic statistics based on yesterdays access log file
$yesterday = date('Ymd',time() - 86400);
- $logfile = $rec['document_root'].'/log/'.$yesterday.'-access.log';
+
+ $log_folder = 'log';
+ if($rec['type'] == 'vhostsubdomain') {
+ $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($rec['parent_domain_id']));
+ $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']);
+ if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id'];
+ $log_folder .= '/' . $subdomain_host;
+ unset($tmp);
+ }
+
+ $logfile = $rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log';
$total_bytes = 0;
$handle = @fopen($logfile, "r");
@@ -462,7 +490,7 @@ foreach($records as $rec) {
}
$yesterday2 = date('Ymd',time() - 86400*2);
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday2.'-access.log');
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday2.'-access.log');
//* Compress logfile
if(@is_file($logfile)) {
@@ -472,7 +500,7 @@ foreach($records as $rec) {
}
// rotate and compress the error.log when it exceeds a size of 10 MB
- $logfile = escapeshellcmd($rec['document_root'].'/log/error.log');
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/error.log');
if(is_file($logfile) && filesize($logfile) > 10000000) {
exec("gzip -c $logfile > $logfile.1.gz");
exec("cat /dev/null > $logfile");
@@ -480,7 +508,7 @@ foreach($records as $rec) {
// delete logfiles after 30 days
$month_ago = date('Ymd',time() - 86400 * 30);
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$month_ago.'-access.log.gz');
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$month_ago.'-access.log.gz');
if(@is_file($logfile)) {
unlink($logfile);
}
@@ -488,10 +516,10 @@ foreach($records as $rec) {
//* Delete older Log files, in case that we missed them before due to serverdowntimes.
$datepart = date('Ym',time() - 86400 * 31 * 2);
- $logfile = escapeshellcmd($rec['document_root']).'/log/'.$datepart.'*-access.log.gz';
+ $logfile = escapeshellcmd($rec['document_root']).'/' . $log_folder . '/'.$datepart.'*-access.log.gz';
exec('rm -f '.$logfile);
- $logfile = escapeshellcmd($rec['document_root']).'/log/'.$datepart.'*-access.log';
+ $logfile = escapeshellcmd($rec['document_root']).'/' . $log_folder . '/'.$datepart.'*-access.log';
exec('rm -f '.$logfile);
}
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 1de54e29ff..c958e8b86d 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -574,6 +574,58 @@ class system{
}
}
+ /**
+ * Get the group id from an group
+ *
+ */
+ function getgid($group){
+ global $app;
+ if($this->is_group($group)){
+ $group_datei = $this->server_conf['group_datei'];
+ $groups = $app->file->no_comments($group_datei);
+ $lines = explode("\n", $groups);
+ if(is_array($lines)){
+ foreach($lines as $line){
+ if(trim($line) != ""){
+ list($f1, $f2, $f3, $f4) = explode(':', $line);
+ if($f1 == $group) return $f3;
+ }
+ }
+ }
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Return info about a group by name
+ *
+ */
+ function posix_getgrnam($group) {
+ if(!function_exists('posix_getgrnam')){
+ $group_datei = $this->server_conf['group_datei'];
+ $cmd = 'grep -m 1 "^'.$group.':" '.$group_datei;
+ exec($cmd, $output, $return_var);
+ if($return_var != 0 || !$output[0]) return false;
+ list($f1, $f2, $f3, $f4) = explode(':', $output[0]);
+ $f2 = trim($f2);
+ $f3 = trim($f3);
+ $f4 = trim($f4);
+ if($f4 != ''){
+ $members = explode(',', $f4);
+ } else {
+ $members = array();
+ }
+ $group_details = array( 'name' => $group,
+ 'passwd' => $f2,
+ 'members' => $members,
+ 'gid' => $f3);
+ return $group_details;
+ } else {
+ return posix_getgrnam($group);
+ }
+ }
+
/**
* Get all information from a user
*
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 8df1dcf97e..58e941d6d5 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -923,7 +923,7 @@ class apache2_plugin {
//* Create custom php.ini
if(trim($data['new']['custom_php_ini']) != '') {
$has_custom_php_ini = true;
- if(!is_dir($custom_php_ini_dir)) $app->system->mkdir($custom_php_ini_dir);
+ if(!is_dir($custom_php_ini_dir)) $app->system->mkdirpath($custom_php_ini_dir);
$php_ini_content = '';
if($data['new']['php'] == 'mod') {
$master_php_ini_path = $web_config['php_ini_path_apache'];
diff --git a/server/plugins-available/mailman_plugin.inc.php b/server/plugins-available/mailman_plugin.inc.php
index 7e6eaf2589..c302806b90 100644
--- a/server/plugins-available/mailman_plugin.inc.php
+++ b/server/plugins-available/mailman_plugin.inc.php
@@ -74,7 +74,7 @@ class mailman_plugin {
$this->update_config();
exec("nohup /usr/lib/mailman/bin/newlist -u ".escapeshellcmd($data["new"]["domain"])." -e ".escapeshellcmd($data["new"]["domain"])." ".escapeshellcmd($data["new"]["listname"])." ".escapeshellcmd($data["new"]["email"])." ".escapeshellcmd($data["new"]["password"])." >/dev/null 2>&1 &");
-
+ if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');
exec('nohup '.$conf['init_scripts'] . '/' . 'mailman reload >/dev/null 2>&1 &');
$app->db->query("UPDATE mail_mailinglist SET password = '' WHERE mailinglist_id = ".$app->db->quote($data["new"]['mailinglist_id']));
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 7a1e562ad5..2c347f4a2e 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -831,7 +831,7 @@ class nginx_plugin {
if(!is_dir($web_config['website_basedir'].'/conf')) mkdir($web_config['website_basedir'].'/conf');
if(trim($data['new']['custom_php_ini']) != '') {
$has_custom_php_ini = true;
- if(!is_dir($custom_php_ini_dir)) $app->system->mkdir($custom_php_ini_dir);
+ if(!is_dir($custom_php_ini_dir)) $app->system->mkdirpath($custom_php_ini_dir);
$php_ini_content = '';
if($data['new']['php'] == 'mod') {
$master_php_ini_path = $web_config['php_ini_path_apache'];
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index c3133a6fde..2924d49bcb 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -162,8 +162,8 @@ class shelluser_base_plugin {
exec($command);
$app->log("Executed command: $command ",LOGLEVEL_DEBUG);
*/
- $groupinfo = posix_getgrnam($data['new']['pgroup']);
- $app->system->usermod($data['old']['username'],0, $groupinfo[gid], $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']);
+ //$groupinfo = $app->system->posix_getgrnam($data['new']['pgroup']);
+ $app->system->usermod($data['old']['username'],0, $app->system->getgid($data['new']['pgroup']), $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']);
$app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
// call the ssh-rsa update function
--
GitLab