From bfcdef6bc91753cb2044e3626f522b5b1aec129f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 14 Nov 2012 10:34:56 +0000
Subject: [PATCH] Merged revisions 3596-3670 from 3.0.5 stable branch.
---
install/dist/lib/fedora.lib.php | 11 +-
install/dist/lib/gentoo.lib.php | 11 +-
install/dist/lib/opensuse.lib.php | 11 +-
install/lib/install.lib.php | 40 +-
install/lib/installer_base.lib.php | 13 +-
install/sql/incremental/upd_0044.sql | 4 +
install/sql/ispconfig3.sql | 2 +
install/tpl/apache_ispconfig.vhost.master | 28 +-
install/tpl/debian6_dovecot-sql.conf.master | 5 +-
install/tpl/debian_dovecot-sql.conf.master | 4 +-
install/tpl/fedora_dovecot-sql.conf.master | 5 +-
install/tpl/opensuse_dovecot-sql.conf.master | 4 +
install/tpl/server.ini.master | 2 +-
interface/lib/app.inc.php | 6 +
interface/lib/classes/aps_base.inc.php | 6 -
interface/lib/classes/aps_crawler.inc.php | 64 +-
.../lib/classes/aps_guicontroller.inc.php | 175 +++---
interface/lib/classes/db_mysql.inc.php | 34 +-
interface/lib/classes/remoting.inc.php | 93 +--
interface/lib/classes/remoting_lib.inc.php | 22 +-
interface/lib/classes/tools_sites.inc.php | 2 +-
.../classes/validate_autoresponder.inc.php | 12 +-
interface/lib/lang/ar.lng | 49 ++
interface/lib/lang/bg.lng | 49 ++
interface/lib/lang/br.lng | 49 ++
interface/lib/lang/cz.lng | 123 ++--
interface/lib/lang/de.lng | 213 ++++---
interface/lib/lang/el.lng | 49 ++
interface/lib/lang/en.lng | 51 ++
interface/lib/lang/es.lng | 49 ++
interface/lib/lang/fi.lng | 49 ++
interface/lib/lang/hr.lng | 49 ++
interface/lib/lang/hu.lng | 49 ++
interface/lib/lang/id.lng | 49 ++
interface/lib/lang/it.lng | 49 ++
interface/lib/lang/ja.lng | 49 ++
interface/lib/lang/nl.lng | 49 ++
interface/lib/lang/pl.lng | 49 ++
interface/lib/lang/pt.lng | 49 ++
interface/lib/lang/ro.lng | 49 ++
interface/lib/lang/ru.lng | 49 ++
interface/lib/lang/se.lng | 49 ++
interface/lib/lang/sk.lng | 49 ++
interface/lib/lang/tr.lng | 49 ++
.../plugins/mail_user_filter_plugin.inc.php | 2 +
.../sites_web_vhost_subdomain_plugin.inc.php | 11 +-
.../admin/form/directive_snippets.tform.php | 2 +-
.../web/admin/form/server_config.tform.php | 7 +-
interface/web/admin/lib/lang/ar.lng | 1 +
.../admin/lib/lang/ar_directive_snippets.lng | 9 +
.../lib/lang/ar_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/ar_server_config.lng | 340 +++++------
.../web/admin/lib/lang/ar_system_config.lng | 6 +
interface/web/admin/lib/lang/bg.lng | 1 +
.../admin/lib/lang/bg_directive_snippets.lng | 9 +
.../lib/lang/bg_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/bg_server_config.lng | 340 +++++------
.../web/admin/lib/lang/bg_system_config.lng | 6 +
interface/web/admin/lib/lang/br.lng | 1 +
.../admin/lib/lang/br_directive_snippets.lng | 9 +
.../lib/lang/br_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/br_server_config.lng | 340 +++++------
.../web/admin/lib/lang/br_system_config.lng | 6 +
interface/web/admin/lib/lang/cz.lng | 41 +-
.../admin/lib/lang/cz_directive_snippets.lng | 9 +
.../lib/lang/cz_directive_snippets_list.lng | 7 +
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 | 8 +-
.../admin/lib/lang/cz_language_complete.lng | 8 +-
.../web/admin/lib/lang/cz_language_export.lng | 4 +-
.../web/admin/lib/lang/cz_language_import.lng | 6 +-
.../web/admin/lib/lang/cz_package_install.lng | 2 +-
.../web/admin/lib/lang/cz_remote_action.lng | 20 +-
.../web/admin/lib/lang/cz_remote_user.lng | 8 +-
.../web/admin/lib/lang/cz_server_config.lng | 340 +++++------
interface/web/admin/lib/lang/cz_server_ip.lng | 4 +-
.../web/admin/lib/lang/cz_system_config.lng | 30 +-
.../admin/lib/lang/cz_tpl_default_admin.lng | 4 +-
interface/web/admin/lib/lang/cz_users.lng | 8 +-
.../web/admin/lib/lang/cz_users_list.lng | 2 +-
interface/web/admin/lib/lang/de.lng | 97 ++-
.../admin/lib/lang/de_directive_snippets.lng | 15 +-
.../lib/lang/de_directive_snippets_list.lng | 1 -
interface/web/admin/lib/lang/de_firewall.lng | 1 -
.../web/admin/lib/lang/de_firewall_list.lng | 13 +-
interface/web/admin/lib/lang/de_groups.lng | 1 -
.../web/admin/lib/lang/de_groups_list.lng | 1 -
interface/web/admin/lib/lang/de_iptables.lng | 23 +-
.../web/admin/lib/lang/de_iptables_list.lng | 27 +-
.../web/admin/lib/lang/de_language_add.lng | 1 -
.../admin/lib/lang/de_language_complete.lng | 1 -
.../web/admin/lib/lang/de_language_edit.lng | 1 -
.../web/admin/lib/lang/de_language_export.lng | 1 -
.../web/admin/lib/lang/de_language_import.lng | 1 -
.../web/admin/lib/lang/de_language_list.lng | 1 -
.../web/admin/lib/lang/de_package_install.lng | 1 -
.../web/admin/lib/lang/de_remote_action.lng | 1 -
.../web/admin/lib/lang/de_remote_user.lng | 91 ++-
.../admin/lib/lang/de_remote_user_list.lng | 11 +-
interface/web/admin/lib/lang/de_server.lng | 27 +-
.../web/admin/lib/lang/de_server_config.lng | 343 ++++++-----
.../admin/lib/lang/de_server_config_list.lng | 1 -
interface/web/admin/lib/lang/de_server_ip.lng | 1 -
.../web/admin/lib/lang/de_server_ip_list.lng | 17 +-
.../web/admin/lib/lang/de_server_list.lng | 1 -
.../web/admin/lib/lang/de_server_php.lng | 29 +-
.../web/admin/lib/lang/de_server_php_list.lng | 11 +-
.../lib/lang/de_software_package_install.lng | 1 -
.../lib/lang/de_software_package_list.lng | 17 +-
.../web/admin/lib/lang/de_software_repo.lng | 1 -
.../admin/lib/lang/de_software_repo_list.lng | 1 -
.../lib/lang/de_software_update_list.lng | 1 -
.../web/admin/lib/lang/de_system_config.lng | 85 ++-
.../admin/lib/lang/de_tpl_default_admin.lng | 33 +-
interface/web/admin/lib/lang/de_users.lng | 1 -
.../web/admin/lib/lang/de_users_list.lng | 1 -
interface/web/admin/lib/lang/el.lng | 1 +
.../admin/lib/lang/el_directive_snippets.lng | 9 +
.../lib/lang/el_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/el_server_config.lng | 340 +++++------
.../web/admin/lib/lang/el_system_config.lng | 6 +
.../web/admin/lib/lang/en_system_config.lng | 1 +
interface/web/admin/lib/lang/es.lng | 1 +
.../admin/lib/lang/es_directive_snippets.lng | 9 +
.../lib/lang/es_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/es_server_config.lng | 340 +++++------
.../web/admin/lib/lang/es_system_config.lng | 6 +
interface/web/admin/lib/lang/fi.lng | 1 +
.../admin/lib/lang/fi_directive_snippets.lng | 9 +
.../lib/lang/fi_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/fi_server_config.lng | 340 +++++------
.../web/admin/lib/lang/fi_system_config.lng | 6 +
interface/web/admin/lib/lang/hr.lng | 1 +
.../admin/lib/lang/hr_directive_snippets.lng | 9 +
.../lib/lang/hr_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/hr_server_config.lng | 340 +++++------
.../web/admin/lib/lang/hr_system_config.lng | 6 +
interface/web/admin/lib/lang/hu.lng | 1 +
.../admin/lib/lang/hu_directive_snippets.lng | 9 +
.../lib/lang/hu_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/hu_server_config.lng | 340 +++++------
.../web/admin/lib/lang/hu_system_config.lng | 6 +
interface/web/admin/lib/lang/id.lng | 1 +
.../admin/lib/lang/id_directive_snippets.lng | 9 +
.../lib/lang/id_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/id_server_config.lng | 340 +++++------
.../web/admin/lib/lang/id_system_config.lng | 6 +
interface/web/admin/lib/lang/it.lng | 1 +
.../admin/lib/lang/it_directive_snippets.lng | 9 +
.../lib/lang/it_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/it_server_config.lng | 340 +++++------
.../web/admin/lib/lang/it_system_config.lng | 6 +
interface/web/admin/lib/lang/ja.lng | 1 +
.../admin/lib/lang/ja_directive_snippets.lng | 9 +
.../lib/lang/ja_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/ja_server_config.lng | 340 +++++------
.../web/admin/lib/lang/ja_system_config.lng | 6 +
interface/web/admin/lib/lang/nl.lng | 1 +
.../admin/lib/lang/nl_directive_snippets.lng | 9 +
.../lib/lang/nl_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/nl_server_config.lng | 340 +++++------
.../web/admin/lib/lang/nl_system_config.lng | 6 +
interface/web/admin/lib/lang/pl.lng | 1 +
.../admin/lib/lang/pl_directive_snippets.lng | 9 +
.../lib/lang/pl_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/pl_server_config.lng | 340 +++++------
.../web/admin/lib/lang/pl_system_config.lng | 6 +
interface/web/admin/lib/lang/pt.lng | 1 +
.../admin/lib/lang/pt_directive_snippets.lng | 9 +
.../lib/lang/pt_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/pt_server_config.lng | 340 +++++------
.../web/admin/lib/lang/pt_system_config.lng | 6 +
interface/web/admin/lib/lang/ro.lng | 1 +
.../admin/lib/lang/ro_directive_snippets.lng | 9 +
.../lib/lang/ro_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/ro_server_config.lng | 340 +++++------
.../web/admin/lib/lang/ro_system_config.lng | 6 +
interface/web/admin/lib/lang/ru.lng | 1 +
.../admin/lib/lang/ru_directive_snippets.lng | 9 +
.../lib/lang/ru_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/ru_server_config.lng | 340 +++++------
.../web/admin/lib/lang/ru_system_config.lng | 6 +
interface/web/admin/lib/lang/se.lng | 1 +
.../admin/lib/lang/se_directive_snippets.lng | 9 +
.../lib/lang/se_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/se_server_config.lng | 340 +++++------
.../web/admin/lib/lang/se_system_config.lng | 6 +
interface/web/admin/lib/lang/sk.lng | 1 +
.../admin/lib/lang/sk_directive_snippets.lng | 9 +
.../lib/lang/sk_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/sk_server_config.lng | 340 +++++------
.../web/admin/lib/lang/sk_system_config.lng | 6 +
interface/web/admin/lib/lang/tr.lng | 1 +
.../admin/lib/lang/tr_directive_snippets.lng | 9 +
.../lib/lang/tr_directive_snippets_list.lng | 7 +
.../web/admin/lib/lang/tr_server_config.lng | 340 +++++------
.../web/admin/lib/lang/tr_system_config.lng | 6 +
.../admin/list/directive_snippets.list.php | 2 +-
interface/web/admin/users_edit.php | 57 ++
interface/web/client/client_del.php | 8 +-
interface/web/client/client_edit.php | 2 +-
interface/web/client/form/client.tform.php | 23 +
interface/web/client/form/reseller.tform.php | 100 +++
interface/web/client/lib/lang/ar_client.lng | 4 +
.../web/client/lib/lang/ar_client_circle.lng | 16 +-
.../client/lib/lang/ar_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/ar_reseller.lng | 2 +
interface/web/client/lib/lang/bg_client.lng | 4 +
interface/web/client/lib/lang/bg_reseller.lng | 2 +
interface/web/client/lib/lang/br_client.lng | 4 +
.../web/client/lib/lang/br_client_circle.lng | 16 +-
.../client/lib/lang/br_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/br_reseller.lng | 2 +
interface/web/client/lib/lang/cz_client.lng | 28 +-
.../web/client/lib/lang/cz_client_circle.lng | 16 +-
.../client/lib/lang/cz_client_circle_list.lng | 18 +-
.../web/client/lib/lang/cz_client_del.lng | 2 +-
interface/web/client/lib/lang/cz_reseller.lng | 16 +-
interface/web/client/lib/lang/de.lng | 1 -
interface/web/client/lib/lang/de_client.lng | 278 ++++-----
.../web/client/lib/lang/de_client_circle.lng | 1 -
.../client/lib/lang/de_client_circle_list.lng | 1 -
.../web/client/lib/lang/de_client_del.lng | 1 -
.../web/client/lib/lang/de_client_message.lng | 1 -
.../client/lib/lang/de_client_template.lng | 171 +++---
.../lib/lang/de_client_template_list.lng | 1 -
.../web/client/lib/lang/de_clients_list.lng | 1 -
interface/web/client/lib/lang/de_domain.lng | 1 -
.../web/client/lib/lang/de_domain_list.lng | 1 -
interface/web/client/lib/lang/de_reseller.lng | 271 +++++----
.../web/client/lib/lang/de_resellers_list.lng | 1 -
interface/web/client/lib/lang/el_client.lng | 4 +
.../web/client/lib/lang/el_client_circle.lng | 16 +-
.../client/lib/lang/el_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/el_reseller.lng | 2 +
interface/web/client/lib/lang/en_client.lng | 2 +
interface/web/client/lib/lang/en_reseller.lng | 9 +
interface/web/client/lib/lang/es_client.lng | 4 +
.../web/client/lib/lang/es_client_circle.lng | 16 +-
.../client/lib/lang/es_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/es_reseller.lng | 2 +
interface/web/client/lib/lang/fi_client.lng | 4 +
.../web/client/lib/lang/fi_client_circle.lng | 16 +-
.../client/lib/lang/fi_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/fi_reseller.lng | 2 +
interface/web/client/lib/lang/hr_client.lng | 4 +
.../web/client/lib/lang/hr_client_circle.lng | 16 +-
.../client/lib/lang/hr_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/hr_reseller.lng | 2 +
interface/web/client/lib/lang/hu_client.lng | 4 +
.../web/client/lib/lang/hu_client_circle.lng | 16 +-
.../client/lib/lang/hu_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/hu_reseller.lng | 2 +
interface/web/client/lib/lang/id_client.lng | 4 +
.../web/client/lib/lang/id_client_circle.lng | 16 +-
.../client/lib/lang/id_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/id_reseller.lng | 2 +
interface/web/client/lib/lang/it_client.lng | 4 +
.../web/client/lib/lang/it_client_circle.lng | 16 +-
.../client/lib/lang/it_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/it_reseller.lng | 2 +
interface/web/client/lib/lang/ja_client.lng | 4 +
.../web/client/lib/lang/ja_client_circle.lng | 16 +-
.../client/lib/lang/ja_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/ja_reseller.lng | 2 +
interface/web/client/lib/lang/nl_client.lng | 4 +
.../web/client/lib/lang/nl_client_circle.lng | 16 +-
.../client/lib/lang/nl_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/nl_reseller.lng | 2 +
interface/web/client/lib/lang/pl_client.lng | 4 +
.../web/client/lib/lang/pl_client_circle.lng | 16 +-
.../client/lib/lang/pl_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/pl_reseller.lng | 2 +
interface/web/client/lib/lang/pt_client.lng | 4 +
.../web/client/lib/lang/pt_client_circle.lng | 16 +-
.../client/lib/lang/pt_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/pt_reseller.lng | 2 +
interface/web/client/lib/lang/ro_client.lng | 4 +
.../web/client/lib/lang/ro_client_circle.lng | 16 +-
.../client/lib/lang/ro_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/ro_reseller.lng | 2 +
interface/web/client/lib/lang/ru_client.lng | 4 +
.../web/client/lib/lang/ru_client_circle.lng | 16 +-
.../client/lib/lang/ru_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/ru_reseller.lng | 2 +
interface/web/client/lib/lang/se_client.lng | 4 +
.../web/client/lib/lang/se_client_circle.lng | 16 +-
.../client/lib/lang/se_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/se_reseller.lng | 2 +
interface/web/client/lib/lang/sk_client.lng | 4 +
.../web/client/lib/lang/sk_client_circle.lng | 16 +-
.../client/lib/lang/sk_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/sk_reseller.lng | 2 +
interface/web/client/lib/lang/tr_client.lng | 4 +
.../web/client/lib/lang/tr_client_circle.lng | 16 +-
.../client/lib/lang/tr_client_circle_list.lng | 18 +-
interface/web/client/lib/lang/tr_reseller.lng | 2 +
interface/web/client/reseller_edit.php | 8 +-
.../client/templates/client_edit_address.htm | 4 +
.../templates/reseller_edit_address.htm | 32 +
interface/web/dashboard/dashboard.php | 2 +-
.../dashboard/lib/lang/cz_dashlet_limits.lng | 28 +-
interface/web/dashboard/lib/lang/de.lng | 1 -
.../dashboard/lib/lang/de_dashlet_limits.lng | 57 +-
.../dashboard/lib/lang/de_dashlet_modules.lng | 1 -
.../web/designer/lib/lang/cz_form_edit.lng | 2 +-
.../web/designer/lib/lang/cz_module_edit.lng | 2 +-
.../designer/lib/lang/cz_module_nav_edit.lng | 2 +-
interface/web/designer/lib/lang/de.lng | 1 -
.../web/designer/lib/lang/de_form_edit.lng | 1 -
.../web/designer/lib/lang/de_form_list.lng | 1 -
.../web/designer/lib/lang/de_form_show.lng | 1 -
.../web/designer/lib/lang/de_module_edit.lng | 1 -
.../web/designer/lib/lang/de_module_list.lng | 1 -
.../designer/lib/lang/de_module_nav_edit.lng | 1 -
.../lib/lang/de_module_nav_item_edit.lng | 1 -
.../web/designer/lib/lang/de_module_show.lng | 1 -
interface/web/dns/lib/lang/ar_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/bg_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/br_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/cz.lng | 10 +-
interface/web/dns/lib/lang/cz_dns_import.lng | 18 +-
interface/web/dns/lib/lang/cz_dns_soa.lng | 4 +-
.../web/dns/lib/lang/cz_dns_soa_list.lng | 2 +-
interface/web/dns/lib/lang/cz_dns_wizard.lng | 4 +-
interface/web/dns/lib/lang/de.lng | 1 -
interface/web/dns/lib/lang/de_dns_a.lng | 1 -
interface/web/dns/lib/lang/de_dns_a_list.lng | 1 -
interface/web/dns/lib/lang/de_dns_aaaa.lng | 1 -
interface/web/dns/lib/lang/de_dns_alias.lng | 1 -
interface/web/dns/lib/lang/de_dns_cname.lng | 1 -
interface/web/dns/lib/lang/de_dns_hinfo.lng | 1 -
interface/web/dns/lib/lang/de_dns_import.lng | 1 -
interface/web/dns/lib/lang/de_dns_mx.lng | 1 -
interface/web/dns/lib/lang/de_dns_ns.lng | 1 -
interface/web/dns/lib/lang/de_dns_ptr.lng | 1 -
interface/web/dns/lib/lang/de_dns_rp.lng | 1 -
interface/web/dns/lib/lang/de_dns_slave.lng | 1 -
.../web/dns/lib/lang/de_dns_slave_list.lng | 1 -
interface/web/dns/lib/lang/de_dns_soa.lng | 1 -
.../web/dns/lib/lang/de_dns_soa_list.lng | 1 -
interface/web/dns/lib/lang/de_dns_srv.lng | 1 -
.../web/dns/lib/lang/de_dns_template.lng | 1 -
.../web/dns/lib/lang/de_dns_template_list.lng | 1 -
interface/web/dns/lib/lang/de_dns_txt.lng | 1 -
interface/web/dns/lib/lang/de_dns_wizard.lng | 1 -
interface/web/dns/lib/lang/el_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/es_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/fi_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/hr_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/hu_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/id_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/it_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/ja_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/nl_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/pl_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/pt_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/ro_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/ru_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/se_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/sk_dns_wizard.lng | 2 +
interface/web/dns/lib/lang/tr_dns_wizard.lng | 2 +
interface/web/dns/templates/dns_a_list.htm | 16 +
.../web/dns/templates/dns_slave_list.htm | 16 +
interface/web/dns/templates/dns_soa_list.htm | 16 +
interface/web/help/lib/lang/de.lng | 1 -
interface/web/help/lib/lang/de_faq_form.lng | 1 -
.../lib/lang/de_faq_manage_questions_list.lng | 1 -
.../help/lib/lang/de_faq_sections_form.lng | 1 -
.../web/help/lib/lang/de_help_faq_list.lng | 1 -
.../lib/lang/de_help_faq_sections_list.lng | 1 -
.../web/help/lib/lang/de_support_message.lng | 1 -
.../help/lib/lang/de_support_message_list.lng | 1 -
interface/web/js/jquery.tipsy.js | 34 +-
interface/web/login/lib/lang/ar.lng | 1 +
interface/web/login/lib/lang/bg.lng | 1 +
interface/web/login/lib/lang/br.lng | 1 +
interface/web/login/lib/lang/cz.lng | 19 +-
interface/web/login/lib/lang/de.lng | 1 -
interface/web/login/lib/lang/el.lng | 1 +
interface/web/login/lib/lang/es.lng | 1 +
interface/web/login/lib/lang/fi.lng | 1 +
interface/web/login/lib/lang/hr.lng | 1 +
interface/web/login/lib/lang/hu.lng | 1 +
interface/web/login/lib/lang/id.lng | 1 +
interface/web/login/lib/lang/it.lng | 1 +
interface/web/login/lib/lang/ja.lng | 1 +
interface/web/login/lib/lang/nl.lng | 1 +
interface/web/login/lib/lang/pl.lng | 1 +
interface/web/login/lib/lang/pt.lng | 1 +
interface/web/login/lib/lang/ro.lng | 1 +
interface/web/login/lib/lang/ru.lng | 1 +
interface/web/login/lib/lang/se.lng | 1 +
interface/web/login/lib/lang/sk.lng | 1 +
interface/web/login/lib/lang/tr.lng | 1 +
interface/web/mail/form/mail_user.tform.php | 5 +
interface/web/mail/lib/lang/cz.lng | 12 +-
.../lib/lang/cz_mail_domain_admin_list.lng | 2 +-
.../lib/lang/cz_mail_domain_catchall_list.lng | 8 +-
.../web/mail/lib/lang/cz_mail_mailinglist.lng | 8 +-
interface/web/mail/lib/lang/cz_mail_user.lng | 32 +-
.../web/mail/lib/lang/cz_mail_user_filter.lng | 4 +-
.../web/mail/lib/lang/cz_mail_user_list.lng | 4 +-
.../mail/lib/lang/cz_spamfilter_blacklist.lng | 2 +-
.../mail/lib/lang/cz_spamfilter_config.lng | 2 +-
.../mail/lib/lang/cz_spamfilter_policy.lng | 10 +-
interface/web/mail/lib/lang/de.lng | 92 ++-
interface/web/mail/lib/lang/de_mail_alias.lng | 25 +-
.../web/mail/lib/lang/de_mail_alias_list.lng | 1 -
.../web/mail/lib/lang/de_mail_aliasdomain.lng | 19 +-
.../lib/lang/de_mail_aliasdomain_list.lng | 11 +-
.../web/mail/lib/lang/de_mail_blacklist.lng | 15 +-
.../mail/lib/lang/de_mail_blacklist_list.lng | 1 -
.../mail/lib/lang/de_mail_content_filter.lng | 1 -
.../lib/lang/de_mail_content_filter_list.lng | 1 -
.../web/mail/lib/lang/de_mail_domain.lng | 23 +-
.../lib/lang/de_mail_domain_admin_list.lng | 13 +-
.../mail/lib/lang/de_mail_domain_catchall.lng | 19 +-
.../lib/lang/de_mail_domain_catchall_list.lng | 1 -
.../web/mail/lib/lang/de_mail_domain_list.lng | 11 +-
.../web/mail/lib/lang/de_mail_forward.lng | 15 +-
.../mail/lib/lang/de_mail_forward_list.lng | 1 -
interface/web/mail/lib/lang/de_mail_get.lng | 33 +-
.../web/mail/lib/lang/de_mail_get_list.lng | 15 +-
.../web/mail/lib/lang/de_mail_mailinglist.lng | 1 -
.../lib/lang/de_mail_mailinglist_list.lng | 1 -
.../mail/lib/lang/de_mail_relay_recipient.lng | 15 +-
.../lib/lang/de_mail_relay_recipient_list.lng | 1 -
.../web/mail/lib/lang/de_mail_spamfilter.lng | 31 +-
.../mail/lib/lang/de_mail_spamfilter_list.lng | 1 -
.../web/mail/lib/lang/de_mail_transport.lng | 19 +-
.../mail/lib/lang/de_mail_transport_list.lng | 15 +-
interface/web/mail/lib/lang/de_mail_user.lng | 97 ++-
.../web/mail/lib/lang/de_mail_user_filter.lng | 37 +-
.../lib/lang/de_mail_user_filter_list.lng | 1 -
.../web/mail/lib/lang/de_mail_user_list.lng | 13 +-
.../mail/lib/lang/de_mail_user_stats_list.lng | 13 +-
.../web/mail/lib/lang/de_mail_whitelist.lng | 15 +-
.../mail/lib/lang/de_mail_whitelist_list.lng | 1 -
.../mail/lib/lang/de_spamfilter_blacklist.lng | 1 -
.../lib/lang/de_spamfilter_blacklist_list.lng | 1 -
.../mail/lib/lang/de_spamfilter_config.lng | 37 +-
.../lib/lang/de_spamfilter_config_list.lng | 1 -
.../mail/lib/lang/de_spamfilter_policy.lng | 73 ++-
.../lib/lang/de_spamfilter_policy_list.lng | 1 -
.../web/mail/lib/lang/de_spamfilter_users.lng | 13 +-
.../lib/lang/de_spamfilter_users_list.lng | 1 -
.../mail/lib/lang/de_spamfilter_whitelist.lng | 15 +-
.../lib/lang/de_spamfilter_whitelist_list.lng | 1 -
.../lib/lang/de_user_quota_stats_list.lng | 11 +-
.../web/mail/templates/mail_alias_list.htm | 16 +
.../mail/templates/mail_aliasdomain_list.htm | 16 +
.../mail/templates/mail_blacklist_list.htm | 16 +
.../templates/mail_content_filter_list.htm | 16 +
.../templates/mail_domain_catchall_list.htm | 16 +
.../web/mail/templates/mail_domain_list.htm | 16 +
.../web/mail/templates/mail_forward_list.htm | 16 +
.../web/mail/templates/mail_get_list.htm | 16 +
.../mail/templates/mail_mailinglist_list.htm | 16 +
.../templates/mail_relay_recipient_list.htm | 16 +
.../mail/templates/mail_transport_list.htm | 16 +
.../mail/templates/mail_user_filter_list.htm | 16 +
.../web/mail/templates/mail_user_list.htm | 18 +-
interface/web/mailuser/lib/lang/ar.lng | 16 +-
interface/web/mailuser/lib/lang/ar_index.lng | 22 +-
.../lib/lang/ar_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/ar_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/ar_mail_user_filter.lng | 18 +-
.../lib/lang/ar_mail_user_filter_list.lng | 14 +-
.../lib/lang/ar_mail_user_password.lng | 10 +-
.../lib/lang/ar_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/br.lng | 16 +-
interface/web/mailuser/lib/lang/br_index.lng | 22 +-
.../lib/lang/br_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/br_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/br_mail_user_filter.lng | 18 +-
.../lib/lang/br_mail_user_filter_list.lng | 14 +-
.../lib/lang/br_mail_user_password.lng | 10 +-
.../lib/lang/br_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/cz.lng | 16 +-
interface/web/mailuser/lib/lang/cz_index.lng | 22 +-
.../lib/lang/cz_mail_user_autoresponder.lng | 22 +-
.../web/mailuser/lib/lang/cz_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/cz_mail_user_filter.lng | 36 +-
.../lib/lang/cz_mail_user_filter_list.lng | 14 +-
.../lib/lang/cz_mail_user_password.lng | 18 +-
.../lib/lang/cz_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/de.lng | 1 -
interface/web/mailuser/lib/lang/de_index.lng | 21 +-
.../lib/lang/de_mail_user_autoresponder.lng | 1 -
.../web/mailuser/lib/lang/de_mail_user_cc.lng | 1 -
.../mailuser/lib/lang/de_mail_user_filter.lng | 37 +-
.../lib/lang/de_mail_user_filter_list.lng | 1 -
.../lib/lang/de_mail_user_password.lng | 17 +-
.../lib/lang/de_mail_user_spamfilter.lng | 1 -
interface/web/mailuser/lib/lang/el.lng | 16 +-
interface/web/mailuser/lib/lang/el_index.lng | 22 +-
.../lib/lang/el_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/el_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/el_mail_user_filter.lng | 18 +-
.../lib/lang/el_mail_user_filter_list.lng | 14 +-
.../lib/lang/el_mail_user_password.lng | 10 +-
.../lib/lang/el_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/es.lng | 16 +-
interface/web/mailuser/lib/lang/es_index.lng | 22 +-
.../lib/lang/es_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/es_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/es_mail_user_filter.lng | 18 +-
.../lib/lang/es_mail_user_filter_list.lng | 14 +-
.../lib/lang/es_mail_user_password.lng | 10 +-
.../lib/lang/es_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/fi.lng | 16 +-
interface/web/mailuser/lib/lang/fi_index.lng | 22 +-
.../lib/lang/fi_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/fi_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/fi_mail_user_filter.lng | 18 +-
.../lib/lang/fi_mail_user_filter_list.lng | 14 +-
.../lib/lang/fi_mail_user_password.lng | 10 +-
.../lib/lang/fi_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/hr.lng | 16 +-
interface/web/mailuser/lib/lang/hr_index.lng | 22 +-
.../lib/lang/hr_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/hr_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/hr_mail_user_filter.lng | 18 +-
.../lib/lang/hr_mail_user_filter_list.lng | 14 +-
.../lib/lang/hr_mail_user_password.lng | 10 +-
.../lib/lang/hr_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/hu.lng | 16 +-
interface/web/mailuser/lib/lang/hu_index.lng | 22 +-
.../lib/lang/hu_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/hu_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/hu_mail_user_filter.lng | 18 +-
.../lib/lang/hu_mail_user_filter_list.lng | 14 +-
.../lib/lang/hu_mail_user_password.lng | 10 +-
.../lib/lang/hu_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/id.lng | 16 +-
interface/web/mailuser/lib/lang/id_index.lng | 22 +-
.../lib/lang/id_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/id_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/id_mail_user_filter.lng | 18 +-
.../lib/lang/id_mail_user_filter_list.lng | 14 +-
.../lib/lang/id_mail_user_password.lng | 10 +-
.../lib/lang/id_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/it.lng | 16 +-
interface/web/mailuser/lib/lang/it_index.lng | 22 +-
.../lib/lang/it_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/it_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/it_mail_user_filter.lng | 18 +-
.../lib/lang/it_mail_user_filter_list.lng | 14 +-
.../lib/lang/it_mail_user_password.lng | 10 +-
.../lib/lang/it_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/ja.lng | 16 +-
interface/web/mailuser/lib/lang/ja_index.lng | 22 +-
.../lib/lang/ja_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/ja_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/ja_mail_user_filter.lng | 18 +-
.../lib/lang/ja_mail_user_filter_list.lng | 14 +-
.../lib/lang/ja_mail_user_password.lng | 10 +-
.../lib/lang/ja_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/nl.lng | 16 +-
interface/web/mailuser/lib/lang/nl_index.lng | 22 +-
.../lib/lang/nl_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/nl_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/nl_mail_user_filter.lng | 18 +-
.../lib/lang/nl_mail_user_filter_list.lng | 14 +-
.../lib/lang/nl_mail_user_password.lng | 10 +-
.../lib/lang/nl_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/pl.lng | 16 +-
interface/web/mailuser/lib/lang/pl_index.lng | 22 +-
.../lib/lang/pl_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/pl_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/pl_mail_user_filter.lng | 18 +-
.../lib/lang/pl_mail_user_filter_list.lng | 14 +-
.../lib/lang/pl_mail_user_password.lng | 10 +-
.../lib/lang/pl_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/pt.lng | 16 +-
interface/web/mailuser/lib/lang/pt_index.lng | 22 +-
.../lib/lang/pt_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/pt_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/pt_mail_user_filter.lng | 18 +-
.../lib/lang/pt_mail_user_filter_list.lng | 14 +-
.../lib/lang/pt_mail_user_password.lng | 10 +-
.../lib/lang/pt_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/ro.lng | 16 +-
interface/web/mailuser/lib/lang/ro_index.lng | 22 +-
.../lib/lang/ro_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/ro_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/ro_mail_user_filter.lng | 18 +-
.../lib/lang/ro_mail_user_filter_list.lng | 14 +-
.../lib/lang/ro_mail_user_password.lng | 10 +-
.../lib/lang/ro_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/ru.lng | 16 +-
interface/web/mailuser/lib/lang/ru_index.lng | 22 +-
.../lib/lang/ru_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/ru_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/ru_mail_user_filter.lng | 18 +-
.../lib/lang/ru_mail_user_filter_list.lng | 14 +-
.../lib/lang/ru_mail_user_password.lng | 10 +-
.../lib/lang/ru_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/se.lng | 16 +-
interface/web/mailuser/lib/lang/se_index.lng | 22 +-
.../lib/lang/se_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/se_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/se_mail_user_filter.lng | 18 +-
.../lib/lang/se_mail_user_filter_list.lng | 14 +-
.../lib/lang/se_mail_user_password.lng | 10 +-
.../lib/lang/se_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/sk.lng | 16 +-
interface/web/mailuser/lib/lang/sk_index.lng | 22 +-
.../lib/lang/sk_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/sk_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/sk_mail_user_filter.lng | 18 +-
.../lib/lang/sk_mail_user_filter_list.lng | 14 +-
.../lib/lang/sk_mail_user_password.lng | 10 +-
.../lib/lang/sk_mail_user_spamfilter.lng | 12 +-
interface/web/mailuser/lib/lang/tr.lng | 16 +-
interface/web/mailuser/lib/lang/tr_index.lng | 22 +-
.../lib/lang/tr_mail_user_autoresponder.lng | 18 +-
.../web/mailuser/lib/lang/tr_mail_user_cc.lng | 12 +-
.../mailuser/lib/lang/tr_mail_user_filter.lng | 18 +-
.../lib/lang/tr_mail_user_filter_list.lng | 14 +-
.../lib/lang/tr_mail_user_password.lng | 10 +-
.../lib/lang/tr_mail_user_spamfilter.lng | 12 +-
interface/web/monitor/lib/lang/cz.lng | 32 +-
.../web/monitor/lib/lang/cz_datalog_list.lng | 2 +-
interface/web/monitor/lib/lang/de.lng | 295 +++++----
.../web/monitor/lib/lang/de_datalog_list.lng | 1 -
interface/web/sites/ajax_get_json.php | 29 +
interface/web/sites/database_edit.php | 17 +-
interface/web/sites/database_phpmyadmin.php | 4 +-
interface/web/sites/database_user_edit.php | 5 +-
.../web/sites/form/web_aliasdomain.tform.php | 35 +-
interface/web/sites/form/web_domain.tform.php | 14 +-
.../web/sites/form/web_subdomain.tform.php | 29 +-
.../sites/form/web_vhost_subdomain.tform.php | 14 +-
interface/web/sites/lib/lang/ar.lng | 6 +-
interface/web/sites/lib/lang/ar_aps.lng | 114 ++--
.../sites/lib/lang/ar_aps_instances_list.lng | 26 +-
.../sites/lib/lang/ar_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/ar_database.lng | 4 +
.../web/sites/lib/lang/ar_database_user.lng | 23 +
.../lib/lang/ar_database_user_admin_list.lng | 6 +
.../sites/lib/lang/ar_database_user_list.lng | 5 +
.../web/sites/lib/lang/ar_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/ar_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/ar_web_domain.lng | 5 +
.../lib/lang/ar_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/ar_web_subdomain.lng | 1 +
.../sites/lib/lang/ar_web_vhost_subdomain.lng | 113 ++++
.../lib/lang/ar_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/bg.lng | 6 +-
interface/web/sites/lib/lang/bg_aps.lng | 4 +-
interface/web/sites/lib/lang/bg_database.lng | 4 +
.../web/sites/lib/lang/bg_database_user.lng | 23 +
.../lib/lang/bg_database_user_admin_list.lng | 6 +
.../sites/lib/lang/bg_database_user_list.lng | 5 +
.../web/sites/lib/lang/bg_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/bg_web_domain.lng | 5 +
.../lib/lang/bg_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/bg_web_subdomain.lng | 1 +
.../sites/lib/lang/bg_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/bg_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/br.lng | 6 +-
interface/web/sites/lib/lang/br_aps.lng | 114 ++--
.../sites/lib/lang/br_aps_instances_list.lng | 26 +-
.../sites/lib/lang/br_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/br_database.lng | 4 +
.../web/sites/lib/lang/br_database_user.lng | 23 +
.../lib/lang/br_database_user_admin_list.lng | 6 +
.../sites/lib/lang/br_database_user_list.lng | 5 +
.../web/sites/lib/lang/br_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/br_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/br_web_domain.lng | 5 +
.../lib/lang/br_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/br_web_subdomain.lng | 1 +
.../sites/lib/lang/br_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/br_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/cz.lng | 22 +-
interface/web/sites/lib/lang/cz_aps.lng | 114 ++--
.../sites/lib/lang/cz_aps_instances_list.lng | 26 +-
.../sites/lib/lang/cz_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/cz_database.lng | 24 +-
.../sites/lib/lang/cz_database_admin_list.lng | 14 +-
.../web/sites/lib/lang/cz_database_user.lng | 23 +
.../lib/lang/cz_database_user_admin_list.lng | 6 +
.../sites/lib/lang/cz_database_user_list.lng | 5 +
interface/web/sites/lib/lang/cz_ftp_user.lng | 8 +-
.../web/sites/lib/lang/cz_shell_user.lng | 8 +-
.../web/sites/lib/lang/cz_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/cz_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/cz_web_domain.lng | 13 +-
.../web/sites/lib/lang/cz_web_folder.lng | 2 +-
.../web/sites/lib/lang/cz_web_folder_list.lng | 6 +-
.../web/sites/lib/lang/cz_web_folder_user.lng | 10 +-
.../lib/lang/cz_web_folder_user_list.lng | 2 +-
.../lib/lang/cz_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/cz_web_subdomain.lng | 1 +
.../sites/lib/lang/cz_web_vhost_subdomain.lng | 113 ++++
.../lib/lang/cz_web_vhost_subdomain_list.lng | 8 +
.../web/sites/lib/lang/cz_webdav_user.lng | 10 +-
.../sites/lib/lang/cz_webdav_user_list.lng | 2 +-
interface/web/sites/lib/lang/de.lng | 63 +-
interface/web/sites/lib/lang/de_aps.lng | 1 -
.../sites/lib/lang/de_aps_instances_list.lng | 1 -
.../sites/lib/lang/de_aps_packages_list.lng | 1 -
interface/web/sites/lib/lang/de_cron.lng | 1 -
interface/web/sites/lib/lang/de_cron_list.lng | 1 -
interface/web/sites/lib/lang/de_database.lng | 2 +-
.../sites/lib/lang/de_database_admin_list.lng | 1 -
.../web/sites/lib/lang/de_database_list.lng | 1 -
.../web/sites/lib/lang/de_database_user.lng | 1 -
.../lib/lang/de_database_user_admin_list.lng | 1 -
.../sites/lib/lang/de_database_user_list.lng | 1 -
interface/web/sites/lib/lang/de_ftp_user.lng | 65 +-
.../web/sites/lib/lang/de_ftp_user_list.lng | 1 -
.../web/sites/lib/lang/de_shell_user.lng | 1 -
.../web/sites/lib/lang/de_shell_user_list.lng | 1 -
.../lib/lang/de_user_quota_stats_list.lng | 15 +-
.../lib/lang/de_web_aliasdomain_list.lng | 1 -
.../web/sites/lib/lang/de_web_backup_list.lng | 1 -
.../web/sites/lib/lang/de_web_domain.lng | 223 +++----
.../lib/lang/de_web_domain_admin_list.lng | 1 -
.../web/sites/lib/lang/de_web_domain_list.lng | 1 -
.../web/sites/lib/lang/de_web_folder.lng | 1 -
.../web/sites/lib/lang/de_web_folder_list.lng | 1 -
.../web/sites/lib/lang/de_web_folder_user.lng | 1 -
.../lib/lang/de_web_folder_user_list.lng | 1 -
.../lib/lang/de_web_sites_stats_list.lng | 15 +-
.../web/sites/lib/lang/de_web_subdomain.lng | 7 +-
.../sites/lib/lang/de_web_subdomain_list.lng | 1 -
.../sites/lib/lang/de_web_vhost_subdomain.lng | 6 +-
.../lib/lang/de_web_vhost_subdomain_list.lng | 1 -
.../web/sites/lib/lang/de_webdav_user.lng | 1 -
.../sites/lib/lang/de_webdav_user_list.lng | 1 -
interface/web/sites/lib/lang/el.lng | 6 +-
interface/web/sites/lib/lang/el_aps.lng | 114 ++--
.../sites/lib/lang/el_aps_instances_list.lng | 26 +-
.../sites/lib/lang/el_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/el_database.lng | 4 +
.../web/sites/lib/lang/el_database_user.lng | 23 +
.../lib/lang/el_database_user_admin_list.lng | 6 +
.../sites/lib/lang/el_database_user_list.lng | 5 +
.../web/sites/lib/lang/el_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/el_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/el_web_domain.lng | 5 +
.../lib/lang/el_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/el_web_subdomain.lng | 1 +
.../sites/lib/lang/el_web_vhost_subdomain.lng | 113 ++++
.../lib/lang/el_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/en_database.lng | 1 +
.../web/sites/lib/lang/en_web_domain.lng | 2 +
.../web/sites/lib/lang/en_web_subdomain.lng | 2 +
.../sites/lib/lang/en_web_vhost_subdomain.lng | 5 +
interface/web/sites/lib/lang/es.lng | 6 +-
interface/web/sites/lib/lang/es_aps.lng | 114 ++--
.../sites/lib/lang/es_aps_instances_list.lng | 26 +-
.../sites/lib/lang/es_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/es_database.lng | 4 +
.../web/sites/lib/lang/es_database_user.lng | 23 +
.../lib/lang/es_database_user_admin_list.lng | 6 +
.../sites/lib/lang/es_database_user_list.lng | 5 +
.../web/sites/lib/lang/es_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/es_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/es_web_domain.lng | 5 +
.../lib/lang/es_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/es_web_subdomain.lng | 1 +
.../sites/lib/lang/es_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/es_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/fi.lng | 6 +-
interface/web/sites/lib/lang/fi_aps.lng | 114 ++--
.../sites/lib/lang/fi_aps_instances_list.lng | 26 +-
.../sites/lib/lang/fi_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/fi_database.lng | 4 +
.../web/sites/lib/lang/fi_database_user.lng | 23 +
.../lib/lang/fi_database_user_admin_list.lng | 6 +
.../sites/lib/lang/fi_database_user_list.lng | 5 +
.../web/sites/lib/lang/fi_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/fi_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/fi_web_domain.lng | 5 +
.../lib/lang/fi_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/fi_web_subdomain.lng | 1 +
.../sites/lib/lang/fi_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/fi_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/hr.lng | 6 +-
interface/web/sites/lib/lang/hr_aps.lng | 114 ++--
.../sites/lib/lang/hr_aps_instances_list.lng | 26 +-
.../sites/lib/lang/hr_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/hr_database.lng | 4 +
.../web/sites/lib/lang/hr_database_user.lng | 23 +
.../lib/lang/hr_database_user_admin_list.lng | 6 +
.../sites/lib/lang/hr_database_user_list.lng | 5 +
.../web/sites/lib/lang/hr_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/hr_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/hr_web_domain.lng | 5 +
.../lib/lang/hr_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/hr_web_subdomain.lng | 1 +
.../sites/lib/lang/hr_web_vhost_subdomain.lng | 113 ++++
.../lib/lang/hr_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/hu.lng | 6 +-
interface/web/sites/lib/lang/hu_aps.lng | 114 ++--
.../sites/lib/lang/hu_aps_instances_list.lng | 26 +-
.../sites/lib/lang/hu_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/hu_database.lng | 4 +
.../web/sites/lib/lang/hu_database_user.lng | 23 +
.../lib/lang/hu_database_user_admin_list.lng | 6 +
.../sites/lib/lang/hu_database_user_list.lng | 5 +
.../web/sites/lib/lang/hu_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/hu_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/hu_web_domain.lng | 5 +
.../lib/lang/hu_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/hu_web_subdomain.lng | 1 +
.../sites/lib/lang/hu_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/hu_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/id.lng | 6 +-
interface/web/sites/lib/lang/id_aps.lng | 114 ++--
.../sites/lib/lang/id_aps_instances_list.lng | 26 +-
.../sites/lib/lang/id_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/id_database.lng | 4 +
.../web/sites/lib/lang/id_database_user.lng | 23 +
.../lib/lang/id_database_user_admin_list.lng | 6 +
.../sites/lib/lang/id_database_user_list.lng | 5 +
.../web/sites/lib/lang/id_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/id_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/id_web_domain.lng | 5 +
.../lib/lang/id_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/id_web_subdomain.lng | 1 +
.../sites/lib/lang/id_web_vhost_subdomain.lng | 113 ++++
.../lib/lang/id_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/it.lng | 6 +-
interface/web/sites/lib/lang/it_aps.lng | 114 ++--
.../sites/lib/lang/it_aps_instances_list.lng | 26 +-
.../sites/lib/lang/it_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/it_database.lng | 4 +
.../web/sites/lib/lang/it_database_user.lng | 23 +
.../lib/lang/it_database_user_admin_list.lng | 6 +
.../sites/lib/lang/it_database_user_list.lng | 5 +
.../web/sites/lib/lang/it_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/it_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/it_web_domain.lng | 5 +
.../lib/lang/it_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/it_web_subdomain.lng | 1 +
.../sites/lib/lang/it_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/it_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/ja.lng | 6 +-
interface/web/sites/lib/lang/ja_aps.lng | 114 ++--
.../sites/lib/lang/ja_aps_instances_list.lng | 26 +-
.../sites/lib/lang/ja_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/ja_database.lng | 4 +
.../web/sites/lib/lang/ja_database_user.lng | 23 +
.../lib/lang/ja_database_user_admin_list.lng | 6 +
.../sites/lib/lang/ja_database_user_list.lng | 5 +
.../web/sites/lib/lang/ja_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/ja_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/ja_web_domain.lng | 5 +
.../lib/lang/ja_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/ja_web_subdomain.lng | 1 +
.../sites/lib/lang/ja_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/ja_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/nl.lng | 6 +-
interface/web/sites/lib/lang/nl_aps.lng | 114 ++--
.../sites/lib/lang/nl_aps_instances_list.lng | 26 +-
.../sites/lib/lang/nl_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/nl_database.lng | 4 +
.../web/sites/lib/lang/nl_database_user.lng | 23 +
.../lib/lang/nl_database_user_admin_list.lng | 6 +
.../sites/lib/lang/nl_database_user_list.lng | 5 +
.../web/sites/lib/lang/nl_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/nl_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/nl_web_domain.lng | 5 +
.../lib/lang/nl_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/nl_web_subdomain.lng | 1 +
.../sites/lib/lang/nl_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/nl_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/pl.lng | 6 +-
interface/web/sites/lib/lang/pl_aps.lng | 114 ++--
.../sites/lib/lang/pl_aps_instances_list.lng | 26 +-
.../sites/lib/lang/pl_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/pl_database.lng | 4 +
.../web/sites/lib/lang/pl_database_user.lng | 23 +
.../lib/lang/pl_database_user_admin_list.lng | 6 +
.../sites/lib/lang/pl_database_user_list.lng | 5 +
.../web/sites/lib/lang/pl_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/pl_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/pl_web_domain.lng | 5 +
.../lib/lang/pl_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/pl_web_subdomain.lng | 1 +
.../sites/lib/lang/pl_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/pl_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/pt.lng | 6 +-
interface/web/sites/lib/lang/pt_aps.lng | 114 ++--
.../sites/lib/lang/pt_aps_instances_list.lng | 26 +-
.../sites/lib/lang/pt_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/pt_database.lng | 4 +
.../web/sites/lib/lang/pt_database_user.lng | 23 +
.../lib/lang/pt_database_user_admin_list.lng | 6 +
.../sites/lib/lang/pt_database_user_list.lng | 5 +
.../web/sites/lib/lang/pt_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/pt_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/pt_web_domain.lng | 5 +
.../lib/lang/pt_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/pt_web_subdomain.lng | 1 +
.../sites/lib/lang/pt_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/pt_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/ro.lng | 6 +-
interface/web/sites/lib/lang/ro_aps.lng | 114 ++--
.../sites/lib/lang/ro_aps_instances_list.lng | 26 +-
.../sites/lib/lang/ro_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/ro_database.lng | 4 +
.../web/sites/lib/lang/ro_database_user.lng | 23 +
.../lib/lang/ro_database_user_admin_list.lng | 6 +
.../sites/lib/lang/ro_database_user_list.lng | 5 +
.../web/sites/lib/lang/ro_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/ro_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/ro_web_domain.lng | 5 +
.../lib/lang/ro_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/ro_web_subdomain.lng | 1 +
.../sites/lib/lang/ro_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/ro_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/ru.lng | 6 +-
interface/web/sites/lib/lang/ru_aps.lng | 114 ++--
.../sites/lib/lang/ru_aps_instances_list.lng | 26 +-
.../sites/lib/lang/ru_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/ru_database.lng | 4 +
.../web/sites/lib/lang/ru_database_user.lng | 23 +
.../lib/lang/ru_database_user_admin_list.lng | 6 +
.../sites/lib/lang/ru_database_user_list.lng | 5 +
.../web/sites/lib/lang/ru_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/ru_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/ru_web_domain.lng | 5 +
.../lib/lang/ru_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/ru_web_subdomain.lng | 1 +
.../sites/lib/lang/ru_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/ru_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/se.lng | 6 +-
interface/web/sites/lib/lang/se_aps.lng | 114 ++--
.../sites/lib/lang/se_aps_instances_list.lng | 26 +-
.../sites/lib/lang/se_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/se_database.lng | 4 +
.../web/sites/lib/lang/se_database_user.lng | 23 +
.../lib/lang/se_database_user_admin_list.lng | 6 +
.../sites/lib/lang/se_database_user_list.lng | 5 +
.../web/sites/lib/lang/se_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/se_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/se_web_domain.lng | 5 +
.../lib/lang/se_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/se_web_subdomain.lng | 1 +
.../sites/lib/lang/se_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/se_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/sk.lng | 6 +-
interface/web/sites/lib/lang/sk_aps.lng | 114 ++--
.../sites/lib/lang/sk_aps_instances_list.lng | 26 +-
.../sites/lib/lang/sk_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/sk_database.lng | 4 +
.../web/sites/lib/lang/sk_database_user.lng | 23 +
.../lib/lang/sk_database_user_admin_list.lng | 6 +
.../sites/lib/lang/sk_database_user_list.lng | 5 +
.../web/sites/lib/lang/sk_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/sk_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/sk_web_domain.lng | 5 +
.../lib/lang/sk_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/sk_web_subdomain.lng | 1 +
.../sites/lib/lang/sk_web_vhost_subdomain.lng | 114 ++++
.../lib/lang/sk_web_vhost_subdomain_list.lng | 8 +
interface/web/sites/lib/lang/tr.lng | 6 +-
interface/web/sites/lib/lang/tr_aps.lng | 114 ++--
.../sites/lib/lang/tr_aps_instances_list.lng | 26 +-
.../sites/lib/lang/tr_aps_packages_list.lng | 16 +-
interface/web/sites/lib/lang/tr_database.lng | 4 +
.../web/sites/lib/lang/tr_database_user.lng | 23 +
.../lib/lang/tr_database_user_admin_list.lng | 6 +
.../sites/lib/lang/tr_database_user_list.lng | 5 +
.../web/sites/lib/lang/tr_web_aliasdomain.lng | 3 +
.../web/sites/lib/lang/tr_web_backup_list.lng | 3 +-
.../web/sites/lib/lang/tr_web_domain.lng | 5 +
.../lib/lang/tr_web_sites_stats_list.lng | 1 +
.../web/sites/lib/lang/tr_web_subdomain.lng | 1 +
.../sites/lib/lang/tr_web_vhost_subdomain.lng | 113 ++++
.../lib/lang/tr_web_vhost_subdomain_list.lng | 8 +
.../web/sites/templates/database_edit.htm | 20 +
.../web/sites/templates/database_list.htm | 16 +
.../sites/templates/database_user_list.htm | 16 +
.../web/sites/templates/ftp_user_list.htm | 16 +
.../web/sites/templates/shell_user_list.htm | 16 +
.../templates/web_aliasdomain_advanced.htm | 37 ++
.../sites/templates/web_aliasdomain_edit.htm | 27 +-
.../sites/templates/web_aliasdomain_list.htm | 16 +
.../sites/templates/web_domain_advanced.htm | 11 +
.../web/sites/templates/web_domain_edit.htm | 6 +-
.../web/sites/templates/web_domain_list.htm | 16 +
.../sites/templates/web_domain_redirect.htm | 8 +-
.../web/sites/templates/web_folder_list.htm | 16 +
.../sites/templates/web_folder_user_list.htm | 16 +
.../templates/web_subdomain_advanced.htm | 37 ++
.../sites/templates/web_subdomain_edit.htm | 21 +-
.../sites/templates/web_subdomain_list.htm | 16 +
.../web_vhost_subdomain_advanced.htm | 17 +-
.../templates/web_vhost_subdomain_edit.htm | 6 +-
.../templates/web_vhost_subdomain_list.htm | 16 +
.../web_vhost_subdomain_redirect.htm | 6 +-
.../web/sites/templates/webdav_user_list.htm | 16 +
interface/web/sites/web_aliasdomain_edit.php | 15 +-
interface/web/sites/web_domain_edit.php | 10 +
interface/web/sites/web_subdomain_edit.php | 13 +
.../web/sites/web_vhost_subdomain_edit.php | 60 +-
.../lib/lang/de_strengthmeter.lng | 1 -
.../default/css/jquery-ui-1.8.16.custom.css | 3 +-
interface/web/themes/default/css/styles.css | 14 +-
interface/web/tools/lib/lang/ar_index.lng | 2 +-
interface/web/tools/lib/lang/ar_interface.lng | 12 +-
.../web/tools/lib/lang/ar_tpl_default.lng | 12 +-
.../web/tools/lib/lang/bg_tpl_default.lng | 10 +-
interface/web/tools/lib/lang/br_index.lng | 2 +-
interface/web/tools/lib/lang/br_interface.lng | 12 +-
.../web/tools/lib/lang/br_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/cz.lng | 12 +-
.../tools/lib/lang/cz_import_ispconfig.lng | 40 +-
interface/web/tools/lib/lang/cz_index.lng | 6 +-
interface/web/tools/lib/lang/cz_interface.lng | 12 +-
interface/web/tools/lib/lang/cz_resync.lng | 22 +-
.../web/tools/lib/lang/cz_tpl_default.lng | 12 +-
.../web/tools/lib/lang/cz_usersettings.lng | 8 +-
interface/web/tools/lib/lang/de.lng | 1 -
.../tools/lib/lang/de_import_ispconfig.lng | 1 -
interface/web/tools/lib/lang/de_index.lng | 1 -
interface/web/tools/lib/lang/de_interface.lng | 11 +-
interface/web/tools/lib/lang/de_resync.lng | 1 -
.../web/tools/lib/lang/de_tpl_default.lng | 11 +-
.../web/tools/lib/lang/de_usersettings.lng | 1 -
interface/web/tools/lib/lang/el_index.lng | 2 +-
interface/web/tools/lib/lang/el_interface.lng | 12 +-
.../web/tools/lib/lang/el_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/es_index.lng | 2 +-
interface/web/tools/lib/lang/es_interface.lng | 12 +-
.../web/tools/lib/lang/es_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/fi_index.lng | 2 +-
interface/web/tools/lib/lang/fi_interface.lng | 12 +-
.../web/tools/lib/lang/fi_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/hr_index.lng | 2 +-
interface/web/tools/lib/lang/hr_interface.lng | 12 +-
.../web/tools/lib/lang/hr_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/hu_index.lng | 2 +-
interface/web/tools/lib/lang/hu_interface.lng | 12 +-
.../web/tools/lib/lang/hu_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/id_index.lng | 2 +-
interface/web/tools/lib/lang/id_interface.lng | 12 +-
.../web/tools/lib/lang/id_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/it_index.lng | 2 +-
interface/web/tools/lib/lang/it_interface.lng | 12 +-
.../web/tools/lib/lang/it_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/ja_index.lng | 2 +-
interface/web/tools/lib/lang/ja_interface.lng | 12 +-
.../web/tools/lib/lang/ja_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/nl_index.lng | 2 +-
interface/web/tools/lib/lang/nl_interface.lng | 12 +-
.../web/tools/lib/lang/nl_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/pl_index.lng | 2 +-
interface/web/tools/lib/lang/pl_interface.lng | 12 +-
.../web/tools/lib/lang/pl_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/pt_index.lng | 2 +-
interface/web/tools/lib/lang/pt_interface.lng | 12 +-
.../web/tools/lib/lang/pt_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/ro_index.lng | 2 +-
interface/web/tools/lib/lang/ro_interface.lng | 12 +-
.../web/tools/lib/lang/ro_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/ru_index.lng | 2 +-
interface/web/tools/lib/lang/ru_interface.lng | 12 +-
.../web/tools/lib/lang/ru_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/se_index.lng | 2 +-
interface/web/tools/lib/lang/se_interface.lng | 12 +-
.../web/tools/lib/lang/se_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/sk_index.lng | 2 +-
interface/web/tools/lib/lang/sk_interface.lng | 12 +-
.../web/tools/lib/lang/sk_tpl_default.lng | 12 +-
interface/web/tools/lib/lang/tr_index.lng | 2 +-
interface/web/tools/lib/lang/tr_interface.lng | 12 +-
.../web/tools/lib/lang/tr_tpl_default.lng | 12 +-
.../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/de.lng | 1 -
.../web/vm/lib/lang/de_openvz_action.lng | 1 -
interface/web/vm/lib/lang/de_openvz_ip.lng | 1 -
.../web/vm/lib/lang/de_openvz_ip_list.lng | 1 -
.../web/vm/lib/lang/de_openvz_ostemplate.lng | 1 -
.../vm/lib/lang/de_openvz_ostemplate_list.lng | 1 -
.../web/vm/lib/lang/de_openvz_template.lng | 1 -
.../vm/lib/lang/de_openvz_template_list.lng | 1 -
interface/web/vm/lib/lang/de_openvz_vm.lng | 1 -
.../web/vm/lib/lang/de_openvz_vm_list.lng | 1 -
remoting_client/examples/client_add.php | 10 +-
.../examples/client_delete_everything.php | 2 +-
remoting_client/examples/mail_user_add.php | 2 +-
remoting_client/examples/soap_config.php | 6 +-
server/conf/nginx_vhost.conf.master | 79 ++-
server/conf/vhost.conf.master | 15 +-
server/cron_daily.php | 219 ++++++-
server/cron_daily.sh | 3 +
server/lib/classes/aps_base.inc.php | 6 -
server/lib/classes/aps_installer.inc.php | 112 ++--
server/lib/classes/db_mysql.inc.php | 3 +-
server/lib/classes/system.inc.php | 10 +
.../monitor_core_module.inc.php | 54 +-
.../plugins-available/apache2_plugin.inc.php | 161 ++++-
.../maildeliver_plugin.inc.php | 36 +-
.../mysql_clientdb_plugin.inc.php | 4 +-
server/plugins-available/nginx_plugin.inc.php | 567 +++++++++++++-----
1110 files changed, 16307 insertions(+), 9372 deletions(-)
create mode 100644 install/sql/incremental/upd_0044.sql
create mode 100644 interface/web/admin/lib/lang/ar_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/ar_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/bg_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/bg_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/br_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/br_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/cz_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/cz_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/el_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/el_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/es_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/es_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/fi_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/fi_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/hr_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/hr_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/hu_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/hu_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/id_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/id_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/it_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/it_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/ja_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/ja_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/nl_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/nl_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/pl_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/pl_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/pt_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/pt_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/ro_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/ro_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/ru_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/ru_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/se_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/se_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/sk_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/sk_directive_snippets_list.lng
create mode 100644 interface/web/admin/lib/lang/tr_directive_snippets.lng
create mode 100644 interface/web/admin/lib/lang/tr_directive_snippets_list.lng
create mode 100644 interface/web/sites/lib/lang/ar_database_user.lng
create mode 100644 interface/web/sites/lib/lang/ar_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/ar_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/ar_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/bg_database_user.lng
create mode 100644 interface/web/sites/lib/lang/bg_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/bg_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/bg_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/br_database_user.lng
create mode 100644 interface/web/sites/lib/lang/br_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/br_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/br_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/cz_database_user.lng
create mode 100644 interface/web/sites/lib/lang/cz_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/cz_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/cz_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/el_database_user.lng
create mode 100644 interface/web/sites/lib/lang/el_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/el_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/el_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/es_database_user.lng
create mode 100644 interface/web/sites/lib/lang/es_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/es_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/es_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/fi_database_user.lng
create mode 100644 interface/web/sites/lib/lang/fi_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/fi_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/fi_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/hr_database_user.lng
create mode 100644 interface/web/sites/lib/lang/hr_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/hr_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/hr_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/hu_database_user.lng
create mode 100644 interface/web/sites/lib/lang/hu_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/hu_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/hu_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/id_database_user.lng
create mode 100644 interface/web/sites/lib/lang/id_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/id_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/id_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/it_database_user.lng
create mode 100644 interface/web/sites/lib/lang/it_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/it_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/it_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/it_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/ja_database_user.lng
create mode 100644 interface/web/sites/lib/lang/ja_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/ja_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/ja_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/nl_database_user.lng
create mode 100644 interface/web/sites/lib/lang/nl_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/nl_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/nl_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/pl_database_user.lng
create mode 100644 interface/web/sites/lib/lang/pl_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/pl_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/pl_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/pt_database_user.lng
create mode 100644 interface/web/sites/lib/lang/pt_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/pt_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/pt_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/ro_database_user.lng
create mode 100644 interface/web/sites/lib/lang/ro_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/ro_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/ro_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/ru_database_user.lng
create mode 100644 interface/web/sites/lib/lang/ru_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/ru_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/ru_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/se_database_user.lng
create mode 100644 interface/web/sites/lib/lang/se_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/se_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/se_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/sk_database_user.lng
create mode 100644 interface/web/sites/lib/lang/sk_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/sk_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/sk_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/lib/lang/tr_database_user.lng
create mode 100644 interface/web/sites/lib/lang/tr_database_user_admin_list.lng
create mode 100644 interface/web/sites/lib/lang/tr_database_user_list.lng
create mode 100644 interface/web/sites/lib/lang/tr_web_aliasdomain.lng
create mode 100644 interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng
create mode 100644 interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng
create mode 100644 interface/web/sites/templates/web_aliasdomain_advanced.htm
create mode 100644 interface/web/sites/templates/web_subdomain_advanced.htm
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 67c156f17..964d17bfd 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -875,8 +875,15 @@ class installer_dist extends installer_base {
exec("chmod -R 770 $install_dir/server/aps_packages");
//* make sure that the server config file (not the interface one) is only readable by the root user
- exec("chmod 600 $install_dir/server/lib/$configfile");
- exec("chown root:root $install_dir/server/lib/$configfile");
+ chmod($install_dir.'/server/lib/config.inc.php', 0600);
+ chown($install_dir.'/server/lib/config.inc.php', 'root');
+ chgrp($install_dir.'/server/lib/config.inc.php', 'root');
+
+ //* Make sure thet the interface config file is readable by user ispconfig only
+ chmod($install_dir.'/interface/lib/config.inc.php', 0600);
+ chown($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
+ chgrp($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
+
if(@is_file("$install_dir/server/lib/mysql_clientdb.conf")) {
exec("chmod 600 $install_dir/server/lib/mysql_clientdb.conf");
exec("chown root:root $install_dir/server/lib/mysql_clientdb.conf");
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 4d4ada8a1..db2cf6e1a 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -864,9 +864,14 @@ class installer extends installer_base
exec("chmod -R 770 $install_dir/server/aps_packages");
//* make sure that the server config file (not the interface one) is only readable by the root user
- chmod($install_dir.'/server/lib/'.$configfile, 0600);
- chown($install_dir.'/server/lib/'.$configfile, 'root');
- chgrp($install_dir.'/server/lib/'.$configfile, 'root');
+ chmod($install_dir.'/server/lib/config.inc.php', 0600);
+ chown($install_dir.'/server/lib/config.inc.php', 'root');
+ chgrp($install_dir.'/server/lib/config.inc.php', 'root');
+
+ //* Make sure thet the interface config file is readable by user ispconfig only
+ chmod($install_dir.'/interface/lib/config.inc.php', 0600);
+ chown($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
+ chgrp($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
chmod($install_dir.'/server/lib/remote_action.inc.php', 0600);
chown($install_dir.'/server/lib/remote_action.inc.php', 'root');
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 1a8e3c8a0..97a2a6f72 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -914,8 +914,15 @@ class installer_dist extends installer_base {
exec("chmod -R 770 $install_dir/server/aps_packages");
//* make sure that the server config file (not the interface one) is only readable by the root user
- exec("chmod 600 $install_dir/server/lib/$configfile");
- exec("chown root:root $install_dir/server/lib/$configfile");
+ chmod($install_dir.'/server/lib/config.inc.php', 0600);
+ chown($install_dir.'/server/lib/config.inc.php', 'root');
+ chgrp($install_dir.'/server/lib/config.inc.php', 'root');
+
+ //* Make sure thet the interface config file is readable by user ispconfig only
+ chmod($install_dir.'/interface/lib/config.inc.php', 0600);
+ chown($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
+ chgrp($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
+
if(@is_file("$install_dir/server/lib/mysql_clientdb.conf")) {
exec("chmod 600 $install_dir/server/lib/mysql_clientdb.conf");
exec("chown root:root $install_dir/server/lib/mysql_clientdb.conf");
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 8d2ae4806..9673a76c6 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -757,10 +757,11 @@ function is_ispconfig_ssl_enabled() {
function find_hash_file($hash, $dir, $basedir = '') {
$res = opendir($dir);
if(!$res) return false;
-
+
+ if(substr($basedir, -1) === '/') $basedir = substr($basedir, 0, strlen($basedir) - 1);
if(substr($dir, -1) === '/') $dir = substr($dir, 0, strlen($dir) - 1);
if($basedir === '') $basedir = $dir;
-
+
while($cur = readdir($res)) {
if($cur == '.' || $cur == '..') continue;
$entry = $dir.'/'.$cur;
@@ -768,7 +769,7 @@ function find_hash_file($hash, $dir, $basedir = '') {
$result = find_hash_file($hash, $entry, $basedir);
if($result !== false) return $result;
} elseif(md5_file($entry) === $hash) {
- $entry = substr($entry, strlen($basedir));
+ $entry = substr($entry, strlen($basedir) + 1);
if(substr($entry, 0, 7) === '/posix/') $entry = substr($entry, 7);
return $entry;
}
@@ -782,23 +783,28 @@ function find_hash_file($hash, $dir, $basedir = '') {
(c) 2012 Marius Cramer, pixcept KG, m.cramer@pixcept.de
*/
function get_system_timezone() {
- if(is_link('/etc/localtime')) {
- $timezone = readlink('/etc/localtime');
- $timezone = str_replace('/usr/share/zoneinfo/', '', $timezone);
- if(substr($timezone, 0, 6) === 'posix/') $timezone = substr($timezone, 6);
- } else {
- $hash = md5_file('/etc/localtime');
- $timezone = find_hash_file($hash, '/usr/share/zoneinfo');
- }
+ $timezone = false;
+ if(file_exists('/etc/timezone') && is_readable('/etc/timezone')) {
+ $timezone = trim(file_get_contents('/etc/timezone'));
+ if(file_exists('/usr/share/zoneinfo/' . $timezone) == false) $timezone = false;
+ }
+
+ if(!$timezone && is_link('/etc/localtime')) {
+ $timezone = readlink('/etc/localtime');
+ $timezone = str_replace('/usr/share/zoneinfo/', '', $timezone);
+ if(substr($timezone, 0, 6) === 'posix/') $timezone = substr($timezone, 6);
+ } elseif(!$timezone) {
+ $hash = md5_file('/etc/localtime');
+ $timezone = find_hash_file($hash, '/usr/share/zoneinfo');
+ }
- if(!$timezone) {
- exec('date +%Z', $tzinfo);
- $timezone = $tzinfo[0];
- }
+ if(!$timezone) {
+ exec('date +%Z', $tzinfo);
+ $timezone = $tzinfo[0];
+ }
- return $timezone;
+ return $timezone;
}
-
?>
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 399e7dd25..65cafa915 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -423,7 +423,7 @@ class installer_base {
$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
}
- $query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`) ON ".$value['db'].".`web_domain` TO '".$value['user']."'@'".$host."' ";
+ $query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`, `ssl_key`) ON ".$value['db'].".`web_domain` TO '".$value['user']."'@'".$host."' ";
if ($verbose){
echo $query ."\n";
}
@@ -1816,9 +1816,14 @@ class installer_base {
exec("chmod -R 770 $install_dir/server/aps_packages");
//* make sure that the server config file (not the interface one) is only readable by the root user
- chmod($install_dir.'/server/lib/'.$configfile, 0600);
- chown($install_dir.'/server/lib/'.$configfile, 'root');
- chgrp($install_dir.'/server/lib/'.$configfile, 'root');
+ chmod($install_dir.'/server/lib/config.inc.php', 0600);
+ chown($install_dir.'/server/lib/config.inc.php', 'root');
+ chgrp($install_dir.'/server/lib/config.inc.php', 'root');
+
+ //* Make sure thet the interface config file is readable by user ispconfig only
+ chmod($install_dir.'/interface/lib/config.inc.php', 0600);
+ chown($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
+ chgrp($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
chmod($install_dir.'/server/lib/remote_action.inc.php', 0600);
chown($install_dir.'/server/lib/remote_action.inc.php', 'root');
diff --git a/install/sql/incremental/upd_0044.sql b/install/sql/incremental/upd_0044.sql
new file mode 100644
index 000000000..53fe040d0
--- /dev/null
+++ b/install/sql/incremental/upd_0044.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `client` ADD `paypal_email` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `bank_account_swift` ;
+ALTER TABLE `web_domain` ADD `proxy_directives` MEDIUMTEXT NULL DEFAULT NULL ;
+
+
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 76a13c54d..64cbb3984 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -166,6 +166,7 @@ CREATE TABLE `client` (
`bank_name` varchar(255) DEFAULT NULL,
`bank_account_iban` varchar(255) DEFAULT NULL,
`bank_account_swift` varchar(255) DEFAULT NULL,
+ `paypal_email` varchar(255) DEFAULT NULL,
`default_mailserver` int(11) unsigned NOT NULL DEFAULT '1',
`limit_maildomain` int(11) NOT NULL DEFAULT '-1',
`limit_mailbox` int(11) NOT NULL DEFAULT '-1',
@@ -1750,6 +1751,7 @@ CREATE TABLE `web_domain` (
`active` enum('n','y') NOT NULL default 'y',
`traffic_quota_lock` enum('n','y') NOT NULL default 'n',
`fastcgi_php_version` varchar(255) DEFAULT NULL,
+ `proxy_directives` mediumtext,
PRIMARY KEY (`domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index bca61b279..4d59dfead 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -10,6 +10,10 @@ NameVirtualHost *:{vhost_port}
<VirtualHost _default_:{vhost_port}>
ServerAdmin webmaster@localhost
+ <FilesMatch "\.ph(p3?|tml)$">
+ SetHandler None
+ </FilesMatch>
+
<IfModule mod_fcgid.c>
DocumentRoot /var/www/ispconfig/
SuexecUserGroup ispconfig ispconfig
@@ -23,18 +27,18 @@ NameVirtualHost *:{vhost_port}
</Directory>
</IfModule>
- <IfModule mod_php5.c>
- DocumentRoot /usr/local/ispconfig/interface/web/
- AddType application/x-httpd-php .php
- <Directory /usr/local/ispconfig/interface/web>
- # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
- Options FollowSymLinks
- AllowOverride None
- Order allow,deny
- Allow from all
- php_value magic_quotes_gpc 0
- </Directory>
- </IfModule>
+# <IfModule mod_php5.c>
+# DocumentRoot /usr/local/ispconfig/interface/web/
+# AddType application/x-httpd-php .php
+# <Directory /usr/local/ispconfig/interface/web>
+# # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
+# Options FollowSymLinks
+# AllowOverride None
+# Order allow,deny
+# Allow from all
+# php_value magic_quotes_gpc 0
+# </Directory>
+# </IfModule>
# ErrorLog /var/log/apache2/error.log
# CustomLog /var/log/apache2/access.log combined
diff --git a/install/tpl/debian6_dovecot-sql.conf.master b/install/tpl/debian6_dovecot-sql.conf.master
index 30cb0fe50..7d209fac2 100644
--- a/install/tpl/debian6_dovecot-sql.conf.master
+++ b/install/tpl/debian6_dovecot-sql.conf.master
@@ -14,5 +14,8 @@ connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_se
default_pass_scheme = CRYPT
password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-# user_query = SELECT email AS user, maildir AS home, CONCAT('*:storage=', quota , 'B') AS quota_rule FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n'
+
+# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
+# Do not enable it on Dovecot 1.x servers
+# iterate_query = SELECT email as user FROM mail_user
diff --git a/install/tpl/debian_dovecot-sql.conf.master b/install/tpl/debian_dovecot-sql.conf.master
index f8b103c3b..81874a7a4 100644
--- a/install/tpl/debian_dovecot-sql.conf.master
+++ b/install/tpl/debian_dovecot-sql.conf.master
@@ -121,7 +121,9 @@ connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_se
default_pass_scheme = CRYPT
password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-# user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n'
+# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
+# Do not enable it on Dovecot 1.x servers
+# iterate_query = SELECT email as user FROM mail_user
diff --git a/install/tpl/fedora_dovecot-sql.conf.master b/install/tpl/fedora_dovecot-sql.conf.master
index fdfba48b8..7a5f49176 100644
--- a/install/tpl/fedora_dovecot-sql.conf.master
+++ b/install/tpl/fedora_dovecot-sql.conf.master
@@ -134,5 +134,8 @@ connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_se
default_pass_scheme = CRYPT
password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-# user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n'
+
+# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
+# Do not enable it on Dovecot 1.x servers
+# iterate_query = SELECT email as user FROM mail_user
\ No newline at end of file
diff --git a/install/tpl/opensuse_dovecot-sql.conf.master b/install/tpl/opensuse_dovecot-sql.conf.master
index 159b94aec..26615fe31 100644
--- a/install/tpl/opensuse_dovecot-sql.conf.master
+++ b/install/tpl/opensuse_dovecot-sql.conf.master
@@ -135,3 +135,7 @@ default_pass_scheme = CRYPT
password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n'
+
+# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
+# Do not enable it on Dovecot 1.x servers
+# iterate_query = SELECT email as user FROM mail_user
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index f9deca377..c057ef862 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -55,7 +55,7 @@ nginx_group=www-data
apps_vhost_port=8081
apps_vhost_ip=_default_
apps_vhost_servername=
-php_open_basedir=[website_path]/web:[website_path]/private:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/usr/share/php
+php_open_basedir=[website_path]/web:[website_path]/private:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/usr/share/php:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/usr/share/php
htaccess_allow_override=All
awstats_conf_dir=/etc/awstats
awstats_data_dir=/var/lib/awstats
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 71566e6d1..e0b237b3b 100755
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -213,6 +213,12 @@ class app {
$this->tpl->setVar('app_title', $this->_conf['app_title']);
if(isset($_SESSION['s']['user'])) {
$this->tpl->setVar('app_version', $this->_conf['app_version']);
+ // get pending datalog changes
+ $datalog = $this->db->datalogStatus();
+ $this->tpl->setVar('datalog_changes_txt', $this->lng('datalog_changes_txt'));
+ $this->tpl->setVar('datalog_changes_end_txt', $this->lng('datalog_changes_end_txt'));
+ $this->tpl->setVar('datalog_changes_count', $datalog['count']);
+ $this->tpl->setLoop('datalog_changes', $datalog['entries']);
} else {
$this->tpl->setVar('app_version', '');
}
diff --git a/interface/lib/classes/aps_base.inc.php b/interface/lib/classes/aps_base.inc.php
index 9822caeaa..b8f6ad923 100644
--- a/interface/lib/classes/aps_base.inc.php
+++ b/interface/lib/classes/aps_base.inc.php
@@ -43,9 +43,6 @@ define('PACKAGE_ERROR_NOMETA', 4);
class ApsBase
{
- protected $app = null;
- protected $db = null;
-
protected $log_prefix = '';
protected $fetch_url = '';
protected $aps_version = '';
@@ -63,9 +60,6 @@ class ApsBase
*/
public function __construct($app, $log_prefix = 'APS: ', $interface_mode = false)
{
- $this->db = $app->db;
- $this->app = $app;
-
$this->log_prefix = $log_prefix;
$this->interface_mode = $interface_mode;
$this->fetch_url = 'apscatalog.com';
diff --git a/interface/lib/classes/aps_crawler.inc.php b/interface/lib/classes/aps_crawler.inc.php
index 25a700f13..ca3402ed2 100644
--- a/interface/lib/classes/aps_crawler.inc.php
+++ b/interface/lib/classes/aps_crawler.inc.php
@@ -54,6 +54,8 @@ class ApsCrawler extends ApsBase
*/
private function checkRequirements()
{
+ global $app;
+
try
{
// Check if allow_url_fopen is enabled
@@ -77,7 +79,7 @@ class ApsCrawler extends ApsBase
}
catch(Exception $e)
{
- $this->app->log($this->log_prefix.'Aborting execution because '.$e->getMessage(), LOGLEVEL_ERROR);
+ $app->log($this->log_prefix.'Aborting execution because '.$e->getMessage(), LOGLEVEL_ERROR);
return false;
}
}
@@ -213,6 +215,8 @@ class ApsCrawler extends ApsBase
*/
public function startCrawler()
{
+ global $app;
+
try
{
// Make sure the requirements are given so that this script can execute
@@ -220,7 +224,7 @@ class ApsCrawler extends ApsBase
if(!$req_ret) return false;
// Execute the open task and first fetch all vendors (APS catalog API 1.1, p. 12)
- $this->app->log($this->log_prefix.'Fetching data from '.$this->fetch_url);
+ $app->log($this->log_prefix.'Fetching data from '.$this->fetch_url);
$vendor_page = $this->fetchPage('/all-app/'); //$vendor_page = $this->fetchPage('/'.$this->aps_version.'/');
preg_match_all("/\<a href=\"(.+)\/\" class=\"vendor\"/i", $vendor_page, $matches);
@@ -242,7 +246,7 @@ class ApsCrawler extends ApsBase
// Get all known apps from the database and the highest known version
// Note: A dirty hack is used for numerical sorting of the VARCHAR field Version: +0 -> cast
// A longer but typesafe way would be: ORDER BY CAST(REPLACE(Version, '.', '') AS UNSIGNED) DESC
- $existing_apps = $this->db->queryAllRecords("SELECT * FROM (
+ $existing_apps = $app->db->queryAllRecords("SELECT * FROM (
SELECT name AS Name, CONCAT(version, '-', CAST(`release` AS CHAR)) AS CurrentVersion
FROM aps_packages ORDER BY REPLACE(version, '.', '')+0 DESC, `release` DESC
) as Versions GROUP BY name");
@@ -325,14 +329,14 @@ class ApsCrawler extends ApsBase
if(file_exists($old_folder)) $this->removeDirectory($old_folder);
/*
- $this->db->query("UPDATE aps_packages SET package_status = '".PACKAGE_OUTDATED."' WHERE name = '".
- $this->db->quote($app_name)."' AND CONCAT(version, '-', CAST(`release` AS CHAR)) = '".
- $this->db->quote($ex_ver)."';");
+ $app->db->query("UPDATE aps_packages SET package_status = '".PACKAGE_OUTDATED."' WHERE name = '".
+ $app->db->quote($app_name)."' AND CONCAT(version, '-', CAST(`release` AS CHAR)) = '".
+ $app->db->quote($ex_ver)."';");
*/
- $tmp = $this->db->queryOneRecord("SELECT id FROM aps_packages WHERE name = '".
- $this->db->quote($app_name)."' AND CONCAT(version, '-', CAST(`release` AS CHAR)) = '".
- $this->db->quote($ex_ver)."';");
- $this->db->datalogUpdate('aps_packages', "package_status = ".PACKAGE_OUTDATED, 'id', $tmp['id']);
+ $tmp = $app->db->queryOneRecord("SELECT id FROM aps_packages WHERE name = '".
+ $app->db->quote($app_name)."' AND CONCAT(version, '-', CAST(`release` AS CHAR)) = '".
+ $app->db->quote($ex_ver)."';");
+ $app->db->datalogUpdate('aps_packages', "package_status = ".PACKAGE_OUTDATED, 'id', $tmp['id']);
unset($tmp);
}
@@ -446,19 +450,19 @@ class ApsCrawler extends ApsBase
if($apps_to_dl_chunks[$i][$j]['filesize'] != 0 &&
$apps_to_dl_chunks[$i][$j]['filesize'] != filesize($apps_to_dl_chunks[$i][$j]['localtarget']))
{
- $this->app->log($this->log_prefix.' The filesize of the package "'.
+ $app->log($this->log_prefix.' The filesize of the package "'.
$apps_to_dl_chunks[$i][$j]['name'].'" is wrong. Download failure?', LOGLEVEL_WARN);
}
}
}
- $this->app->log($this->log_prefix.'Processed '.$apps_in_repo.
+ $app->log($this->log_prefix.'Processed '.$apps_in_repo.
' apps from the repo. Downloaded '.$apps_updated.
' updates, '.$apps_downloaded.' new apps');
}
catch(Exception $e)
{
- $this->app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR);
+ $app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR);
return false;
}
}
@@ -472,6 +476,8 @@ class ApsCrawler extends ApsBase
*/
public function parseFolderToDB()
{
+ global $app;
+
try
{
// This method must be used in server mode
@@ -491,14 +497,14 @@ class ApsCrawler extends ApsBase
// Get registered packages and mark non-existant packages with an error code to omit the install
$existing_packages = array();
- $path_query = $this->db->queryAllRecords('SELECT path AS Path FROM aps_packages;');
+ $path_query = $app->db->queryAllRecords('SELECT path AS Path FROM aps_packages;');
foreach($path_query as $path) $existing_packages[] = $path['Path'];
$diff = array_diff($existing_packages, $pkg_list);
foreach($diff as $todelete) {
- /*$this->db->query("UPDATE aps_packages SET package_status = '".PACKAGE_ERROR_NOMETA."'
- WHERE path = '".$this->db->quote($todelete)."';");*/
- $tmp = $this->db->queryOneRecord("SELECT id FROM aps_packages WHERE path = '".$this->db->quote($todelete)."';");
- $this->db->datalogUpdate('aps_packages', "package_status = ".PACKAGE_ERROR_NOMETA, 'id', $tmp['id']);
+ /*$app->db->query("UPDATE aps_packages SET package_status = '".PACKAGE_ERROR_NOMETA."'
+ WHERE path = '".$app->db->quote($todelete)."';");*/
+ $tmp = $app->db->queryOneRecord("SELECT id FROM aps_packages WHERE path = '".$app->db->quote($todelete)."';");
+ $app->db->datalogUpdate('aps_packages', "package_status = ".PACKAGE_ERROR_NOMETA, 'id', $tmp['id']);
unset($tmp);
}
@@ -510,7 +516,7 @@ class ApsCrawler extends ApsBase
$metafile = $this->interface_pkg_dir.'/'.$pkg.'/APP-META.xml';
if(!file_exists($metafile))
{
- $this->app->log($this->log_prefix.'Cannot read metadata from '.$pkg, LOGLEVEL_ERROR);
+ $app->log($this->log_prefix.'Cannot read metadata from '.$pkg, LOGLEVEL_ERROR);
continue;
}
@@ -527,25 +533,25 @@ class ApsCrawler extends ApsBase
$pkg_release = parent::getXPathValue($sxe, 'release');
/*
- $this->db->query("INSERT INTO `aps_packages`
+ $app->db->query("INSERT INTO `aps_packages`
(`path`, `name`, `category`, `version`, `release`, `package_status`) VALUES
- ('".$this->db->quote($pkg)."', '".$this->db->quote($pkg_name)."',
- '".$this->db->quote($pkg_category)."', '".$this->db->quote($pkg_version)."',
- ".$this->db->quote($pkg_release).", ".PACKAGE_ENABLED.");");
+ ('".$app->db->quote($pkg)."', '".$app->db->quote($pkg_name)."',
+ '".$app->db->quote($pkg_category)."', '".$app->db->quote($pkg_version)."',
+ ".$app->db->quote($pkg_release).", ".PACKAGE_ENABLED.");");
*/
$insert_data = "(`path`, `name`, `category`, `version`, `release`, `package_url`, `package_status`) VALUES
- ('".$this->db->quote($pkg)."', '".$this->db->quote($pkg_name)."',
- '".$this->db->quote($pkg_category)."', '".$this->db->quote($pkg_version)."',
- ".$this->db->quote($pkg_release).", '".$this->db->quote($this->app_download_url_list[$pkg])."', ".PACKAGE_ENABLED.");";
+ ('".$app->db->quote($pkg)."', '".$app->db->quote($pkg_name)."',
+ '".$app->db->quote($pkg_category)."', '".$app->db->quote($pkg_version)."',
+ ".$app->db->quote($pkg_release).", '".$app->db->quote($this->app_download_url_list[$pkg])."', ".PACKAGE_ENABLED.");";
- $this->app->db->datalogInsert('aps_packages', $insert_data, 'id');
+ $app->db->datalogInsert('aps_packages', $insert_data, 'id');
}
}
catch(Exception $e)
{
- $this->app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR);
- $this->app->error($e->getMessage());
+ $app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR);
+ $app->error($e->getMessage());
return false;
}
}
diff --git a/interface/lib/classes/aps_guicontroller.inc.php b/interface/lib/classes/aps_guicontroller.inc.php
index 53c9ea39b..c5feec474 100644
--- a/interface/lib/classes/aps_guicontroller.inc.php
+++ b/interface/lib/classes/aps_guicontroller.inc.php
@@ -87,11 +87,12 @@ class ApsGUIController extends ApsBase
*/
private function getCustomerIDFromDomain($domain)
{
+ global $app;
$customerid = 0;
- $customerdata = $this->db->queryOneRecord("SELECT client_id FROM sys_group, web_domain
+ $customerdata = $app->db->queryOneRecord("SELECT client_id FROM sys_group, web_domain
WHERE web_domain.sys_groupid = sys_group.groupid
- AND web_domain.domain = '".$this->db->quote($domain)."';");
+ AND web_domain.domain = '".$app->db->quote($domain)."';");
if(!empty($customerdata)) $customerid = $customerdata['client_id'];
return $customerid;
@@ -106,18 +107,19 @@ class ApsGUIController extends ApsBase
*/
private function getInstanceDataForDatalog($instanceid)
{
+ global $app;
$webserver_id = '';
- $websrv = $this->db->queryOneRecord("SELECT server_id FROM web_domain
+ $websrv = $app->db->queryOneRecord("SELECT server_id FROM web_domain
WHERE domain = (SELECT value FROM aps_instances_settings
- WHERE name = 'main_domain' AND instance_id = ".$this->db->quote($instanceid).");");
+ WHERE name = 'main_domain' AND instance_id = ".$app->db->quote($instanceid).");");
// If $websrv is empty, an error has occured. Domain no longer existing? Settings table damaged?
// Anyhow, remove this instance record because it's not useful at all
if(empty($websrv))
{
- $this->db->query("DELETE FROM aps_instances WHERE id = ".$this->db->quote($instanceid).";");
- $this->db->query("DELETE FROM aps_instances_settings WHERE instance_id = ".$this->db->quote($instanceid).";");
+ $app->db->query("DELETE FROM aps_instances WHERE id = ".$app->db->quote($instanceid).";");
+ $app->db->query("DELETE FROM aps_instances_settings WHERE instance_id = ".$app->db->quote($instanceid).";");
}
else $webserver_id = $websrv['server_id'];
@@ -133,12 +135,14 @@ class ApsGUIController extends ApsBase
*/
public function getNewestPackageID($id)
{
+ global $app;
+
if(preg_match('/^[0-9]+$/', $id) != 1) return 0;
- $result = $this->db->queryOneRecord("SELECT id, name,
+ $result = $app->db->queryOneRecord("SELECT id, name,
CONCAT(version, '-', CAST(`release` AS CHAR)) AS current_version
FROM aps_packages
- WHERE name = (SELECT name FROM aps_packages WHERE id = ".$this->db->quote($id).")
+ WHERE name = (SELECT name FROM aps_packages WHERE id = ".$app->db->quote($id).")
ORDER BY REPLACE(version, '.', '')+0 DESC, `release` DESC");
if(!empty($result) && ($id != $result['id'])) return $result['id'];
@@ -155,13 +159,15 @@ class ApsGUIController extends ApsBase
*/
public function isValidPackageID($id, $is_admin = false)
{
+ global $app;
+
if(preg_match('/^[0-9]+$/', $id) != 1) return false;
$sql_ext = (!$is_admin) ?
'package_status = '.PACKAGE_ENABLED.' AND' :
'(package_status = '.PACKAGE_ENABLED.' OR package_status = '.PACKAGE_LOCKED.') AND';
- $result = $this->db->queryOneRecord("SELECT id FROM aps_packages WHERE ".$sql_ext." id = ".$this->db->quote($id).";");
+ $result = $app->db->queryOneRecord("SELECT id FROM aps_packages WHERE ".$sql_ext." id = ".$app->db->quote($id).";");
if(!$result) return false;
return true;
@@ -177,12 +183,14 @@ class ApsGUIController extends ApsBase
*/
public function isValidInstanceID($id, $client_id, $is_admin = false)
{
+ global $app;
+
if(preg_match('/^[0-9]+$/', $id) != 1) return false;
// Only filter if not admin
- $sql_ext = (!$is_admin) ? 'customer_id = '.$this->db->quote($client_id).' AND' : '';
+ $sql_ext = (!$is_admin) ? 'customer_id = '.$app->db->quote($client_id).' AND' : '';
- $result = $this->db->queryOneRecord('SELECT id FROM aps_instances WHERE '.$sql_ext.' id = '.$this->db->quote($id).';');
+ $result = $app->db->queryOneRecord('SELECT id FROM aps_instances WHERE '.$sql_ext.' id = '.$app->db->quote($id).';');
if(!$result) return false;
return true;
@@ -202,15 +210,15 @@ class ApsGUIController extends ApsBase
$app->uses('tools_sites');
$webserver_id = 0;
- $websrv = $this->db->queryOneRecord("SELECT * FROM web_domain WHERE domain = '".$this->db->quote($settings['main_domain'])."';");
+ $websrv = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain = '".$app->db->quote($settings['main_domain'])."';");
if(!empty($websrv)) $webserver_id = $websrv['server_id'];
$customerid = $this->getCustomerIDFromDomain($settings['main_domain']);
if(empty($settings) || empty($webserver_id)) return false;
//* Get server config of the web server
- $this->app->uses("getconf");
- $web_config = $this->app->getconf->get_server_config($app->functions->intval($websrv["server_id"]),'web');
+ $app->uses("getconf");
+ $web_config = $app->getconf->get_server_config($app->functions->intval($websrv["server_id"]),'web');
//* Set mysql mode to php-fcgi and enable suexec in website on apache servers
if($web_config['server_type'] == 'apache') {
@@ -220,7 +228,7 @@ class ApsGUIController extends ApsBase
}
//* Create the MySQL database for the application
- $pkg = $this->db->queryOneRecord('SELECT * FROM aps_packages WHERE id = '.$this->db->quote($packageid).';');
+ $pkg = $app->db->queryOneRecord('SELECT * FROM aps_packages WHERE id = '.$app->db->quote($packageid).';');
$metafile = $this->interface_pkg_dir.'/'.$pkg['path'].'/APP-META.xml';
$sxe = $this->readInMetaFile($metafile);
@@ -235,30 +243,49 @@ class ApsGUIController extends ApsBase
$dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $tmp);
unset($tmp);
- //* get the default database server of the client
- $client = $app->db->queryOneRecord("SELECT default_dbserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ".$websrv['sys_groupid']);
- if(is_array($client) && $client['default_dbserver'] > 0 && $client['default_dbserver'] != $websrv['server_id']) {
- $mysql_db_server_id = $client['default_dbserver'];
- $dbserver_config = $web_config = $app->getconf->get_server_config($app->functions->intval($mysql_db_server_id),'server');
- $mysql_db_host = $dbserver_config['ip_address'];
- $mysql_db_remote_access = 'y';
- $mysql_db_remote_ips = $dbserver_config['ip_address'];
- } else {
+ // get information if the webserver is a db server, too
+ $web_server = $app->db->queryOneRecord("SELECT server_id,server_name,db_server FROM server WHERE server_id = ".$websrv['server_id']);
+ if($web_server['db_server'] == 1) {
+ // create database on "localhost" (webserver)
$mysql_db_server_id = $websrv['server_id'];
$mysql_db_host = 'localhost';
$mysql_db_remote_access = 'n';
$mysql_db_remote_ips = '';
- }
+ } else {
+ //* get the default database server of the client
+ $client = $app->db->queryOneRecord("SELECT default_dbserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ".$websrv['sys_groupid']);
+ if(is_array($client) && $client['default_dbserver'] > 0 && $client['default_dbserver'] != $websrv['server_id']) {
+ $mysql_db_server_id = $client['default_dbserver'];
+ $dbserver_config = $web_config = $app->getconf->get_server_config($app->functions->intval($mysql_db_server_id),'server');
+ $mysql_db_host = $dbserver_config['ip_address'];
+ $mysql_db_remote_access = 'y';
+ $webserver_config = $app->getconf->get_server_config($app->functions->intval($websrv['server_id']),'server');
+ $mysql_db_remote_ips = $webserver_config['ip_address'];
+ } else {
+ /* I left this in place for a fallback that should NEVER! happen.
+ * if we reach this point it means that there is NO default db server for the client
+ * AND the webserver has NO db service enabled.
+ * We have to abort the aps installation here... so I added a return false
+ * although this does not present any error message to the user.
+ */
+ return false;
+
+ /*$mysql_db_server_id = $websrv['server_id'];
+ $mysql_db_host = 'localhost';
+ $mysql_db_remote_access = 'n';
+ $mysql_db_remote_ips = '';*/
+ }
+ }
- //* Find a free db name for the app
+ //* Find a free db name for the app
for($n = 1; $n <= 1000; $n++) {
- $mysql_db_name = $dbname_prefix.'aps'.$n;
+ $mysql_db_name = ($dbname_prefix != '' ? $dbname_prefix.'aps'.$n : uniqid('aps'));
$tmp = $app->db->queryOneRecord("SELECT count(database_id) as number FROM web_database WHERE database_name = '".$app->db->quote($mysql_db_name)."'");
if($tmp['number'] == 0) break;
}
//* Find a free db username for the app
for($n = 1; $n <= 1000; $n++) {
- $mysql_db_user = $dbuser_prefix.'aps'.$n;
+ $mysql_db_user = ($dbname_prefix != '' ? $dbname_prefix.'aps'.$n : uniqid('aps'));
$tmp = $app->db->queryOneRecord("SELECT count(database_user_id) as number FROM web_database_user WHERE database_user = '".$app->db->quote($mysql_db_user)."'");
if($tmp['number'] == 0) break;
}
@@ -283,14 +310,14 @@ class ApsGUIController extends ApsBase
}
//* Insert new package instance
- $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `customer_id`, `package_id`, `instance_status`) VALUES (".$websrv['sys_userid'].", ".$websrv['sys_groupid'].", 'riud', '".$websrv['sys_perm_group']."', '', ".$this->db->quote($webserver_id).",".$this->db->quote($customerid).", ".$this->db->quote($packageid).", ".INSTANCE_PENDING.")";
+ $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `customer_id`, `package_id`, `instance_status`) VALUES (".$websrv['sys_userid'].", ".$websrv['sys_groupid'].", 'riud', '".$websrv['sys_perm_group']."', '', ".$app->db->quote($webserver_id).",".$app->db->quote($customerid).", ".$app->db->quote($packageid).", ".INSTANCE_PENDING.")";
$InstanceID = $app->db->datalogInsert('aps_instances', $insert_data, 'id');
//* Insert all package settings
if(is_array($settings)) {
foreach($settings as $key => $value) {
- $insert_data = "(server_id, instance_id, name, value) VALUES (".$this->db->quote($webserver_id).",".$this->db->quote($InstanceID).", '".$this->db->quote($key)."', '".$this->db->quote($value)."')";
- $this->db->datalogInsert('aps_instances_settings', $insert_data, 'id');
+ $insert_data = "(server_id, instance_id, name, value) VALUES (".$app->db->quote($webserver_id).",".$app->db->quote($InstanceID).", '".$app->db->quote($key)."', '".$app->db->quote($value)."')";
+ $app->db->datalogInsert('aps_instances_settings', $insert_data, 'id');
}
}
@@ -308,23 +335,23 @@ class ApsGUIController extends ApsBase
{
global $app;
/*
- $this->db->query("UPDATE aps_instances SET instance_status = ".INSTANCE_REMOVE." WHERE id = ".$instanceid.";");
+ $app->db->query("UPDATE aps_instances SET instance_status = ".INSTANCE_REMOVE." WHERE id = ".$instanceid.";");
$webserver_id = $this->getInstanceDataForDatalog($instanceid);
if($webserver_id == '') return;
// Create a sys_datalog entry for deletion
$datalog = array('Instance_id' => $instanceid, 'server_id' => $webserver_id);
- $this->db->datalogSave('aps', 'DELETE', 'id', $instanceid, array(), $datalog);
+ $app->db->datalogSave('aps', 'DELETE', 'id', $instanceid, array(), $datalog);
*/
$sql = "SELECT web_database.database_id as database_id, web_database.database_user_id as `database_user_id` FROM aps_instances_settings, web_database WHERE aps_instances_settings.value = web_database.database_name AND aps_instances_settings.value = aps_instances_settings.name = 'main_database_name' AND aps_instances_settings.instance_id = ".$instanceid." LIMIT 0,1";
- $tmp = $this->db->queryOneRecord($sql);
- if($tmp['database_id'] > 0) $this->db->datalogDelete('web_database', 'database_id', $tmp['database_id']);
+ $tmp = $app->db->queryOneRecord($sql);
+ if($tmp['database_id'] > 0) $app->db->datalogDelete('web_database', 'database_id', $tmp['database_id']);
$database_user = $tmp['database_user_id'];
- $tmp = $this->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_database` WHERE `database_user_id` = '" . $app->functions->intval($database_user) . "' OR `database_ro_user_id` = '" . $app->functions->intval($database_user) . "'");
- if($tmp['cnt'] < 1) $this->db->datalogDelete('web_database_user', 'database_user_id', $database_user);
+ $tmp = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_database` WHERE `database_user_id` = '" . $app->functions->intval($database_user) . "' OR `database_ro_user_id` = '" . $app->functions->intval($database_user) . "'");
+ if($tmp['cnt'] < 1) $app->db->datalogDelete('web_database_user', 'database_user_id', $database_user);
$app->db->datalogUpdate('aps_instances', "instance_status = ".INSTANCE_REMOVE, 'id', $instanceid);
@@ -338,22 +365,24 @@ class ApsGUIController extends ApsBase
*/
public function reinstallInstance($instanceid)
{
+ global $app;
+
/*
- $this->db->query("UPDATE aps_instances SET instance_status = ".INSTANCE_INSTALL." WHERE id = ".$instanceid.";");
+ $app->db->query("UPDATE aps_instances SET instance_status = ".INSTANCE_INSTALL." WHERE id = ".$instanceid.";");
$webserver_id = $this->getInstanceDataForDatalog($instanceid);
if($webserver_id == '') return;
// Create a sys_datalog entry for re-installation
$datalog = array('instance_id' => $instanceid, 'server_id' => $webserver_id);
- $this->db->datalogSave('aps', 'INSERT', 'id', $instanceid, array(), $datalog);
+ $app->db->datalogSave('aps', 'INSERT', 'id', $instanceid, array(), $datalog);
*/
$sql = "SELECT web_database.database_id as database_id FROM aps_instances_settings, web_database WHERE aps_instances_settings.value = web_database.database_name AND aps_instances_settings.value = aps_instances_settings.name = 'main_database_name' AND aps_instances_settings.instance_id = ".$instanceid." LIMIT 0,1";
- $tmp = $this->db->queryOneRecord($sql);
- if($tmp['database_id'] > 0) $this->db->datalogDelete('web_database', 'database_id', $tmp['database_id']);
+ $tmp = $app->db->queryOneRecord($sql);
+ if($tmp['database_id'] > 0) $app->db->datalogDelete('web_database', 'database_id', $tmp['database_id']);
- $this->db->datalogUpdate('aps_instances', "instance_status = ".INSTANCE_INSTALL, 'id', $instanceid);
+ $app->db->datalogUpdate('aps_instances', "instance_status = ".INSTANCE_INSTALL, 'id', $instanceid);
}
/**
@@ -364,7 +393,9 @@ class ApsGUIController extends ApsBase
*/
public function getPackageSettings($id)
{
- $pkg = $this->db->queryOneRecord('SELECT * FROM aps_packages WHERE id = '.$this->db->quote($id).';');
+ global $app;
+
+ $pkg = $app->db->queryOneRecord('SELECT * FROM aps_packages WHERE id = '.$app->db->quote($id).';');
// Load in meta file if existing and register its namespaces
$metafile = $this->interface_pkg_dir.'/'.$pkg['path'].'/APP-META.xml';
@@ -460,10 +491,10 @@ class ApsGUIController extends ApsBase
// Main domain (obligatory)
if(isset($postinput['main_domain']))
{
- if(!in_array($postinput['main_domain'], $domains)) $error[] = $this->app->lng('error_main_domain');
+ if(!in_array($postinput['main_domain'], $domains)) $error[] = $app->lng('error_main_domain');
else $input['main_domain'] = $postinput['main_domain'];
}
- else $error[] = $this->app->lng('error_main_domain');
+ else $error[] = $app->lng('error_main_domain');
// Main location (not obligatory but must be supplied)
if(isset($postinput['main_location']))
@@ -478,13 +509,13 @@ class ApsGUIController extends ApsBase
$main_location = $this->secureLocation($main_location);
// Only allow digits, words, / and -
$main_location = preg_replace("/[^\d\w\/\-]/i", "", $main_location);
- if($userinput && (strlen($main_location) == 0)) $temp_errstr = $this->app->lng('error_inv_main_location');
+ if($userinput && (strlen($main_location) == 0)) $temp_errstr = $app->lng('error_inv_main_location');
// Find out document_root and make sure no apps are installed twice to one location
if(in_array($postinput['main_domain'], $domains))
{
- $docroot = $this->db->queryOneRecord("SELECT document_root FROM web_domain
- WHERE domain = '".$this->db->quote($postinput['main_domain'])."';");
+ $docroot = $app->db->queryOneRecord("SELECT document_root FROM web_domain
+ WHERE domain = '".$app->db->quote($postinput['main_domain'])."';");
$new_path = $docroot['document_root'];
if(substr($new_path, -1) != '/') $new_path .= '/';
$new_path .= $main_location;
@@ -496,16 +527,16 @@ class ApsGUIController extends ApsBase
// and get the corresponding document roots as well as the defined
// locations. If an existing doc_root + location matches with the
// new one -> error
- $instance_domains = $this->db->queryAllRecords("SELECT instance_id, s.value AS domain
+ $instance_domains = $app->db->queryAllRecords("SELECT instance_id, s.value AS domain
FROM aps_instances AS i, aps_instances_settings AS s
WHERE i.id = s.instance_id AND s.name = 'main_domain'
- AND i.customer_id = '".$this->db->quote($customerid)."';");
+ AND i.customer_id = '".$app->db->quote($customerid)."';");
for($i = 0; $i < count($instance_domains); $i++)
{
$used_path = '';
- $doc_root = $this->db->queryOneRecord("SELECT document_root FROM web_domain
- WHERE domain = '".$this->db->quote($instance_domains[$i]['domain'])."';");
+ $doc_root = $app->db->queryOneRecord("SELECT document_root FROM web_domain
+ WHERE domain = '".$app->db->quote($instance_domains[$i]['domain'])."';");
// Probably the domain settings were changed later, so make sure the doc_root
// is not empty for further validation
@@ -514,34 +545,34 @@ class ApsGUIController extends ApsBase
$used_path = $docroot['document_root'];
if(substr($used_path, -1) != '/') $used_path .= '/';
- $location_for_domain = $this->db->queryOneRecord("SELECT value
+ $location_for_domain = $app->db->queryOneRecord("SELECT value
FROM aps_instances_settings WHERE name = 'main_location'
- AND instance_id = '".$this->db->quote($instance_domains[$i]['instance_id'])."';");
+ AND instance_id = '".$app->db->quote($instance_domains[$i]['instance_id'])."';");
// The location might be empty but the DB return must not be false!
if($location_for_domain) $used_path .= $location_for_domain['value'];
if($new_path == $used_path)
{
- $temp_errstr = $this->app->lng('error_used_location');
+ $temp_errstr = $app->lng('error_used_location');
break;
}
}
}
}
- else $temp_errstr = $this->app->lng('error_main_domain');
+ else $temp_errstr = $app->lng('error_main_domain');
if($temp_errstr == '') $input['main_location'] = htmlspecialchars($main_location);
else $error[] = $temp_errstr;
}
- else $error[] = $this->app->lng('error_no_main_location');
+ else $error[] = $app->lng('error_no_main_location');
// License (the checkbox must be set)
if(isset($pkg_details['License need agree'])
&& $pkg_details['License need agree'] == 'true')
{
if(isset($postinput['license']) && $postinput['license'] == 'on') $input['license'] = 'true';
- else $error[] = $this->app->lng('error_license_agreement');
+ else $error[] = $app->lng('error_license_agreement');
}
// Database
@@ -550,12 +581,12 @@ class ApsGUIController extends ApsBase
{
if(isset($postinput['main_database_password']))
{
- if($postinput['main_database_password'] == '') $error[] = $this->app->lng('error_no_database_pw');
+ if($postinput['main_database_password'] == '') $error[] = $app->lng('error_no_database_pw');
else if(strlen($postinput['main_database_password']) > 8)
$input['main_database_password'] = htmlspecialchars($postinput['main_database_password']);
- else $error[] = $this->app->lng('error_short_database_pw');
+ else $error[] = $app->lng('error_short_database_pw');
}
- else $error[] = $this->app->lng('error_no_database_pw');
+ else $error[] = $app->lng('error_no_database_pw');
}
// Validate the package settings
@@ -572,36 +603,36 @@ class ApsGUIController extends ApsBase
{
if($app->functions->intval($setting['SettingMinLength'], true) != 0
&& strlen($postinput[$setting_id]) < $app->functions->intval($setting['SettingMinLength'], true))
- $temp_errstr = sprintf($this->app->lng('error_short_value_for'), $setting['setting_name']);
+ $temp_errstr = sprintf($app->lng('error_short_value_for'), $setting['setting_name']);
if($app->functions->intval($setting['SettingMaxLength'], true) != 0
&& strlen($postinput[$setting_id]) > $app->functions->intval($setting['SettingMaxLength'], true))
- $temp_errstr = sprintf($this->app->lng('error_long_value_for'), $setting['setting_name']);
+ $temp_errstr = sprintf($app->lng('error_long_value_for'), $setting['setting_name']);
if(isset($setting['SettingRegex'])
&& !preg_match("/".$setting['SettingRegex']."/", $postinput[$setting_id]))
- $temp_errstr = sprintf($this->app->lng('error_inv_value_for'), $setting['setting_name']);
+ $temp_errstr = sprintf($app->lng('error_inv_value_for'), $setting['setting_name']);
}
else if($setting['SettingType'] == 'email')
{
if(filter_var(strtolower($postinput[$setting_id]), FILTER_VALIDATE_EMAIL) === false)
- $temp_errstr = sprintf($this->app->lng('error_inv_email_for'), $setting['setting_name']);
+ $temp_errstr = sprintf($app->lng('error_inv_email_for'), $setting['setting_name']);
}
else if($setting['SettingType'] == 'domain-name')
{
if(!preg_match("^(http|https)\://([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(\:[0-9]+)*(/($|[a-zA-Z0-9\.\,\?\'\\\+&%\$#\=~_\-]+))*$",
$postinput[$setting_id]))
- $temp_errstr = sprintf($this->app->lng('error_inv_domain_for'), $setting['setting_name']);
+ $temp_errstr = sprintf($app->lng('error_inv_domain_for'), $setting['setting_name']);
}
else if($setting['SettingType'] == 'integer')
{
if(filter_var($postinput[$setting_id], FILTER_VALIDATE_INT) === false)
- $temp_errstr = sprintf($this->app->lng('error_inv_integer_for'), $setting['setting_name']);
+ $temp_errstr = sprintf($app->lng('error_inv_integer_for'), $setting['setting_name']);
}
else if($setting['SettingType'] == 'float')
{
if(filter_var($postinput[$setting_id], FILTER_VALIDATE_FLOAT) === false)
- $temp_errstr = sprintf($this->app->lng('error_inv_float_for'), $setting['setting_name']);
+ $temp_errstr = sprintf($app->lng('error_inv_float_for'), $setting['setting_name']);
}
else if($setting['SettingType'] == 'boolean')
{
@@ -618,13 +649,13 @@ class ApsGUIController extends ApsBase
if($setting['SettingChoices'][$i]['EnumID'] == $postinput[$setting_id])
$found = true;
}
- if(!$found) $temp_errstr = sprintf($this->app->lng('error_inv_value_for'), $setting['SettingName']);
+ if(!$found) $temp_errstr = sprintf($app->lng('error_inv_value_for'), $setting['SettingName']);
}
if($temp_errstr == '') $input[$setting_id] = $postinput[$setting_id];
else $error[] = $temp_errstr;
}
- else $error[] = sprintf($this->app->lng('error_no_value_for'), $setting['SettingName']);
+ else $error[] = sprintf($app->lng('error_no_value_for'), $setting['SettingName']);
}
$ret['input'] = $input;
@@ -641,7 +672,9 @@ class ApsGUIController extends ApsBase
*/
public function getPackageDetails($id)
{
- $pkg = $this->db->queryOneRecord('SELECT * FROM aps_packages WHERE id = '.$this->db->quote($id).';');
+ global $app;
+
+ $pkg = $app->db->queryOneRecord('SELECT * FROM aps_packages WHERE id = '.$app->db->quote($id).';');
// Load in meta file if existing and register its namespaces
$metafile = $this->interface_pkg_dir.'/'.$pkg['path'].'/APP-META.xml';
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index d9b660051..5ea448a7e 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -96,7 +96,8 @@ class db extends mysqli
}
public function query($queryString) {
- $this->queryId = parent::query($queryString);
+ parent::ping();
+ $this->queryId = parent::query($queryString);
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
if($this->errorNumber) debug_print_backtrace();
if(!$this->queryId) {
@@ -317,6 +318,28 @@ public function toLower($record) {
return true;
}
+
+ //* get the current datalog status for the specified login (or currently logged in user)
+ public function datalogStatus($login = '') {
+ global $app;
+
+ $return = array('count' => 0, 'entries' => array());
+ if($_SESSION['s']['user']['typ'] == 'admin') return $return; // these information should not be displayed to admin users
+
+ if($login == '' && isset($_SESSION['s']['user'])) {
+ $login = $_SESSION['s']['user']['username'];
+ }
+
+ $result = $this->queryAllRecords("SELECT COUNT( * ) AS cnt, sys_datalog.action, sys_datalog.dbtable FROM sys_datalog, server WHERE server.server_id = sys_datalog.server_id AND sys_datalog.user = '" . $this->quote($login) . "' AND sys_datalog.datalog_id > server.updated GROUP BY sys_datalog.dbtable, sys_datalog.action");
+ foreach($result as $row) {
+ if(!$row['dbtable'] || in_array($row['dbtable'], array('aps_instances', 'aps_instances_settings', 'mail_access', 'mail_content_filter'))) continue; // ignore some entries, maybe more to come
+ $return['entries'][] = array('table' => $row['dbtable'], 'action' => $row['action'], 'count' => $row['cnt'], 'text' => $app->lng('datalog_status_' . $row['action'] . '_' . $row['dbtable']));
+ $return['count'] += $row['cnt'];
+ }
+ unset($result);
+
+ return $return;
+ }
public function freeResult($query)
@@ -466,12 +489,21 @@ public function toLower($record) {
if($rows = $app->db->queryAllRecords('SHOW FIELDS FROM '.$table_name)){
foreach($rows as $row) {
+ /*
$name = $row[0];
$default = $row[4];
$key = $row[3];
$extra = $row[5];
$isnull = $row[2];
$type = $row[1];
+ */
+
+ $name = $row['Field'];
+ $default = $row['Default'];
+ $key = $row['Key'];
+ $extra = $row['Extra'];
+ $isnull = $row['Null'];
+ $type = $row['Type'];
$column = array();
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 269a5cba8..0b2877e57 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -306,30 +306,52 @@ class remoting {
}
- //* dodanie uzytkownika email
+ //* Add mail domain
public function mail_user_add($session_id, $client_id, $params){
+ global $app;
+
if (!$this->checkPerm($session_id, 'mail_user_add')){
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
+
+ //* Check if mail domain exists
+ $email_parts = explode('@',$params['email']);
+ $tmp = $app->db->queryOneRecord("SELECT domain FROM mail_domain WHERE domain = '".$app->db->quote($email_parts[1])."'");
+ if($tmp['domain'] != $email_parts[1]) {
+ $this->server->fault('mail_domain_does_not_exist','Mail domain - '.$email_parts[1].' - does not exist.');
+ return false;
+ }
+
$affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
return $affected_rows;
}
- //* edycja uzytkownika email
+ //* Update mail user
public function mail_user_update($session_id, $client_id, $primary_id, $params)
{
+ global $app;
+
if (!$this->checkPerm($session_id, 'mail_user_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
+
+ //* Check if mail domain exists
+ $email_parts = explode('@',$params['email']);
+ $tmp = $app->db->queryOneRecord("SELECT domain FROM mail_domain WHERE domain = '".$app->db->quote($email_parts[1])."'");
+ if($tmp['domain'] != $email_parts[1]) {
+ $this->server->fault('mail_domain_does_not_exist','Mail domain - '.$email_parts[1].' - does not exist.');
+ return false;
+ }
+
$affected_rows = $this->updateQuery('../mail/form/mail_user.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- //*usuniecie uzytkownika emial
+ //* Delete mail user
public function mail_user_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_user_delete'))
@@ -1108,61 +1130,56 @@ class remoting {
public function client_delete_everything($session_id, $client_id)
{
global $app, $conf;
+
if(!$this->checkPerm($session_id, 'client_delete_everything')) {
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
- $client_id = $app->functions->intval($client_id);
- $client_group = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = $client_id");
-
- $tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_traffic';
- $tables_array = explode(',',$tables);
- $client_group_id = $app->functions->intval($client_group['groupid']);
-
- $table_list = array();
- if($client_group_id > 1) {
- foreach($tables_array as $table) {
- if($table != '') {
- $records = $app->db->queryAllRecords("SELECT * FROM $table WHERE sys_groupid = ".$client_group_id);
- $number = count($records);
- if($number > 0) $table_list[] = array('table' => $table."(".$number.")");
- }
- }
- }
-
+
+ $client_id = $app->functions->intval($client_id);
- if($client_id > 0) {
- // remove the group of the client from the resellers group
+ if($client_id > 0) {
+ //* remove the group of the client from the resellers group
$parent_client_id = $app->functions->intval($this->dataRecord['parent_client_id']);
$parent_user = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE client_id = $parent_client_id");
$client_group = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = $client_id");
$app->auth->remove_group_from_user($parent_user['userid'],$client_group['groupid']);
- // delete the group of the client
+ //* delete the group of the client
$app->db->query("DELETE FROM sys_group WHERE client_id = $client_id");
- // delete the sys user(s) of the client
+ //* delete the sys user(s) of the client
$app->db->query("DELETE FROM sys_user WHERE client_id = $client_id");
- // Delete all records (sub-clients, mail, web, etc....) of this client.
+ //* Delete all records (sub-clients, mail, web, etc....) of this client.
$tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_traffic';
$tables_array = explode(',',$tables);
$client_group_id = $app->functions->intval($client_group['groupid']);
+
if($client_group_id > 1) {
foreach($tables_array as $table) {
if($table != '') {
$records = $app->db->queryAllRecords("SELECT * FROM $table WHERE sys_groupid = ".$client_group_id);
- // find the primary ID of the table
+ //* find the primary ID of the table
$table_info = $app->db->tableInfo($table);
$index_field = '';
foreach($table_info as $tmp) {
if($tmp['option'] == 'primary') $index_field = $tmp['name'];
}
- // Delete the records
+
+ //* Delete the records
if($index_field != '') {
if(is_array($records)) {
foreach($records as $rec) {
$app->db->datalogDelete($table, $index_field, $rec[$index_field]);
+ //* Delete traffic records that dont have a sys_groupid column
+ if($table == 'web_domain') {
+ $app->db->query("DELETE FROM web_traffic WHERE hostname = '".$app->db->quote($rec['domain'])."'");
+ }
+ //* Delete mail_traffic records that dont have a sys_groupid
+ if($table == 'mail_user') {
+ $app->db->query("DELETE FROM mail_traffic WHERE mailuser_id = '".$app->db->quote($rec['mailuser_id'])."'");
+ }
}
}
}
@@ -1171,21 +1188,15 @@ class remoting {
}
}
-
-
}
- if (!$this->checkPerm($session_id, 'client_delete'))
- {
- $this->server->fault('permission_denied','You do not have the permissions to access this function.');
- return false;
- }
- $affected_rows = $this->deleteQuery('../client/form/client.tform.php',$client_id);
-
- // $app->remoting_lib->ispconfig_sysuser_delete($client_id);
-
+ if (!$this->checkPerm($session_id, 'client_delete')) {
+ $this->server->fault('permission_denied','You do not have the permissions to access this function.');
+ return false;
+ }
+ $affected_rows = $this->deleteQuery('../client/form/client.tform.php',$client_id);
- return false;
+ return $affected_rows;
}
// Website functions ---------------------------------------------------------------------------------------
@@ -2654,7 +2665,7 @@ class remoting {
$this->id = $insert_id;
$this->dataRecord = $params;
- $app->plugin->raiseEvent('client:' . ($reseller_id ? 'reseller' : 'client') . ':on_after_insert',$this);
+ $app->plugin->raiseEvent('client:' . (isset($params['limit_client']) && $params['limit_client'] > 0 ? 'reseller' : 'client') . ':on_after_insert',$this);
/*
if($app->db->errorMessage != '') {
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 47660f71c..9726b75a0 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -160,7 +160,7 @@ class remoting_lib {
}
}*/
- $user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE client_id = $client_id");
+ $user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE client_id = $this->client_id");
$this->sys_username = $user['username'];
$this->sys_userid = $user['userid'];
$this->sys_default_group = $user['default_group'];
@@ -672,13 +672,13 @@ class remoting_lib {
if($action == "INSERT") {
if($field['formtype'] == 'PASSWORD') {
$sql_insert_key .= "`$key`, ";
- if($field['encryption'] == 'CRYPT') {
+ if ((isset($field['encryption']) && $field['encryption'] == 'CLEARTEXT') || (isset($record['_ispconfig_pw_crypted']) && $record['_ispconfig_pw_crypted'] == 1)) {
+ $sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
+ } elseif(isset($field['encryption']) && $field['encryption'] == 'CRYPT') {
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
- } elseif ($field['encryption'] == 'MYSQL') {
+ } elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
$sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), ";
- } elseif ($field['encryption'] == 'CLEARTEXT') {
- $sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
} else {
$record[$key] = md5(stripslashes($record[$key]));
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
@@ -699,14 +699,14 @@ class remoting_lib {
}
} else {
if($field['formtype'] == 'PASSWORD') {
- if(isset($field['encryption']) && $field['encryption'] == 'CRYPT') {
+ if ((isset($field['encryption']) && $field['encryption'] == 'CLEARTEXT') || (isset($record['_ispconfig_pw_crypted']) && $record['_ispconfig_pw_crypted'] == 1)) {
+ $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
+ } elseif(isset($field['encryption']) && $field['encryption'] == 'CRYPT') {
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
$sql_update .= "`$key` = PASSWORD('".$app->db->quote($record[$key])."'), ";
- } elseif (isset($field['encryption']) && $field['encryption'] == 'CLEARTEXT') {
- $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
- } else {
+ } else {
$record[$key] = md5(stripslashes($record[$key]));
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
}
@@ -825,6 +825,10 @@ class remoting_lib {
} else {
$modules = $app->db->quote($params['modules']);
}
+ if(isset($params['limit_client']) && $params['limit_client'] > 0) {
+ $modules .= ',client';
+ }
+
if(!isset($params['startmodule'])) {
$startmodule = 'dashboard';
} else {
diff --git a/interface/lib/classes/tools_sites.inc.php b/interface/lib/classes/tools_sites.inc.php
index 0619f2fd1..b4407541a 100644
--- a/interface/lib/classes/tools_sites.inc.php
+++ b/interface/lib/classes/tools_sites.inc.php
@@ -91,7 +91,7 @@ class tools_sites {
// Get the group-id from the data itself
if(isset($dataRecord['client_group_id'])) {
$client_group_id = $dataRecord['client_group_id'];
- } elseif (isset($dataRecord['parent_domain_id'])) {
+ } elseif (isset($dataRecord['parent_domain_id']) && $dataRecord['parent_domain_id'] != 0) {
$tmp = $app->db->queryOneRecord("SELECT sys_groupid FROM web_domain WHERE domain_id = " . $dataRecord['parent_domain_id']);
$client_group_id = $tmp['sys_groupid'];
} elseif(isset($dataRecord['sys_groupid'])) {
diff --git a/interface/lib/classes/validate_autoresponder.inc.php b/interface/lib/classes/validate_autoresponder.inc.php
index c8db6a9a2..c5e989e84 100755
--- a/interface/lib/classes/validate_autoresponder.inc.php
+++ b/interface/lib/classes/validate_autoresponder.inc.php
@@ -33,8 +33,15 @@ class validate_autoresponder extends validate_datetime
{
function start_date($field_name, $field_value, $validator)
{
+ # save field value for later use in end_date()
+ $this->start_date = $field_value;
+
if ($this->_datetime_selected($field_value)) {
- return $this->is_future($field_name, $field_value, $validator);
+ # We just require a start date be set
+ return;
+ }
+ if($_POST['autoresponder'] == 'y') {
+ return "No start date selected";
}
}
@@ -42,7 +49,8 @@ class validate_autoresponder extends validate_datetime
{
global $app;
- $start_date = $app->tform_actions->dataRecord['autoresponder_start_date'];
+ $start_date = $this->start_date;
+ //$start_date = $app->tform_actions->dataRecord['autoresponder_start_date'];
$_msg = $this->not_empty('autoresponder_start_date', $start_date, $validator);
if (!$_msg) // Start date set
diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng
index 15a9e1d92..de01446fd 100644
--- a/interface/lib/lang/ar.lng
+++ b/interface/lib/lang/ar.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
index 46d9d0a7b..d05ce81c9 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng
index d0b2e1256..29428f45b 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index ecbb7b979..582f57b1f 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -27,8 +27,8 @@ $wb['add_new_record_txt'] = 'Přidat záznam';
$wb['btn_save_txt'] = 'Uložit';
$wb['btn_cancel_txt'] = 'Zpět';
$wb['top_menu_system'] = 'Systém';
-$wb['top_menu_client'] = 'Klient';
-$wb['top_menu_email'] = 'Email';
+$wb['top_menu_client'] = 'Klienti';
+$wb['top_menu_email'] = 'E-mail';
$wb['top_menu_monitor'] = 'Monitor';
$wb['top_menu_sites'] = 'Stránky';
$wb['top_menu_dns'] = 'DNS';
@@ -38,44 +38,93 @@ $wb['toolsarea_head_txt'] = 'Nástroje';
$wb['top_menu_billing'] = 'Fakturace';
$wb['top_menu_domain'] = 'Doména';
$wb['top_menu_dashboard'] = 'Nástěnka';
-$wb['latest_news_txt'] = 'Nejnovějšà novinky';
+$wb['latest_news_txt'] = 'Poslednà novinky';
$wb['top_menu_vm'] = 'VServer';
-$wb['daynamesmin_su'] = 'Su';
-$wb['daynamesmin_mo'] = 'Mo';
-$wb['daynamesmin_tu'] = 'Tu';
-$wb['daynamesmin_we'] = 'We';
-$wb['daynamesmin_th'] = 'Th';
-$wb['daynamesmin_fr'] = 'Fr';
-$wb['daynamesmin_sa'] = 'Sa';
-$wb['daynames_sunday'] = 'Sunday';
-$wb['daynames_monday'] = 'Monday';
-$wb['daynames_tuesday'] = 'Tuesday';
-$wb['daynames_wednesday'] = 'Wednesday';
-$wb['daynames_thursday'] = 'Thursday';
-$wb['daynames_friday'] = 'Friday';
-$wb['daynames_saturday'] = 'Saturday';
-$wb['monthnamesshort_jan'] = 'Jan';
-$wb['monthnamesshort_feb'] = 'Feb';
-$wb['monthnamesshort_mar'] = 'Mar';
-$wb['monthnamesshort_apr'] = 'Apr';
-$wb['monthnamesshort_may'] = 'May';
+$wb['daynamesmin_su'] = 'Ne';
+$wb['daynamesmin_mo'] = 'Po';
+$wb['daynamesmin_tu'] = 'Út';
+$wb['daynamesmin_we'] = 'St';
+$wb['daynamesmin_th'] = 'ÄŒt';
+$wb['daynamesmin_fr'] = 'Pá';
+$wb['daynamesmin_sa'] = 'So';
+$wb['daynames_sunday'] = 'Neděle';
+$wb['daynames_monday'] = 'PondÄ›lÃ';
+$wb['daynames_tuesday'] = 'Úterý';
+$wb['daynames_wednesday'] = 'Středa';
+$wb['daynames_thursday'] = 'ÄŒtvrtek';
+$wb['daynames_friday'] = 'Pátek';
+$wb['daynames_saturday'] = 'Sobota';
+$wb['monthnamesshort_jan'] = 'Led';
+$wb['monthnamesshort_feb'] = 'Úno';
+$wb['monthnamesshort_mar'] = 'Bře';
+$wb['monthnamesshort_apr'] = 'Dub';
+$wb['monthnamesshort_may'] = 'KvÄ›';
$wb['monthnamesshort_jun'] = 'Jun';
$wb['monthnamesshort_jul'] = 'Jul';
-$wb['monthnamesshort_aug'] = 'Aug';
-$wb['monthnamesshort_sep'] = 'Sep';
-$wb['monthnamesshort_oct'] = 'Oct';
-$wb['monthnamesshort_nov'] = 'Nov';
-$wb['monthnamesshort_dec'] = 'Dec';
-$wb['datepicker_nextText'] = 'Next';
-$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'Logout';
+$wb['monthnamesshort_aug'] = 'Srp';
+$wb['monthnamesshort_sep'] = 'Zář';
+$wb['monthnamesshort_oct'] = 'ŘÃj';
+$wb['monthnamesshort_nov'] = 'Lis';
+$wb['monthnamesshort_dec'] = 'Pro';
+$wb['datepicker_nextText'] = 'DalÅ¡Ã';
+$wb['datepicker_prevText'] = 'PÅ™edchozÃ';
+$wb['logout_txt'] = 'OdhlášenÃ';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
-$wb['submit_confirmation'] = 'Do you really want to perform this action?';
-$wb['top_menu_mailuser'] = 'Mailuser';
+$wb['submit_confirmation'] = 'Opravdu chcete provést tuto akci ?';
+$wb['top_menu_mailuser'] = 'E-malový uživatel';
$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['globalsearch_resultslimit_results_txt'] = 'výsledky';
+$wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.';
+$wb['globalsearch_noresults_limit_txt'] = '0 výsledků';
+$wb['globalsearch_searchfield_watermark_txt'] = 'VyhledávánÃ';
+$wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
+$wb['global_tabchange_warning_txt'] = 'ZmÄ›nÄ›né údaje v této záložce se zmÄ›nÃ, pokud stisknete tlaÄÃtko OK. Pokud zmáÄknete tlaÄÃtko zruÅ¡it, zmÄ›ny nebudou provedeny.';
+$wb['global_tabchange_discard_txt'] = 'Máte neuložené zmÄ›ny v této záložce. ZmÄ›ny budou zahozeny, pokud budete pokraÄovat.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index 5527584ac..f3d043b0c 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -1,84 +1,133 @@
<?php
-$wb['conf_format_dateshort'] = "d.m.Y";
-$wb['conf_format_dateshort_human_readable'] = "tt.mm.jjjj";
-$wb['conf_format_datelong'] = "l, d. F Y";
-$wb['conf_format_timeshort'] = "H:i";
-$wb['conf_format_timelong'] = "H:i:s";
-$wb['conf_format_datetime'] = "d.m.Y H:i";
-$wb['number_format_decimals'] = "4";
-$wb['number_format_decimals_client'] = "2";
-$wb['number_format_dec_point'] = ",";
-$wb['number_format_thousands_sep'] = "";
-$wb['error_301'] = "Modul für Benutzer nicht erlaubt.";
-$wb['error_302'] = "Modul ungültig.";
-$wb['error_1001'] = "Der Benutzername und das Passwort dürfen nicht leer sein!";
-$wb['error_1002'] = "Der Benutzername und/oder das Passwort sind nicht korrekt!";
-$wb['error_1003'] = "Der Benutzername ist deaktiviert!";
-$wb['delete_confirmation'] = "Wollen Sie diesen Datensatz wirklich löschen?";
-$wb['error_no_view_permission'] = "Sie haben nicht die Berechtigung, diesen Datensatz zu lesen, oder dieser Datensatz existiert nicht!";
-$wb['error_no_delete_permission'] = "Sie haben nicht die Berechtigung, diesen Datensatz zu löschen!";
-$wb['page_txt'] = "Seite";
-$wb['page_of_txt'] = "von";
-$wb['page_next_txt'] = "Weiter";
-$wb['page_back_txt'] = "Zurück";
-$wb['delete_txt'] = "Löschen";
-$wb['filter_txt'] = "Filter";
-$wb['add_new_record_txt'] = "Neuen Datensatz hinzufügen";
-$wb['btn_save_txt'] = "Speichern";
-$wb['btn_cancel_txt'] = "Abbrechen";
-$wb['toolsarea_head_txt'] = "Einstellungen";
-$wb['page_and_txt'] = "und";
-$wb['top_menu_system'] = "System";
-$wb['top_menu_client'] = "Kunden";
-$wb['top_menu_email'] = "E-Mail";
-$wb['top_menu_monitor'] = "Ãœberwachung";
-$wb['top_menu_sites'] = "Webseiten";
-$wb['top_menu_dns'] = "DNS";
-$wb['top_menu_tools'] = "Einstellungen";
-$wb['top_menu_help'] = "Support";
-$wb['top_menu_billing'] = "Fakturierung";
-$wb['top_menu_mailuser'] = "E-Mail Benutzer";
-$wb['top_menu_domain'] = "Domains";
-$wb['top_menu_dashboard'] = "Home";
-$wb['latest_news_txt'] = "Neuigkeiten";
-$wb['top_menu_vm'] = "VServer";
-$wb['daynamesmin_su'] = "So";
-$wb['daynamesmin_mo'] = "Mo";
-$wb['daynamesmin_tu'] = "Di";
-$wb['daynamesmin_we'] = "Mi";
-$wb['daynamesmin_th'] = "Do";
-$wb['daynamesmin_fr'] = "Fr";
-$wb['daynamesmin_sa'] = "Sa";
-$wb['daynames_sunday'] = "Sonntag";
-$wb['daynames_monday'] = "Montag";
-$wb['daynames_tuesday'] = "Dienstag";
-$wb['daynames_wednesday'] = "Mittwoch";
-$wb['daynames_thursday'] = "Donnerstag";
-$wb['daynames_friday'] = "Freitag";
-$wb['daynames_saturday'] = "Samstag";
-$wb['monthnamesshort_jan'] = "Jan";
-$wb['monthnamesshort_feb'] = "Feb";
-$wb['monthnamesshort_mar'] = "Mär";
-$wb['monthnamesshort_apr'] = "Apr";
-$wb['monthnamesshort_may'] = "Mai";
-$wb['monthnamesshort_jun'] = "Jun";
-$wb['monthnamesshort_jul'] = "Jul";
-$wb['monthnamesshort_aug'] = "Aug";
-$wb['monthnamesshort_sep'] = "Sep";
-$wb['monthnamesshort_oct'] = "Okt";
-$wb['monthnamesshort_nov'] = "Nov";
-$wb['monthnamesshort_dec'] = "Dez";
-$wb['datepicker_nextText'] = "Vor";
-$wb['datepicker_prevText'] = "Zurück";
-$wb['logout_txt'] = "Abmelden";
-$wb['submit_confirmation'] = "Wollen Sie diese Aktion wirlich ausführen?";
-$wb['globalsearch_resultslimit_of_txt'] = "von";
-$wb['globalsearch_resultslimit_results_txt'] = "Treffern";
-$wb['globalsearch_noresults_text_txt'] = "Keine Treffer.";
-$wb['globalsearch_noresults_limit_txt'] = "0 Treffer";
-$wb['globalsearch_searchfield_watermark_txt'] = "Suche";
-$wb['globalsearch_suggestions_text_txt'] = "Vorschläge";
-$wb['global_tabchange_warning_txt'] = "Die Eingaben in diesem Tab werden gespeichert, wenn Sie OK klicken, bei Abbrechen werden die Änderungen verworfen.";
-$wb['global_tabchange_discard_txt'] = "Achtung, Sie haben ungespeicherte Änderungen in diesem Tab. Wenn Sie fortfahren werden die Änderungen verworfen.";
+$wb['conf_format_dateshort'] = 'd.m.Y';
+$wb['conf_format_dateshort_human_readable'] = 'tt.mm.jjjj';
+$wb['conf_format_datelong'] = 'l, d. F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'd.m.Y H:i';
+$wb['number_format_decimals'] = '4';
+$wb['number_format_decimals_client'] = '2';
+$wb['number_format_dec_point'] = ',';
+$wb['number_format_thousands_sep'] = '';
+$wb['error_301'] = 'Modul für Benutzer nicht erlaubt.';
+$wb['error_302'] = 'Modul ungültig.';
+$wb['error_1001'] = 'Der Benutzername und das Passwort dürfen nicht leer sein!';
+$wb['error_1002'] = 'Der Benutzername und/oder das Passwort sind nicht korrekt!';
+$wb['error_1003'] = 'Der Benutzername ist deaktiviert!';
+$wb['delete_confirmation'] = 'Wollen Sie diesen Datensatz wirklich löschen?';
+$wb['error_no_view_permission'] = 'Sie haben nicht die Berechtigung, diesen Datensatz zu lesen, oder dieser Datensatz existiert nicht!';
+$wb['error_no_delete_permission'] = 'Sie haben nicht die Berechtigung, diesen Datensatz zu löschen!';
+$wb['page_txt'] = 'Seite';
+$wb['page_of_txt'] = 'von';
+$wb['page_next_txt'] = 'Weiter';
+$wb['page_back_txt'] = 'Zurück';
+$wb['delete_txt'] = 'Löschen';
+$wb['filter_txt'] = 'Filter';
+$wb['add_new_record_txt'] = 'Neuen Datensatz hinzufügen';
+$wb['btn_save_txt'] = 'Speichern';
+$wb['btn_cancel_txt'] = 'Abbrechen';
+$wb['toolsarea_head_txt'] = 'Einstellungen';
+$wb['page_and_txt'] = 'und';
+$wb['top_menu_system'] = 'System';
+$wb['top_menu_client'] = 'Kunden';
+$wb['top_menu_email'] = 'E-Mail';
+$wb['top_menu_monitor'] = 'Ãœberwachung';
+$wb['top_menu_sites'] = 'Webseiten';
+$wb['top_menu_dns'] = 'DNS';
+$wb['top_menu_tools'] = 'Einstellungen';
+$wb['top_menu_help'] = 'Support';
+$wb['top_menu_billing'] = 'Fakturierung';
+$wb['top_menu_mailuser'] = 'E-Mail Benutzer';
+$wb['top_menu_domain'] = 'Domains';
+$wb['top_menu_dashboard'] = 'Home';
+$wb['latest_news_txt'] = 'Neuigkeiten';
+$wb['top_menu_vm'] = 'VServer';
+$wb['daynamesmin_su'] = 'So';
+$wb['daynamesmin_mo'] = 'Mo';
+$wb['daynamesmin_tu'] = 'Di';
+$wb['daynamesmin_we'] = 'Mi';
+$wb['daynamesmin_th'] = 'Do';
+$wb['daynamesmin_fr'] = 'Fr';
+$wb['daynamesmin_sa'] = 'Sa';
+$wb['daynames_sunday'] = 'Sonntag';
+$wb['daynames_monday'] = 'Montag';
+$wb['daynames_tuesday'] = 'Dienstag';
+$wb['daynames_wednesday'] = 'Mittwoch';
+$wb['daynames_thursday'] = 'Donnerstag';
+$wb['daynames_friday'] = 'Freitag';
+$wb['daynames_saturday'] = 'Samstag';
+$wb['monthnamesshort_jan'] = 'Jan';
+$wb['monthnamesshort_feb'] = 'Feb';
+$wb['monthnamesshort_mar'] = 'Mär';
+$wb['monthnamesshort_apr'] = 'Apr';
+$wb['monthnamesshort_may'] = 'Mai';
+$wb['monthnamesshort_jun'] = 'Jun';
+$wb['monthnamesshort_jul'] = 'Jul';
+$wb['monthnamesshort_aug'] = 'Aug';
+$wb['monthnamesshort_sep'] = 'Sep';
+$wb['monthnamesshort_oct'] = 'Okt';
+$wb['monthnamesshort_nov'] = 'Nov';
+$wb['monthnamesshort_dec'] = 'Dez';
+$wb['datepicker_nextText'] = 'Vor';
+$wb['datepicker_prevText'] = 'Zurück';
+$wb['logout_txt'] = 'Abmelden';
+$wb['submit_confirmation'] = 'Wollen Sie diese Aktion wirlich ausführen?';
+$wb['globalsearch_resultslimit_of_txt'] = 'von';
+$wb['globalsearch_resultslimit_results_txt'] = 'Treffern';
+$wb['globalsearch_noresults_text_txt'] = 'Keine Treffer.';
+$wb['globalsearch_noresults_limit_txt'] = '0 Treffer';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Suche';
+$wb['globalsearch_suggestions_text_txt'] = 'Vorschläge';
+$wb['global_tabchange_warning_txt'] = 'Die Eingaben in diesem Tab werden gespeichert, wenn Sie OK klicken, bei Abbrechen werden die Änderungen verworfen.';
+$wb['global_tabchange_discard_txt'] = 'Achtung, Sie haben ungespeicherte Änderungen in diesem Tab. Wenn Sie fortfahren werden die Änderungen verworfen.';
+$wb['datalog_changes_txt'] = 'Folgende Änderungen wurden noch nicht auf alle Server übernommen:';
+$wb['datalog_changes_end_txt'] = 'Die Übernahme der Änderungen kann bis zu 1 Minute in Anspruch nehmen.';
+$wb['datalog_status_i_web_database'] = 'Neue Datenbank anlegen';
+$wb['datalog_status_u_web_database'] = 'Datenbank ändern';
+$wb['datalog_status_d_web_database'] = 'Datenbank löschen';
+$wb['datalog_status_i_web_database_user'] = 'Datenbank-Benutzer für Datenbank anlegen';
+$wb['datalog_status_u_web_database_user'] = 'Datenbank-Benutzer ändern';
+$wb['datalog_status_d_web_database_user'] = 'Datenbank-Benutzer löschen';
+$wb['datalog_status_i_web_domain'] = 'Neue Webseite anlegen';
+$wb['datalog_status_u_web_domain'] = 'Webseiten-Einstellungen ändern';
+$wb['datalog_status_d_web_domain'] = 'Webseite löschen';
+$wb['datalog_status_i_ftp_user'] = 'FTP-Benutzer anlegen';
+$wb['datalog_status_u_ftp_user'] = 'FTP-Benutzer ändern';
+$wb['datalog_status_d_ftp_user'] = 'FTP-Benutzer löschen';
+$wb['datalog_status_i_mail_domain'] = 'Neue E-Mail Domain anlegen';
+$wb['datalog_status_u_mail_domain'] = 'E-Mail Domain ändern';
+$wb['datalog_status_d_mail_domain'] = 'E-Mail Domain löschen';
+$wb['datalog_status_i_mail_user'] = 'Neues E-Mail Konto anlegen';
+$wb['datalog_status_u_mail_user'] = 'E-Mail Konto ändern';
+$wb['datalog_status_d_mail_user'] = 'E-Mail Konto löschen';
+$wb['datalog_status_i_spamfilter_users'] = 'Spamfilter-Einstellungen anlegen';
+$wb['datalog_status_u_spamfilter_users'] = 'Spamfilter-Einstellungen ändern';
+$wb['datalog_status_d_spamfilter_users'] = 'Spamfilter-Einstellungen löschen';
+$wb['datalog_status_i_mail_forwarding'] = 'Neue E-Mail Adresse anlegen';
+$wb['datalog_status_u_mail_forwarding'] = 'E-Mail Adresse ändern';
+$wb['datalog_status_d_mail_forwarding'] = 'E-Mail Adresse löschen';
+$wb['datalog_status_i_dns_rr'] = 'DNS Record anlegen';
+$wb['datalog_status_u_dns_rr'] = 'DNS Record ändern';
+$wb['datalog_status_d_dns_rr'] = 'DNS Record löschen';
+$wb['datalog_status_i_dns_soa'] = 'DNS Zone anlegen';
+$wb['datalog_status_u_dns_soa'] = 'DNS Zone ändern';
+$wb['datalog_status_d_dns_soa'] = 'DNS Zone löschen';
+$wb['datalog_status_i_cron'] = 'Cronjob anlegen';
+$wb['datalog_status_u_cron'] = 'Cronjob ändern';
+$wb['datalog_status_d_cron'] = 'Cronjob löschen';
+$wb['datalog_status_i_mail_get'] = 'Mailabruf anlegen';
+$wb['datalog_status_u_mail_get'] = 'Mailabruf ändern';
+$wb['datalog_status_d_mail_get'] = 'Mailabruf löschen';
+$wb['datalog_status_i_mail_mailinglist'] = 'Mailingliste anlegen';
+$wb['datalog_status_u_mail_mailinglist'] = 'Mailingliste ändern';
+$wb['datalog_status_d_mail_mailinglist'] = 'Mailingliste löschen';
+$wb['datalog_status_i_shell_user'] = 'Shell User anlegen';
+$wb['datalog_status_u_shell_user'] = 'Shell User ändern';
+$wb['datalog_status_d_shell_user'] = 'Shell User löschen';
+$wb['datalog_status_i_web_folder'] = 'Verzeichnisschutz anlegen';
+$wb['datalog_status_u_web_folder'] = 'Verzeichnisschutz ändern';
+$wb['datalog_status_d_web_folder'] = 'Verzeichnisschutz löschen';
+$wb['datalog_status_i_web_folder_user'] = 'Verzeichnisschutz Benutzer anlegen';
+$wb['datalog_status_u_web_folder_user'] = 'Verzeichnisschutz Benutzer ändern';
+$wb['datalog_status_d_web_folder_user'] = 'Verzeichnisschutz Benutzer löschen';
?>
-
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index 58cfc7414..ee79b81bc 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index 09b692b23..f73f4e242 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -80,4 +80,55 @@ $wb['globalsearch_searchfield_watermark_txt'] = "Search";
$wb['globalsearch_suggestions_text_txt'] = "Suggestions";
$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
+$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
+$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
index 1157891e1..c2b8d0835 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index d53fcf203..74cf33b3a 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng
index 30441b6ac..2726e3f04 100644
--- a/interface/lib/lang/hr.lng
+++ b/interface/lib/lang/hr.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng
index ef082d597..2746241c5 100644
--- a/interface/lib/lang/hu.lng
+++ b/interface/lib/lang/hu.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng
index d24845bd0..b51d039c7 100644
--- a/interface/lib/lang/id.lng
+++ b/interface/lib/lang/id.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
index 4c293f13f..e4073d1bc 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng
index 25a80be9b..6b6fb6e26 100644
--- a/interface/lib/lang/ja.lng
+++ b/interface/lib/lang/ja.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index 0e5c8411e..027028709 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index 6a8619225..104a01d44 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng
index cc48b4221..0f44b4315 100644
--- a/interface/lib/lang/pt.lng
+++ b/interface/lib/lang/pt.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng
index 39fc3b099..1c46c22ed 100644
--- a/interface/lib/lang/ro.lng
+++ b/interface/lib/lang/ro.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index a8012c621..7ed33db2a 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index 07a52e44a..8004b2b92 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng
index ab7670f9d..08542cce9 100644
--- a/interface/lib/lang/sk.lng
+++ b/interface/lib/lang/sk.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng
index 8fc68442c..8f73db094 100644
--- a/interface/lib/lang/tr.lng
+++ b/interface/lib/lang/tr.lng
@@ -78,4 +78,53 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
?>
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
index dcdcc5442..f376a777a 100644
--- a/interface/lib/plugins/mail_user_filter_plugin.inc.php
+++ b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -141,6 +141,8 @@ class mail_user_filter_plugin {
$content .= 'if header :regex ["'.strtolower($page_form->dataRecord["source"]).'"] ["';
$searchterm = preg_quote($page_form->dataRecord["searchterm"]);
+ $searchterm = str_replace('\\[','\\\\[',$searchterm);
+ $searchterm = str_replace('\\]','\\\\]',$searchterm);
if($page_form->dataRecord["op"] == 'contains') {
$content .= ".*".$searchterm;
diff --git a/interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php b/interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
index ba9f061d3..e4de54a5e 100644
--- a/interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
+++ b/interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
@@ -46,19 +46,18 @@ class sites_web_vhost_subdomain_plugin {
// Get configuration for the web system
$app->uses("getconf");
- $web_rec = $app->tform->getDataRecord($page_form->id);
- $web_config = $app->getconf->get_server_config($app->functions->intval($web_rec['server_id']),'web');
+ $web_config = $app->getconf->get_server_config($app->functions->intval($page_form->dataRecord['server_id']),'web');
- $parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = '" . $app->functions->intval($web_rec['parent_domain_id']) . "'");
+ $parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = '" . $app->functions->intval($page_form->dataRecord['parent_domain_id']) . "'");
// Set the values for document_root, system_user and system_group
$system_user = $app->db->quote($parent_domain['system_user']);
$system_group = $app->db->quote($parent_domain['system_group']);
$document_root = $app->db->quote($parent_domain['document_root']);
- $php_open_basedir = str_replace("[website_path]/web",$document_root.'/'.$web_rec['web_folder'],$web_config["php_open_basedir"]);
- $php_open_basedir = str_replace("[website_domain]/web",$web_rec['domain'].'/'.$web_rec['web_folder'],$php_open_basedir);
+ $php_open_basedir = str_replace("[website_path]/web",$document_root.'/'.$page_form->dataRecord['web_folder'],$web_config["php_open_basedir"]);
+ $php_open_basedir = str_replace("[website_domain]/web",$page_form->dataRecord['domain'].'/'.$page_form->dataRecord['web_folder'],$php_open_basedir);
$php_open_basedir = str_replace("[website_path]",$document_root,$php_open_basedir);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]",$web_rec['domain'],$php_open_basedir));
+ $php_open_basedir = $app->db->quote(str_replace("[website_domain]",$page_form->dataRecord['domain'],$php_open_basedir));
$htaccess_allow_override = $app->db->quote($parent_domain['allow_override']);
$sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($parent_domain['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$page_form->id;
diff --git a/interface/web/admin/form/directive_snippets.tform.php b/interface/web/admin/form/directive_snippets.tform.php
index 533708499..b41e0e4d7 100644
--- a/interface/web/admin/form/directive_snippets.tform.php
+++ b/interface/web/admin/form/directive_snippets.tform.php
@@ -81,7 +81,7 @@ $form["tabs"]['directive_snippets'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
- 'value' => array('apache' => 'Apache','nginx' => 'nginx','php' => 'PHP'),
+ 'value' => array('apache' => 'Apache','nginx' => 'nginx','php' => 'PHP','proxy' => 'Proxy'),
'searchable' => 2
),
'snippet' => array (
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index b16b5928e..360c1ba5c 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -894,8 +894,11 @@ $form["tabs"]['fastcgi'] = array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
- 'validators' => array(0 => array('type' => 'NOTEMPTY',
- 'errmsg' => 'fastcgi_max_requests_error_empty'),
+ 'validators' => array( 0 => array( 'type' => 'ISINT',
+ 'errmsg' => 'fastcgi_max_requests_error_empty'),
+ 1 => array( 'type' => 'RANGE',
+ 'range' => '0:',
+ 'errmsg' => 'fastcgi_max_requests_error_empty'),
),
'value' => '',
'width' => '40',
diff --git a/interface/web/admin/lib/lang/ar.lng b/interface/web/admin/lib/lang/ar.lng
index b8d39b543..5c84d33ba 100644
--- a/interface/web/admin/lib/lang/ar.lng
+++ b/interface/web/admin/lib/lang/ar.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Import';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/ar_directive_snippets.lng b/interface/web/admin/lib/lang/ar_directive_snippets.lng
new file mode 100644
index 000000000..d836ab0da
--- /dev/null
+++ b/interface/web/admin/lib/lang/ar_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['Directive Snippets'] = 'Directive Snippets';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['snippet_txt'] = 'Snippet';
+$wb['active_txt'] = 'Active';
+$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/ar_directive_snippets_list.lng b/interface/web/admin/lib/lang/ar_directive_snippets_list.lng
new file mode 100644
index 000000000..4124ea346
--- /dev/null
+++ b/interface/web/admin/lib/lang/ar_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Directive Snippets';
+$wb['active_txt'] = 'Active';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['add_new_record_txt'] = 'Add Directive Snippet';
+?>
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index cea3f6395..ef609bb05 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot home";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sections";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted applications";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted applications";
-$wb['website_path_txt'] = "Website path";
-$wb['website_symlinks_txt'] = "Website symlinks";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['website_basedir_txt'] = "Website basedir";
-$wb['vhost_conf_dir_txt'] = "Vhost config dir";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost config enabled dir";
-$wb['getmail_config_dir_txt'] = "Getmail config dir";
-$wb['fastcgi_starter_path_txt'] = "FastCGI starter path";
-$wb['fastcgi_starter_script_txt'] = "FastCGI starter script";
-$wb['fastcgi_alias_txt'] = "FastCGI Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini Path";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. Requests";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Module";
-$wb['maildir_path_txt'] = "Maildir Path";
-$wb['homedir_path_txt'] = "Homedir Path";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Mailuser Name";
-$wb['mailuser_group_txt'] = "Mailuser Group";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost User";
-$wb['relayhost_password_txt'] = "Relayhost Password";
-$wb['mailbox_size_limit_txt'] = "Mailbox Size Limit";
-$wb['message_size_limit_txt'] = "Message Size Limit";
-$wb['ip_address_txt'] = "IP Address";
-$wb['netmask_txt'] = "Netmask";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameservers";
-$wb['auto_network_configuration_txt'] = "Network Configuration";
-$wb['ip_address_error_wrong'] = "Invalid IP address format.";
-$wb['netmask_error_wrong'] = "Invalid Netmask format.";
-$wb['gateway_error_wrong'] = "Invalid Gateway format.";
-$wb['hostname_error_empty'] = "Hostname is empty.";
-$wb['nameservers_error_empty'] = "Nameserver is empty.";
-$wb['config_dir_txt'] = "Config directory";
-$wb['init_script_txt'] = "Cron init script name";
-$wb['crontab_dir_txt'] = "Path for individual crontabs";
-$wb['wget_txt'] = "Path to wget program";
-$wb['web_user_txt'] = "Apache user";
-$wb['web_group_txt'] = "Apache group";
-$wb['security_level_txt'] = "Security level";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "BIND User";
-$wb['bind_group_txt'] = "BIND Group";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf path";
-$wb['bind_user_error_empty'] = "BIND user is empty.";
-$wb['bind_group_error_empty'] = "BIND group is empty.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is empty.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf path is empty.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local path is empty.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is empty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is empty.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$wb['website_path_txt'] = 'Website path';
+$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_basedir_txt'] = 'Website basedir';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Module';
+$wb['maildir_path_txt'] = 'Maildir Path';
+$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Mailuser Name';
+$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
+$wb['message_size_limit_txt'] = 'Message Size Limit';
+$wb['ip_address_txt'] = 'IP Address';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameservers';
+$wb['auto_network_configuration_txt'] = 'Network Configuration';
+$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
+$wb['netmask_error_wrong'] = 'Invalid Netmask format.';
+$wb['gateway_error_wrong'] = 'Invalid Gateway format.';
+$wb['hostname_error_empty'] = 'Hostname is empty.';
+$wb['nameservers_error_empty'] = 'Nameserver is empty.';
+$wb['config_dir_txt'] = 'Config directory';
+$wb['init_script_txt'] = 'Cron init script name';
+$wb['crontab_dir_txt'] = 'Path for individual crontabs';
+$wb['wget_txt'] = 'Path to wget program';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
+$wb['security_level_txt'] = 'Security level';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'BIND User';
+$wb['bind_group_txt'] = 'BIND Group';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf path';
+$wb['bind_user_error_empty'] = 'BIND user is empty.';
+$wb['bind_group_error_empty'] = 'BIND group is empty.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng
index dd87527e2..2380eeff9 100644
--- a/interface/web/admin/lib/lang/ar_system_config.lng
+++ b/interface/web/admin/lib/lang/ar_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/bg.lng b/interface/web/admin/lib/lang/bg.lng
index f6ad02b19..c4b3ef634 100644
--- a/interface/web/admin/lib/lang/bg.lng
+++ b/interface/web/admin/lib/lang/bg.lng
@@ -46,4 +46,5 @@ $wb['Additional PHP Versions'] = 'Additional PHP Versions';
$wb['Interface'] = 'Interface';
$wb['Domains'] = 'Domains';
$wb['Misc'] = 'Misc';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/bg_directive_snippets.lng b/interface/web/admin/lib/lang/bg_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/bg_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/bg_directive_snippets_list.lng b/interface/web/admin/lib/lang/bg_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/bg_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 208bc476e..5c2b5f6c5 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot home";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sections";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted applications";
-$wb['website_path_txt'] = "Website path";
-$wb['website_symlinks_txt'] = "Website symlinks";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['vhost_conf_dir_txt'] = "Vhost config dir";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost config enabled dir";
-$wb['getmail_config_dir_txt'] = "Getmail config dir";
-$wb['fastcgi_starter_path_txt'] = "FastCGI starter path";
-$wb['fastcgi_starter_script_txt'] = "FastCGI starter script";
-$wb['fastcgi_alias_txt'] = "FastCGI Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini Path";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. Requests";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Модул";
-$wb['maildir_path_txt'] = "Maildir Path";
-$wb['homedir_path_txt'] = "Homedir Path";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Mailuser Name";
-$wb['mailuser_group_txt'] = "Mailuser Group";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost User";
-$wb['relayhost_password_txt'] = "Relayhost Password";
-$wb['mailbox_size_limit_txt'] = "Mailbox Size Limit";
-$wb['message_size_limit_txt'] = "Message Size Limit";
-$wb['ip_address_txt'] = "IP адреÑ";
-$wb['netmask_txt'] = "Ðет маÑка";
-$wb['gateway_txt'] = "Шлюз";
-$wb['hostname_txt'] = "ХоÑÑ‚ име";
-$wb['nameservers_txt'] = "Nameservers";
-$wb['auto_network_configuration_txt'] = "Мрежова конфигурациÑ";
-$wb['website_basedir_txt'] = "Базова Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° Ñайта";
-$wb['ip_address_error_wrong'] = "Грешен формат за IP адреÑ.";
-$wb['netmask_error_wrong'] = "Грешен формат за ÐЕТ маÑка.";
-$wb['gateway_error_wrong'] = "Грешен формат за Шлюз.";
-$wb['hostname_error_empty'] = "ХоÑÑ‚ името е празно.";
-$wb['nameservers_error_empty'] = "Nameserver is empty.";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted applications";
-$wb['config_dir_txt'] = "Config directory";
-$wb['init_script_txt'] = "Cron init script name";
-$wb['crontab_dir_txt'] = "Path for individual crontabs";
-$wb['wget_txt'] = "Path to wget program";
-$wb['security_level_txt'] = "Security level";
-$wb['web_user_txt'] = "Apache потребител";
-$wb['web_group_txt'] = "Apache група";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost порт";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost домейн";
-$wb['bind_user_txt'] = "BIND Потребител";
-$wb['bind_group_txt'] = "BIND Група";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf path";
-$wb['bind_user_error_empty'] = "BIND user is empty.";
-$wb['bind_group_error_empty'] = "BIND group is empty.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is empty.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf path is empty.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local path is empty.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is empty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is empty.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° бекъп";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "ОпциÑта за мрежова ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ðµ възможна Ñамо за Ñървъри на Debian и Ubuntu. Ðе разрашавай тази Ð¾Ð¿Ñ†Ð¸Ñ Ð°ÐºÐ¾ Ñ‚Ð²Ð¾Ñ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð·Ð° връзка към интернет не е eth0.";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Сървър тип";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Бекъп директориÑта е празна.";
-$wb['maildir_path_error_empty'] = "Maildir Path е празна.";
-$wb['homedir_path_error_empty'] = "Homedir Path е празна.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID е празна.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID е празна.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name е празен.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group е празна.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Забрани MySQL мониторинга";
-$wb['do_not_try_rescue_mail_txt'] = "Забрани Email мониторинга";
-$wb['rescue_description_txt'] = "<b>ИÐФОРМÐЦИЯ:</b> Ðко иÑкате да изключвате MySQL, вие Ñ‚Ñ€Ñбва да изберете Забрани MySQL монитор кутийката и Ñлед това изчакайте 2-3 минути.<br>ако не изчакайте 2-3 минути, MySQL ще Ñе опита да реÑтартира !";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
+$wb['website_path_txt'] = 'Website path';
+$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Модул';
+$wb['maildir_path_txt'] = 'Maildir Path';
+$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Mailuser Name';
+$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
+$wb['message_size_limit_txt'] = 'Message Size Limit';
+$wb['ip_address_txt'] = 'IP адреÑ';
+$wb['netmask_txt'] = 'Ðет маÑка';
+$wb['gateway_txt'] = 'Шлюз';
+$wb['hostname_txt'] = 'ХоÑÑ‚ име';
+$wb['nameservers_txt'] = 'Nameservers';
+$wb['auto_network_configuration_txt'] = 'Мрежова конфигурациÑ';
+$wb['website_basedir_txt'] = 'Базова Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° Ñайта';
+$wb['ip_address_error_wrong'] = 'Грешен формат за IP адреÑ.';
+$wb['netmask_error_wrong'] = 'Грешен формат за ÐЕТ маÑка.';
+$wb['gateway_error_wrong'] = 'Грешен формат за Шлюз.';
+$wb['hostname_error_empty'] = 'ХоÑÑ‚ името е празно.';
+$wb['nameservers_error_empty'] = 'Nameserver is empty.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$wb['config_dir_txt'] = 'Config directory';
+$wb['init_script_txt'] = 'Cron init script name';
+$wb['crontab_dir_txt'] = 'Path for individual crontabs';
+$wb['wget_txt'] = 'Path to wget program';
+$wb['security_level_txt'] = 'Security level';
+$wb['web_user_txt'] = 'Apache потребител';
+$wb['web_group_txt'] = 'Apache група';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost порт';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost домейн';
+$wb['bind_user_txt'] = 'BIND Потребител';
+$wb['bind_group_txt'] = 'BIND Група';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf path';
+$wb['bind_user_error_empty'] = 'BIND user is empty.';
+$wb['bind_group_error_empty'] = 'BIND group is empty.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° бекъп';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'ОпциÑта за мрежова ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ðµ възможна Ñамо за Ñървъри на Debian и Ubuntu. Ðе разрашавай тази Ð¾Ð¿Ñ†Ð¸Ñ Ð°ÐºÐ¾ Ñ‚Ð²Ð¾Ñ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð·Ð° връзка към интернет не е eth0.';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Сървър тип';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Бекъп директориÑта е празна.';
+$wb['maildir_path_error_empty'] = 'Maildir Path е празна.';
+$wb['homedir_path_error_empty'] = 'Homedir Path е празна.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID е празна.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID е празна.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name е празен.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group е празна.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Забрани MySQL мониторинга';
+$wb['do_not_try_rescue_mail_txt'] = 'Забрани Email мониторинга';
+$wb['rescue_description_txt'] = '<b>ИÐФОРМÐЦИЯ:</b> Ðко иÑкате да изключвате MySQL, вие Ñ‚Ñ€Ñбва да изберете Забрани MySQL монитор кутийката и Ñлед това изчакайте 2-3 минути.<br>ако не изчакайте 2-3 минути, MySQL ще Ñе опита да реÑтартира !';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
+$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng
index 5dfeb13e6..f29dcf0ac 100644
--- a/interface/web/admin/lib/lang/bg_system_config.lng
+++ b/interface/web/admin/lib/lang/bg_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/br.lng b/interface/web/admin/lib/lang/br.lng
index a56ff6d1f..347855558 100644
--- a/interface/web/admin/lib/lang/br.lng
+++ b/interface/web/admin/lib/lang/br.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Importar';
$wb['Remote Actions'] = 'Ações Remotas';
$wb['Do OS-Update'] = 'Fazer Atualização do SO';
$wb['Do ISPConfig-Update'] = 'Fazer Atualização do ISPConfig';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/br_directive_snippets.lng b/interface/web/admin/lib/lang/br_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/br_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/br_directive_snippets_list.lng b/interface/web/admin/lib/lang/br_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/br_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index 59c4533ff..c7237996b 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Raiz do Chroot Jailkit";
-$wb['jailkit_chroot_app_sections_txt'] = "Aplicações Jailkit chroot (Sessões)";
-$wb['jailkit_chroot_app_programs_txt'] = "Aplicações Jailkit em ambiente chroot";
-$wb['website_path_txt'] = "Caminho do Website";
-$wb['website_symlinks_txt'] = "Website symlinks: link simbólico";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['website_basedir_txt'] = "Website basedir: Diretório base ";
-$wb['vhost_conf_dir_txt'] = "Vhost config dir";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost diretório de configuração ativo";
-$wb['getmail_config_dir_txt'] = "Getmail config dir";
-$wb['fastcgi_starter_path_txt'] = "FastCGI: Caminho diretório inicial";
-$wb['fastcgi_starter_script_txt'] = "FastCGI: Script inicial";
-$wb['fastcgi_alias_txt'] = "FastCGI: Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI: Caminho do php.ini ";
-$wb['fastcgi_children_txt'] = "FastCGI: Filhos";
-$wb['fastcgi_max_requests_txt'] = "FastCGI: Requisições máximas";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Módulo";
-$wb['maildir_path_txt'] = "Caminho do diretório Maildir";
-$wb['homedir_path_txt'] = "Caminho do diretório Home";
-$wb['mailuser_uid_txt'] = "UID usuário de email";
-$wb['mailuser_gid_txt'] = "GID usuário de email";
-$wb['mailuser_name_txt'] = "Nome usuário de email";
-$wb['mailuser_group_txt'] = "Grupo usuário de email";
-$wb['relayhost_txt'] = "Host Relay";
-$wb['relayhost_user_txt'] = "Usuário do Host Relay";
-$wb['relayhost_password_txt'] = "Senha do Host Relay";
-$wb['mailbox_size_limit_txt'] = "Tamanho máximo da Caixa Postal";
-$wb['message_size_limit_txt'] = "Tamanho máximo de mensagem";
-$wb['ip_address_txt'] = "Endereço IP";
-$wb['netmask_txt'] = "Máscara de Rede";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Nome do Host";
-$wb['nameservers_txt'] = "Servidores DNS";
-$wb['auto_network_configuration_txt'] = "Configuração de Rede";
-$wb['ip_address_error_wrong'] = "Formato do Endereço IP inválido!";
-$wb['netmask_error_wrong'] = "Formato da Máscara de Rede inválio!";
-$wb['gateway_error_wrong'] = "Gateway inválido!";
-$wb['hostname_error_empty'] = "Por favor, entre com o nome do Host.";
-$wb['nameservers_error_empty'] = "Por favor, entre com o Servidor DNS.";
-$wb['jailkit_chroot_cron_programs_txt'] = "Cron de aplicações Jailkit em ambiente chroot";
-$wb['config_dir_txt'] = "Diretório de configuração";
-$wb['init_script_txt'] = "Cron init nome do script";
-$wb['crontab_dir_txt'] = "Caminho para crontabs individuais";
-$wb['wget_txt'] = "Caminho para o wget";
-$wb['web_user_txt'] = "Usuário Apache";
-$wb['web_group_txt'] = "Grupo Apache";
-$wb['security_level_txt'] = "NÃvel de Segurança";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "Usuário BIND";
-$wb['bind_group_txt'] = "Grupo BIND";
-$wb['bind_zonefiles_dir_txt'] = "Diretório de arquivos de zona do BIND";
-$wb['named_conf_path_txt'] = "Caminho do BIND named.conf";
-$wb['bind_user_error_empty'] = "Usuário do BIND está em branco.";
-$wb['bind_group_error_empty'] = "Grupo do BIND está em branco.";
-$wb['bind_zonefiles_dir_error_empty'] = "Diretório de arquivos de zona está em branco.";
-$wb['named_conf_path_error_empty'] = "Caminho do BIND named.conf.";
-$wb['named_conf_local_path_error_empty'] = "Caminho do BIND named.conf.local está em branco.";
-$wb['mail_filter_syntax_txt'] = "Sintaxe do Mailfilter";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir está em branco.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride está em branco.";
-$wb['awstats_conf_dir_txt'] = "Diretório de configuração do awstats";
-$wb['awstats_data_dir_txt'] = "Diretório de dados do awstats";
-$wb['awstats_pl_txt'] = "script awstats.pl";
-$wb['awstats_buildstaticpages_pl_txt'] = "script awstats_buildstaticpages.pl";
-$wb['backup_dir_txt'] = "Diretório de Backup";
-$wb['named_conf_local_path_txt'] = "Caminho do named.conf.local do BIND";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Caminho do php.ini do Apache";
-$wb['check_apache_config_txt'] = "Testar a configuração do Apache ao reiniciar";
-$wb['network_config_warning_txt'] = "A configuração de rede só está disponÃvel para servidores Debian e Ubuntu. Não ative esta configuração de a sua placa de rede não for eth0.";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Raiz do Chroot Jailkit';
+$wb['jailkit_chroot_app_sections_txt'] = 'Aplicações Jailkit chroot (Sessões)';
+$wb['jailkit_chroot_app_programs_txt'] = 'Aplicações Jailkit em ambiente chroot';
+$wb['website_path_txt'] = 'Caminho do Website';
+$wb['website_symlinks_txt'] = 'Website symlinks: link simbólico';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_basedir_txt'] = 'Website basedir: Diretório base ';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost diretório de configuração ativo';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI: Caminho diretório inicial';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI: Script inicial';
+$wb['fastcgi_alias_txt'] = 'FastCGI: Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI: Caminho do php.ini ';
+$wb['fastcgi_children_txt'] = 'FastCGI: Filhos';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI: Requisições máximas';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Módulo';
+$wb['maildir_path_txt'] = 'Caminho do diretório Maildir';
+$wb['homedir_path_txt'] = 'Caminho do diretório Home';
+$wb['mailuser_uid_txt'] = 'UID usuário de email';
+$wb['mailuser_gid_txt'] = 'GID usuário de email';
+$wb['mailuser_name_txt'] = 'Nome usuário de email';
+$wb['mailuser_group_txt'] = 'Grupo usuário de email';
+$wb['relayhost_txt'] = 'Host Relay';
+$wb['relayhost_user_txt'] = 'Usuário do Host Relay';
+$wb['relayhost_password_txt'] = 'Senha do Host Relay';
+$wb['mailbox_size_limit_txt'] = 'Tamanho máximo da Caixa Postal';
+$wb['message_size_limit_txt'] = 'Tamanho máximo de mensagem';
+$wb['ip_address_txt'] = 'Endereço IP';
+$wb['netmask_txt'] = 'Máscara de Rede';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Nome do Host';
+$wb['nameservers_txt'] = 'Servidores DNS';
+$wb['auto_network_configuration_txt'] = 'Configuração de Rede';
+$wb['ip_address_error_wrong'] = 'Formato do Endereço IP inválido!';
+$wb['netmask_error_wrong'] = 'Formato da Máscara de Rede inválio!';
+$wb['gateway_error_wrong'] = 'Gateway inválido!';
+$wb['hostname_error_empty'] = 'Por favor, entre com o nome do Host.';
+$wb['nameservers_error_empty'] = 'Por favor, entre com o Servidor DNS.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Cron de aplicações Jailkit em ambiente chroot';
+$wb['config_dir_txt'] = 'Diretório de configuração';
+$wb['init_script_txt'] = 'Cron init nome do script';
+$wb['crontab_dir_txt'] = 'Caminho para crontabs individuais';
+$wb['wget_txt'] = 'Caminho para o wget';
+$wb['web_user_txt'] = 'Usuário Apache';
+$wb['web_group_txt'] = 'Grupo Apache';
+$wb['security_level_txt'] = 'NÃvel de Segurança';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'Usuário BIND';
+$wb['bind_group_txt'] = 'Grupo BIND';
+$wb['bind_zonefiles_dir_txt'] = 'Diretório de arquivos de zona do BIND';
+$wb['named_conf_path_txt'] = 'Caminho do BIND named.conf';
+$wb['bind_user_error_empty'] = 'Usuário do BIND está em branco.';
+$wb['bind_group_error_empty'] = 'Grupo do BIND está em branco.';
+$wb['bind_zonefiles_dir_error_empty'] = 'Diretório de arquivos de zona está em branco.';
+$wb['named_conf_path_error_empty'] = 'Caminho do BIND named.conf.';
+$wb['named_conf_local_path_error_empty'] = 'Caminho do BIND named.conf.local está em branco.';
+$wb['mail_filter_syntax_txt'] = 'Sintaxe do Mailfilter';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir está em branco.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride está em branco.';
+$wb['awstats_conf_dir_txt'] = 'Diretório de configuração do awstats';
+$wb['awstats_data_dir_txt'] = 'Diretório de dados do awstats';
+$wb['awstats_pl_txt'] = 'script awstats.pl';
+$wb['awstats_buildstaticpages_pl_txt'] = 'script awstats_buildstaticpages.pl';
+$wb['backup_dir_txt'] = 'Diretório de Backup';
+$wb['named_conf_local_path_txt'] = 'Caminho do named.conf.local do BIND';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Caminho do php.ini do Apache';
+$wb['check_apache_config_txt'] = 'Testar a configuração do Apache ao reiniciar';
+$wb['network_config_warning_txt'] = 'A configuração de rede só está disponÃvel para servidores Debian e Ubuntu. Não ative esta configuração de a sua placa de rede não for eth0.';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng
index 614714d2c..bde177d00 100644
--- a/interface/web/admin/lib/lang/br_system_config.lng
+++ b/interface/web/admin/lib/lang/br_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng
index 33f4908f3..404c27367 100644
--- a/interface/web/admin/lib/lang/cz.lng
+++ b/interface/web/admin/lib/lang/cz.lng
@@ -1,6 +1,6 @@
<?php
-$wb['1001'] = 'Username or password is empty.';
-$wb['1002'] = 'Username or password is wrong.';
+$wb['1001'] = 'Uživatelské jméno nebo heslo je prázdné.';
+$wb['1002'] = 'Uživatelské jméno nebo heslo je nesprávné.';
$wb['Groups'] = 'Skupiny';
$wb['groups_description'] = 'Úprava skupin systémových uživatelů.';
$wb['Servers'] = 'Servery';
@@ -12,7 +12,7 @@ $wb['Edit group'] = 'Upravit skupinu';
$wb['Edit server'] = 'Upravit server';
$wb['Sync. Now'] = 'Synch. nynÃ';
$wb['DB Sync.'] = 'DB synch.';
-$wb['User Management'] = 'User Management';
+$wb['User Management'] = 'Správa uživatelů';
$wb['CP Users'] = 'CP uživatelé';
$wb['Remote Users'] = 'Vzdálenà uživatelé';
$wb['System'] = 'Systém';
@@ -20,30 +20,31 @@ $wb['Server Services'] = 'Služby serveru';
$wb['Services'] = 'Služby';
$wb['Server Config'] = 'Konfigurace serveru';
$wb['Server'] = 'Server';
-$wb['Mail'] = 'Mail';
+$wb['Mail'] = 'E-mail';
$wb['Getmail'] = 'Getmail';
$wb['Web'] = 'Web';
$wb['FastCGI'] = 'FastCGI';
$wb['Jailkit'] = 'Jailkit';
-$wb['Rescue'] = 'Rescue';
-$wb['Server IP addresses'] = 'IP adresy server';
-$wb['Additional PHP Versions'] = 'Additional PHP Versions';
+$wb['Rescue'] = 'Zachrána';
+$wb['Server IP addresses'] = 'IP adresy serveru';
+$wb['Additional PHP Versions'] = 'Dalšà PHP verze';
$wb['Firewall'] = 'Firewall';
-$wb['Interface'] = 'Interface';
-$wb['Interface Config'] = 'Main Config';
-$wb['Domains'] = 'Domains';
-$wb['Misc'] = 'Misc';
+$wb['Interface'] = 'RozhranÃ';
+$wb['Interface Config'] = 'Hlavnà konfigurace';
+$wb['Domains'] = 'Domény';
+$wb['Misc'] = 'Různé';
$wb['Software'] = 'Software';
$wb['Repositories'] = 'Repozitáře';
$wb['Packages'] = 'BalÃÄky';
$wb['Updates'] = 'Aktualizace';
-$wb['Language Editor'] = 'Editor jazyků';
-$wb['Languages'] = 'Jazyky';
-$wb['New Language'] = 'Nový jazyk';
-$wb['Merge'] = 'SlouÄit';
-$wb['Export'] = 'Exportovat';
-$wb['Import'] = 'Importovat';
-$wb['Remote Actions'] = 'Remote Actions';
-$wb['Do OS-Update'] = 'Do OS-Update';
-$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Language Editor'] = 'Jazykový editor';
+$wb['Languages'] = 'VýbÄ›r jazyka - pÅ™Ãmá editace';
+$wb['New Language'] = 'Vytvořit nový jazyk';
+$wb['Merge'] = 'SlouÄit jazykový soubor';
+$wb['Export'] = 'Uložit jazyk do souboru';
+$wb['Import'] = 'Nahrát jazykový soubor';
+$wb['Remote Actions'] = 'Vzdálené akce';
+$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
new file mode 100644
index 000000000..2204ff5f7
--- /dev/null
+++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['Directive Snippets'] = 'Directive Snippets';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['snippet_txt'] = 'Snippet';
+$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
new file mode 100644
index 000000000..42d45a6f7
--- /dev/null
+++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Directive Snippets';
+$wb['active_txt'] = 'AktivnÃ';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['add_new_record_txt'] = 'Add Directive Snippet';
+?>
diff --git a/interface/web/admin/lib/lang/cz_iptables.lng b/interface/web/admin/lib/lang/cz_iptables.lng
index 40760b949..d6f45feda 100644
--- a/interface/web/admin/lib/lang/cz_iptables.lng
+++ b/interface/web/admin/lib/lang/cz_iptables.lng
@@ -8,6 +8,6 @@ $wb['target_txt'] = 'Target';
$wb['state_txt'] = 'State';
$wb['destination_ip_txt'] = 'Destination Address';
$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
?>
diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng
index 15c8baddc..a823c4ca9 100644
--- a/interface/web/admin/lib/lang/cz_iptables_list.lng
+++ b/interface/web/admin/lib/lang/cz_iptables_list.lng
@@ -10,6 +10,6 @@ $wb['target_txt'] = 'Target';
$wb['state_txt'] = 'State';
$wb['destination_ip_txt'] = 'Destination Address';
$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
?>
diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng
index eb3a1421f..285dff276 100644
--- a/interface/web/admin/lib/lang/cz_language_add.lng
+++ b/interface/web/admin/lib/lang/cz_language_add.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Přidat jazyk';
+$wb['list_head_txt'] = 'Přidat nový jazyk';
$wb['language_select_txt'] = 'Vybrat jazykový základ';
-$wb['language_new_txt'] = 'Nový jazyk';
-$wb['language_new_hint_txt'] = '2 znakové ISO 639-1 jazykiové kódy (viz http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
-$wb['btn_save_txt'] = 'Vytvořit nový jazykový soubor';
+$wb['language_new_txt'] = 'Název nového jazyka';
+$wb['language_new_hint_txt'] = '2 znakové ISO 639-1 jazykové kódy (Viz: http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
+$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 886a3c305..f1e6f4924 100644
--- a/interface/web/admin/lib/lang/cz_language_complete.lng
+++ b/interface/web/admin/lib/lang/cz_language_complete.lng
@@ -1,7 +1,7 @@
<?php
-$wb['list_head_txt'] = 'SlouÄit jazyk';
-$wb['list_desc_txt'] = 'SlouÄit vybraný jazykový soubor s hlavnÃm anglickým jazykovým souborem. <br />Toto pÅ™idá chybÄ›jÃcà řetÄ›zce z anglického hlavnÃho souboru do vybraného souboru.';
-$wb['language_select_txt'] = 'Vybrat jazyk';
-$wb['btn_save_txt'] = 'SlouÄit soubory';
+$wb['list_head_txt'] = 'SlouÄit jazykový soubor';
+$wb['list_desc_txt'] = 'SlouÄit vybraný jazykový soubor s hlavnÃm anglickým jazykovým souborem. <br />Toto pÅ™idá chybÄ›jÃcà řetÄ›zce z anglického hlavnÃho souboru do vybraného jazykového souboru. <br /> V nových verzÃch ISPConfigu vznikajà nové moduly a položky, které chybÄ›jà ve starÅ¡Ãch jazykových souborech a takto je doplnÃte k pÅ™ekladu.';
+$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_export.lng b/interface/web/admin/lib/lang/cz_language_export.lng
index 347e7a3ad..7998eea01 100644
--- a/interface/web/admin/lib/lang/cz_language_export.lng
+++ b/interface/web/admin/lib/lang/cz_language_export.lng
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Exportovat jazykové soubory';
-$wb['language_select_txt'] = 'Vybrat jazyk';
-$wb['btn_save_txt'] = 'Exportovat vybraný jazykový soubor';
+$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 f93524d63..838c325f7 100644
--- a/interface/web/admin/lib/lang/cz_language_import.lng
+++ b/interface/web/admin/lib/lang/cz_language_import.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Importovat jazykový soubor';
+$wb['list_head_txt'] = 'Nahrát vybraný jazykový soubor';
$wb['language_import_txt'] = 'Vybrat jazykový soubor';
-$wb['btn_save_txt'] = 'Importovat vybraný jazykový soubor';
+$wb['btn_save_txt'] = 'Nahrát vybraný jazykový soubor';
$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';
+$wb['ignore_version_txt'] = 'PÅ™eskoÄit kontrolu verze ISPConfigu.';
?>
diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng
index 574dd1162..3375bd51c 100644
--- a/interface/web/admin/lib/lang/cz_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_package_install.lng
@@ -3,5 +3,5 @@ $wb['repo_name_txt'] = 'Repository';
$wb['repo_url_txt'] = 'URL';
$wb['repo_username_txt'] = 'User (optional)';
$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
+$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 f26852708..68da1c065 100644
--- a/interface/web/admin/lib/lang/cz_remote_action.lng
+++ b/interface/web/admin/lib/lang/cz_remote_action.lng
@@ -1,12 +1,12 @@
<?php
-$wb['select_server_txt'] = 'Select Server';
-$wb['btn_do_txt'] = 'Execute action';
-$wb['do_osupdate_caption'] = 'Do OS-Update at remote server';
-$wb['do_osupdate_desc'] = 'This Action does a aptitude -y upgrade at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
-$wb['do_ispcupdate_caption'] = 'Do ISPConfig 3 - Update at remote server';
-$wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
-$wb['action_scheduled'] = 'The action is scheduled for execution';
-$wb['select_all_server'] = 'All server';
-$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 instructins</a>';
+$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_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['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 db73e5aea..f764fc73e 100644
--- a/interface/web/admin/lib/lang/cz_remote_user.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user.lng
@@ -40,8 +40,8 @@ $wb['DNS rp functions'] = 'Funkce DNS RP';
$wb['DNS srv functions'] = 'Funkce DNS SRV';
$wb['DNS txt functions'] = 'Funkce DNS TXT';
$wb['Mail mailing list functions'] = 'Mail mailinglist functions';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$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_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index cf1642cf1..e7d148d75 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot adresář";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sekce";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrootované aplikace";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrootované aplikace";
-$wb['website_path_txt'] = "Website cesta";
-$wb['website_symlinks_txt'] = "Website symlinky";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['website_basedir_txt'] = "Website config adresář";
-$wb['vhost_conf_dir_txt'] = "Vhost config adresář";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost config enabled adresář";
-$wb['getmail_config_dir_txt'] = "Getmail config adresář";
-$wb['fastcgi_starter_path_txt'] = "FastCGI starter cesta";
-$wb['fastcgi_starter_script_txt'] = "FastCGI starter skript";
-$wb['fastcgi_alias_txt'] = "FastCGI alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini cesta";
-$wb['fastcgi_children_txt'] = "FastCGI děti";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. požadavků";
-$wb['fastcgi_bin_txt'] = "FastCGI bin";
-$wb['module_txt'] = "Modul";
-$wb['maildir_path_txt'] = "Cesta k mail adresáři";
-$wb['homedir_path_txt'] = "Cesta k domácÃmu adresáři";
-$wb['mailuser_uid_txt'] = "Mail uživatel UID";
-$wb['mailuser_gid_txt'] = "Mail uživatel GID";
-$wb['mailuser_name_txt'] = "Mail uživatel jméno";
-$wb['mailuser_group_txt'] = "Mail uživatel skupina";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost uživatel";
-$wb['relayhost_password_txt'] = "Relayhost heslo";
-$wb['mailbox_size_limit_txt'] = "Limit velikosti mailboxu";
-$wb['message_size_limit_txt'] = "Limit velikosti zprávy";
-$wb['ip_address_txt'] = "IP adresa";
-$wb['netmask_txt'] = "Maska";
-$wb['gateway_txt'] = "Brána";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Jmenné servery";
-$wb['auto_network_configuration_txt'] = "Konfigurace sÃtÄ›";
-$wb['ip_address_error_wrong'] = "Neplatný formát IP adresy.";
-$wb['netmask_error_wrong'] = "Neplatný formát sÃÅ¥ové masky.";
-$wb['gateway_error_wrong'] = "Neplatný formát brány.";
-$wb['hostname_error_empty'] = "Hostname je prázdný.";
-$wb['nameservers_error_empty'] = "Jmenný server je prázdný.";
-$wb['config_dir_txt'] = "KonfiguraÄnà adresář";
-$wb['init_script_txt'] = "Název cron init skriptu";
-$wb['crontab_dir_txt'] = "Cesta k individuálnÃm cron tabulkám";
-$wb['wget_txt'] = "Cesta k wget programu";
-$wb['web_user_txt'] = "Apache uživatel";
-$wb['web_group_txt'] = "Apache skupina";
-$wb['security_level_txt'] = "Úroveň bezpeÄnosti";
-$wb['loglevel_txt'] = "Úroveň logovánÃ";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost doména";
-$wb['bind_user_txt'] = "BIND uživatel";
-$wb['bind_group_txt'] = "BIND skupina";
-$wb['bind_zonefiles_dir_txt'] = "BIND adresář se zónovými soubory";
-$wb['named_conf_path_txt'] = "BIND named.conf cesta";
-$wb['bind_user_error_empty'] = "BIND uživatel je prázdný.";
-$wb['bind_group_error_empty'] = "BIND skupina je prázdná.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND adresář se zónovými soubory je prázdný.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf cesta je prázdná.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local cesta je prázdná.";
-$wb['mail_filter_syntax_txt'] = "Syntaxe mailového filtru";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP démon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir ije prázdný.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride je prázdný.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot adresář';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sekce';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrootované aplikace';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrootované aplikace';
+$wb['website_path_txt'] = 'Website cesta';
+$wb['website_symlinks_txt'] = 'Website symlinky';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_basedir_txt'] = 'Website config adresář';
+$wb['vhost_conf_dir_txt'] = 'Vhost config adresář';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled adresář';
+$wb['getmail_config_dir_txt'] = 'Getmail config adresář';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter cesta';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter skript';
+$wb['fastcgi_alias_txt'] = 'FastCGI alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini cesta';
+$wb['fastcgi_children_txt'] = 'FastCGI děti';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. požadavků';
+$wb['fastcgi_bin_txt'] = 'FastCGI bin';
+$wb['module_txt'] = 'Modul';
+$wb['maildir_path_txt'] = 'Cesta k mail adresáři';
+$wb['homedir_path_txt'] = 'Cesta k domácÃmu adresáři';
+$wb['mailuser_uid_txt'] = 'Mail uživatel UID';
+$wb['mailuser_gid_txt'] = 'Mail uživatel GID';
+$wb['mailuser_name_txt'] = 'Mail uživatel jméno';
+$wb['mailuser_group_txt'] = 'Mail uživatel skupina';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost uživatel';
+$wb['relayhost_password_txt'] = 'Relayhost heslo';
+$wb['mailbox_size_limit_txt'] = 'Limit velikosti mailboxu';
+$wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['netmask_txt'] = 'Maska';
+$wb['gateway_txt'] = 'Brána';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Jmenné servery';
+$wb['auto_network_configuration_txt'] = 'Konfigurace sÃtÄ›';
+$wb['ip_address_error_wrong'] = 'Neplatný formát IP adresy.';
+$wb['netmask_error_wrong'] = 'Neplatný formát sÃÅ¥ové masky.';
+$wb['gateway_error_wrong'] = 'Neplatný formát brány.';
+$wb['hostname_error_empty'] = 'Hostname je prázdný.';
+$wb['nameservers_error_empty'] = 'Jmenný server je prázdný.';
+$wb['config_dir_txt'] = 'Vlogger config adresář';
+$wb['init_script_txt'] = 'Název cron init skriptu';
+$wb['crontab_dir_txt'] = 'Cesta k individuálnÃm cron tabulkám';
+$wb['wget_txt'] = 'Cesta k wget programu';
+$wb['web_user_txt'] = 'Apache uživatel';
+$wb['web_group_txt'] = 'Apache skupina';
+$wb['security_level_txt'] = 'Úroveň bezpeÄnosti';
+$wb['loglevel_txt'] = 'Úroveň logovánÃ';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost doména';
+$wb['bind_user_txt'] = 'BIND uživatel';
+$wb['bind_group_txt'] = 'BIND skupina';
+$wb['bind_zonefiles_dir_txt'] = 'BIND adresář se zónovými soubory';
+$wb['named_conf_path_txt'] = 'BIND named.conf cesta';
+$wb['bind_user_error_empty'] = 'BIND uživatel je prázdný.';
+$wb['bind_group_error_empty'] = 'BIND skupina je prázdná.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND adresář se zónovými soubory je prázdný.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf cesta je prázdná.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local cesta je prázdná.';
+$wb['mail_filter_syntax_txt'] = 'Syntaxe mailového filtru';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP démon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir ije prázdný.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride je prázdný.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Adresář pro zálohy';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'Možnost konfigurace sÃtÄ› je k dispozici pouze pro Debian a Ubuntu servery. NepoužÃvejte tuto volbu, pokud vaÅ¡e sÃÅ¥ové rozhranà nenà eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Povolit monitorovánà služeb a restartovat pÅ™i selhánÃ';
+$wb['do_not_try_rescue_mysql_txt'] = 'Zakázat MySQL sledovánÃ';
+$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail sledovánÃ';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD sledovánÃ';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Režim zálohovánÃ';
+$wb['backup_mode_userzip'] = 'Zálohovánà vÅ¡ech souborů v adresáři web jako uživatel vlastnÃcà web adresář do souboru zip';
+$wb['backup_mode_rootgz'] = 'Zálohovánà všech souborů v adresáři web jako uživatel root';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Samostatná RBL se oddÄ›luje Äárkou)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Statistika kvóty poštovnà schránky';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/cz_server_ip.lng b/interface/web/admin/lib/lang/cz_server_ip.lng
index d4003f261..fa719665b 100644
--- a/interface/web/admin/lib/lang/cz_server_ip.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip.lng
@@ -4,8 +4,8 @@ $wb['ip_address_txt'] = 'IP adresa';
$wb['virtualhost_txt'] = 'HTTP NameVirtualHost';
$wb['ip_error_wrong'] = 'IP adresa je neplatná';
$wb['ip_error_unique'] = 'IP adresa musà být unikátnÃ';
-$wb['client_id_txt'] = 'Client';
-$wb['ip_type_txt'] = 'Type';
+$wb['client_id_txt'] = 'Klient';
+$wb['ip_type_txt'] = 'Verze';
$wb['virtualhost_port_txt'] = 'HTTP Ports';
$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
?>
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index ac3ab0b89..7182593e8 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -9,30 +9,36 @@ $wb['dbname_prefix_error_regex'] = 'Znak nenà povolen v prefixu databázovém n
$wb['dbuser_prefix_error_regex'] = 'Znak nenà povolen v prefixu databázového uživatele.';
$wb['ftpuser_prefix_error_regex'] = 'Znak nenà povolen v prefixu FTP uživatele.';
$wb['shelluser_prefix_error_regex'] = 'Znak nenà povolen v prefixu shell uživatele.';
-$wb['dblist_phpmyadmin_link_txt'] = 'Odkaz na apolikaci PHPMyAdmin v DB seznamu';
+$wb['dblist_phpmyadmin_link_txt'] = 'Odkaz na aplikaci PHPMyAdmin v DB seznamu';
$wb['mailboxlist_webmail_link_txt'] = 'Odkaz na aplikaci Webmail v Mailbox seznamu';
$wb['webmail_url_txt'] = 'Webmail URL';
$wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL';
$wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)';
$wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)';
$wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)';
-$wb['webdavuser_prefix_txt'] = 'Webdav user prefix';
+$wb['webdavuser_prefix_txt'] = 'Prefix webdav uživatele';
$wb['webdavuser_prefix_error_regex'] = 'Char not allowed in webdav user prefix.';
-$wb['use_domain_module_txt'] = 'Use the domain-module to add new domains';
+$wb['use_domain_module_txt'] = 'Použijte modul-domény pro přidánà nových domén';
$wb['use_domain_module_hint'] = 'If you use this module, your customers can only select one of the domains the admin creates for them. They can not free edit the domain-field.You have to re-login after changing this value, to make the changes visible.';
-$wb['new_domain_txt'] = 'HTML to create a new domain';
+$wb['new_domain_txt'] = 'HTML vytvořit novou doménu';
$wb['webftp_url_txt'] = 'WebFTP URL';
$wb['admin_mail_txt'] = 'E-mail Administrátora';
$wb['admin_name_txt'] = 'Jméno Administrátora';
-$wb['enable_custom_login_txt'] = 'Allow custom login name';
-$wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
-$wb['mailmailinglist_url_txt'] = 'Mailing list URL';
+$wb['enable_custom_login_txt'] = 'Povolit vlastnà přihlašovacà jméno';
+$wb['mailmailinglist_link_txt'] = 'Odkaz na aplikaci mailing seznam e-mailových konferencÃ';
+$wb['mailmailinglist_url_txt'] = 'Mailing seznam URL';
$wb['monitor_key_txt'] = 'Monitor keyword';
-$wb['maintenance_mode_txt'] = 'Maintenance Mode';
-$wb['smtp_enabled_txt'] = 'Use SMTP to send system mails';
+$wb['maintenance_mode_txt'] = 'Režim údržby';
+$wb['smtp_enabled_txt'] = 'PoužÃt (zvolit) SMTP server pro zasÃlánà systemových mailů';
$wb['smtp_host_txt'] = 'SMTP host';
$wb['smtp_port_txt'] = 'SMTP port';
-$wb['smtp_user_txt'] = 'SMTP user';
-$wb['smtp_pass_txt'] = 'SMTP password';
-$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_user_txt'] = 'SMTP uživatel';
+$wb['smtp_pass_txt'] = 'SMTP heslo';
+$wb['smtp_crypt_txt'] = 'PoužÃt SSL/TLS Å¡ifrované spojenà pro SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Záložka zmÄ›na varovánÃ';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
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 eee3af5fe..46b2988b5 100644
--- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
@@ -7,8 +7,8 @@ $wb['name_txt'] = 'PHP Name';
$wb['Name'] = 'Name';
$wb['FastCGI Settings'] = 'FastCGI Settings';
$wb['PHP-FPM Settings'] = 'PHP-FPM Settings';
-$wb['Additional PHP Versions'] = 'Additional PHP Versions';
-$wb['Form to edit additional PHP versions'] = 'Form to edit additional PHP versions';
+$wb['Additional PHP Versions'] = 'Dalšà PHP verze';
+$wb['Form to edit additional PHP versions'] = 'Formulář pro úpravu dalÅ¡Ã PHP verzÃ';
$wb['server_php_name_error_empty'] = 'The Name field must not be empty.';
$wb['php_fastcgi_binary_txt'] = 'Path to the PHP FastCGI binary';
$wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory';
diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng
index 0da6d871a..fc50add99 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -25,8 +25,8 @@ $wb['fax_txt'] = 'Fax';
$wb['groups_txt'] = 'Skupiny';
$wb['default_group_txt'] = 'Výchozà skupina';
$wb['startmodule_err'] = 'Výchozà modul nenalezen v modulech.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$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_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng
index 53e24812d..ab5db38ec 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -2,7 +2,7 @@
$wb['list_head_txt'] = 'Uživatelé';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['client_id_txt'] = 'Client ID';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$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'] = 'Groups';
diff --git a/interface/web/admin/lib/lang/de.lng b/interface/web/admin/lib/lang/de.lng
index a4e8c55c2..0c34257b2 100644
--- a/interface/web/admin/lib/lang/de.lng
+++ b/interface/web/admin/lib/lang/de.lng
@@ -1,51 +1,50 @@
<?php
-$wb['1001'] = "Benutzername oder Passwort ist leer.";
-$wb['1002'] = "Benutzername oder Passwort ist falsch.";
-$wb['Groups'] = "Gruppen";
-$wb['groups_description'] = "Formular zur Bearbeitung von Systembenutzer Gruppen.";
-$wb['Servers'] = "Server";
-$wb['Config'] = "Konfiguration";
-$wb['Add user'] = "Benutzer hinzufügen";
-$wb['Edit user'] = "Benutzer bearbeiten";
-$wb['Add group'] = "Gruppe hinzufügen";
-$wb['Edit group'] = "Gruppe bearbeiten";
-$wb['Edit server'] = "Server bearbeiten";
-$wb['Sync. Now'] = "Jetzt synchronisieren";
-$wb['DB Sync.'] = "Datenbank Synchronisation";
-$wb['User Management'] = "Benutzerverwaltung";
-$wb['CP Users'] = "CP Benutzer";
-$wb['Remote Users'] = "Remote Benutzer";
-$wb['System'] = "System";
-$wb['Server Services'] = "Server Dienste";
-$wb['Services'] = "Dienste";
-$wb['Server Config'] = "Serverkonfiguration";
-$wb['Server'] = "Server";
-$wb['Mail'] = "E-Mail";
-$wb['Getmail'] = "Getmail";
-$wb['Web'] = "Web";
-$wb['FastCGI'] = "FastCGI";
-$wb['Jailkit'] = "Jailkit";
-$wb['Rescue'] = "Ãœberwachung";
-$wb['Server IP addresses'] = "Server IP Adressen";
-$wb['Additional PHP Versions'] = "Zusätzliche PHP Versionen";
-$wb['Directive Snippets'] = "Direktiven Schnipsel";
-$wb['Firewall'] = "Firewall";
-$wb['Interface'] = "Benutzeroberfläche";
-$wb['Interface Config'] = "Einstellungen";
-$wb['Domains'] = "Domains";
-$wb['Misc'] = "Diverses";
-$wb['Software'] = "Apps & Add-Ons";
-$wb['Repositories'] = "Bibliotheken";
-$wb['Packages'] = "Pakete";
-$wb['Updates'] = "Updates";
-$wb['Language Editor'] = "Sprachen Editor";
-$wb['Languages'] = "Sprachen";
-$wb['New Language'] = "Neue Sprache";
-$wb['Merge'] = "Zusammenführen";
-$wb['Export'] = "Exportieren";
-$wb['Import'] = "Importieren";
-$wb['Remote Actions'] = "Wartung";
-$wb['Do OS-Update'] = "Betriebssystem Update";
-$wb['Do ISPConfig-Update'] = "ISPConfig Update";
+$wb['1001'] = 'Benutzername oder Passwort ist leer.';
+$wb['1002'] = 'Benutzername oder Passwort ist falsch.';
+$wb['Groups'] = 'Gruppen';
+$wb['groups_description'] = 'Formular zur Bearbeitung von Systembenutzer Gruppen.';
+$wb['Servers'] = 'Server';
+$wb['Config'] = 'Konfiguration';
+$wb['Add user'] = 'Benutzer hinzufügen';
+$wb['Edit user'] = 'Benutzer bearbeiten';
+$wb['Add group'] = 'Gruppe hinzufügen';
+$wb['Edit group'] = 'Gruppe bearbeiten';
+$wb['Edit server'] = 'Server bearbeiten';
+$wb['Sync. Now'] = 'Jetzt synchronisieren';
+$wb['DB Sync.'] = 'Datenbank Synchronisation';
+$wb['User Management'] = 'Benutzerverwaltung';
+$wb['CP Users'] = 'CP Benutzer';
+$wb['Remote Users'] = 'Remote Benutzer';
+$wb['System'] = 'System';
+$wb['Server Services'] = 'Server Dienste';
+$wb['Services'] = 'Dienste';
+$wb['Server Config'] = 'Serverkonfiguration';
+$wb['Server'] = 'Server';
+$wb['Mail'] = 'E-Mail';
+$wb['Getmail'] = 'Getmail';
+$wb['Web'] = 'Web';
+$wb['FastCGI'] = 'FastCGI';
+$wb['Jailkit'] = 'Jailkit';
+$wb['Rescue'] = 'Ãœberwachung';
+$wb['Server IP addresses'] = 'Server IP Adressen';
+$wb['Additional PHP Versions'] = 'Zusätzliche PHP Versionen';
+$wb['Directive Snippets'] = 'Direktiven Schnipsel';
+$wb['Firewall'] = 'Firewall';
+$wb['Interface'] = 'Benutzeroberfläche';
+$wb['Interface Config'] = 'Einstellungen';
+$wb['Domains'] = 'Domains';
+$wb['Misc'] = 'Diverses';
+$wb['Software'] = 'Apps & Add-Ons';
+$wb['Repositories'] = 'Bibliotheken';
+$wb['Packages'] = 'Pakete';
+$wb['Updates'] = 'Updates';
+$wb['Language Editor'] = 'Sprachen Editor';
+$wb['Languages'] = 'Sprachen';
+$wb['New Language'] = 'Neue Sprache';
+$wb['Merge'] = 'Zusammenführen';
+$wb['Export'] = 'Exportieren';
+$wb['Import'] = 'Importieren';
+$wb['Remote Actions'] = 'Wartung';
+$wb['Do OS-Update'] = 'Betriebssystem Update';
+$wb['Do ISPConfig-Update'] = 'ISPConfig Update';
?>
-
diff --git a/interface/web/admin/lib/lang/de_directive_snippets.lng b/interface/web/admin/lib/lang/de_directive_snippets.lng
index a858301b0..7a9b7563b 100644
--- a/interface/web/admin/lib/lang/de_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/de_directive_snippets.lng
@@ -1,10 +1,9 @@
<?php
-$wb['Directive Snippets'] = "Direktiven Schnipsel";
-$wb['name_txt'] = "Name des Schnipsels";
-$wb['type_txt'] = "Typ";
-$wb['snippet_txt'] = "Schnipsel";
-$wb['active_txt'] = "Aktiv";
-$wb['directive_snippets_name_empty'] = "Bitte geben Sie einen Namen für den Schnipsel an.";
-$wb['directive_snippets_name_error_unique'] = "Es existiert schon ein Direktiven-Schnipsel mit diesem Namen.";
+$wb['Directive Snippets'] = 'Direktiven Schnipsel';
+$wb['name_txt'] = 'Name des Schnipsels';
+$wb['type_txt'] = 'Typ';
+$wb['snippet_txt'] = 'Schnipsel';
+$wb['active_txt'] = 'Aktiv';
+$wb['directive_snippets_name_empty'] = 'Bitte geben Sie einen Namen für den Schnipsel an.';
+$wb['directive_snippets_name_error_unique'] = 'Es existiert schon ein Direktiven-Schnipsel mit diesem Namen.';
?>
-
diff --git a/interface/web/admin/lib/lang/de_directive_snippets_list.lng b/interface/web/admin/lib/lang/de_directive_snippets_list.lng
index e1cfd39b0..c5f1b1001 100644
--- a/interface/web/admin/lib/lang/de_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/de_directive_snippets_list.lng
@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Name des Schnipsels';
$wb['type_txt'] = 'Typ';
$wb['add_new_record_txt'] = 'Direcktiven Schnipsel hinzufügen';
?>
-
diff --git a/interface/web/admin/lib/lang/de_firewall.lng b/interface/web/admin/lib/lang/de_firewall.lng
index a475290e1..92b73270f 100644
--- a/interface/web/admin/lib/lang/de_firewall.lng
+++ b/interface/web/admin/lib/lang/de_firewall.lng
@@ -9,4 +9,3 @@ $wb['firewall_error_unique'] = 'Es gibt bereits einen Firewalldatensatz für die
$wb['tcp_ports_error_regex'] = 'Zeichen nicht erlaubt in TCP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.';
$wb['udp_ports_error_regex'] = 'Zeichen nicht erlaubt in UDP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.';
?>
-
diff --git a/interface/web/admin/lib/lang/de_firewall_list.lng b/interface/web/admin/lib/lang/de_firewall_list.lng
index a0b44aedf..0cf79f0af 100644
--- a/interface/web/admin/lib/lang/de_firewall_list.lng
+++ b/interface/web/admin/lib/lang/de_firewall_list.lng
@@ -1,9 +1,8 @@
<?php
-$wb['list_head_txt'] = "Firewall";
-$wb['active_txt'] = "Aktiv";
-$wb['server_id_txt'] = "Server";
-$wb['tcp_port_txt'] = "Offene TCP Ports";
-$wb['udp_port_txt'] = "Offene UD Ports";
-$wb['add_new_record_txt'] = "Firewalleintrag hinzufügen";
+$wb['list_head_txt'] = 'Firewall';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['tcp_port_txt'] = 'Offene TCP Ports';
+$wb['udp_port_txt'] = 'Offene UD Ports';
+$wb['add_new_record_txt'] = 'Firewalleintrag hinzufügen';
?>
-
diff --git a/interface/web/admin/lib/lang/de_groups.lng b/interface/web/admin/lib/lang/de_groups.lng
index b29c0996f..80abd65f7 100644
--- a/interface/web/admin/lib/lang/de_groups.lng
+++ b/interface/web/admin/lib/lang/de_groups.lng
@@ -3,4 +3,3 @@ $wb['description_txt'] = 'Beschreibung';
$wb['name_txt'] = 'Gruppe';
$wb['name_err'] = 'Der Gruppenname muss min. 1, max. 30 Zeichen lang sein.';
?>
-
diff --git a/interface/web/admin/lib/lang/de_groups_list.lng b/interface/web/admin/lib/lang/de_groups_list.lng
index 23492f19f..244743177 100644
--- a/interface/web/admin/lib/lang/de_groups_list.lng
+++ b/interface/web/admin/lib/lang/de_groups_list.lng
@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Gruppe';
$wb['add_new_record_txt'] = 'Neue Gruppe hinzufügen';
$wb['warning_txt'] = '<b>WARNUNG:</b> Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!';
?>
-
diff --git a/interface/web/admin/lib/lang/de_iptables.lng b/interface/web/admin/lib/lang/de_iptables.lng
index 0ba1920ff..3e5553234 100644
--- a/interface/web/admin/lib/lang/de_iptables.lng
+++ b/interface/web/admin/lib/lang/de_iptables.lng
@@ -1,14 +1,13 @@
<?php
-$wb['server_id_txt'] = "Server";
-$wb['multiport_txt'] = "Multi Port";
-$wb['singleport_txt'] = "Single Port";
-$wb['protocol_txt'] = "Protokoll";
-$wb['table_txt'] = "Table";
-$wb['target_txt'] = "Ziel";
-$wb['state_txt'] = "Status";
-$wb['destination_ip_txt'] = "Ziel Address";
-$wb['source_ip_txt'] = "Ausgangs Adresse";
-$wb['active_txt'] = "Aktiv";
-$wb['iptables_error_unique'] = "Es besteht bereits eine Firewall Regel für diesen Server.";
+$wb['server_id_txt'] = 'Server';
+$wb['multiport_txt'] = 'Multi Port';
+$wb['singleport_txt'] = 'Single Port';
+$wb['protocol_txt'] = 'Protokoll';
+$wb['table_txt'] = 'Table';
+$wb['target_txt'] = 'Ziel';
+$wb['state_txt'] = 'Status';
+$wb['destination_ip_txt'] = 'Ziel Address';
+$wb['source_ip_txt'] = 'Ausgangs Adresse';
+$wb['active_txt'] = 'Aktiv';
+$wb['iptables_error_unique'] = 'Es besteht bereits eine Firewall Regel für diesen Server.';
?>
-
diff --git a/interface/web/admin/lib/lang/de_iptables_list.lng b/interface/web/admin/lib/lang/de_iptables_list.lng
index b367a5613..378db7955 100644
--- a/interface/web/admin/lib/lang/de_iptables_list.lng
+++ b/interface/web/admin/lib/lang/de_iptables_list.lng
@@ -1,16 +1,15 @@
<?php
-$wb['list_head_txt'] = "IPTables";
-$wb['add_new_rule_txt'] = "Neue IPTables Regel hinzufügen";
-$wb['server_id_txt'] = "Server";
-$wb['multiport_txt'] = "Multi Port";
-$wb['singleport_txt'] = "Single Port";
-$wb['protocol_txt'] = "Protokoll";
-$wb['table_txt'] = "Table";
-$wb['target_txt'] = "Ziel";
-$wb['state_txt'] = "Status";
-$wb['destination_ip_txt'] = "Ziel Adresse";
-$wb['source_ip_txt'] = "Ausgangs Adresse";
-$wb['active_txt'] = "Aktiv";
-$wb['iptables_error_unique'] = "Es besteht bereits eine Firewall Regel für diesen Server.";
+$wb['list_head_txt'] = 'IPTables';
+$wb['add_new_rule_txt'] = 'Neue IPTables Regel hinzufügen';
+$wb['server_id_txt'] = 'Server';
+$wb['multiport_txt'] = 'Multi Port';
+$wb['singleport_txt'] = 'Single Port';
+$wb['protocol_txt'] = 'Protokoll';
+$wb['table_txt'] = 'Table';
+$wb['target_txt'] = 'Ziel';
+$wb['state_txt'] = 'Status';
+$wb['destination_ip_txt'] = 'Ziel Adresse';
+$wb['source_ip_txt'] = 'Ausgangs Adresse';
+$wb['active_txt'] = 'Aktiv';
+$wb['iptables_error_unique'] = 'Es besteht bereits eine Firewall Regel für diesen Server.';
?>
-
diff --git a/interface/web/admin/lib/lang/de_language_add.lng b/interface/web/admin/lib/lang/de_language_add.lng
index 52b98691a..118bdee04 100644
--- a/interface/web/admin/lib/lang/de_language_add.lng
+++ b/interface/web/admin/lib/lang/de_language_add.lng
@@ -6,4 +6,3 @@ $wb['language_new_hint_txt'] = '2 Buchstaben ISO 639-1 Sprachcode (siehe http://
$wb['btn_save_txt'] = 'Neues Sprachdateiset erstellen';
$wb['btn_cancel_txt'] = 'Zurück';
?>
-
diff --git a/interface/web/admin/lib/lang/de_language_complete.lng b/interface/web/admin/lib/lang/de_language_complete.lng
index d8c31934e..1376e0c8a 100644
--- a/interface/web/admin/lib/lang/de_language_complete.lng
+++ b/interface/web/admin/lib/lang/de_language_complete.lng
@@ -5,4 +5,3 @@ $wb['language_select_txt'] = 'Sprache auswählen';
$wb['btn_save_txt'] = 'Dateien jetzt zusammenführen';
$wb['btn_cancel_txt'] = 'Zurück';
?>
-
diff --git a/interface/web/admin/lib/lang/de_language_edit.lng b/interface/web/admin/lib/lang/de_language_edit.lng
index 66743049a..30ab21b28 100644
--- a/interface/web/admin/lib/lang/de_language_edit.lng
+++ b/interface/web/admin/lib/lang/de_language_edit.lng
@@ -6,4 +6,3 @@ $wb['lang_file_txt'] = 'Sprachdatei';
$wb['btn_save_txt'] = 'Speichern';
$wb['btn_cancel_txt'] = 'Zurück';
?>
-
diff --git a/interface/web/admin/lib/lang/de_language_export.lng b/interface/web/admin/lib/lang/de_language_export.lng
index 7893f39d0..70eb466d4 100644
--- a/interface/web/admin/lib/lang/de_language_export.lng
+++ b/interface/web/admin/lib/lang/de_language_export.lng
@@ -4,4 +4,3 @@ $wb['language_select_txt'] = 'Sprache auswählen';
$wb['btn_save_txt'] = 'Ausgewähltes Sprachdateiset exportieren';
$wb['btn_cancel_txt'] = 'Zurück';
?>
-
diff --git a/interface/web/admin/lib/lang/de_language_import.lng b/interface/web/admin/lib/lang/de_language_import.lng
index 26f82c877..29ee03078 100644
--- a/interface/web/admin/lib/lang/de_language_import.lng
+++ b/interface/web/admin/lib/lang/de_language_import.lng
@@ -6,4 +6,3 @@ $wb['language_overwrite_txt'] = 'Datei überschreiben, falls diese schon existie
$wb['btn_cancel_txt'] = 'Zurück';
$wb['ignore_version_txt'] = 'ISPConfig Versionsüberprüfung überspringen';
?>
-
diff --git a/interface/web/admin/lib/lang/de_language_list.lng b/interface/web/admin/lib/lang/de_language_list.lng
index 6d4a7ae77..bf75420cf 100644
--- a/interface/web/admin/lib/lang/de_language_list.lng
+++ b/interface/web/admin/lib/lang/de_language_list.lng
@@ -5,4 +5,3 @@ $wb['module_txt'] = 'Modul';
$wb['lang_file_txt'] = 'Sprachdatei';
$wb['lang_file_date_txt'] = 'Letzte Änderung';
?>
-
diff --git a/interface/web/admin/lib/lang/de_package_install.lng b/interface/web/admin/lib/lang/de_package_install.lng
index f54fbfefb..bbacc85d4 100644
--- a/interface/web/admin/lib/lang/de_package_install.lng
+++ b/interface/web/admin/lib/lang/de_package_install.lng
@@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'Benutzername (optional)';
$wb['repo_password_txt'] = 'Passwort (optional)';
$wb['active_txt'] = 'Aktiv';
?>
-
diff --git a/interface/web/admin/lib/lang/de_remote_action.lng b/interface/web/admin/lib/lang/de_remote_action.lng
index b8534e34f..c1dacca34 100644
--- a/interface/web/admin/lib/lang/de_remote_action.lng
+++ b/interface/web/admin/lib/lang/de_remote_action.lng
@@ -10,4 +10,3 @@ $wb['select_all_server'] = 'Alle Server';
$wb['ispconfig_update_title'] = 'ISPConfig 3 Update Anweisungen';
$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 instructins</a>';
?>
-
diff --git a/interface/web/admin/lib/lang/de_remote_user.lng b/interface/web/admin/lib/lang/de_remote_user.lng
index 37eb47e7b..9e7d2a0c7 100644
--- a/interface/web/admin/lib/lang/de_remote_user.lng
+++ b/interface/web/admin/lib/lang/de_remote_user.lng
@@ -1,48 +1,47 @@
<?php
-$wb['username_txt'] = "Benutzername";
-$wb['password_txt'] = "Passwort";
-$wb['function_txt'] = "Funktionen";
-$wb['username_error_unique'] = "Benutzername muss einzigartig sein";
-$wb['username_error_empty'] = "Benutzername darf nicht leer sein";
-$wb['password_error_empty'] = "Passwort darf nicht leer sein";
-$wb['password_strength_txt'] = "Passwortstärke:";
-$wb['Mail domain functions'] = "Mail Domain Funktionen";
-$wb['Mail user functions'] = "Mail Benutzer Funktionen";
-$wb['Mail alias functions'] = "Mail Alias Funktionen";
-$wb['Mail forward functions'] = "Mail Weiterleitung Funktionen";
-$wb['Mail catchall functions'] = "Mail Catchall Funktionen";
-$wb['Mail transport functions'] = "Mail Transport Funktionen";
-$wb['Mail whitelist functions'] = "Mail Whitelist Funktionen";
-$wb['Mail blacklist functions'] = "Mail Blacklist Funktionen";
-$wb['Mail spamfilter user functions'] = "Mail Spamfilter Benutzer Funktionen";
-$wb['Mail spamfilter policy functions'] = "Mail Spamfilter Richtlinien Funktionen";
-$wb['Mail fetchmail functions'] = "Mail Fetchmail Funktionen";
-$wb['Mail user filter functions'] = "Mail Benutzer Filter Funktionen";
-$wb['Mail filter functions'] = "Mail Filter Funktionen";
-$wb['Client functions'] = "Kunden Funktionen";
-$wb['Sites cron functions'] = "Webseiten Cron Funktionen";
-$wb['Sites database functions'] = "Webseiten Datenbanken Funktionen";
-$wb['Sites FTP-User functions'] = "Webseiten FTP Benutzer Funktionen";
-$wb['Sites Shell-User functions'] = "Webseiten Shell Benutzer Funktionen";
-$wb['Sites Domain functions'] = "Webseiten Domain Funktionen";
-$wb['Sites Aliasdomain functions'] = "Webseiten Aliasdomain Funktionen";
-$wb['Sites Subdomain functions'] = "Webseiten Subdomain Funktionen";
-$wb['DNS zone functions'] = "DNS Zone Funktionen";
-$wb['DNS a functions'] = "DNS a Funktionen";
-$wb['DNS aaaa functions'] = "DNS aaaa Funktionen";
-$wb['DNS alias functions'] = "DNS Alias Funktionen";
-$wb['DNS cname functions'] = "DNS cname Funktionen";
-$wb['DNS hinfo functions'] = "DNS hinfo Funktionen";
-$wb['DNS mx functions'] = "DNS mx Funktionen";
-$wb['DNS ns functions'] = "DNS ns Funktionen";
-$wb['DNS ptr functions'] = "DNS ptr Funktionen";
-$wb['DNS rp functions'] = "DNS rp Funktionen";
-$wb['DNS srv functions'] = "DNS srv Funktionen";
-$wb['DNS txt functions'] = "DNS txt Funktionen";
-$wb['Mail mailing list functions'] = "Mail Mailinglisten Funktionen";
-$wb['generate_password_txt'] = "Passwort erzeugen";
-$wb['repeat_password_txt'] = "Passwort wiederholen";
-$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein.";
-$wb['password_match_txt'] = "Die Passwörter stimmen überein.";
+$wb['username_txt'] = 'Benutzername';
+$wb['password_txt'] = 'Passwort';
+$wb['function_txt'] = 'Funktionen';
+$wb['username_error_unique'] = 'Benutzername muss einzigartig sein';
+$wb['username_error_empty'] = 'Benutzername darf nicht leer sein';
+$wb['password_error_empty'] = 'Passwort darf nicht leer sein';
+$wb['password_strength_txt'] = 'Passwortstärke:';
+$wb['Mail domain functions'] = 'Mail Domain Funktionen';
+$wb['Mail user functions'] = 'Mail Benutzer Funktionen';
+$wb['Mail alias functions'] = 'Mail Alias Funktionen';
+$wb['Mail forward functions'] = 'Mail Weiterleitung Funktionen';
+$wb['Mail catchall functions'] = 'Mail Catchall Funktionen';
+$wb['Mail transport functions'] = 'Mail Transport Funktionen';
+$wb['Mail whitelist functions'] = 'Mail Whitelist Funktionen';
+$wb['Mail blacklist functions'] = 'Mail Blacklist Funktionen';
+$wb['Mail spamfilter user functions'] = 'Mail Spamfilter Benutzer Funktionen';
+$wb['Mail spamfilter policy functions'] = 'Mail Spamfilter Richtlinien Funktionen';
+$wb['Mail fetchmail functions'] = 'Mail Fetchmail Funktionen';
+$wb['Mail user filter functions'] = 'Mail Benutzer Filter Funktionen';
+$wb['Mail filter functions'] = 'Mail Filter Funktionen';
+$wb['Client functions'] = 'Kunden Funktionen';
+$wb['Sites cron functions'] = 'Webseiten Cron Funktionen';
+$wb['Sites database functions'] = 'Webseiten Datenbanken Funktionen';
+$wb['Sites FTP-User functions'] = 'Webseiten FTP Benutzer Funktionen';
+$wb['Sites Shell-User functions'] = 'Webseiten Shell Benutzer Funktionen';
+$wb['Sites Domain functions'] = 'Webseiten Domain Funktionen';
+$wb['Sites Aliasdomain functions'] = 'Webseiten Aliasdomain Funktionen';
+$wb['Sites Subdomain functions'] = 'Webseiten Subdomain Funktionen';
+$wb['DNS zone functions'] = 'DNS Zone Funktionen';
+$wb['DNS a functions'] = 'DNS a Funktionen';
+$wb['DNS aaaa functions'] = 'DNS aaaa Funktionen';
+$wb['DNS alias functions'] = 'DNS Alias Funktionen';
+$wb['DNS cname functions'] = 'DNS cname Funktionen';
+$wb['DNS hinfo functions'] = 'DNS hinfo Funktionen';
+$wb['DNS mx functions'] = 'DNS mx Funktionen';
+$wb['DNS ns functions'] = 'DNS ns Funktionen';
+$wb['DNS ptr functions'] = 'DNS ptr Funktionen';
+$wb['DNS rp functions'] = 'DNS rp Funktionen';
+$wb['DNS srv functions'] = 'DNS srv Funktionen';
+$wb['DNS txt functions'] = 'DNS txt Funktionen';
+$wb['Mail mailing list functions'] = 'Mail Mailinglisten Funktionen';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
-
diff --git a/interface/web/admin/lib/lang/de_remote_user_list.lng b/interface/web/admin/lib/lang/de_remote_user_list.lng
index cb19beb20..8fb1641b6 100644
--- a/interface/web/admin/lib/lang/de_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/de_remote_user_list.lng
@@ -1,8 +1,7 @@
<?php
-$wb['list_head_txt'] = "Remote Benutzer";
-$wb['list_desc_txt'] = "Remote Benutzer hinzufügen";
-$wb['add_new_record_txt'] = "Neuen Benutzer hinzufügen";
-$wb['parent_remote_userid_txt'] = "Benutzer ID";
-$wb['username_txt'] = "Benutzername";
+$wb['list_head_txt'] = 'Remote Benutzer';
+$wb['list_desc_txt'] = 'Remote Benutzer hinzufügen';
+$wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
+$wb['parent_remote_userid_txt'] = 'Benutzer ID';
+$wb['username_txt'] = 'Benutzername';
?>
-
diff --git a/interface/web/admin/lib/lang/de_server.lng b/interface/web/admin/lib/lang/de_server.lng
index a83149ed3..1d6c2b7d7 100644
--- a/interface/web/admin/lib/lang/de_server.lng
+++ b/interface/web/admin/lib/lang/de_server.lng
@@ -1,16 +1,15 @@
<?php
-$wb['config_txt'] = "Konfiguration";
-$wb['server_name_txt'] = "Servername";
-$wb['mail_server_txt'] = "Mailserver";
-$wb['web_server_txt'] = "Webserver";
-$wb['dns_server_txt'] = "DNS Server";
-$wb['file_server_txt'] = "Dateiserver";
-$wb['db_server_txt'] = "Datenbankserver";
-$wb['vserver_server_txt'] = "VServer Server";
-$wb['active_txt'] = "Aktiv";
-$wb['mirror_server_id_txt'] = "Ist Mirror von Server";
-$wb['- None -'] = "- Nichts -";
-$wb['proxy_server_txt'] = "Proxy Server";
-$wb['firewall_server_txt'] = "Firewall Server";
+$wb['config_txt'] = 'Konfiguration';
+$wb['server_name_txt'] = 'Servername';
+$wb['mail_server_txt'] = 'Mailserver';
+$wb['web_server_txt'] = 'Webserver';
+$wb['dns_server_txt'] = 'DNS Server';
+$wb['file_server_txt'] = 'Dateiserver';
+$wb['db_server_txt'] = 'Datenbankserver';
+$wb['vserver_server_txt'] = 'VServer Server';
+$wb['active_txt'] = 'Aktiv';
+$wb['mirror_server_id_txt'] = 'Ist Mirror von Server';
+$wb['- None -'] = '- Nichts -';
+$wb['proxy_server_txt'] = 'Proxy Server';
+$wb['firewall_server_txt'] = 'Firewall Server';
?>
-
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 81cc6ab5c..bcbab1919 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -1,174 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit Chroot home";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit Chroot Anwendungsbereiche";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit Chrooted Anwendungen";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit Cron Chrooted Anwendungen";
-$wb['website_path_txt'] = "Webseiten Pfad";
-$wb['website_symlinks_txt'] = "Webseiten Symlinks";
-$wb['website_symlinks_rel_txt'] = "Erstelle relative Symlinks";
-$wb['vhost_conf_dir_txt'] = "vHost Konfigurationsverzeichnis";
-$wb['vhost_conf_enabled_dir_txt'] = "vHost config enabled dir";
-$wb['getmail_config_dir_txt'] = "Getmail Konfigurationsverzeichnis";
-$wb['fastcgi_starter_path_txt'] = "FastCGI Starter Pfad";
-$wb['fastcgi_starter_script_txt'] = "FastCGI Starter Script";
-$wb['fastcgi_alias_txt'] = "FastCGI Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini Pfad";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. Anfragen";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Modul";
-$wb['maildir_path_txt'] = "Maildir Pfad";
-$wb['homedir_path_txt'] = "Homedir Pfad";
-$wb['mailuser_uid_txt'] = "Mailbenutzer UID";
-$wb['mailuser_gid_txt'] = "Mailbenutzer GID";
-$wb['mailuser_name_txt'] = "Mailbenutzer Name";
-$wb['mailuser_group_txt'] = "Mailbenutzer Gruppe";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost Benutzer";
-$wb['relayhost_password_txt'] = "Relayhost Passwort";
-$wb['mailbox_size_limit_txt'] = "Mailboxgrößen Limit";
-$wb['message_size_limit_txt'] = "Nachrichtengrößen Limit";
-$wb['ip_address_txt'] = "IP Adresse";
-$wb['netmask_txt'] = "Netzmaske";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameserver";
-$wb['auto_network_configuration_txt'] = "Netzwerkkonfiguration";
-$wb['website_basedir_txt'] = "Webseiten basedir";
-$wb['website_autoalias_txt'] = "Webseiten Autoalias";
-$wb['website_autoalias_note_txt'] = "Platzhalter:";
-$wb['ip_address_error_wrong'] = "Ungültiges IP Adressen Format.";
-$wb['netmask_error_wrong'] = "Ungültiges Netzmasken Format.";
-$wb['gateway_error_wrong'] = "Ungültiges Gateway Format.";
-$wb['hostname_error_empty'] = "Hostname ist leer.";
-$wb['nameservers_error_empty'] = "Nameserver ist leer.";
-$wb['config_dir_txt'] = "Konfigurationsverzeichnis";
-$wb['init_script_txt'] = "Cron init Script Name";
-$wb['crontab_dir_txt'] = "Pfad für individuelle Crontabs";
-$wb['wget_txt'] = "Pfad zum wget Programm";
-$wb['web_user_txt'] = "Apache Benutzer";
-$wb['web_group_txt'] = "Apache Gruppe";
-$wb['security_level_txt'] = "Sicherheitslevel";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps vHost Port";
-$wb['apps_vhost_ip_txt'] = "Apps vHost IP Adresse";
-$wb['apps_vhost_servername_txt'] = "Apps vHost Domain";
-$wb['bind_user_txt'] = "BIND Benutzer";
-$wb['bind_group_txt'] = "BIND Gruppe";
-$wb['bind_zonefiles_dir_txt'] = "BIND Zonefiles Verzeichnis";
-$wb['named_conf_path_txt'] = "BIND named.conf Pfad";
-$wb['bind_user_error_empty'] = "BIND Benutzer ist leer.";
-$wb['bind_group_error_empty'] = "BIND Gruppe ist leer.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND Zonefiles Verzeichnis ist leer.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf Pfad ist leer.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local Pfad ist leer.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Dämon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir ist leer.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride ist leer.";
-$wb['awstats_conf_dir_txt'] = "AWStats Konfigurationsverzeichnis";
-$wb['awstats_data_dir_txt'] = "AWStats Datenverzeichnis";
-$wb['awstats_pl_txt'] = "AWStats awstats.pl Script";
-$wb['awstats_buildstaticpages_pl_txt'] = "AWStats awstats_buildstaticpages.pl Script";
-$wb['backup_dir_txt'] = "Backupverzeichnis";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local Pfad";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini Pfad";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini Pfad";
-$wb['check_apache_config_txt'] = "Teste Apache Konfiguration beim Neustart";
-$wb['CA_path_txt'] = "CA Pfad";
-$wb['CA_pass_txt'] = "CA Passwort";
-$wb['ufw_enable_txt'] = "Aktivieren";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Aktiviere IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Loglevel";
-$wb['network_config_warning_txt'] = "Die Netzwerk Konfiguration Option ist nur auf Debian- und Ubuntu Servern verfügbar. Aktivieren Sie diese Option nicht, falls Ihr Netzwerk Interface nicht eth0 heißt.";
-$wb['server_type_txt'] = "Server Typ";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx vHost Konfigurations Verzeichnis";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx Benutzer";
-$wb['nginx_group_txt'] = "Nginx Gruppe";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup Verzeichnis ist leer.";
-$wb['maildir_path_error_empty'] = "Maildir Pfad ist leer.";
-$wb['homedir_path_error_empty'] = "Homedir Pfad ist leer.";
-$wb['mailuser_uid_error_empty'] = "Mail Benutzer UID ist leer.";
-$wb['mailuser_gid_error_empty'] = "Mail Benutzer GID ist leer.";
-$wb['mailuser_name_error_empty'] = "Mail Benutzer Name ist leer.";
-$wb['mailuser_group_error_empty'] = "Mail Benutzer Gruppe ist leer.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir ist leer.";
-$wb['website_basedir_error_empty'] = "Webseiten basedir ist leer.";
-$wb['website_path_error_empty'] = "Webseiten Pfad ist leer.";
-$wb['website_symlinks_error_empty'] = "Webseiten Symlinks ist leer.";
-$wb['vhost_conf_dir_error_empty'] = "vHost config dir ist leer.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "vHost config enabled dir ist leer.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx vHost config dir ist leer.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx vHost config enabled dir ist leer.";
-$wb['apache_user_error_empty'] = "Apache Benutzer ist leer.";
-$wb['apache_group_error_empty'] = "Apache Grupp ist leer.";
-$wb['nginx_user_error_empty'] = "Nginx Benutzer ist leer.";
-$wb['nginx_group_error_empty'] = "Nginx Gruppe ist leer.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini Pfad ist leer.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini Pfad ist leer.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket ist leer.";
-$wb['apps_vhost_port_error_empty'] = "Apps vHost Port ist leer.";
-$wb['apps_vhost_ip_error_empty'] = "Apps vHost IP Adresse ist leer.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI Starter Pfad ist leer.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI Starter Script ist leer.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias ist leer.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Pfad ist leer.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children ist leer.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests ist leer.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin ist leer.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit Chroot home ist leer.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit Chroot Anwendungsbereiche ist leer.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit Chrooted Anwendungen ist leer.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit Cron Chrooted Anwendungen ist leer.";
-$wb['vlogger_config_dir_error_empty'] = "Config Verzeichnis ist leer.";
-$wb['cron_init_script_error_empty'] = "Cron init Script Name ist leer.";
-$wb['crontab_dir_error_empty'] = "Pfad für individuelle Crontabs ist leer.";
-$wb['cron_wget_error_empty'] = "Pfad zum wget Programm ist leer.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM Init Script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM Init Script ist leer.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini Pfad";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini Pfad ist leer.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM Pool Verzeichnis";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM Pool Verzeichnis ist leer.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM Start Port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM Start Port ist leer.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM Socket Verzeichnis";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM Socket Verzeichnis ist leer.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI Konfigurations Syntax";
-$wb['try_rescue_txt'] = "Aktiviere Service Monitoring und Neustart bei Unerreichbarkeit";
-$wb['do_not_try_rescue_httpd_txt'] = "Deaktiviere HTTPD Monitoring";
-$wb['do_not_try_rescue_mysql_txt'] = "Deaktiviere MySQL Monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Deaktiviere E-Mail Monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> Falls Sie MySQL stoppen möchten, wählen Sie die ";
-$wb['enable_sni_txt'] = "Aktiviere SNI";
-$wb['set_folder_permissions_on_update_txt'] = "Verzeichnisberechtigungen beim Update setzen";
-$wb['add_web_users_to_sshusers_group_txt'] = "Webbenutzer zur -sshusers- hinzufügen";
-$wb['connect_userid_to_webid_txt'] = "Linux Userid mit webid verknüpfen";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID für userid/webid Verknüpfung";
-$wb['realtime_blackhole_list_txt'] = "Realtime Blackhole Liste";
-$wb['realtime_blackhole_list_note_txt'] = "(RBL's mit Kommas trennen)";
-$wb['ssl_settings_txt'] = "SSL Einstellungen";
-$wb['permissions_txt'] = "Berechtigungen";
-$wb['php_settings_txt'] = "PHP Einstellungen";
-$wb['apps_vhost_settings_txt'] = "Apps vHost Einstellungen";
-$wb['awstats_settings_txt'] = "AWStats Einstellungen";
-$wb['backup_mode_txt'] = "Backupmodus";
-$wb['backup_mode_userzip'] = "Backup Dateien gehören dem Web Benutzer (ZIP-Datei)";
-$wb['backup_mode_rootgz'] = "Backup aller Dateien des Webverzeichnisses als Root Benutzer";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailboxbeschränkung Statistiken";
-$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['jailkit_chroot_home_txt'] = 'Jailkit Chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit Chroot Anwendungsbereiche';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit Chrooted Anwendungen';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit Cron Chrooted Anwendungen';
+$wb['website_path_txt'] = 'Webseiten Pfad';
+$wb['website_symlinks_txt'] = 'Webseiten Symlinks';
+$wb['website_symlinks_rel_txt'] = 'Erstelle relative Symlinks';
+$wb['vhost_conf_dir_txt'] = 'vHost Konfigurationsverzeichnis';
+$wb['vhost_conf_enabled_dir_txt'] = 'vHost config enabled dir';
+$wb['getmail_config_dir_txt'] = 'Getmail Konfigurationsverzeichnis';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI Starter Pfad';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI Starter Script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Pfad';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Anfragen';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Modul';
+$wb['maildir_path_txt'] = 'Maildir Pfad';
+$wb['homedir_path_txt'] = 'Homedir Pfad';
+$wb['mailuser_uid_txt'] = 'Mailbenutzer UID';
+$wb['mailuser_gid_txt'] = 'Mailbenutzer GID';
+$wb['mailuser_name_txt'] = 'Mailbenutzer Name';
+$wb['mailuser_group_txt'] = 'Mailbenutzer Gruppe';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost Benutzer';
+$wb['relayhost_password_txt'] = 'Relayhost Passwort';
+$wb['mailbox_size_limit_txt'] = 'Mailboxgrößen Limit';
+$wb['message_size_limit_txt'] = 'Nachrichtengrößen Limit';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['netmask_txt'] = 'Netzmaske';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameserver';
+$wb['auto_network_configuration_txt'] = 'Netzwerkkonfiguration';
+$wb['website_basedir_txt'] = 'Webseiten basedir';
+$wb['website_autoalias_txt'] = 'Webseiten Autoalias';
+$wb['website_autoalias_note_txt'] = 'Platzhalter:';
+$wb['ip_address_error_wrong'] = 'Ungültiges IP Adressen Format.';
+$wb['netmask_error_wrong'] = 'Ungültiges Netzmasken Format.';
+$wb['gateway_error_wrong'] = 'Ungültiges Gateway Format.';
+$wb['hostname_error_empty'] = 'Hostname ist leer.';
+$wb['nameservers_error_empty'] = 'Nameserver ist leer.';
+$wb['config_dir_txt'] = 'Konfigurationsverzeichnis';
+$wb['init_script_txt'] = 'Cron init Script Name';
+$wb['crontab_dir_txt'] = 'Pfad für individuelle Crontabs';
+$wb['wget_txt'] = 'Pfad zum wget Programm';
+$wb['web_user_txt'] = 'Apache Benutzer';
+$wb['web_group_txt'] = 'Apache Gruppe';
+$wb['security_level_txt'] = 'Sicherheitslevel';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps vHost Port';
+$wb['apps_vhost_ip_txt'] = 'Apps vHost IP Adresse';
+$wb['apps_vhost_servername_txt'] = 'Apps vHost Domain';
+$wb['bind_user_txt'] = 'BIND Benutzer';
+$wb['bind_group_txt'] = 'BIND Gruppe';
+$wb['bind_zonefiles_dir_txt'] = 'BIND Zonefiles Verzeichnis';
+$wb['named_conf_path_txt'] = 'BIND named.conf Pfad';
+$wb['bind_user_error_empty'] = 'BIND Benutzer ist leer.';
+$wb['bind_group_error_empty'] = 'BIND Gruppe ist leer.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND Zonefiles Verzeichnis ist leer.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf Pfad ist leer.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local Pfad ist leer.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Dämon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir ist leer.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride ist leer.';
+$wb['awstats_conf_dir_txt'] = 'AWStats Konfigurationsverzeichnis';
+$wb['awstats_data_dir_txt'] = 'AWStats Datenverzeichnis';
+$wb['awstats_pl_txt'] = 'AWStats awstats.pl Script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'AWStats awstats_buildstaticpages.pl Script';
+$wb['backup_dir_txt'] = 'Backupverzeichnis';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local Pfad';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini Pfad';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini Pfad';
+$wb['check_apache_config_txt'] = 'Teste Apache Konfiguration beim Neustart';
+$wb['CA_path_txt'] = 'CA Pfad';
+$wb['CA_pass_txt'] = 'CA Passwort';
+$wb['ufw_enable_txt'] = 'Aktivieren';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Aktiviere IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Loglevel';
+$wb['network_config_warning_txt'] = 'Die Netzwerk Konfiguration Option ist nur auf Debian- und Ubuntu Servern verfügbar. Aktivieren Sie diese Option nicht, falls Ihr Netzwerk Interface nicht eth0 heißt.';
+$wb['server_type_txt'] = 'Server Typ';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx vHost Konfigurations Verzeichnis';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx Benutzer';
+$wb['nginx_group_txt'] = 'Nginx Gruppe';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup Verzeichnis ist leer.';
+$wb['maildir_path_error_empty'] = 'Maildir Pfad ist leer.';
+$wb['homedir_path_error_empty'] = 'Homedir Pfad ist leer.';
+$wb['mailuser_uid_error_empty'] = 'Mail Benutzer UID ist leer.';
+$wb['mailuser_gid_error_empty'] = 'Mail Benutzer GID ist leer.';
+$wb['mailuser_name_error_empty'] = 'Mail Benutzer Name ist leer.';
+$wb['mailuser_group_error_empty'] = 'Mail Benutzer Gruppe ist leer.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir ist leer.';
+$wb['website_basedir_error_empty'] = 'Webseiten basedir ist leer.';
+$wb['website_path_error_empty'] = 'Webseiten Pfad ist leer.';
+$wb['website_symlinks_error_empty'] = 'Webseiten Symlinks ist leer.';
+$wb['vhost_conf_dir_error_empty'] = 'vHost config dir ist leer.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'vHost config enabled dir ist leer.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx vHost config dir ist leer.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx vHost config enabled dir ist leer.';
+$wb['apache_user_error_empty'] = 'Apache Benutzer ist leer.';
+$wb['apache_group_error_empty'] = 'Apache Grupp ist leer.';
+$wb['nginx_user_error_empty'] = 'Nginx Benutzer ist leer.';
+$wb['nginx_group_error_empty'] = 'Nginx Gruppe ist leer.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini Pfad ist leer.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini Pfad ist leer.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket ist leer.';
+$wb['apps_vhost_port_error_empty'] = 'Apps vHost Port ist leer.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps vHost IP Adresse ist leer.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI Starter Pfad ist leer.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI Starter Script ist leer.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias ist leer.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Pfad ist leer.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children ist leer.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests ist leer.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin ist leer.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit Chroot home ist leer.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit Chroot Anwendungsbereiche ist leer.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit Chrooted Anwendungen ist leer.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit Cron Chrooted Anwendungen ist leer.';
+$wb['vlogger_config_dir_error_empty'] = 'Config Verzeichnis ist leer.';
+$wb['cron_init_script_error_empty'] = 'Cron init Script Name ist leer.';
+$wb['crontab_dir_error_empty'] = 'Pfad für individuelle Crontabs ist leer.';
+$wb['cron_wget_error_empty'] = 'Pfad zum wget Programm ist leer.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM Init Script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM Init Script ist leer.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini Pfad';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini Pfad ist leer.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM Pool Verzeichnis';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM Pool Verzeichnis ist leer.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM Start Port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM Start Port ist leer.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM Socket Verzeichnis';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM Socket Verzeichnis ist leer.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI Konfigurations Syntax';
+$wb['try_rescue_txt'] = 'Aktiviere Service Monitoring und Neustart bei Unerreichbarkeit';
+$wb['do_not_try_rescue_httpd_txt'] = 'Deaktiviere HTTPD Monitoring';
+$wb['do_not_try_rescue_mysql_txt'] = 'Deaktiviere MySQL Monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere E-Mail Monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> Falls Sie MySQL stoppen möchten, wählen Sie die ';
+$wb['enable_sni_txt'] = 'Aktiviere SNI';
+$wb['set_folder_permissions_on_update_txt'] = 'Verzeichnisberechtigungen beim Update setzen';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Webbenutzer zur -sshusers- hinzufügen';
+$wb['connect_userid_to_webid_txt'] = 'Linux Userid mit webid verknüpfen';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID für userid/webid Verknüpfung';
+$wb['realtime_blackhole_list_txt'] = 'Realtime Blackhole Liste';
+$wb['realtime_blackhole_list_note_txt'] = '(RBL\'s mit Kommas trennen)';
+$wb['ssl_settings_txt'] = 'SSL Einstellungen';
+$wb['permissions_txt'] = 'Berechtigungen';
+$wb['php_settings_txt'] = 'PHP Einstellungen';
+$wb['apps_vhost_settings_txt'] = 'Apps vHost Einstellungen';
+$wb['awstats_settings_txt'] = 'AWStats Einstellungen';
+$wb['backup_mode_txt'] = 'Backupmodus';
+$wb['backup_mode_userzip'] = 'Backup Dateien gehören dem Web Benutzer (ZIP-Datei)';
+$wb['backup_mode_rootgz'] = 'Backup aller Dateien des Webverzeichnisses als Root Benutzer';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailboxbeschränkung Statistiken';
+$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';
?>
-
diff --git a/interface/web/admin/lib/lang/de_server_config_list.lng b/interface/web/admin/lib/lang/de_server_config_list.lng
index 9ff7f9b64..191b2c8d3 100644
--- a/interface/web/admin/lib/lang/de_server_config_list.lng
+++ b/interface/web/admin/lib/lang/de_server_config_list.lng
@@ -2,4 +2,3 @@
$wb['list_head_txt'] = 'Serverkonfiguration';
$wb['server_name_txt'] = 'Server';
?>
-
diff --git a/interface/web/admin/lib/lang/de_server_ip.lng b/interface/web/admin/lib/lang/de_server_ip.lng
index 9f5f2e0a8..5757b165c 100644
--- a/interface/web/admin/lib/lang/de_server_ip.lng
+++ b/interface/web/admin/lib/lang/de_server_ip.lng
@@ -9,4 +9,3 @@ $wb['ip_type_txt'] = 'Typ';
$wb['virtualhost_port_txt'] = 'HTTP Ports';
$wb['error_port_syntax'] = 'Ungültige Zeichen im Ports Feld. Bitte geben Sie nur komma-separierte Nummern an. Beispiel: 80,443';
?>
-
diff --git a/interface/web/admin/lib/lang/de_server_ip_list.lng b/interface/web/admin/lib/lang/de_server_ip_list.lng
index 697c49462..37f237c9e 100644
--- a/interface/web/admin/lib/lang/de_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/de_server_ip_list.lng
@@ -1,11 +1,10 @@
<?php
-$wb['list_head_txt'] = "IP Adressen";
-$wb['server_id_txt'] = "Server";
-$wb['ip_address_txt'] = "IP Adresse";
-$wb['add_new_record_txt'] = "Neue IP Adresse hinzufügen";
-$wb['client_id_txt'] = "Kunde";
-$wb['virtualhost_txt'] = "HTTP vHost";
-$wb['virtualhost_port_txt'] = "HTTP Ports";
-$wb['ip_type_txt'] = "Typ";
+$wb['list_head_txt'] = 'IP Adressen';
+$wb['server_id_txt'] = 'Server';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['add_new_record_txt'] = 'Neue IP Adresse hinzufügen';
+$wb['client_id_txt'] = 'Kunde';
+$wb['virtualhost_txt'] = 'HTTP vHost';
+$wb['virtualhost_port_txt'] = 'HTTP Ports';
+$wb['ip_type_txt'] = 'Typ';
?>
-
diff --git a/interface/web/admin/lib/lang/de_server_list.lng b/interface/web/admin/lib/lang/de_server_list.lng
index 416dba046..a770a850c 100644
--- a/interface/web/admin/lib/lang/de_server_list.lng
+++ b/interface/web/admin/lib/lang/de_server_list.lng
@@ -11,4 +11,3 @@ $wb['add_new_record_txt'] = 'Neuen Server hinzufügen';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
-
diff --git a/interface/web/admin/lib/lang/de_server_php.lng b/interface/web/admin/lib/lang/de_server_php.lng
index dc2a833fe..9b26ea3c6 100644
--- a/interface/web/admin/lib/lang/de_server_php.lng
+++ b/interface/web/admin/lib/lang/de_server_php.lng
@@ -1,17 +1,16 @@
<?php
-$wb['server_id_txt'] = "Server";
-$wb['client_id_txt'] = "Kunde";
-$wb['name_txt'] = "PHP Name";
-$wb['Name'] = "Name";
-$wb['FastCGI Settings'] = "FastCGI Einstellungen";
-$wb['PHP-FPM Settings'] = "PHP-FPM Einstellungen";
-$wb['Additional PHP Versions'] = "Zusätzliche PHP Versionen";
-$wb['Form to edit additional PHP versions'] = "Formular, um zusätzliche PHP Versionen hinzuzufügen";
-$wb['server_php_name_error_empty'] = "Das Name Feld darf nicht leer sein.";
-$wb['php_fastcgi_binary_txt'] = "Pfad zum PHP FastCGI Binary";
-$wb['php_fastcgi_ini_dir_txt'] = "Pfad zum php.ini Verzeichnis";
-$wb['php_fpm_init_script_txt'] = "Pfad zum PHP-FPM Init Script";
-$wb['php_fpm_ini_dir_txt'] = "Pfad zum php.ini Verzeichnis";
-$wb['php_fpm_pool_dir_txt'] = "Pfad zum PHP-FPM Pool Verzeichnis";
+$wb['server_id_txt'] = 'Server';
+$wb['client_id_txt'] = 'Kunde';
+$wb['name_txt'] = 'PHP Name';
+$wb['Name'] = 'Name';
+$wb['FastCGI Settings'] = 'FastCGI Einstellungen';
+$wb['PHP-FPM Settings'] = 'PHP-FPM Einstellungen';
+$wb['Additional PHP Versions'] = 'Zusätzliche PHP Versionen';
+$wb['Form to edit additional PHP versions'] = 'Formular, um zusätzliche PHP Versionen hinzuzufügen';
+$wb['server_php_name_error_empty'] = 'Das Name Feld darf nicht leer sein.';
+$wb['php_fastcgi_binary_txt'] = 'Pfad zum PHP FastCGI Binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis';
+$wb['php_fpm_init_script_txt'] = 'Pfad zum PHP-FPM Init Script';
+$wb['php_fpm_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis';
+$wb['php_fpm_pool_dir_txt'] = 'Pfad zum PHP-FPM Pool Verzeichnis';
?>
-
diff --git a/interface/web/admin/lib/lang/de_server_php_list.lng b/interface/web/admin/lib/lang/de_server_php_list.lng
index f821fef31..d775fc6c0 100644
--- a/interface/web/admin/lib/lang/de_server_php_list.lng
+++ b/interface/web/admin/lib/lang/de_server_php_list.lng
@@ -1,8 +1,7 @@
<?php
-$wb['list_head_txt'] = "Zusätzliche PHP Versionen";
-$wb['server_id_txt'] = "Server";
-$wb['add_new_record_txt'] = "Neue PHP Version hinzufügen";
-$wb['client_id_txt'] = "Kunde";
-$wb['name_txt'] = "PHP Name";
+$wb['list_head_txt'] = 'Zusätzliche PHP Versionen';
+$wb['server_id_txt'] = 'Server';
+$wb['add_new_record_txt'] = 'Neue PHP Version hinzufügen';
+$wb['client_id_txt'] = 'Kunde';
+$wb['name_txt'] = 'PHP Name';
?>
-
diff --git a/interface/web/admin/lib/lang/de_software_package_install.lng b/interface/web/admin/lib/lang/de_software_package_install.lng
index 107a58d0b..cd4b20d06 100644
--- a/interface/web/admin/lib/lang/de_software_package_install.lng
+++ b/interface/web/admin/lib/lang/de_software_package_install.lng
@@ -4,4 +4,3 @@ $wb['install_key_txt'] = 'Installations Key eingeben';
$wb['btn_save_txt'] = 'Installation starten';
$wb['btn_cancel_txt'] = 'Abbrechen';
?>
-
diff --git a/interface/web/admin/lib/lang/de_software_package_list.lng b/interface/web/admin/lib/lang/de_software_package_list.lng
index 38819af1f..8cf3e39d8 100644
--- a/interface/web/admin/lib/lang/de_software_package_list.lng
+++ b/interface/web/admin/lib/lang/de_software_package_list.lng
@@ -1,11 +1,10 @@
<?php
-$wb['list_head_txt'] = "Softwarepakete";
-$wb['installed_txt'] = "Status";
-$wb['package_title_txt'] = "Paket";
-$wb['package_description_txt'] = "Beschreibung";
-$wb['action_txt'] = "Aktion";
-$wb['toolsarea_head_txt'] = "Pakete";
-$wb['repoupdate_txt'] = "Softwarepakete Liste updaten";
-$wb['package_id_txt'] = "Lokale App ID";
+$wb['list_head_txt'] = 'Softwarepakete';
+$wb['installed_txt'] = 'Status';
+$wb['package_title_txt'] = 'Paket';
+$wb['package_description_txt'] = 'Beschreibung';
+$wb['action_txt'] = 'Aktion';
+$wb['toolsarea_head_txt'] = 'Pakete';
+$wb['repoupdate_txt'] = 'Softwarepakete Liste updaten';
+$wb['package_id_txt'] = 'Lokale App ID';
?>
-
diff --git a/interface/web/admin/lib/lang/de_software_repo.lng b/interface/web/admin/lib/lang/de_software_repo.lng
index f54fbfefb..bbacc85d4 100644
--- a/interface/web/admin/lib/lang/de_software_repo.lng
+++ b/interface/web/admin/lib/lang/de_software_repo.lng
@@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'Benutzername (optional)';
$wb['repo_password_txt'] = 'Passwort (optional)';
$wb['active_txt'] = 'Aktiv';
?>
-
diff --git a/interface/web/admin/lib/lang/de_software_repo_list.lng b/interface/web/admin/lib/lang/de_software_repo_list.lng
index 9d290cc60..4a9c2c42d 100644
--- a/interface/web/admin/lib/lang/de_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/de_software_repo_list.lng
@@ -4,4 +4,3 @@ $wb['active_txt'] = 'Aktiv';
$wb['repo_name_txt'] = 'Bibliothek';
$wb['repo_url_txt'] = 'URL';
?>
-
diff --git a/interface/web/admin/lib/lang/de_software_update_list.lng b/interface/web/admin/lib/lang/de_software_update_list.lng
index e636219ab..6f01c1f08 100644
--- a/interface/web/admin/lib/lang/de_software_update_list.lng
+++ b/interface/web/admin/lib/lang/de_software_update_list.lng
@@ -6,4 +6,3 @@ $wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Aktion';
?>
-
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 164b81ab0..0eff4a171 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -1,45 +1,44 @@
<?php
-$wb['system_config_desc_txt'] = "Systemkonfiguration";
-$wb['smtp_missing_admin_mail_txt'] = "Bitte geben Sie die Administrator E-Mail und den Namen ein, wenn Sie SMTP Versand nutzen wollen.";
-$wb['warning'] = "Bearbeiten Sie diese Werte sorgfältig! Entfernen Sie die Prefixe nicht auf Systemen mit mehr als einem Client.";
-$wb['tab_change_warning_txt'] = "Tab Wechsel Warnung";
-$wb['tab_change_discard_txt'] = "Verwerfe Änderungen bei Tab Wechsel";
-$wb['tab_change_warning_note_txt'] = "Zeigt eine Warnung an, wenn der Tab in einem Formular gewechselt wird und Daten geändert wurden.";
-$wb['dbname_prefix_txt'] = "Datenbank Namen Präfix";
-$wb['dbuser_prefix_txt'] = "Datenbank Benutzer Präfix";
-$wb['shelluser_prefix_txt'] = "Shell Benutzer Präfix";
-$wb['ftpuser_prefix_txt'] = "FTP Benutzer Präfix";
-$wb['vhost_subdomains_txt'] = "Subdomains als Webseite anlegen";
-$wb['vhost_subdomains_note_txt'] = "Diese Einstellung kann nicht wieder deaktiviert werden, wenn Vhost Subdomains im System vorhanden sind!";
-$wb['dbname_prefix_error_regex'] = "Zeichen nicht erlaubt in Datenbank Namen Präfix.";
-$wb['dbuser_prefix_error_regex'] = "Zeichen nicht erlaubt in Datenbank Benutzer Präfix.";
-$wb['ftpuser_prefix_error_regex'] = "Zeichen nicht erlaubt in FTP Benutzer Präfix.";
-$wb['shelluser_prefix_error_regex'] = "Zeichen nicht erlaubt in Shell Benutzer Präfix.";
-$wb['dblist_phpmyadmin_link_txt'] = "Link zu phpMyAdmin in der Datenbankliste";
-$wb['mailboxlist_webmail_link_txt'] = "Link zu Webmail in der Mailboxliste";
-$wb['webmail_url_txt'] = "Webmail URL";
-$wb['phpmyadmin_url_txt'] = "phpMyAdmin URL";
-$wb['dashboard_atom_url_admin_txt'] = "Dashboard atom feed URL (für Admins)";
-$wb['dashboard_atom_url_reseller_txt'] = "Dashboard atom feed URL (für Reseller)";
-$wb['dashboard_atom_url_client_txt'] = "Dashboard atom feed URL (für Kunden)";
-$wb['webdavuser_prefix_txt'] = "WebDAV Benutzer Präfix";
-$wb['webdavuser_prefix_error_regex'] = "Zeichen nicht zulässig im WebDAV Benutzer Präfix.";
-$wb['use_domain_module_txt'] = "Das Domain Modul benutzen, um neue Domains hinzuzufügen";
-$wb['use_domain_module_hint'] = "Falls Sie dieses Modul benutzen, können Ihre Kunden nur eine der Domains auswählen, die der Admin für sie angelegt hat. Die Kunden können das Domain-Feld nicht frei editieren. Sie müssen sich neu einloggen, wenn Sie diesen Wert ändern.";
-$wb['new_domain_txt'] = "HTML Text zum Anlegen einer neuen Domain";
-$wb['webftp_url_txt'] = "WebFTP URL";
-$wb['enable_custom_login_txt'] = "Abweichenden Login Namen erlauben";
-$wb['mailmailinglist_link_txt'] = "Link zur Mailingliste in der Mailinglisten Ãœbersicht";
-$wb['mailmailinglist_url_txt'] = "Mailinglisten URL";
-$wb['admin_mail_txt'] = "Administrator E-Mail";
-$wb['monitor_key_txt'] = "ISPConfig Monitor App Passwort";
-$wb['admin_name_txt'] = "Name des Administrators";
-$wb['maintenance_mode_txt'] = "Wartungsmodus";
-$wb['smtp_enabled_txt'] = "SMTP zum System Mailversand nutzen";
-$wb['smtp_host_txt'] = "SMTP Server";
-$wb['smtp_port_txt'] = "SMTP Port";
-$wb['smtp_user_txt'] = "SMTP Benutzer";
-$wb['smtp_pass_txt'] = "SMTP Passwort";
-$wb['smtp_crypt_txt'] = "SSL/TLS verschlüsselte Verbindung für SMTP";
+$wb['system_config_desc_txt'] = 'Systemkonfiguration';
+$wb['smtp_missing_admin_mail_txt'] = 'Bitte geben Sie die Administrator E-Mail und den Namen ein, wenn Sie SMTP Versand nutzen wollen.';
+$wb['warning'] = 'Bearbeiten Sie diese Werte sorgfältig! Entfernen Sie die Prefixe nicht auf Systemen mit mehr als einem Client.';
+$wb['tab_change_warning_txt'] = 'Tab Wechsel Warnung';
+$wb['tab_change_discard_txt'] = 'Verwerfe Änderungen bei Tab Wechsel';
+$wb['tab_change_warning_note_txt'] = 'Zeigt eine Warnung an, wenn der Tab in einem Formular gewechselt wird und Daten geändert wurden.';
+$wb['dbname_prefix_txt'] = 'Datenbank Namen Präfix';
+$wb['dbuser_prefix_txt'] = 'Datenbank Benutzer Präfix';
+$wb['shelluser_prefix_txt'] = 'Shell Benutzer Präfix';
+$wb['ftpuser_prefix_txt'] = 'FTP Benutzer Präfix';
+$wb['vhost_subdomains_txt'] = 'Subdomains als Webseite anlegen';
+$wb['vhost_subdomains_note_txt'] = 'Diese Einstellung kann nicht wieder deaktiviert werden, wenn Vhost Subdomains im System vorhanden sind!';
+$wb['dbname_prefix_error_regex'] = 'Zeichen nicht erlaubt in Datenbank Namen Präfix.';
+$wb['dbuser_prefix_error_regex'] = 'Zeichen nicht erlaubt in Datenbank Benutzer Präfix.';
+$wb['ftpuser_prefix_error_regex'] = 'Zeichen nicht erlaubt in FTP Benutzer Präfix.';
+$wb['shelluser_prefix_error_regex'] = 'Zeichen nicht erlaubt in Shell Benutzer Präfix.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link zu phpMyAdmin in der Datenbankliste';
+$wb['mailboxlist_webmail_link_txt'] = 'Link zu Webmail in der Mailboxliste';
+$wb['webmail_url_txt'] = 'Webmail URL';
+$wb['phpmyadmin_url_txt'] = 'phpMyAdmin URL';
+$wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (für Admins)';
+$wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (für Reseller)';
+$wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (für Kunden)';
+$wb['webdavuser_prefix_txt'] = 'WebDAV Benutzer Präfix';
+$wb['webdavuser_prefix_error_regex'] = 'Zeichen nicht zulässig im WebDAV Benutzer Präfix.';
+$wb['use_domain_module_txt'] = 'Das Domain Modul benutzen, um neue Domains hinzuzufügen';
+$wb['use_domain_module_hint'] = 'Falls Sie dieses Modul benutzen, können Ihre Kunden nur eine der Domains auswählen, die der Admin für sie angelegt hat. Die Kunden können das Domain-Feld nicht frei editieren. Sie müssen sich neu einloggen, wenn Sie diesen Wert ändern.';
+$wb['new_domain_txt'] = 'HTML Text zum Anlegen einer neuen Domain';
+$wb['webftp_url_txt'] = 'WebFTP URL';
+$wb['enable_custom_login_txt'] = 'Abweichenden Login Namen erlauben';
+$wb['mailmailinglist_link_txt'] = 'Link zur Mailingliste in der Mailinglisten Ãœbersicht';
+$wb['mailmailinglist_url_txt'] = 'Mailinglisten URL';
+$wb['admin_mail_txt'] = 'Administrator E-Mail';
+$wb['monitor_key_txt'] = 'ISPConfig Monitor App Passwort';
+$wb['admin_name_txt'] = 'Name des Administrators';
+$wb['maintenance_mode_txt'] = 'Wartungsmodus';
+$wb['smtp_enabled_txt'] = 'SMTP zum System Mailversand nutzen';
+$wb['smtp_host_txt'] = 'SMTP Server';
+$wb['smtp_port_txt'] = 'SMTP Port';
+$wb['smtp_user_txt'] = 'SMTP Benutzer';
+$wb['smtp_pass_txt'] = 'SMTP Passwort';
+$wb['smtp_crypt_txt'] = 'SSL/TLS verschlüsselte Verbindung für SMTP';
?>
-
diff --git a/interface/web/admin/lib/lang/de_tpl_default_admin.lng b/interface/web/admin/lib/lang/de_tpl_default_admin.lng
index d397616fb..97674003e 100644
--- a/interface/web/admin/lib/lang/de_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/de_tpl_default_admin.lng
@@ -1,19 +1,18 @@
<?php
-$wb['tpl_default_admin_head_txt'] = "Globale Standard Template Einstellungen";
-$wb['tpl_default_admin_desc_txt'] = "Globale Standard Template Einstellungen für Kunden";
-$wb['server_id_txt'] = "Server";
-$wb['client_id_txt'] = "Kunde";
-$wb['name_txt'] = "PHP Name";
-$wb['Name'] = "Name";
-$wb['FastCGI Settings'] = "FastCGI Einstellungen";
-$wb['PHP-FPM Settings'] = "PHP-FPM Einstellungen";
-$wb['Additional PHP Versions'] = "Zusätzliche PHP Versionen";
-$wb['Form to edit additional PHP versions'] = "Formular, um zusätzliche PHP Versionen hinzuzufügen";
-$wb['server_php_name_error_empty'] = "Das Name Feld darf nicht leer sein.";
-$wb['php_fastcgi_binary_txt'] = "Pfad zum PHP FastCGI Binary";
-$wb['php_fastcgi_ini_dir_txt'] = "Pfad zum php.ini Verzeichnis";
-$wb['php_fpm_init_script_txt'] = "Pfad zum PHP-FPM Init Script";
-$wb['php_fpm_ini_dir_txt'] = "Pfad zum php.ini Verzeichnis";
-$wb['php_fpm_pool_dir_txt'] = "Pfad zum PHP-FPM Pool Verzeichnis";
+$wb['tpl_default_admin_head_txt'] = 'Globale Standard Template Einstellungen';
+$wb['tpl_default_admin_desc_txt'] = 'Globale Standard Template Einstellungen für Kunden';
+$wb['server_id_txt'] = 'Server';
+$wb['client_id_txt'] = 'Kunde';
+$wb['name_txt'] = 'PHP Name';
+$wb['Name'] = 'Name';
+$wb['FastCGI Settings'] = 'FastCGI Einstellungen';
+$wb['PHP-FPM Settings'] = 'PHP-FPM Einstellungen';
+$wb['Additional PHP Versions'] = 'Zusätzliche PHP Versionen';
+$wb['Form to edit additional PHP versions'] = 'Formular, um zusätzliche PHP Versionen hinzuzufügen';
+$wb['server_php_name_error_empty'] = 'Das Name Feld darf nicht leer sein.';
+$wb['php_fastcgi_binary_txt'] = 'Pfad zum PHP FastCGI Binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis';
+$wb['php_fpm_init_script_txt'] = 'Pfad zum PHP-FPM Init Script';
+$wb['php_fpm_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis';
+$wb['php_fpm_pool_dir_txt'] = 'Pfad zum PHP-FPM Pool Verzeichnis';
?>
-
diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng
index e60d8efc3..1ead952e5 100644
--- a/interface/web/admin/lib/lang/de_users.lng
+++ b/interface/web/admin/lib/lang/de_users.lng
@@ -30,4 +30,3 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
-
diff --git a/interface/web/admin/lib/lang/de_users_list.lng b/interface/web/admin/lib/lang/de_users_list.lng
index 8cb2a46a8..c635ba728 100644
--- a/interface/web/admin/lib/lang/de_users_list.lng
+++ b/interface/web/admin/lib/lang/de_users_list.lng
@@ -7,4 +7,3 @@ $wb['groups_txt'] = 'Gruppen';
$wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
$wb['warning_txt'] = '<b>WARNUNG:</b> Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!';
?>
-
diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng
index f85a3f599..010a5506d 100644
--- a/interface/web/admin/lib/lang/el.lng
+++ b/interface/web/admin/lib/lang/el.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Εισαγωγή';
$wb['Remote Actions'] = 'ΑπομακÏυσμÎνες ΕνÎÏγειες';
$wb['Do OS-Update'] = 'Αναβάθμιση λειτουÏÎ³Î¹ÎºÎ¿Ï ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚';
$wb['Do ISPConfig-Update'] = 'Αναβάθμιση ISPConfig';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/el_directive_snippets.lng b/interface/web/admin/lib/lang/el_directive_snippets.lng
new file mode 100644
index 000000000..d836ab0da
--- /dev/null
+++ b/interface/web/admin/lib/lang/el_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['Directive Snippets'] = 'Directive Snippets';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['snippet_txt'] = 'Snippet';
+$wb['active_txt'] = 'Active';
+$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/el_directive_snippets_list.lng b/interface/web/admin/lib/lang/el_directive_snippets_list.lng
new file mode 100644
index 000000000..4124ea346
--- /dev/null
+++ b/interface/web/admin/lib/lang/el_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Directive Snippets';
+$wb['active_txt'] = 'Active';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['add_new_record_txt'] = 'Add Directive Snippet';
+?>
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 40cf91875..5768d3f79 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot home";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sections";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted applications";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted applications";
-$wb['website_path_txt'] = "ΔιαδÏομή Website";
-$wb['website_symlinks_txt'] = "Website symlinks";
-$wb['website_symlinks_rel_txt'] = "ΔημιουÏγία σχετικών symlinks";
-$wb['website_basedir_txt'] = "Βασικός φάκελος Website";
-$wb['vhost_conf_dir_txt'] = "Φάκελος Ïυθμίσεων Vhost";
-$wb['vhost_conf_enabled_dir_txt'] = "Φάκελος Ïυθμίσεων (ενεÏγών) Vhost";
-$wb['getmail_config_dir_txt'] = "Φάκελος Ïυθμίσεων Getmail";
-$wb['fastcgi_starter_path_txt'] = "ΔιαδÏομή εκκίνησης FastCGI";
-$wb['fastcgi_starter_script_txt'] = "Script εκκίνησης FastCGI";
-$wb['fastcgi_alias_txt'] = "Ψευδώνυμο FastCGI";
-$wb['fastcgi_phpini_path_txt'] = "ΔιαδÏομή FastCGI php.ini";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "ÎŒÏιο πλήθους αιτήσεων FastCGI";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "ΆÏθÏωμα";
-$wb['maildir_path_txt'] = "ΔιαδÏομή Maildir";
-$wb['homedir_path_txt'] = "ΔιαδÏομή Homedir";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Όνομα Mailuser";
-$wb['mailuser_group_txt'] = "Ομάδα Mailuser";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "ΧÏήστης Relayhost";
-$wb['relayhost_password_txt'] = "Συνθηματικό Relayhost";
-$wb['mailbox_size_limit_txt'] = "ÎŒÏιο χώÏου θυÏίδας";
-$wb['message_size_limit_txt'] = "Μήνυμα οÏίου χώÏου";
-$wb['ip_address_txt'] = "ΔιεÏθυνση IP";
-$wb['netmask_txt'] = "Μάσκα υποδικτÏου";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameservers";
-$wb['auto_network_configuration_txt'] = "Ρυθμίσεις ΔικτÏου";
-$wb['ip_address_error_wrong'] = "Η μοÏφοποίηση της IP δεν είναι ÎγκυÏη";
-$wb['netmask_error_wrong'] = "Η μοÏφοποίηση της μάσκας υποδικτÏου δεν είναι ÎγκυÏη.";
-$wb['gateway_error_wrong'] = "Η μοÏφοποίηση της Gateway δεν είναι ÎγκυÏη.";
-$wb['hostname_error_empty'] = "Το Hostname δεν Îχει οÏιστεί.";
-$wb['nameservers_error_empty'] = "Ο Nameserver δεν Îχει οÏιστεί.";
-$wb['config_dir_txt'] = "Φάκελος Config";
-$wb['init_script_txt'] = "Όνομα αÏχείου εκκίνησης Cron";
-$wb['crontab_dir_txt'] = "ΔιαδÏομή για ανεξάÏτητα crontabs";
-$wb['wget_txt'] = "ΔιαδÏομή για το wget";
-$wb['web_user_txt'] = "ΧÏήστης Apache";
-$wb['web_group_txt'] = "Ομάδα Apache";
-$wb['security_level_txt'] = "Επίπεδο ασφαλείας";
-$wb['loglevel_txt'] = "Επίπεδο καταγÏαφής";
-$wb['apps_vhost_port_txt'] = "ΘÏÏα του Apps-vhost";
-$wb['apps_vhost_ip_txt'] = "IP διεÏθυνση του Apps-vhost";
-$wb['apps_vhost_servername_txt'] = "Domain του Apps-vhost";
-$wb['bind_user_txt'] = "ΧÏήστης BIND";
-$wb['bind_group_txt'] = "Ομάδα BIND";
-$wb['bind_zonefiles_dir_txt'] = "Φάκελος αÏχείων ζωνών BIND";
-$wb['named_conf_path_txt'] = "ΔιαδÏομη του named.conf του BIND ";
-$wb['bind_user_error_empty'] = "Δεν δώσατε χÏήστη BIND.";
-$wb['bind_group_error_empty'] = "Δεν δώσατε ομάδα BIND.";
-$wb['bind_zonefiles_dir_error_empty'] = "Ο φάκελος με τα zonefiles του BIND δεν Îχει οÏιστεί.";
-$wb['named_conf_path_error_empty'] = "Η διαδÏομή για το named.conf του BIND δεν Îχει οÏιστεί.";
-$wb['named_conf_local_path_error_empty'] = "Η διαδÏομή για το named.conf.local του BIND δεν Îχει οÏιστεί.";
-$wb['mail_filter_syntax_txt'] = "Συντακτικό Mailfilter";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "Το open_basedir της PHP δεν Îχει οÏιστεί.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = "Το AllowOverride του .htaccess δεν Îχει οÏιστεί.";
-$wb['awstats_conf_dir_txt'] = "Φάκελος Ïυθμίσεων του awstats";
-$wb['awstats_data_dir_txt'] = "Φάκελος δεδομÎνων του awstats";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Φάκελος Backup";
-$wb['named_conf_local_path_txt'] = "ΔιαδÏομή του named.conf.local του BIND";
-$wb['php_ini_path_cgi_txt'] = "ΔιαδÏομή του php.ini για CGI";
-$wb['php_ini_path_apache_txt'] = "ΔιαδÏομή του php.ini για Apache";
-$wb['check_apache_config_txt'] = "Έλεγχος των Ïυθμίσεων του apache ή επαννεκίνηση";
-$wb['CA_path_txt'] = "ΔιαδÏομή CA";
-$wb['CA_pass_txt'] = "Συνθηματική φÏάση CA";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "ΔιαχείÏιση ενσωματωμÎνων κανόνων";
-$wb['ufw_ipv6_txt'] = "ΕνεÏγοποίηση IPv6";
-$wb['ufw_default_input_policy_txt'] = "Î ÏοκαθοÏισμÎνη Πολιτική Εισόδου";
-$wb['ufw_default_output_policy_txt'] = "Î ÏοκαθοÏισμÎνη Πολιτική Εξόδου";
-$wb['ufw_default_forward_policy_txt'] = "Î ÏοκαθοÏισμÎνη Πολιτική Î Ïοώθησης";
-$wb['ufw_default_application_policy_txt'] = "Î ÏοκαθοÏισμÎνη Πολιτική ΕφαÏμογών";
-$wb['ufw_log_level_txt'] = "Επίπεδο ΚαταγÏαφής";
-$wb['network_config_warning_txt'] = "Η επιλογή για την παÏαμετÏοποίηση του δικτÏου είναι διαθÎσιμη μόνο για Debian και Ubuntu Servers. Μην ενεÏγοποιείτε αυτή την επιλογή αν η (διεπαφή) κάÏτα δικτÏου δεν είναι η eth0.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "ΤÏπος Server";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "ΧÏήστης Nginx";
-$wb['nginx_group_txt'] = "Ομάδα Nginx";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Ο φάκελος Backup είναι άδειος.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Η διαδÏομή για το wget δεν δόθηκε.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "ΕνεÏγοποίηση εποπτείας υπηÏεσιών και επανεκκινησης σε πεÏίπτωση αποτυχίας";
-$wb['do_not_try_rescue_mysql_txt'] = "ΑπενεÏγοποίηση εποπτείας MySQL";
-$wb['do_not_try_rescue_mail_txt'] = "ΑπενεÏγοποίηση εποπτείας Email";
-$wb['rescue_description_txt'] = "<b>ΠληÏοφοÏία:</b> Αν θÎλετε να τεÏματίσετε την MySQL Ï€ÏÎπει να επιλÎξετε την επιλογή ΑπενεÏγοποίηση εποπτείας MySQL και μετά να πεÏιμÎνετε 2-3 λεπτά.<br>Αν δεν πεÏιμÎνετε 2-3 λεπτά, η εποπτεία και αποκατάσταση θα Ï€Ïοσπαθήσει να επανεκκινήσει την MySQL!";
-$wb['enable_sni_txt'] = "ΕνεÏγοποίηση SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "ΑπενεÏγοποίηση εποπτείας HTTPD";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$wb['website_path_txt'] = 'ΔιαδÏομή Website';
+$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['website_symlinks_rel_txt'] = 'ΔημιουÏγία σχετικών symlinks';
+$wb['website_basedir_txt'] = 'Βασικός φάκελος Website';
+$wb['vhost_conf_dir_txt'] = 'Φάκελος Ïυθμίσεων Vhost';
+$wb['vhost_conf_enabled_dir_txt'] = 'Φάκελος Ïυθμίσεων (ενεÏγών) Vhost';
+$wb['getmail_config_dir_txt'] = 'Φάκελος Ïυθμίσεων Getmail';
+$wb['fastcgi_starter_path_txt'] = 'ΔιαδÏομή εκκίνησης FastCGI';
+$wb['fastcgi_starter_script_txt'] = 'Script εκκίνησης FastCGI';
+$wb['fastcgi_alias_txt'] = 'Ψευδώνυμο FastCGI';
+$wb['fastcgi_phpini_path_txt'] = 'ΔιαδÏομή FastCGI php.ini';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'ÎŒÏιο πλήθους αιτήσεων FastCGI';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'ΆÏθÏωμα';
+$wb['maildir_path_txt'] = 'ΔιαδÏομή Maildir';
+$wb['homedir_path_txt'] = 'ΔιαδÏομή Homedir';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Όνομα Mailuser';
+$wb['mailuser_group_txt'] = 'Ομάδα Mailuser';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'ΧÏήστης Relayhost';
+$wb['relayhost_password_txt'] = 'Συνθηματικό Relayhost';
+$wb['mailbox_size_limit_txt'] = 'ÎŒÏιο χώÏου θυÏίδας';
+$wb['message_size_limit_txt'] = 'Μήνυμα οÏίου χώÏου';
+$wb['ip_address_txt'] = 'ΔιεÏθυνση IP';
+$wb['netmask_txt'] = 'Μάσκα υποδικτÏου';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameservers';
+$wb['auto_network_configuration_txt'] = 'Ρυθμίσεις ΔικτÏου';
+$wb['ip_address_error_wrong'] = 'Η μοÏφοποίηση της IP δεν είναι ÎγκυÏη';
+$wb['netmask_error_wrong'] = 'Η μοÏφοποίηση της μάσκας υποδικτÏου δεν είναι ÎγκυÏη.';
+$wb['gateway_error_wrong'] = 'Η μοÏφοποίηση της Gateway δεν είναι ÎγκυÏη.';
+$wb['hostname_error_empty'] = 'Το Hostname δεν Îχει οÏιστεί.';
+$wb['nameservers_error_empty'] = 'Ο Nameserver δεν Îχει οÏιστεί.';
+$wb['config_dir_txt'] = 'Φάκελος Config';
+$wb['init_script_txt'] = 'Όνομα αÏχείου εκκίνησης Cron';
+$wb['crontab_dir_txt'] = 'ΔιαδÏομή για ανεξάÏτητα crontabs';
+$wb['wget_txt'] = 'ΔιαδÏομή για το wget';
+$wb['web_user_txt'] = 'ΧÏήστης Apache';
+$wb['web_group_txt'] = 'Ομάδα Apache';
+$wb['security_level_txt'] = 'Επίπεδο ασφαλείας';
+$wb['loglevel_txt'] = 'Επίπεδο καταγÏαφής';
+$wb['apps_vhost_port_txt'] = 'ΘÏÏα του Apps-vhost';
+$wb['apps_vhost_ip_txt'] = 'IP διεÏθυνση του Apps-vhost';
+$wb['apps_vhost_servername_txt'] = 'Domain του Apps-vhost';
+$wb['bind_user_txt'] = 'ΧÏήστης BIND';
+$wb['bind_group_txt'] = 'Ομάδα BIND';
+$wb['bind_zonefiles_dir_txt'] = 'Φάκελος αÏχείων ζωνών BIND';
+$wb['named_conf_path_txt'] = 'ΔιαδÏομη του named.conf του BIND ';
+$wb['bind_user_error_empty'] = 'Δεν δώσατε χÏήστη BIND.';
+$wb['bind_group_error_empty'] = 'Δεν δώσατε ομάδα BIND.';
+$wb['bind_zonefiles_dir_error_empty'] = 'Ο φάκελος με τα zonefiles του BIND δεν Îχει οÏιστεί.';
+$wb['named_conf_path_error_empty'] = 'Η διαδÏομή για το named.conf του BIND δεν Îχει οÏιστεί.';
+$wb['named_conf_local_path_error_empty'] = 'Η διαδÏομή για το named.conf.local του BIND δεν Îχει οÏιστεί.';
+$wb['mail_filter_syntax_txt'] = 'Συντακτικό Mailfilter';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'Το open_basedir της PHP δεν Îχει οÏιστεί.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = 'Το AllowOverride του .htaccess δεν Îχει οÏιστεί.';
+$wb['awstats_conf_dir_txt'] = 'Φάκελος Ïυθμίσεων του awstats';
+$wb['awstats_data_dir_txt'] = 'Φάκελος δεδομÎνων του awstats';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Φάκελος Backup';
+$wb['named_conf_local_path_txt'] = 'ΔιαδÏομή του named.conf.local του BIND';
+$wb['php_ini_path_cgi_txt'] = 'ΔιαδÏομή του php.ini για CGI';
+$wb['php_ini_path_apache_txt'] = 'ΔιαδÏομή του php.ini για Apache';
+$wb['check_apache_config_txt'] = 'Έλεγχος των Ïυθμίσεων του apache ή επαννεκίνηση';
+$wb['CA_path_txt'] = 'ΔιαδÏομή CA';
+$wb['CA_pass_txt'] = 'Συνθηματική φÏάση CA';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'ΔιαχείÏιση ενσωματωμÎνων κανόνων';
+$wb['ufw_ipv6_txt'] = 'ΕνεÏγοποίηση IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Î ÏοκαθοÏισμÎνη Πολιτική Εισόδου';
+$wb['ufw_default_output_policy_txt'] = 'Î ÏοκαθοÏισμÎνη Πολιτική Εξόδου';
+$wb['ufw_default_forward_policy_txt'] = 'Î ÏοκαθοÏισμÎνη Πολιτική Î Ïοώθησης';
+$wb['ufw_default_application_policy_txt'] = 'Î ÏοκαθοÏισμÎνη Πολιτική ΕφαÏμογών';
+$wb['ufw_log_level_txt'] = 'Επίπεδο ΚαταγÏαφής';
+$wb['network_config_warning_txt'] = 'Η επιλογή για την παÏαμετÏοποίηση του δικτÏου είναι διαθÎσιμη μόνο για Debian και Ubuntu Servers. Μην ενεÏγοποιείτε αυτή την επιλογή αν η (διεπαφή) κάÏτα δικτÏου δεν είναι η eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'ΤÏπος Server';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'ΧÏήστης Nginx';
+$wb['nginx_group_txt'] = 'Ομάδα Nginx';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Ο φάκελος Backup είναι άδειος.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Η διαδÏομή για το wget δεν δόθηκε.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'ΕνεÏγοποίηση εποπτείας υπηÏεσιών και επανεκκινησης σε πεÏίπτωση αποτυχίας';
+$wb['do_not_try_rescue_mysql_txt'] = 'ΑπενεÏγοποίηση εποπτείας MySQL';
+$wb['do_not_try_rescue_mail_txt'] = 'ΑπενεÏγοποίηση εποπτείας Email';
+$wb['rescue_description_txt'] = '<b>ΠληÏοφοÏία:</b> Αν θÎλετε να τεÏματίσετε την MySQL Ï€ÏÎπει να επιλÎξετε την επιλογή ΑπενεÏγοποίηση εποπτείας MySQL και μετά να πεÏιμÎνετε 2-3 λεπτά.<br>Αν δεν πεÏιμÎνετε 2-3 λεπτά, η εποπτεία και αποκατάσταση θα Ï€Ïοσπαθήσει να επανεκκινήσει την MySQL!';
+$wb['enable_sni_txt'] = 'ΕνεÏγοποίηση SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'ΑπενεÏγοποίηση εποπτείας HTTPD';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index 7ecadfb86..ef186aab1 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index 650d4b0f9..15dbe8686 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -41,4 +41,5 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL';
?>
diff --git a/interface/web/admin/lib/lang/es.lng b/interface/web/admin/lib/lang/es.lng
index d8a3f990b..dba64b42c 100644
--- a/interface/web/admin/lib/lang/es.lng
+++ b/interface/web/admin/lib/lang/es.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Importar';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/es_directive_snippets.lng b/interface/web/admin/lib/lang/es_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/es_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/es_directive_snippets_list.lng b/interface/web/admin/lib/lang/es_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/es_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index b42b5c974..454f2cd66 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Carpeta Jailkit chroot";
-$wb['jailkit_chroot_app_sections_txt'] = "Secciones de aplicación Jailkit chroot";
-$wb['jailkit_chroot_app_programs_txt'] = "Aplicaciones Jailkit chrooted";
-$wb['website_path_txt'] = "Ruta del sitio web";
-$wb['website_symlinks_txt'] = "Enlaces simbólicos del sitio web";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['vhost_conf_dir_txt'] = "Directorio de configuración de vhost";
-$wb['vhost_conf_enabled_dir_txt'] = "Directorio de configuración de vhost activados";
-$wb['getmail_config_dir_txt'] = "Directorio de configuración de Getmail";
-$wb['fastcgi_starter_path_txt'] = "Ruta inicial de FastCGI";
-$wb['fastcgi_starter_script_txt'] = "Script inicial de FastCGI";
-$wb['fastcgi_alias_txt'] = "Alias de FastCGI";
-$wb['fastcgi_phpini_path_txt'] = "Ruta al php.ini de FastCGI";
-$wb['fastcgi_children_txt'] = "Hijos de FastCGI";
-$wb['fastcgi_max_requests_txt'] = "Peticiones máximas de FastCGI";
-$wb['fastcgi_bin_txt'] = "Binario de FastCGI";
-$wb['module_txt'] = "Módulo";
-$wb['maildir_path_txt'] = "Ruta de maildir";
-$wb['homedir_path_txt'] = "Ruta de homedir";
-$wb['mailuser_uid_txt'] = "UID usuario de correo";
-$wb['mailuser_gid_txt'] = "GID usuario de correo";
-$wb['mailuser_name_txt'] = "Nombre del usuario de correo";
-$wb['mailuser_group_txt'] = "Grupo del usuario de correo";
-$wb['relayhost_txt'] = "Servidor de retransmisión";
-$wb['relayhost_user_txt'] = "Usuario de retransmisión";
-$wb['relayhost_password_txt'] = "Contraseña de retramisión";
-$wb['mailbox_size_limit_txt'] = "LÃmite de tamaño del buzón";
-$wb['message_size_limit_txt'] = "LÃmite de tamaño del mensaje";
-$wb['ip_address_txt'] = "Dirección IP";
-$wb['netmask_txt'] = "Máscara de red";
-$wb['gateway_txt'] = "Pasarela";
-$wb['hostname_txt'] = "Nombre de la máquina (hostname)";
-$wb['nameservers_txt'] = "Servidores de nombres";
-$wb['auto_network_configuration_txt'] = "Configuración de red";
-$wb['website_basedir_txt'] = "Basedir del sitio Web";
-$wb['ip_address_error_wrong'] = "Formato incorrecto de dirección IP.";
-$wb['netmask_error_wrong'] = "Formato incorrecto de máscara de red.";
-$wb['gateway_error_wrong'] = "Formato incorrecto de pasarela.";
-$wb['hostname_error_empty'] = "El nombre de la máquina (hostname) está vacÃo.";
-$wb['nameservers_error_empty'] = "El servidor de nombres (nameserver) está vacÃo.";
-$wb['jailkit_chroot_cron_programs_txt'] = "Aplicaciones Jailkit cron chrooted";
-$wb['config_dir_txt'] = "Directorio de configuración";
-$wb['init_script_txt'] = "Nombre del script de inicio de cron";
-$wb['crontab_dir_txt'] = "Ruta para las crontabs individuales";
-$wb['wget_txt'] = "Ruta al programa wget";
-$wb['security_level_txt'] = "Nivel de seguridad";
-$wb['web_user_txt'] = "Usuario de Apache";
-$wb['web_group_txt'] = "Grupo de Apache";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "BIND User";
-$wb['bind_group_txt'] = "BIND Group";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf path";
-$wb['bind_user_error_empty'] = "BIND user is empty.";
-$wb['bind_group_error_empty'] = "BIND group is empty.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is empty.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf path is empty.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local path is empty.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is empty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is empty.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Carpeta Jailkit chroot';
+$wb['jailkit_chroot_app_sections_txt'] = 'Secciones de aplicación Jailkit chroot';
+$wb['jailkit_chroot_app_programs_txt'] = 'Aplicaciones Jailkit chrooted';
+$wb['website_path_txt'] = 'Ruta del sitio web';
+$wb['website_symlinks_txt'] = 'Enlaces simbólicos del sitio web';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['vhost_conf_dir_txt'] = 'Directorio de configuración de vhost';
+$wb['vhost_conf_enabled_dir_txt'] = 'Directorio de configuración de vhost activados';
+$wb['getmail_config_dir_txt'] = 'Directorio de configuración de Getmail';
+$wb['fastcgi_starter_path_txt'] = 'Ruta inicial de FastCGI';
+$wb['fastcgi_starter_script_txt'] = 'Script inicial de FastCGI';
+$wb['fastcgi_alias_txt'] = 'Alias de FastCGI';
+$wb['fastcgi_phpini_path_txt'] = 'Ruta al php.ini de FastCGI';
+$wb['fastcgi_children_txt'] = 'Hijos de FastCGI';
+$wb['fastcgi_max_requests_txt'] = 'Peticiones máximas de FastCGI';
+$wb['fastcgi_bin_txt'] = 'Binario de FastCGI';
+$wb['module_txt'] = 'Módulo';
+$wb['maildir_path_txt'] = 'Ruta de maildir';
+$wb['homedir_path_txt'] = 'Ruta de homedir';
+$wb['mailuser_uid_txt'] = 'UID usuario de correo';
+$wb['mailuser_gid_txt'] = 'GID usuario de correo';
+$wb['mailuser_name_txt'] = 'Nombre del usuario de correo';
+$wb['mailuser_group_txt'] = 'Grupo del usuario de correo';
+$wb['relayhost_txt'] = 'Servidor de retransmisión';
+$wb['relayhost_user_txt'] = 'Usuario de retransmisión';
+$wb['relayhost_password_txt'] = 'Contraseña de retramisión';
+$wb['mailbox_size_limit_txt'] = 'LÃmite de tamaño del buzón';
+$wb['message_size_limit_txt'] = 'LÃmite de tamaño del mensaje';
+$wb['ip_address_txt'] = 'Dirección IP';
+$wb['netmask_txt'] = 'Máscara de red';
+$wb['gateway_txt'] = 'Pasarela';
+$wb['hostname_txt'] = 'Nombre de la máquina (hostname)';
+$wb['nameservers_txt'] = 'Servidores de nombres';
+$wb['auto_network_configuration_txt'] = 'Configuración de red';
+$wb['website_basedir_txt'] = 'Basedir del sitio Web';
+$wb['ip_address_error_wrong'] = 'Formato incorrecto de dirección IP.';
+$wb['netmask_error_wrong'] = 'Formato incorrecto de máscara de red.';
+$wb['gateway_error_wrong'] = 'Formato incorrecto de pasarela.';
+$wb['hostname_error_empty'] = 'El nombre de la máquina (hostname) está vacÃo.';
+$wb['nameservers_error_empty'] = 'El servidor de nombres (nameserver) está vacÃo.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Aplicaciones Jailkit cron chrooted';
+$wb['config_dir_txt'] = 'Directorio de configuración';
+$wb['init_script_txt'] = 'Nombre del script de inicio de cron';
+$wb['crontab_dir_txt'] = 'Ruta para las crontabs individuales';
+$wb['wget_txt'] = 'Ruta al programa wget';
+$wb['security_level_txt'] = 'Nivel de seguridad';
+$wb['web_user_txt'] = 'Usuario de Apache';
+$wb['web_group_txt'] = 'Grupo de Apache';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'BIND User';
+$wb['bind_group_txt'] = 'BIND Group';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf path';
+$wb['bind_user_error_empty'] = 'BIND user is empty.';
+$wb['bind_group_error_empty'] = 'BIND group is empty.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng
index ebf95618f..8a45a9f1a 100644
--- a/interface/web/admin/lib/lang/es_system_config.lng
+++ b/interface/web/admin/lib/lang/es_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/fi.lng b/interface/web/admin/lib/lang/fi.lng
index 9a0c7c05e..6b1818a92 100755
--- a/interface/web/admin/lib/lang/fi.lng
+++ b/interface/web/admin/lib/lang/fi.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Asenna';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/fi_directive_snippets.lng b/interface/web/admin/lib/lang/fi_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/fi_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/fi_directive_snippets_list.lng b/interface/web/admin/lib/lang/fi_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/fi_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index 5aa74d13b..d56ca7508 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot-kotikansio";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot-ohjelmaosiot";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted-ohjelmat";
-$wb['website_path_txt'] = "Verkkotunnuksen kotihakemisto";
-$wb['website_symlinks_txt'] = "Verkkotunnuksen symmetriset linkit";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['vhost_conf_dir_txt'] = "Virtuaalipalvelimen asetuskansio";
-$wb['vhost_conf_enabled_dir_txt'] = "Virtuaalipalvelimen käyttöönottokansio";
-$wb['getmail_config_dir_txt'] = "Getmail-asetuskansio";
-$wb['fastcgi_starter_path_txt'] = "FastCGI:n käynnistyspolku";
-$wb['fastcgi_starter_script_txt'] = "FastCGI:n käynnistysskripti";
-$wb['fastcgi_alias_txt'] = "FastCGI-alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI:n php.ini-polku";
-$wb['fastcgi_children_txt'] = "FastCGI-lapsiprosessi";
-$wb['fastcgi_max_requests_txt'] = "FastCGI-pyyntöraja";
-$wb['fastcgi_bin_txt'] = "FastCGI-binääri";
-$wb['module_txt'] = "Ohjelmaosio";
-$wb['maildir_path_txt'] = "Postilaatikon hakemistopolku";
-$wb['homedir_path_txt'] = "Kotikansion hakemistopolku";
-$wb['mailuser_uid_txt'] = "Käyttäjätunnus";
-$wb['mailuser_gid_txt'] = "Käyttäjäryhmä";
-$wb['mailuser_name_txt'] = "Postikäyttäjän nimi";
-$wb['mailuser_group_txt'] = "Postikäyttäjän ryhmä";
-$wb['relayhost_txt'] = "Edelleenlähetyspalvelin";
-$wb['relayhost_user_txt'] = "Edelleenlähetyspalvelimen käyttäjätunnus";
-$wb['relayhost_password_txt'] = "Edelleenlähetyspalvelimen salasana";
-$wb['mailbox_size_limit_txt'] = "Postilaatikon koko";
-$wb['message_size_limit_txt'] = "Viestien enimmäiskoko";
-$wb['ip_address_txt'] = "IP-osoite";
-$wb['netmask_txt'] = "Verkon peite";
-$wb['gateway_txt'] = "Yhdyskäytävä";
-$wb['hostname_txt'] = "Palvelimen nimi";
-$wb['nameservers_txt'] = "Nimipalvelimet";
-$wb['auto_network_configuration_txt'] = "Automaattiset verkkoasetukset";
-$wb['website_basedir_txt'] = "Verkkotunnuksen peruskansio";
-$wb['ip_address_error_wrong'] = "IP-osoite on väärän muotoinen.";
-$wb['netmask_error_wrong'] = "Verkon peite on väärän muotoinen.";
-$wb['gateway_error_wrong'] = "Yhdyskäytävä on väärän muotoinen.";
-$wb['hostname_error_empty'] = "Isäntänimi on tyhjä.";
-$wb['nameservers_error_empty'] = "Nimipalvelin on tyhjä.";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrootatut ohjelmat";
-$wb['config_dir_txt'] = "Asetuskansio";
-$wb['init_script_txt'] = "Cronin init-skriptin nimi";
-$wb['crontab_dir_txt'] = "Käyttäjien Crontabien polku";
-$wb['wget_txt'] = "Wget-binäärin polku";
-$wb['security_level_txt'] = "Turvallisuustaso";
-$wb['web_user_txt'] = "Apache-käyttäjä";
-$wb['web_group_txt'] = "Apache-ryhmä";
-$wb['loglevel_txt'] = "Logitaso";
-$wb['apps_vhost_port_txt'] = "Apps-virtuaali-isännän portti";
-$wb['apps_vhost_ip_txt'] = "Apps-virtuaali-isännän IP-osoite";
-$wb['apps_vhost_servername_txt'] = "Apps-virtuaali-isännän verkkotunnus";
-$wb['bind_user_txt'] = "BIND-käyttäjä";
-$wb['bind_group_txt'] = "BIND-ryhmä";
-$wb['bind_zonefiles_dir_txt'] = "BIND-aluetiedostojen polku";
-$wb['named_conf_path_txt'] = "BIND-asetustiedoston polku";
-$wb['bind_user_error_empty'] = "BIND-käyttäjä on tyhjä.";
-$wb['bind_group_error_empty'] = "BIND-ryhmä on tyhjä.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND-aluetiedostojen kansio on tyhjä.";
-$wb['named_conf_path_error_empty'] = "BIND-asetustiedoston polku on tyhjä.";
-$wb['named_conf_local_path_error_empty'] = "BIND:in paikallisen asetustiedoston polku on tyhjä.";
-$wb['mail_filter_syntax_txt'] = "Postisuodattimien syntaksi";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP-ohjelma";
-$wb['php_open_basedir_txt'] = "PHP:een avoin peruskansio";
-$wb['php_open_basedir_error_empty'] = "PHP:een avoin peruskansio on tyhjä.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride on tyhjä.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot-kotikansio';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot-ohjelmaosiot';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted-ohjelmat';
+$wb['website_path_txt'] = 'Verkkotunnuksen kotihakemisto';
+$wb['website_symlinks_txt'] = 'Verkkotunnuksen symmetriset linkit';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['vhost_conf_dir_txt'] = 'Virtuaalipalvelimen asetuskansio';
+$wb['vhost_conf_enabled_dir_txt'] = 'Virtuaalipalvelimen käyttöönottokansio';
+$wb['getmail_config_dir_txt'] = 'Getmail-asetuskansio';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI:n käynnistyspolku';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI:n käynnistysskripti';
+$wb['fastcgi_alias_txt'] = 'FastCGI-alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI:n php.ini-polku';
+$wb['fastcgi_children_txt'] = 'FastCGI-lapsiprosessi';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI-pyyntöraja';
+$wb['fastcgi_bin_txt'] = 'FastCGI-binääri';
+$wb['module_txt'] = 'Ohjelmaosio';
+$wb['maildir_path_txt'] = 'Postilaatikon hakemistopolku';
+$wb['homedir_path_txt'] = 'Kotikansion hakemistopolku';
+$wb['mailuser_uid_txt'] = 'Käyttäjätunnus';
+$wb['mailuser_gid_txt'] = 'Käyttäjäryhmä';
+$wb['mailuser_name_txt'] = 'Postikäyttäjän nimi';
+$wb['mailuser_group_txt'] = 'Postikäyttäjän ryhmä';
+$wb['relayhost_txt'] = 'Edelleenlähetyspalvelin';
+$wb['relayhost_user_txt'] = 'Edelleenlähetyspalvelimen käyttäjätunnus';
+$wb['relayhost_password_txt'] = 'Edelleenlähetyspalvelimen salasana';
+$wb['mailbox_size_limit_txt'] = 'Postilaatikon koko';
+$wb['message_size_limit_txt'] = 'Viestien enimmäiskoko';
+$wb['ip_address_txt'] = 'IP-osoite';
+$wb['netmask_txt'] = 'Verkon peite';
+$wb['gateway_txt'] = 'Yhdyskäytävä';
+$wb['hostname_txt'] = 'Palvelimen nimi';
+$wb['nameservers_txt'] = 'Nimipalvelimet';
+$wb['auto_network_configuration_txt'] = 'Automaattiset verkkoasetukset';
+$wb['website_basedir_txt'] = 'Verkkotunnuksen peruskansio';
+$wb['ip_address_error_wrong'] = 'IP-osoite on väärän muotoinen.';
+$wb['netmask_error_wrong'] = 'Verkon peite on väärän muotoinen.';
+$wb['gateway_error_wrong'] = 'Yhdyskäytävä on väärän muotoinen.';
+$wb['hostname_error_empty'] = 'Isäntänimi on tyhjä.';
+$wb['nameservers_error_empty'] = 'Nimipalvelin on tyhjä.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrootatut ohjelmat';
+$wb['config_dir_txt'] = 'Asetuskansio';
+$wb['init_script_txt'] = 'Cronin init-skriptin nimi';
+$wb['crontab_dir_txt'] = 'Käyttäjien Crontabien polku';
+$wb['wget_txt'] = 'Wget-binäärin polku';
+$wb['security_level_txt'] = 'Turvallisuustaso';
+$wb['web_user_txt'] = 'Apache-käyttäjä';
+$wb['web_group_txt'] = 'Apache-ryhmä';
+$wb['loglevel_txt'] = 'Logitaso';
+$wb['apps_vhost_port_txt'] = 'Apps-virtuaali-isännän portti';
+$wb['apps_vhost_ip_txt'] = 'Apps-virtuaali-isännän IP-osoite';
+$wb['apps_vhost_servername_txt'] = 'Apps-virtuaali-isännän verkkotunnus';
+$wb['bind_user_txt'] = 'BIND-käyttäjä';
+$wb['bind_group_txt'] = 'BIND-ryhmä';
+$wb['bind_zonefiles_dir_txt'] = 'BIND-aluetiedostojen polku';
+$wb['named_conf_path_txt'] = 'BIND-asetustiedoston polku';
+$wb['bind_user_error_empty'] = 'BIND-käyttäjä on tyhjä.';
+$wb['bind_group_error_empty'] = 'BIND-ryhmä on tyhjä.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND-aluetiedostojen kansio on tyhjä.';
+$wb['named_conf_path_error_empty'] = 'BIND-asetustiedoston polku on tyhjä.';
+$wb['named_conf_local_path_error_empty'] = 'BIND:in paikallisen asetustiedoston polku on tyhjä.';
+$wb['mail_filter_syntax_txt'] = 'Postisuodattimien syntaksi';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP-ohjelma';
+$wb['php_open_basedir_txt'] = 'PHP:een avoin peruskansio';
+$wb['php_open_basedir_error_empty'] = 'PHP:een avoin peruskansio on tyhjä.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride on tyhjä.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng
index 68da01c00..af8d9564d 100755
--- a/interface/web/admin/lib/lang/fi_system_config.lng
+++ b/interface/web/admin/lib/lang/fi_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/hr.lng b/interface/web/admin/lib/lang/hr.lng
index 02f0ce82b..d7d22d47f 100644
--- a/interface/web/admin/lib/lang/hr.lng
+++ b/interface/web/admin/lib/lang/hr.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Importiraj';
$wb['Remote Actions'] = 'Udaljene akcije';
$wb['Do OS-Update'] = 'Nadogradnja sistema';
$wb['Do ISPConfig-Update'] = 'Nadogradnja control panela';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/hr_directive_snippets.lng b/interface/web/admin/lib/lang/hr_directive_snippets.lng
new file mode 100644
index 000000000..d836ab0da
--- /dev/null
+++ b/interface/web/admin/lib/lang/hr_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['Directive Snippets'] = 'Directive Snippets';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['snippet_txt'] = 'Snippet';
+$wb['active_txt'] = 'Active';
+$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/hr_directive_snippets_list.lng b/interface/web/admin/lib/lang/hr_directive_snippets_list.lng
new file mode 100644
index 000000000..4124ea346
--- /dev/null
+++ b/interface/web/admin/lib/lang/hr_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Directive Snippets';
+$wb['active_txt'] = 'Active';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['add_new_record_txt'] = 'Add Directive Snippet';
+?>
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index 9487b2531..5c9e7d0ed 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot direktorij";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sekcije";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrootane aplikacije";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrootane aplikacije";
-$wb['website_path_txt'] = "Put do Web stranice";
-$wb['website_symlinks_txt'] = "Symlinkovi Web stranice";
-$wb['website_basedir_txt'] = "Bazni direktorij Web stranice";
-$wb['vhost_conf_dir_txt'] = "Vhost konfiguracijski direktorij";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost dozvoljeni konfiguracijski direktorij";
-$wb['getmail_config_dir_txt'] = "Getmail konfiguracijski direktorij";
-$wb['fastcgi_starter_path_txt'] = "Put do FastCGI-a";
-$wb['fastcgi_starter_script_txt'] = "FastCGI poÄetna skripta";
-$wb['fastcgi_alias_txt'] = "FastCGI alias";
-$wb['fastcgi_phpini_path_txt'] = "Put do FastCGI php.ini datoteke";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "Maks. broj FastCGI zahtjeva";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Modul";
-$wb['maildir_path_txt'] = "Put do Maildir-a";
-$wb['homedir_path_txt'] = "Put do poÄetne stranice";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Mailuser ime";
-$wb['mailuser_group_txt'] = "Mailuser grupa";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost korisnik";
-$wb['relayhost_password_txt'] = "Relayhost Å¡ifra";
-$wb['mailbox_size_limit_txt'] = "Dozvoljena veliÄina mailboxa";
-$wb['message_size_limit_txt'] = "Dozvoljena veliÄina emaila";
-$wb['ip_address_txt'] = "IP adresa";
-$wb['netmask_txt'] = "Netmaska";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameserveri";
-$wb['auto_network_configuration_txt'] = "Konfiguracija mreže";
-$wb['ip_address_error_wrong'] = "Neispravan format IP adrese.";
-$wb['netmask_error_wrong'] = "Neispravni format netmask-a.";
-$wb['gateway_error_wrong'] = "Neispravan format gateway-a.";
-$wb['hostname_error_empty'] = "Hostname polje je prazno.";
-$wb['nameservers_error_empty'] = "Nameserver polje je prazno.";
-$wb['config_dir_txt'] = "Konfiguracijski direktorij";
-$wb['init_script_txt'] = "Inicijalizacijski naziv cron skripte";
-$wb['crontab_dir_txt'] = "Putanja do individualnih crontabs-a";
-$wb['wget_txt'] = "Putanja do wget programa";
-$wb['web_user_txt'] = "Apache korisnik";
-$wb['web_group_txt'] = "Apache grupa";
-$wb['security_level_txt'] = "Stupanj zaštite";
-$wb['loglevel_txt'] = "Stupanj logiranja";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP adresa";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost domena";
-$wb['bind_user_txt'] = "BIND korisnik";
-$wb['bind_group_txt'] = "BIND grupa";
-$wb['bind_zonefiles_dir_txt'] = "BIND direktorij sa zonskim datotekama";
-$wb['named_conf_path_txt'] = "BIND named.conf putanja";
-$wb['bind_user_error_empty'] = "BIND korisnik nije upisan..";
-$wb['bind_group_error_empty'] = "BIND grupa nije upisana.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND direktorij sa zonama nije upisan.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf putanja nije upisana.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local putanja nije upisana.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter sintaksa";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir nije upisan.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride nije upisan.";
-$wb['awstats_conf_dir_txt'] = "awstats konfiguracijski direktorij";
-$wb['awstats_data_dir_txt'] = "awstats podatkovni direktorij";
-$wb['awstats_pl_txt'] = "awstats.pl skripta";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl skripta";
-$wb['backup_dir_txt'] = "Backup direktorij";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local putanja";
-$wb['php_ini_path_cgi_txt'] = "Putanja do CGI php.ini";
-$wb['php_ini_path_apache_txt'] = "Putanja do Apache php.ini";
-$wb['check_apache_config_txt'] = "Testiraj Apache konfiguraciju prilikom restarta";
-$wb['ufw_enable_txt'] = "Omogući";
-$wb['ufw_manage_builtins_txt'] = "Upravljaj standardnim pravilima";
-$wb['ufw_ipv6_txt'] = "Omogući IPv6";
-$wb['ufw_default_input_policy_txt'] = "Standardna ulazna pravila";
-$wb['ufw_default_output_policy_txt'] = "Standardna izlazna pravila";
-$wb['ufw_default_forward_policy_txt'] = "Standardna pravila proslijeđivanja";
-$wb['ufw_default_application_policy_txt'] = "Standardna pravila aplikacija";
-$wb['ufw_log_level_txt'] = "Stupanj logiranja";
-$wb['website_symlinks_rel_txt'] = "Napravi relativne symlinks-e";
-$wb['network_config_warning_txt'] = "Konfiguracija mreže je dostupna samo za Debian i Ubuntu servere. Nemojte ukljuÄivati ovu opciju ako vaÅ¡ mrežni adapter nije eth0.";
-$wb['CA_path_txt'] = "CA putanja";
-$wb['CA_pass_txt'] = "CA Å¡ifra";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI konfiguracijska sintaksa";
-$wb['server_type_txt'] = "Vrsta servera";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost konfiguracijski direktorij";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost omogućeni konfiguracijski direktorij";
-$wb['nginx_user_txt'] = "Nginx korisnik";
-$wb['nginx_group_txt'] = "Nginx grupa";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI socket";
-$wb['backup_dir_error_empty'] = "Backup direktorij nije upisan.";
-$wb['maildir_path_error_empty'] = "Maildir direktorij nije upisan.";
-$wb['homedir_path_error_empty'] = "Homedir direktorij nije upisan.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID nije upisan.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID nije upisan.";
-$wb['mailuser_name_error_empty'] = "Mailuser ime nije upisano.";
-$wb['mailuser_group_error_empty'] = "Mailuser grupa nije upisana.";
-$wb['getmail_config_dir_error_empty'] = "Getmail konfiguracijski direktorij je prazan.";
-$wb['website_basedir_error_empty'] = "Website basedir je prazan.";
-$wb['website_path_error_empty'] = "Website putanja nije upisana.";
-$wb['website_symlinks_error_empty'] = "Website symlinks je prazan.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost konfiguracijski direktorij je prazan.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost omogućeni konfiguracijski direktorij je prazan.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost konfiguracijski direktorij je prazan.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost omogućeni konfiguracijski direktorij je prazan.";
-$wb['apache_user_error_empty'] = "Apache korisnik nije upisan.";
-$wb['apache_group_error_empty'] = "Apache grupa nije upisana.";
-$wb['nginx_user_error_empty'] = "Nginx korisnik nije upisan.";
-$wb['nginx_group_error_empty'] = "Nginx grupa nije upisana.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini putanja nije upisana.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini putanja nije upisana.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI socket nije upisan.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port nije upisan.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP adresa nije upisana.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter putanja nije upisana.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter skripta nije upisana.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI alias nije upisan.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini putanja nije upisana.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children nije upisan.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI maksimalan broj zahtjeva nije upisan.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin nije upisan.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home je prazan.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot aplikacijska sekcija nije upisana.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted aplikacije nisu upisane.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted aplikacije nisu upisane.";
-$wb['vlogger_config_dir_error_empty'] = "Konfiguracijski direktorij je prazan.";
-$wb['cron_init_script_error_empty'] = "Naziv Cron inicijalizacijske skripte je prazan.";
-$wb['crontab_dir_error_empty'] = "Nije upisana putanja za pojedinaÄni crontab.";
-$wb['cron_wget_error_empty'] = "Nije upisana putanja za wget.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM inicijalizacijska skripta";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM inicijalizacijska skripta nije upisana.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini putanja";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini putanja nije upisana.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool direktorij";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool direktorij nije upisan.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM poÄetni port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM poÄetni port nije upisan.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket direktorij";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket direktorij nije upisan.";
-$wb['try_rescue_txt'] = "UkljuÄi monitoring servisa i restartaj ukoliko ne radi";
-$wb['do_not_try_rescue_mysql_txt'] = "IskljuÄi MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "IskljuÄi Email monitoring";
-$wb['rescue_description_txt'] = "<b>Informacija:</b> Ako želite ugasiti mysql morate izabrati IskljuÄi MySQL monitoring kvaÄicu i tada priÄekati 2-3 minute.<br>Ukoliko ne priÄekate, automatski će se restartati MySQL!";
-$wb['enable_sni_txt'] = "Omogući SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "IskljuÄi HTTPD monitoriranje";
-$wb['set_folder_permissions_on_update_txt'] = "Postavi dozvole pri svakoj nadogradnji ISPConfiga";
-$wb['add_web_users_to_sshusers_group_txt'] = "Dodaj web korisnikeu -sshusers- grupu";
-$wb['connect_userid_to_webid_txt'] = "Spoji Linux userid u webid";
-$wb['connect_userid_to_webid_start_txt'] = "PoÄetni ID za spajanje userid/webid-a";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot direktorij';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sekcije';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrootane aplikacije';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrootane aplikacije';
+$wb['website_path_txt'] = 'Put do Web stranice';
+$wb['website_symlinks_txt'] = 'Symlinkovi Web stranice';
+$wb['website_basedir_txt'] = 'Bazni direktorij Web stranice';
+$wb['vhost_conf_dir_txt'] = 'Vhost konfiguracijski direktorij';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost dozvoljeni konfiguracijski direktorij';
+$wb['getmail_config_dir_txt'] = 'Getmail konfiguracijski direktorij';
+$wb['fastcgi_starter_path_txt'] = 'Put do FastCGI-a';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI poÄetna skripta';
+$wb['fastcgi_alias_txt'] = 'FastCGI alias';
+$wb['fastcgi_phpini_path_txt'] = 'Put do FastCGI php.ini datoteke';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'Maks. broj FastCGI zahtjeva';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Modul';
+$wb['maildir_path_txt'] = 'Put do Maildir-a';
+$wb['homedir_path_txt'] = 'Put do poÄetne stranice';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Mailuser ime';
+$wb['mailuser_group_txt'] = 'Mailuser grupa';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost korisnik';
+$wb['relayhost_password_txt'] = 'Relayhost Å¡ifra';
+$wb['mailbox_size_limit_txt'] = 'Dozvoljena veliÄina mailboxa';
+$wb['message_size_limit_txt'] = 'Dozvoljena veliÄina emaila';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['netmask_txt'] = 'Netmaska';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameserveri';
+$wb['auto_network_configuration_txt'] = 'Konfiguracija mreže';
+$wb['ip_address_error_wrong'] = 'Neispravan format IP adrese.';
+$wb['netmask_error_wrong'] = 'Neispravni format netmask-a.';
+$wb['gateway_error_wrong'] = 'Neispravan format gateway-a.';
+$wb['hostname_error_empty'] = 'Hostname polje je prazno.';
+$wb['nameservers_error_empty'] = 'Nameserver polje je prazno.';
+$wb['config_dir_txt'] = 'Konfiguracijski direktorij';
+$wb['init_script_txt'] = 'Inicijalizacijski naziv cron skripte';
+$wb['crontab_dir_txt'] = 'Putanja do individualnih crontabs-a';
+$wb['wget_txt'] = 'Putanja do wget programa';
+$wb['web_user_txt'] = 'Apache korisnik';
+$wb['web_group_txt'] = 'Apache grupa';
+$wb['security_level_txt'] = 'Stupanj zaštite';
+$wb['loglevel_txt'] = 'Stupanj logiranja';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP adresa';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost domena';
+$wb['bind_user_txt'] = 'BIND korisnik';
+$wb['bind_group_txt'] = 'BIND grupa';
+$wb['bind_zonefiles_dir_txt'] = 'BIND direktorij sa zonskim datotekama';
+$wb['named_conf_path_txt'] = 'BIND named.conf putanja';
+$wb['bind_user_error_empty'] = 'BIND korisnik nije upisan..';
+$wb['bind_group_error_empty'] = 'BIND grupa nije upisana.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND direktorij sa zonama nije upisan.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf putanja nije upisana.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local putanja nije upisana.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter sintaksa';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir nije upisan.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride nije upisan.';
+$wb['awstats_conf_dir_txt'] = 'awstats konfiguracijski direktorij';
+$wb['awstats_data_dir_txt'] = 'awstats podatkovni direktorij';
+$wb['awstats_pl_txt'] = 'awstats.pl skripta';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl skripta';
+$wb['backup_dir_txt'] = 'Backup direktorij';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local putanja';
+$wb['php_ini_path_cgi_txt'] = 'Putanja do CGI php.ini';
+$wb['php_ini_path_apache_txt'] = 'Putanja do Apache php.ini';
+$wb['check_apache_config_txt'] = 'Testiraj Apache konfiguraciju prilikom restarta';
+$wb['ufw_enable_txt'] = 'Omogući';
+$wb['ufw_manage_builtins_txt'] = 'Upravljaj standardnim pravilima';
+$wb['ufw_ipv6_txt'] = 'Omogući IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Standardna ulazna pravila';
+$wb['ufw_default_output_policy_txt'] = 'Standardna izlazna pravila';
+$wb['ufw_default_forward_policy_txt'] = 'Standardna pravila proslijeđivanja';
+$wb['ufw_default_application_policy_txt'] = 'Standardna pravila aplikacija';
+$wb['ufw_log_level_txt'] = 'Stupanj logiranja';
+$wb['website_symlinks_rel_txt'] = 'Napravi relativne symlinks-e';
+$wb['network_config_warning_txt'] = 'Konfiguracija mreže je dostupna samo za Debian i Ubuntu servere. Nemojte ukljuÄivati ovu opciju ako vaÅ¡ mrežni adapter nije eth0.';
+$wb['CA_path_txt'] = 'CA putanja';
+$wb['CA_pass_txt'] = 'CA Å¡ifra';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI konfiguracijska sintaksa';
+$wb['server_type_txt'] = 'Vrsta servera';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost konfiguracijski direktorij';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost omogućeni konfiguracijski direktorij';
+$wb['nginx_user_txt'] = 'Nginx korisnik';
+$wb['nginx_group_txt'] = 'Nginx grupa';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI socket';
+$wb['backup_dir_error_empty'] = 'Backup direktorij nije upisan.';
+$wb['maildir_path_error_empty'] = 'Maildir direktorij nije upisan.';
+$wb['homedir_path_error_empty'] = 'Homedir direktorij nije upisan.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID nije upisan.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID nije upisan.';
+$wb['mailuser_name_error_empty'] = 'Mailuser ime nije upisano.';
+$wb['mailuser_group_error_empty'] = 'Mailuser grupa nije upisana.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail konfiguracijski direktorij je prazan.';
+$wb['website_basedir_error_empty'] = 'Website basedir je prazan.';
+$wb['website_path_error_empty'] = 'Website putanja nije upisana.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks je prazan.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost konfiguracijski direktorij je prazan.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost omogućeni konfiguracijski direktorij je prazan.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost konfiguracijski direktorij je prazan.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost omogućeni konfiguracijski direktorij je prazan.';
+$wb['apache_user_error_empty'] = 'Apache korisnik nije upisan.';
+$wb['apache_group_error_empty'] = 'Apache grupa nije upisana.';
+$wb['nginx_user_error_empty'] = 'Nginx korisnik nije upisan.';
+$wb['nginx_group_error_empty'] = 'Nginx grupa nije upisana.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini putanja nije upisana.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini putanja nije upisana.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI socket nije upisan.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port nije upisan.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP adresa nije upisana.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter putanja nije upisana.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter skripta nije upisana.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI alias nije upisan.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini putanja nije upisana.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children nije upisan.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI maksimalan broj zahtjeva nije upisan.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin nije upisan.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home je prazan.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot aplikacijska sekcija nije upisana.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted aplikacije nisu upisane.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted aplikacije nisu upisane.';
+$wb['vlogger_config_dir_error_empty'] = 'Konfiguracijski direktorij je prazan.';
+$wb['cron_init_script_error_empty'] = 'Naziv Cron inicijalizacijske skripte je prazan.';
+$wb['crontab_dir_error_empty'] = 'Nije upisana putanja za pojedinaÄni crontab.';
+$wb['cron_wget_error_empty'] = 'Nije upisana putanja za wget.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM inicijalizacijska skripta';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM inicijalizacijska skripta nije upisana.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini putanja';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini putanja nije upisana.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool direktorij';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool direktorij nije upisan.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM poÄetni port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM poÄetni port nije upisan.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket direktorij';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket direktorij nije upisan.';
+$wb['try_rescue_txt'] = 'UkljuÄi monitoring servisa i restartaj ukoliko ne radi';
+$wb['do_not_try_rescue_mysql_txt'] = 'IskljuÄi MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'IskljuÄi Email monitoring';
+$wb['rescue_description_txt'] = '<b>Informacija:</b> Ako želite ugasiti mysql morate izabrati IskljuÄi MySQL monitoring kvaÄicu i tada priÄekati 2-3 minute.<br>Ukoliko ne priÄekate, automatski će se restartati MySQL!';
+$wb['enable_sni_txt'] = 'Omogući SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'IskljuÄi HTTPD monitoriranje';
+$wb['set_folder_permissions_on_update_txt'] = 'Postavi dozvole pri svakoj nadogradnji ISPConfiga';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Dodaj web korisnikeu -sshusers- grupu';
+$wb['connect_userid_to_webid_txt'] = 'Spoji Linux userid u webid';
+$wb['connect_userid_to_webid_start_txt'] = 'PoÄetni ID za spajanje userid/webid-a';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng
index 67fb32d27..30afbf977 100644
--- a/interface/web/admin/lib/lang/hr_system_config.lng
+++ b/interface/web/admin/lib/lang/hr_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/hu.lng b/interface/web/admin/lib/lang/hu.lng
index 0ee8f66b0..81209fe8d 100644
--- a/interface/web/admin/lib/lang/hu.lng
+++ b/interface/web/admin/lib/lang/hu.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Import';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'OR-FrissÃtés';
$wb['Do ISPConfig-Update'] = 'ISPConfig-FrissÃtés';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/hu_directive_snippets.lng b/interface/web/admin/lib/lang/hu_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/hu_directive_snippets_list.lng b/interface/web/admin/lib/lang/hu_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index b21a7aa42..c3a6806a8 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot home";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sections";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted applications";
-$wb['website_path_txt'] = "Website path";
-$wb['website_symlinks_txt'] = "Website symlinks";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['vhost_conf_dir_txt'] = "Vhost config dir";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost config enabled dir";
-$wb['getmail_config_dir_txt'] = "Getmail config dir";
-$wb['fastcgi_starter_path_txt'] = "FastCGI starter path";
-$wb['fastcgi_starter_script_txt'] = "FastCGI starter script";
-$wb['fastcgi_alias_txt'] = "FastCGI Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini Path";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. Requests";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Modul";
-$wb['maildir_path_txt'] = "Maildir Path";
-$wb['homedir_path_txt'] = "Homedir Path";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Mailuser Name";
-$wb['mailuser_group_txt'] = "Mailuser Group";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost User";
-$wb['relayhost_password_txt'] = "Relayhost Password";
-$wb['mailbox_size_limit_txt'] = "Mailbox Size Limit";
-$wb['message_size_limit_txt'] = "Message Size Limit";
-$wb['ip_address_txt'] = "IP Address";
-$wb['netmask_txt'] = "Netmask";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hosztnév";
-$wb['nameservers_txt'] = "Névszerverek";
-$wb['auto_network_configuration_txt'] = "Network Configuration";
-$wb['website_basedir_txt'] = "Website basedir";
-$wb['ip_address_error_wrong'] = "Invalid IP address format.";
-$wb['netmask_error_wrong'] = "Invalid Netmaszk format.";
-$wb['gateway_error_wrong'] = "Invalid Ãtjáró format.";
-$wb['hostname_error_empty'] = "Hosztnév is empty.";
-$wb['nameservers_error_empty'] = "Nameserver is empty.";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted applications";
-$wb['config_dir_txt'] = "Config directory";
-$wb['init_script_txt'] = "Cron init script name";
-$wb['crontab_dir_txt'] = "Path for individual crontabs";
-$wb['wget_txt'] = "Path to wget program";
-$wb['web_user_txt'] = "Apache user";
-$wb['web_group_txt'] = "Apache group";
-$wb['security_level_txt'] = "Security level";
-$wb['loglevel_txt'] = "Naplólevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "BIND User";
-$wb['bind_group_txt'] = "BIND Group";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf path";
-$wb['bind_user_error_empty'] = "BIND user is empty.";
-$wb['bind_group_error_empty'] = "BIND group is empty.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is empty.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf path is empty.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local path is empty.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is empty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is empty.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Mentés könyvtára";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
+$wb['website_path_txt'] = 'Website path';
+$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Modul';
+$wb['maildir_path_txt'] = 'Maildir Path';
+$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Mailuser Name';
+$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
+$wb['message_size_limit_txt'] = 'Message Size Limit';
+$wb['ip_address_txt'] = 'IP Address';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hosztnév';
+$wb['nameservers_txt'] = 'Névszerverek';
+$wb['auto_network_configuration_txt'] = 'Network Configuration';
+$wb['website_basedir_txt'] = 'Website basedir';
+$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
+$wb['netmask_error_wrong'] = 'Invalid Netmaszk format.';
+$wb['gateway_error_wrong'] = 'Invalid Ãtjáró format.';
+$wb['hostname_error_empty'] = 'Hosztnév is empty.';
+$wb['nameservers_error_empty'] = 'Nameserver is empty.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$wb['config_dir_txt'] = 'Config directory';
+$wb['init_script_txt'] = 'Cron init script name';
+$wb['crontab_dir_txt'] = 'Path for individual crontabs';
+$wb['wget_txt'] = 'Path to wget program';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
+$wb['security_level_txt'] = 'Security level';
+$wb['loglevel_txt'] = 'Naplólevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'BIND User';
+$wb['bind_group_txt'] = 'BIND Group';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf path';
+$wb['bind_user_error_empty'] = 'BIND user is empty.';
+$wb['bind_group_error_empty'] = 'BIND group is empty.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Mentés könyvtára';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng
index 1270cef9b..582c2e783 100644
--- a/interface/web/admin/lib/lang/hu_system_config.lng
+++ b/interface/web/admin/lib/lang/hu_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/id.lng b/interface/web/admin/lib/lang/id.lng
index c4f2a7540..557b49b43 100644
--- a/interface/web/admin/lib/lang/id.lng
+++ b/interface/web/admin/lib/lang/id.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Impor';
$wb['Remote Actions'] = 'Tindakan Remote';
$wb['Do OS-Update'] = 'Lakukan Pemutakhiran OS';
$wb['Do ISPConfig-Update'] = 'Lakukan Pemutakhiran ISPConfig';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/id_directive_snippets.lng b/interface/web/admin/lib/lang/id_directive_snippets.lng
new file mode 100644
index 000000000..d836ab0da
--- /dev/null
+++ b/interface/web/admin/lib/lang/id_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['Directive Snippets'] = 'Directive Snippets';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['snippet_txt'] = 'Snippet';
+$wb['active_txt'] = 'Active';
+$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/id_directive_snippets_list.lng b/interface/web/admin/lib/lang/id_directive_snippets_list.lng
new file mode 100644
index 000000000..4124ea346
--- /dev/null
+++ b/interface/web/admin/lib/lang/id_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Directive Snippets';
+$wb['active_txt'] = 'Active';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['add_new_record_txt'] = 'Add Directive Snippet';
+?>
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 9a13fba05..34ea127fe 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Home chroot Jailkit";
-$wb['jailkit_chroot_app_sections_txt'] = "Bagian app chroot";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit aplikasi yang ter-chroot";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit aplikasi cron yang ter-chroot";
-$wb['website_path_txt'] = "Path situs web";
-$wb['website_symlinks_txt'] = "Symlink Situs web";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['website_basedir_txt'] = "Basedir Situs web";
-$wb['vhost_conf_dir_txt'] = "Direktori konfigurasi vhost";
-$wb['vhost_conf_enabled_dir_txt'] = "Direktori konfigurasi vhost yang aktif";
-$wb['getmail_config_dir_txt'] = "Direktori konfigurasi getmail";
-$wb['fastcgi_starter_path_txt'] = "Path pemicu FastCGI";
-$wb['fastcgi_starter_script_txt'] = "Skrip pemicu FastCGI";
-$wb['fastcgi_alias_txt'] = "Alias FastCGI";
-$wb['fastcgi_phpini_path_txt'] = "Path php.ini FastCGI";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "Maks. Request FastCGI";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Modul";
-$wb['maildir_path_txt'] = "Path Direktori Mail";
-$wb['homedir_path_txt'] = "Path Direktori Home";
-$wb['mailuser_uid_txt'] = "UID Pengguna Mail";
-$wb['mailuser_gid_txt'] = "GID Pengguna Mail";
-$wb['mailuser_name_txt'] = "Nama Pengguna Mail";
-$wb['mailuser_group_txt'] = "Grup Pengguna Mail";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Pengguna Relayhost";
-$wb['relayhost_password_txt'] = "Kata Sandi Relayhost";
-$wb['mailbox_size_limit_txt'] = "Batasan Ukuran Mailbox";
-$wb['message_size_limit_txt'] = "Batasan Ukuran Pesan";
-$wb['ip_address_txt'] = "Alamat IP";
-$wb['netmask_txt'] = "Netmask";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Nama Host";
-$wb['nameservers_txt'] = "Nameserver";
-$wb['auto_network_configuration_txt'] = "Konfigurasi Jaringan";
-$wb['ip_address_error_wrong'] = "Format alamat IP tidak valid.";
-$wb['netmask_error_wrong'] = "Format Netmask tidak valid.";
-$wb['gateway_error_wrong'] = "Format Gateway tidak valid.";
-$wb['hostname_error_empty'] = "Nama Host kosong.";
-$wb['nameservers_error_empty'] = "Nameserver kosong.";
-$wb['config_dir_txt'] = "Direktori Konfigurasi";
-$wb['init_script_txt'] = "Nama skrip init cron";
-$wb['crontab_dir_txt'] = "Path untuk crontab individu";
-$wb['wget_txt'] = "Path ke program wget";
-$wb['web_user_txt'] = "Pengguna Apache";
-$wb['web_group_txt'] = "Grup Apache";
-$wb['security_level_txt'] = "Tingkat Keamanan";
-$wb['loglevel_txt'] = "Tingkatan Log";
-$wb['apps_vhost_port_txt'] = "Port Apps-vhost";
-$wb['apps_vhost_ip_txt'] = "IP Apps-vhost";
-$wb['apps_vhost_servername_txt'] = "Domain Apps-vhost";
-$wb['bind_user_txt'] = "Pengguna BIND";
-$wb['bind_group_txt'] = "Grup BIND";
-$wb['bind_zonefiles_dir_txt'] = "Direktori berkas zona BIND";
-$wb['named_conf_path_txt'] = "Path named.conf BIND";
-$wb['bind_user_error_empty'] = "Pengguna BIND kosong.";
-$wb['bind_group_error_empty'] = "Grup BIND kosong.";
-$wb['bind_zonefiles_dir_error_empty'] = "Direktori berkas zona BIND kosong.";
-$wb['named_conf_path_error_empty'] = "Path named.conf BIND kosong.";
-$wb['named_conf_local_path_error_empty'] = "Path named.conf.local BIND kosong.";
-$wb['mail_filter_syntax_txt'] = "Sintaks Mailfilter";
-$wb['pop3_imap_daemon_txt'] = "Daemon POP3/IMAP";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir kosong.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride kosong.";
-$wb['awstats_conf_dir_txt'] = "direktori konfigurasi awstats";
-$wb['awstats_data_dir_txt'] = "direktori data awstats";
-$wb['awstats_pl_txt'] = "skrip awstats.pl";
-$wb['awstats_buildstaticpages_pl_txt'] = "skrip awstats_buildstaticpages.pl";
-$wb['backup_dir_txt'] = "Direktori Pencadangan";
-$wb['named_conf_local_path_txt'] = "Path named.conf.local BIND";
-$wb['php_ini_path_cgi_txt'] = "Path php.ini CGI";
-$wb['php_ini_path_apache_txt'] = "Path php.ini Apache";
-$wb['check_apache_config_txt'] = "Periksa konfigurasi apache saat dijalankan ulang";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Home chroot Jailkit';
+$wb['jailkit_chroot_app_sections_txt'] = 'Bagian app chroot';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit aplikasi yang ter-chroot';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit aplikasi cron yang ter-chroot';
+$wb['website_path_txt'] = 'Path situs web';
+$wb['website_symlinks_txt'] = 'Symlink Situs web';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_basedir_txt'] = 'Basedir Situs web';
+$wb['vhost_conf_dir_txt'] = 'Direktori konfigurasi vhost';
+$wb['vhost_conf_enabled_dir_txt'] = 'Direktori konfigurasi vhost yang aktif';
+$wb['getmail_config_dir_txt'] = 'Direktori konfigurasi getmail';
+$wb['fastcgi_starter_path_txt'] = 'Path pemicu FastCGI';
+$wb['fastcgi_starter_script_txt'] = 'Skrip pemicu FastCGI';
+$wb['fastcgi_alias_txt'] = 'Alias FastCGI';
+$wb['fastcgi_phpini_path_txt'] = 'Path php.ini FastCGI';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'Maks. Request FastCGI';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Modul';
+$wb['maildir_path_txt'] = 'Path Direktori Mail';
+$wb['homedir_path_txt'] = 'Path Direktori Home';
+$wb['mailuser_uid_txt'] = 'UID Pengguna Mail';
+$wb['mailuser_gid_txt'] = 'GID Pengguna Mail';
+$wb['mailuser_name_txt'] = 'Nama Pengguna Mail';
+$wb['mailuser_group_txt'] = 'Grup Pengguna Mail';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Pengguna Relayhost';
+$wb['relayhost_password_txt'] = 'Kata Sandi Relayhost';
+$wb['mailbox_size_limit_txt'] = 'Batasan Ukuran Mailbox';
+$wb['message_size_limit_txt'] = 'Batasan Ukuran Pesan';
+$wb['ip_address_txt'] = 'Alamat IP';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Nama Host';
+$wb['nameservers_txt'] = 'Nameserver';
+$wb['auto_network_configuration_txt'] = 'Konfigurasi Jaringan';
+$wb['ip_address_error_wrong'] = 'Format alamat IP tidak valid.';
+$wb['netmask_error_wrong'] = 'Format Netmask tidak valid.';
+$wb['gateway_error_wrong'] = 'Format Gateway tidak valid.';
+$wb['hostname_error_empty'] = 'Nama Host kosong.';
+$wb['nameservers_error_empty'] = 'Nameserver kosong.';
+$wb['config_dir_txt'] = 'Direktori Konfigurasi';
+$wb['init_script_txt'] = 'Nama skrip init cron';
+$wb['crontab_dir_txt'] = 'Path untuk crontab individu';
+$wb['wget_txt'] = 'Path ke program wget';
+$wb['web_user_txt'] = 'Pengguna Apache';
+$wb['web_group_txt'] = 'Grup Apache';
+$wb['security_level_txt'] = 'Tingkat Keamanan';
+$wb['loglevel_txt'] = 'Tingkatan Log';
+$wb['apps_vhost_port_txt'] = 'Port Apps-vhost';
+$wb['apps_vhost_ip_txt'] = 'IP Apps-vhost';
+$wb['apps_vhost_servername_txt'] = 'Domain Apps-vhost';
+$wb['bind_user_txt'] = 'Pengguna BIND';
+$wb['bind_group_txt'] = 'Grup BIND';
+$wb['bind_zonefiles_dir_txt'] = 'Direktori berkas zona BIND';
+$wb['named_conf_path_txt'] = 'Path named.conf BIND';
+$wb['bind_user_error_empty'] = 'Pengguna BIND kosong.';
+$wb['bind_group_error_empty'] = 'Grup BIND kosong.';
+$wb['bind_zonefiles_dir_error_empty'] = 'Direktori berkas zona BIND kosong.';
+$wb['named_conf_path_error_empty'] = 'Path named.conf BIND kosong.';
+$wb['named_conf_local_path_error_empty'] = 'Path named.conf.local BIND kosong.';
+$wb['mail_filter_syntax_txt'] = 'Sintaks Mailfilter';
+$wb['pop3_imap_daemon_txt'] = 'Daemon POP3/IMAP';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir kosong.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride kosong.';
+$wb['awstats_conf_dir_txt'] = 'direktori konfigurasi awstats';
+$wb['awstats_data_dir_txt'] = 'direktori data awstats';
+$wb['awstats_pl_txt'] = 'skrip awstats.pl';
+$wb['awstats_buildstaticpages_pl_txt'] = 'skrip awstats_buildstaticpages.pl';
+$wb['backup_dir_txt'] = 'Direktori Pencadangan';
+$wb['named_conf_local_path_txt'] = 'Path named.conf.local BIND';
+$wb['php_ini_path_cgi_txt'] = 'Path php.ini CGI';
+$wb['php_ini_path_apache_txt'] = 'Path php.ini Apache';
+$wb['check_apache_config_txt'] = 'Periksa konfigurasi apache saat dijalankan ulang';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng
index ed4f6bf1e..218cc6487 100644
--- a/interface/web/admin/lib/lang/id_system_config.lng
+++ b/interface/web/admin/lib/lang/id_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/it.lng b/interface/web/admin/lib/lang/it.lng
index 7b9fc8254..d9faee4cf 100644
--- a/interface/web/admin/lib/lang/it.lng
+++ b/interface/web/admin/lib/lang/it.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Importa';
$wb['Remote Actions'] = 'Azioni remote';
$wb['Do OS-Update'] = 'Aggiorna OS';
$wb['Do ISPConfig-Update'] = 'Aggiorna ISPconfig';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/it_directive_snippets.lng b/interface/web/admin/lib/lang/it_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/it_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/it_directive_snippets_list.lng b/interface/web/admin/lib/lang/it_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/it_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 4274f8a62..9a32425b4 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot home";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sections";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted applications";
-$wb['website_path_txt'] = "Website path";
-$wb['website_symlinks_txt'] = "Website symlinks";
-$wb['vhost_conf_dir_txt'] = "Vhost config dir";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost config enabled dir";
-$wb['getmail_config_dir_txt'] = "Getmail config dir";
-$wb['fastcgi_starter_path_txt'] = "FastCGI starter path";
-$wb['fastcgi_starter_script_txt'] = "FastCGI starter script";
-$wb['fastcgi_alias_txt'] = "FastCGI Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini Path";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. Requests";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Module";
-$wb['maildir_path_txt'] = "Maildir Path";
-$wb['homedir_path_txt'] = "Homedir Path";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Mailuser Name";
-$wb['mailuser_group_txt'] = "Mailuser Group";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost User";
-$wb['relayhost_password_txt'] = "Relayhost Password";
-$wb['mailbox_size_limit_txt'] = "Mailbox Size Limit";
-$wb['message_size_limit_txt'] = "Message Size Limit";
-$wb['ip_address_txt'] = "Indirizzo IP";
-$wb['netmask_txt'] = "Netmask";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameservers";
-$wb['auto_network_configuration_txt'] = "Network Configuration";
-$wb['website_basedir_txt'] = "Website basedir";
-$wb['ip_address_error_wrong'] = "Invalid IP address format.";
-$wb['netmask_error_wrong'] = "Invalid Netmask format.";
-$wb['gateway_error_wrong'] = "Invalid Gateway format.";
-$wb['hostname_error_empty'] = "Hostname is empty.";
-$wb['nameservers_error_empty'] = "Nameserver is empty.";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted applications";
-$wb['config_dir_txt'] = "Config directory";
-$wb['init_script_txt'] = "Cron init script name";
-$wb['crontab_dir_txt'] = "Path for individual crontabs";
-$wb['wget_txt'] = "Path to wget program";
-$wb['security_level_txt'] = "Security level";
-$wb['web_user_txt'] = "Apache user";
-$wb['web_group_txt'] = "Apache group";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "BIND User";
-$wb['bind_group_txt'] = "BIND Group";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf path";
-$wb['bind_user_error_empty'] = "BIND user is empty.";
-$wb['bind_group_error_empty'] = "BIND group is empty.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is empty.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf path is empty.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local path is empty.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is empty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is empty.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Directory di backup";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "Percorso php.ini CGI";
-$wb['php_ini_path_apache_txt'] = "Percorso php.ini apache";
-$wb['check_apache_config_txt'] = "Testa al riavvio la configurazione di apache";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>If you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
+$wb['website_path_txt'] = 'Website path';
+$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Module';
+$wb['maildir_path_txt'] = 'Maildir Path';
+$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Mailuser Name';
+$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
+$wb['message_size_limit_txt'] = 'Message Size Limit';
+$wb['ip_address_txt'] = 'Indirizzo IP';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameservers';
+$wb['auto_network_configuration_txt'] = 'Network Configuration';
+$wb['website_basedir_txt'] = 'Website basedir';
+$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
+$wb['netmask_error_wrong'] = 'Invalid Netmask format.';
+$wb['gateway_error_wrong'] = 'Invalid Gateway format.';
+$wb['hostname_error_empty'] = 'Hostname is empty.';
+$wb['nameservers_error_empty'] = 'Nameserver is empty.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$wb['config_dir_txt'] = 'Config directory';
+$wb['init_script_txt'] = 'Cron init script name';
+$wb['crontab_dir_txt'] = 'Path for individual crontabs';
+$wb['wget_txt'] = 'Path to wget program';
+$wb['security_level_txt'] = 'Security level';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'BIND User';
+$wb['bind_group_txt'] = 'BIND Group';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf path';
+$wb['bind_user_error_empty'] = 'BIND user is empty.';
+$wb['bind_group_error_empty'] = 'BIND group is empty.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Directory di backup';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'Percorso php.ini CGI';
+$wb['php_ini_path_apache_txt'] = 'Percorso php.ini apache';
+$wb['check_apache_config_txt'] = 'Testa al riavvio la configurazione di apache';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>If you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng
index fee37bce9..215c8a885 100644
--- a/interface/web/admin/lib/lang/it_system_config.lng
+++ b/interface/web/admin/lib/lang/it_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/ja.lng b/interface/web/admin/lib/lang/ja.lng
index 9b8cc2166..a54ae4679 100644
--- a/interface/web/admin/lib/lang/ja.lng
+++ b/interface/web/admin/lib/lang/ja.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'インãƒãƒ¼ãƒˆ';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/ja_directive_snippets.lng b/interface/web/admin/lib/lang/ja_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/ja_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ja_directive_snippets_list.lng b/interface/web/admin/lib/lang/ja_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/ja_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index f95392b43..2cd8c38a3 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "chroot ホーム";
-$wb['jailkit_chroot_app_sections_txt'] = "利用å¯èƒ½ã‚¢ãƒ—リケーションセクション";
-$wb['jailkit_chroot_app_programs_txt'] = "利用å¯èƒ½ã‚¢ãƒ—リケーション";
-$wb['jailkit_chroot_cron_programs_txt'] = "cron ã§ã®åˆ©ç”¨å¯èƒ½ã‚¢ãƒ—リケーション";
-$wb['website_path_txt'] = "ウェブサイトã®ãƒ‘ス";
-$wb['website_symlinks_txt'] = "ウェブサイトã®ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['website_basedir_txt'] = "ウェブサイトã®ãƒ™ãƒ¼ã‚¹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª";
-$wb['vhost_conf_dir_txt'] = "ãƒãƒ¼ãƒãƒ£ãƒ«ãƒ›ã‚¹ãƒˆè¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª";
-$wb['vhost_conf_enabled_dir_txt'] = "ãƒãƒ¼ãƒãƒ£ãƒ«ãƒ›ã‚¹ãƒˆè¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªï¼ˆæœ‰åŠ¹ï¼‰";
-$wb['getmail_config_dir_txt'] = "Getmail è¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª";
-$wb['fastcgi_starter_path_txt'] = "FastCGIスターターã®ãƒ‘ス";
-$wb['fastcgi_starter_script_txt'] = "FastCGIスタータースクリプト";
-$wb['fastcgi_alias_txt'] = "FastCGIエイリアス";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini ã®ãƒ‘ス";
-$wb['fastcgi_children_txt'] = "FastCGIã®åプãƒã‚»ã‚¹æ•°";
-$wb['fastcgi_max_requests_txt'] = "FastCGI 最大リクエスト数";
-$wb['fastcgi_bin_txt'] = "FastCGI実行ファイル";
-$wb['module_txt'] = "モジュール";
-$wb['maildir_path_txt'] = "メールディレクトリ";
-$wb['homedir_path_txt'] = "ホームディレクトリ";
-$wb['mailuser_uid_txt'] = "メールユーザーã®UID";
-$wb['mailuser_gid_txt'] = "メールユーザーã®GID";
-$wb['mailuser_name_txt'] = "メールユーザーå";
-$wb['mailuser_group_txt'] = "メールユーザーグループ";
-$wb['relayhost_txt'] = "リレーホスト";
-$wb['relayhost_user_txt'] = "リレーホストユーザー";
-$wb['relayhost_password_txt'] = "リレーホストパスワード";
-$wb['mailbox_size_limit_txt'] = "メールボックスã®ã‚µã‚¤ã‚º";
-$wb['message_size_limit_txt'] = "メッセージã®æœ€å¤§ã‚µã‚¤ã‚º";
-$wb['ip_address_txt'] = "IPアドレス";
-$wb['netmask_txt'] = "ãƒãƒƒãƒˆãƒžã‚¹ã‚¯";
-$wb['gateway_txt'] = "ゲートウェイ";
-$wb['hostname_txt'] = "ホストå";
-$wb['nameservers_txt'] = "ãƒãƒ¼ãƒ サーãƒãƒ¼";
-$wb['auto_network_configuration_txt'] = "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®è¨å®š";
-$wb['ip_address_error_wrong'] = "IPアドレスã®å½¢å¼ãŒä¸æ£ã§ã™ã€‚";
-$wb['netmask_error_wrong'] = "ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ã®å½¢å¼ãŒä¸æ£ã§ã™ã€‚";
-$wb['gateway_error_wrong'] = "ゲートウェイã®å½¢å¼ãŒä¸æ£ã§ã™ã€‚";
-$wb['hostname_error_empty'] = "ホストåを指定ã—ã¦ãã ã•ã„";
-$wb['nameservers_error_empty'] = "ãƒãƒ¼ãƒ サーãƒãƒ¼åを指定ã—ã¦ãã ã•ã„";
-$wb['config_dir_txt'] = "è¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª";
-$wb['init_script_txt'] = "Cron init スクリプトå";
-$wb['crontab_dir_txt'] = "個々㮠crontab ã®è¨ç½®ãƒ‘ス";
-$wb['wget_txt'] = "wget ã®ãƒ‘ス";
-$wb['web_user_txt'] = "Apache ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼";
-$wb['web_group_txt'] = "Apache ã®ã‚°ãƒ«ãƒ¼ãƒ—";
-$wb['security_level_txt'] = "ã‚»ã‚ュリティレベル";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "BIND User";
-$wb['bind_group_txt'] = "BIND Group";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf path";
-$wb['bind_user_error_empty'] = "BIND user is empty.";
-$wb['bind_group_error_empty'] = "BIND group is empty.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is empty.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf path is empty.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local path is empty.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is empty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is empty.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'chroot ホーム';
+$wb['jailkit_chroot_app_sections_txt'] = '利用å¯èƒ½ã‚¢ãƒ—リケーションセクション';
+$wb['jailkit_chroot_app_programs_txt'] = '利用å¯èƒ½ã‚¢ãƒ—リケーション';
+$wb['jailkit_chroot_cron_programs_txt'] = 'cron ã§ã®åˆ©ç”¨å¯èƒ½ã‚¢ãƒ—リケーション';
+$wb['website_path_txt'] = 'ウェブサイトã®ãƒ‘ス';
+$wb['website_symlinks_txt'] = 'ウェブサイトã®ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_basedir_txt'] = 'ウェブサイトã®ãƒ™ãƒ¼ã‚¹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª';
+$wb['vhost_conf_dir_txt'] = 'ãƒãƒ¼ãƒãƒ£ãƒ«ãƒ›ã‚¹ãƒˆè¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª';
+$wb['vhost_conf_enabled_dir_txt'] = 'ãƒãƒ¼ãƒãƒ£ãƒ«ãƒ›ã‚¹ãƒˆè¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªï¼ˆæœ‰åŠ¹ï¼‰';
+$wb['getmail_config_dir_txt'] = 'Getmail è¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª';
+$wb['fastcgi_starter_path_txt'] = 'FastCGIスターターã®ãƒ‘ス';
+$wb['fastcgi_starter_script_txt'] = 'FastCGIスタータースクリプト';
+$wb['fastcgi_alias_txt'] = 'FastCGIエイリアス';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini ã®ãƒ‘ス';
+$wb['fastcgi_children_txt'] = 'FastCGIã®åプãƒã‚»ã‚¹æ•°';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI 最大リクエスト数';
+$wb['fastcgi_bin_txt'] = 'FastCGI実行ファイル';
+$wb['module_txt'] = 'モジュール';
+$wb['maildir_path_txt'] = 'メールディレクトリ';
+$wb['homedir_path_txt'] = 'ホームディレクトリ';
+$wb['mailuser_uid_txt'] = 'メールユーザーã®UID';
+$wb['mailuser_gid_txt'] = 'メールユーザーã®GID';
+$wb['mailuser_name_txt'] = 'メールユーザーå';
+$wb['mailuser_group_txt'] = 'メールユーザーグループ';
+$wb['relayhost_txt'] = 'リレーホスト';
+$wb['relayhost_user_txt'] = 'リレーホストユーザー';
+$wb['relayhost_password_txt'] = 'リレーホストパスワード';
+$wb['mailbox_size_limit_txt'] = 'メールボックスã®ã‚µã‚¤ã‚º';
+$wb['message_size_limit_txt'] = 'メッセージã®æœ€å¤§ã‚µã‚¤ã‚º';
+$wb['ip_address_txt'] = 'IPアドレス';
+$wb['netmask_txt'] = 'ãƒãƒƒãƒˆãƒžã‚¹ã‚¯';
+$wb['gateway_txt'] = 'ゲートウェイ';
+$wb['hostname_txt'] = 'ホストå';
+$wb['nameservers_txt'] = 'ãƒãƒ¼ãƒ サーãƒãƒ¼';
+$wb['auto_network_configuration_txt'] = 'ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®è¨å®š';
+$wb['ip_address_error_wrong'] = 'IPアドレスã®å½¢å¼ãŒä¸æ£ã§ã™ã€‚';
+$wb['netmask_error_wrong'] = 'ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ã®å½¢å¼ãŒä¸æ£ã§ã™ã€‚';
+$wb['gateway_error_wrong'] = 'ゲートウェイã®å½¢å¼ãŒä¸æ£ã§ã™ã€‚';
+$wb['hostname_error_empty'] = 'ホストåを指定ã—ã¦ãã ã•ã„';
+$wb['nameservers_error_empty'] = 'ãƒãƒ¼ãƒ サーãƒãƒ¼åを指定ã—ã¦ãã ã•ã„';
+$wb['config_dir_txt'] = 'è¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª';
+$wb['init_script_txt'] = 'Cron init スクリプトå';
+$wb['crontab_dir_txt'] = '個々㮠crontab ã®è¨ç½®ãƒ‘ス';
+$wb['wget_txt'] = 'wget ã®ãƒ‘ス';
+$wb['web_user_txt'] = 'Apache ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼';
+$wb['web_group_txt'] = 'Apache ã®ã‚°ãƒ«ãƒ¼ãƒ—';
+$wb['security_level_txt'] = 'ã‚»ã‚ュリティレベル';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'BIND User';
+$wb['bind_group_txt'] = 'BIND Group';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf path';
+$wb['bind_user_error_empty'] = 'BIND user is empty.';
+$wb['bind_group_error_empty'] = 'BIND group is empty.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng
index 2bca3311d..7e950f879 100644
--- a/interface/web/admin/lib/lang/ja_system_config.lng
+++ b/interface/web/admin/lib/lang/ja_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/nl.lng b/interface/web/admin/lib/lang/nl.lng
index b8fbedcd2..0164f998c 100644
--- a/interface/web/admin/lib/lang/nl.lng
+++ b/interface/web/admin/lib/lang/nl.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Importeer';
$wb['Remote Actions'] = 'Remote acties';
$wb['Do OS-Update'] = 'Voer een OS-Update uit';
$wb['Do ISPConfig-Update'] = 'Voer een ISPConfig-update uit';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/nl_directive_snippets.lng b/interface/web/admin/lib/lang/nl_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/nl_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/nl_directive_snippets_list.lng b/interface/web/admin/lib/lang/nl_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/nl_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index e9308f220..4cb309256 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot home";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app secties";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted applicaties";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted applicaties";
-$wb['website_path_txt'] = "Website pad";
-$wb['website_symlinks_txt'] = "Website symlinks";
-$wb['website_symlinks_rel_txt'] = "Maak relative symlinks";
-$wb['website_basedir_txt'] = "Website basedir";
-$wb['vhost_conf_dir_txt'] = "Vhost config dir";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost config enabled dir";
-$wb['getmail_config_dir_txt'] = "Getmail config dir";
-$wb['fastcgi_starter_path_txt'] = "FastCGI starter pad";
-$wb['fastcgi_starter_script_txt'] = "FastCGI starter script";
-$wb['fastcgi_alias_txt'] = "FastCGI Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini pad";
-$wb['fastcgi_children_txt'] = "FastCGI children";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. gequests";
-$wb['fastcgi_bin_txt'] = "FastCGI bin";
-$wb['module_txt'] = "Module";
-$wb['maildir_path_txt'] = "Maildir pad";
-$wb['homedir_path_txt'] = "Homedir pad";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Mailuser name";
-$wb['mailuser_group_txt'] = "Mailuser groep";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost gebruiker";
-$wb['relayhost_password_txt'] = "Relayhost wachtwoord";
-$wb['mailbox_size_limit_txt'] = "Mailbox grootte limiet";
-$wb['message_size_limit_txt'] = "Message grootte limiet";
-$wb['ip_address_txt'] = "IP adres";
-$wb['netmask_txt'] = "Netmask";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameservers";
-$wb['auto_network_configuration_txt'] = "Netwerk configuratie";
-$wb['ip_address_error_wrong'] = "Ongeldig IP adres formaat.";
-$wb['netmask_error_wrong'] = "Ongeldig Netmask formaat.";
-$wb['gateway_error_wrong'] = "Invalid Gateway formaat.";
-$wb['hostname_error_empty'] = "Hostnnaam is niet ingvuld.";
-$wb['nameservers_error_empty'] = "Nameserver is niet ingvuld.";
-$wb['config_dir_txt'] = "Config directory";
-$wb['init_script_txt'] = "Cron init script naam";
-$wb['crontab_dir_txt'] = "Pad voor individuele crontabs";
-$wb['wget_txt'] = "Pad naar wget programma";
-$wb['web_user_txt'] = "Apache gebruiker";
-$wb['web_group_txt'] = "Apache groep";
-$wb['security_level_txt'] = "Beveiligingsniveau";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost poort";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost domein";
-$wb['bind_user_txt'] = "BIND gebruiker";
-$wb['bind_group_txt'] = "BIND groep";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf pad";
-$wb['bind_user_error_empty'] = "BIND gebruiker is niet ingvuld.";
-$wb['bind_group_error_empty'] = "BIND groep is niet ingvuld.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is niet ingvuld.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf pad is niet ingvuld.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local pad is niet ingvuld.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is niet ingvuld.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is niet ingvuld.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local pad";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini pad";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini pad";
-$wb['check_apache_config_txt'] = "Test Apache configuratie tijdens restart";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app secties';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applicaties';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applicaties';
+$wb['website_path_txt'] = 'Website pad';
+$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['website_symlinks_rel_txt'] = 'Maak relative symlinks';
+$wb['website_basedir_txt'] = 'Website basedir';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter pad';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini pad';
+$wb['fastcgi_children_txt'] = 'FastCGI children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. gequests';
+$wb['fastcgi_bin_txt'] = 'FastCGI bin';
+$wb['module_txt'] = 'Module';
+$wb['maildir_path_txt'] = 'Maildir pad';
+$wb['homedir_path_txt'] = 'Homedir pad';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Mailuser name';
+$wb['mailuser_group_txt'] = 'Mailuser groep';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost gebruiker';
+$wb['relayhost_password_txt'] = 'Relayhost wachtwoord';
+$wb['mailbox_size_limit_txt'] = 'Mailbox grootte limiet';
+$wb['message_size_limit_txt'] = 'Message grootte limiet';
+$wb['ip_address_txt'] = 'IP adres';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameservers';
+$wb['auto_network_configuration_txt'] = 'Netwerk configuratie';
+$wb['ip_address_error_wrong'] = 'Ongeldig IP adres formaat.';
+$wb['netmask_error_wrong'] = 'Ongeldig Netmask formaat.';
+$wb['gateway_error_wrong'] = 'Invalid Gateway formaat.';
+$wb['hostname_error_empty'] = 'Hostnnaam is niet ingvuld.';
+$wb['nameservers_error_empty'] = 'Nameserver is niet ingvuld.';
+$wb['config_dir_txt'] = 'Config directory';
+$wb['init_script_txt'] = 'Cron init script naam';
+$wb['crontab_dir_txt'] = 'Pad voor individuele crontabs';
+$wb['wget_txt'] = 'Pad naar wget programma';
+$wb['web_user_txt'] = 'Apache gebruiker';
+$wb['web_group_txt'] = 'Apache groep';
+$wb['security_level_txt'] = 'Beveiligingsniveau';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost poort';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost domein';
+$wb['bind_user_txt'] = 'BIND gebruiker';
+$wb['bind_group_txt'] = 'BIND groep';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf pad';
+$wb['bind_user_error_empty'] = 'BIND gebruiker is niet ingvuld.';
+$wb['bind_group_error_empty'] = 'BIND groep is niet ingvuld.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is niet ingvuld.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf pad is niet ingvuld.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local pad is niet ingvuld.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is niet ingvuld.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is niet ingvuld.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local pad';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini pad';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini pad';
+$wb['check_apache_config_txt'] = 'Test Apache configuratie tijdens restart';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
index 649e1ae52..3ed66233c 100644
--- a/interface/web/admin/lib/lang/nl_system_config.lng
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng
index 35b5993f2..d813d580e 100644
--- a/interface/web/admin/lib/lang/pl.lng
+++ b/interface/web/admin/lib/lang/pl.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Import';
$wb['Remote Actions'] = 'Akcje zdalne';
$wb['Do OS-Update'] = 'Wykonaj aktualizacjÄ™ systemu';
$wb['Do ISPConfig-Update'] = 'Wykonaj aktualizacjÄ™ ISPConfig';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets.lng b/interface/web/admin/lib/lang/pl_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index 311cfbebc..ac1d280e2 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Adres roota Jailkit";
-$wb['jailkit_chroot_app_sections_txt'] = "Sekcje aplikacji roota Jailkit";
-$wb['jailkit_chroot_app_programs_txt'] = "Ścieżki aplikacji roota Jailkit";
-$wb['jailkit_chroot_cron_programs_txt'] = "Aplikacje cron roota Jailkit";
-$wb['website_path_txt'] = "Adres strony WWW";
-$wb['website_symlinks_txt'] = "Symulowany link strony WWW";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['website_basedir_txt'] = "Ścieżka bazowa strony WWW";
-$wb['vhost_conf_dir_txt'] = "Ścieżka do konfiguracyji wirtualnego serwera";
-$wb['vhost_conf_enabled_dir_txt'] = "Ścieżka do aktywnej konfiguracyji Vhost";
-$wb['getmail_config_dir_txt'] = "Ścieżka do konfiguracyji Getmail";
-$wb['fastcgi_starter_path_txt'] = "Adres startowy FastCGI";
-$wb['fastcgi_starter_script_txt'] = "Startowy skrypt FastCGI";
-$wb['fastcgi_alias_txt'] = "Alias FastCGI";
-$wb['fastcgi_phpini_path_txt'] = "Ścieżka do php.ini FastCGI";
-$wb['fastcgi_children_txt'] = "Ilość wątków FastCGI";
-$wb['fastcgi_max_requests_txt'] = "Maksymalna ilość zadań FastCGI";
-$wb['fastcgi_bin_txt'] = "Kosz FastCGI";
-$wb['module_txt'] = "Moduł";
-$wb['maildir_path_txt'] = "Adres poczty e-mail";
-$wb['homedir_path_txt'] = "Bazowy adres poczty e-mail";
-$wb['mailuser_uid_txt'] = "UID użytkownika e-mail";
-$wb['mailuser_gid_txt'] = "GID użytkownika e-mail";
-$wb['mailuser_name_txt'] = "Nazwa użytkownika e-mail";
-$wb['mailuser_group_txt'] = "Grupa użytkownika e-mail";
-$wb['relayhost_txt'] = "Adres Relayhost";
-$wb['relayhost_user_txt'] = "Użytkownik Relayhost";
-$wb['relayhost_password_txt'] = "Hasło Relayhost";
-$wb['mailbox_size_limit_txt'] = "Maksymalna wielkość skrzynki pocztowej";
-$wb['message_size_limit_txt'] = "Maksymalna wielkość wiadomości";
-$wb['ip_address_txt'] = "Adres IP";
-$wb['netmask_txt'] = "Maska";
-$wb['gateway_txt'] = "Bramka";
-$wb['hostname_txt'] = "Nazwa";
-$wb['nameservers_txt'] = "Nazwa serwera";
-$wb['auto_network_configuration_txt'] = "Konfiguracja sieci";
-$wb['ip_address_error_wrong'] = "Nieprawidłowy format adresu IP.";
-$wb['netmask_error_wrong'] = "Nieprawidłowy format maski.";
-$wb['gateway_error_wrong'] = "Nieprawidłowy format bramki.";
-$wb['hostname_error_empty'] = "Nazwa jest pusta.";
-$wb['nameservers_error_empty'] = "Nazwa serwera jest pusta.";
-$wb['config_dir_txt'] = "Katalog konfiguracji";
-$wb['init_script_txt'] = "Nazwa skryptu inicjujÄ…cego Crona";
-$wb['crontab_dir_txt'] = "Ścieżka do indywidualnych crontabs";
-$wb['wget_txt'] = "Ścieżka do wget";
-$wb['web_user_txt'] = "Użytkownik Apache";
-$wb['web_group_txt'] = "Grupa Apache";
-$wb['security_level_txt'] = "Poziom bezpieczeństwa";
-$wb['loglevel_txt'] = "Poziom Logowania";
-$wb['apps_vhost_port_txt'] = "Port Apps-vhost";
-$wb['apps_vhost_ip_txt'] = "IP Apps-vhost";
-$wb['apps_vhost_servername_txt'] = "Domena Apps-vhost";
-$wb['bind_user_txt'] = "Użytkownik BIND";
-$wb['bind_group_txt'] = "Grupa BIND";
-$wb['bind_zonefiles_dir_txt'] = "Katalog stref BIND";
-$wb['named_conf_path_txt'] = "Ścieżka named.conf BIND";
-$wb['bind_user_error_empty'] = "Użytkownik BIND jest pusty.";
-$wb['bind_group_error_empty'] = "Grupa BIND jest pusta.";
-$wb['bind_zonefiles_dir_error_empty'] = "Katalog stref BIND jest pusty.";
-$wb['named_conf_path_error_empty'] = "Ścieżka named.conf BIND jest pusta.";
-$wb['named_conf_local_path_error_empty'] = "Ścieżka named.conf.local BIND jest pusta.";
-$wb['mail_filter_syntax_txt'] = "Składnia filtra e-mail";
-$wb['pop3_imap_daemon_txt'] = "Demon POP3/IMAP";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir jest pusty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride jest pusty.";
-$wb['awstats_conf_dir_txt'] = "Folder konfiguracji awstats";
-$wb['awstats_data_dir_txt'] = "Folder danych awstats";
-$wb['awstats_pl_txt'] = "Skrypt awstats.pl";
-$wb['awstats_buildstaticpages_pl_txt'] = "Skrypt awstats_buildstaticpages.pl";
-$wb['backup_dir_txt'] = "Katalog kopii zapasowych";
-$wb['named_conf_local_path_txt'] = "Ścieżka named.conf.local BIND";
-$wb['php_ini_path_cgi_txt'] = "Ścieżka CGI php.ini";
-$wb['php_ini_path_apache_txt'] = "ŚcieżkaApache php.ini";
-$wb['check_apache_config_txt'] = "Testuj konfiguracjÄ™ Apache przy restarcie";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "WÅ‚Ä…cz";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "WÅ‚Ä…cz IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Poziom logowania";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "WÅ‚Ä…cz SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Adres roota Jailkit';
+$wb['jailkit_chroot_app_sections_txt'] = 'Sekcje aplikacji roota Jailkit';
+$wb['jailkit_chroot_app_programs_txt'] = 'Ścieżki aplikacji roota Jailkit';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Aplikacje cron roota Jailkit';
+$wb['website_path_txt'] = 'Adres strony WWW';
+$wb['website_symlinks_txt'] = 'Symulowany link strony WWW';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_basedir_txt'] = 'Ścieżka bazowa strony WWW';
+$wb['vhost_conf_dir_txt'] = 'Ścieżka do konfiguracyji wirtualnego serwera';
+$wb['vhost_conf_enabled_dir_txt'] = 'Ścieżka do aktywnej konfiguracyji Vhost';
+$wb['getmail_config_dir_txt'] = 'Ścieżka do konfiguracyji Getmail';
+$wb['fastcgi_starter_path_txt'] = 'Adres startowy FastCGI';
+$wb['fastcgi_starter_script_txt'] = 'Startowy skrypt FastCGI';
+$wb['fastcgi_alias_txt'] = 'Alias FastCGI';
+$wb['fastcgi_phpini_path_txt'] = 'Ścieżka do php.ini FastCGI';
+$wb['fastcgi_children_txt'] = 'Ilość wątków FastCGI';
+$wb['fastcgi_max_requests_txt'] = 'Maksymalna ilość zadań FastCGI';
+$wb['fastcgi_bin_txt'] = 'Kosz FastCGI';
+$wb['module_txt'] = 'Moduł';
+$wb['maildir_path_txt'] = 'Adres poczty e-mail';
+$wb['homedir_path_txt'] = 'Bazowy adres poczty e-mail';
+$wb['mailuser_uid_txt'] = 'UID użytkownika e-mail';
+$wb['mailuser_gid_txt'] = 'GID użytkownika e-mail';
+$wb['mailuser_name_txt'] = 'Nazwa użytkownika e-mail';
+$wb['mailuser_group_txt'] = 'Grupa użytkownika e-mail';
+$wb['relayhost_txt'] = 'Adres Relayhost';
+$wb['relayhost_user_txt'] = 'Użytkownik Relayhost';
+$wb['relayhost_password_txt'] = 'Hasło Relayhost';
+$wb['mailbox_size_limit_txt'] = 'Maksymalna wielkość skrzynki pocztowej';
+$wb['message_size_limit_txt'] = 'Maksymalna wielkość wiadomości';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['netmask_txt'] = 'Maska';
+$wb['gateway_txt'] = 'Bramka';
+$wb['hostname_txt'] = 'Nazwa';
+$wb['nameservers_txt'] = 'Nazwa serwera';
+$wb['auto_network_configuration_txt'] = 'Konfiguracja sieci';
+$wb['ip_address_error_wrong'] = 'Nieprawidłowy format adresu IP.';
+$wb['netmask_error_wrong'] = 'Nieprawidłowy format maski.';
+$wb['gateway_error_wrong'] = 'Nieprawidłowy format bramki.';
+$wb['hostname_error_empty'] = 'Nazwa jest pusta.';
+$wb['nameservers_error_empty'] = 'Nazwa serwera jest pusta.';
+$wb['config_dir_txt'] = 'Katalog konfiguracji';
+$wb['init_script_txt'] = 'Nazwa skryptu inicjujÄ…cego Crona';
+$wb['crontab_dir_txt'] = 'Ścieżka do indywidualnych crontabs';
+$wb['wget_txt'] = 'Ścieżka do wget';
+$wb['web_user_txt'] = 'Użytkownik Apache';
+$wb['web_group_txt'] = 'Grupa Apache';
+$wb['security_level_txt'] = 'Poziom bezpieczeństwa';
+$wb['loglevel_txt'] = 'Poziom Logowania';
+$wb['apps_vhost_port_txt'] = 'Port Apps-vhost';
+$wb['apps_vhost_ip_txt'] = 'IP Apps-vhost';
+$wb['apps_vhost_servername_txt'] = 'Domena Apps-vhost';
+$wb['bind_user_txt'] = 'Użytkownik BIND';
+$wb['bind_group_txt'] = 'Grupa BIND';
+$wb['bind_zonefiles_dir_txt'] = 'Katalog stref BIND';
+$wb['named_conf_path_txt'] = 'Ścieżka named.conf BIND';
+$wb['bind_user_error_empty'] = 'Użytkownik BIND jest pusty.';
+$wb['bind_group_error_empty'] = 'Grupa BIND jest pusta.';
+$wb['bind_zonefiles_dir_error_empty'] = 'Katalog stref BIND jest pusty.';
+$wb['named_conf_path_error_empty'] = 'Ścieżka named.conf BIND jest pusta.';
+$wb['named_conf_local_path_error_empty'] = 'Ścieżka named.conf.local BIND jest pusta.';
+$wb['mail_filter_syntax_txt'] = 'Składnia filtra e-mail';
+$wb['pop3_imap_daemon_txt'] = 'Demon POP3/IMAP';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir jest pusty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride jest pusty.';
+$wb['awstats_conf_dir_txt'] = 'Folder konfiguracji awstats';
+$wb['awstats_data_dir_txt'] = 'Folder danych awstats';
+$wb['awstats_pl_txt'] = 'Skrypt awstats.pl';
+$wb['awstats_buildstaticpages_pl_txt'] = 'Skrypt awstats_buildstaticpages.pl';
+$wb['backup_dir_txt'] = 'Katalog kopii zapasowych';
+$wb['named_conf_local_path_txt'] = 'Ścieżka named.conf.local BIND';
+$wb['php_ini_path_cgi_txt'] = 'Ścieżka CGI php.ini';
+$wb['php_ini_path_apache_txt'] = 'ŚcieżkaApache php.ini';
+$wb['check_apache_config_txt'] = 'Testuj konfiguracjÄ™ Apache przy restarcie';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'WÅ‚Ä…cz';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'WÅ‚Ä…cz IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Poziom logowania';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'WÅ‚Ä…cz SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index 83e8a9663..3437ed39c 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/pt.lng b/interface/web/admin/lib/lang/pt.lng
index 247eb4f80..4ed49ac8a 100644
--- a/interface/web/admin/lib/lang/pt.lng
+++ b/interface/web/admin/lib/lang/pt.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Importar';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/pt_directive_snippets.lng b/interface/web/admin/lib/lang/pt_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/pt_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/pt_directive_snippets_list.lng b/interface/web/admin/lib/lang/pt_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/pt_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index e8440ad98..3470e28a7 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Raiz do Chroot Jailkit";
-$wb['jailkit_chroot_app_sections_txt'] = "Aplicações Jailkit chroot (Sessões)";
-$wb['jailkit_chroot_app_programs_txt'] = "Aplicações Jailkit em ambiente chroot";
-$wb['website_path_txt'] = "Pasta do Website";
-$wb['website_symlinks_txt'] = "Website symlinks: link simbólico";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['website_basedir_txt'] = "Website basedir: pasta base ";
-$wb['vhost_conf_dir_txt'] = "Vhost config dir";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost pasta de configuração activo";
-$wb['getmail_config_dir_txt'] = "Getmail config dir";
-$wb['fastcgi_starter_path_txt'] = "FastCGI: Pasta inicial";
-$wb['fastcgi_starter_script_txt'] = "FastCGI: Script inicial";
-$wb['fastcgi_alias_txt'] = "FastCGI: Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI: Pasta do php.ini ";
-$wb['fastcgi_children_txt'] = "FastCGI: Filhos";
-$wb['fastcgi_max_requests_txt'] = "FastCGI: Requisições máximas";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Módulo";
-$wb['maildir_path_txt'] = "Pasta do Maildir";
-$wb['homedir_path_txt'] = "Pasta Home";
-$wb['mailuser_uid_txt'] = "UID utilizador de email";
-$wb['mailuser_gid_txt'] = "GID utilizador de email";
-$wb['mailuser_name_txt'] = "Nome utilizador de email";
-$wb['mailuser_group_txt'] = "Grupo utilizador de email";
-$wb['relayhost_txt'] = "Host Relay";
-$wb['relayhost_user_txt'] = "Utilizador do Host Relay";
-$wb['relayhost_password_txt'] = "Senha do Host Relay";
-$wb['mailbox_size_limit_txt'] = "Tamanho máximo da Caixa Postal";
-$wb['message_size_limit_txt'] = "Tamanho máximo de mensagem";
-$wb['ip_address_txt'] = "Endereço IP";
-$wb['netmask_txt'] = "Máscara de Rede";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Nome do Host";
-$wb['nameservers_txt'] = "Servidores DNS";
-$wb['auto_network_configuration_txt'] = "Configuração de Rede";
-$wb['ip_address_error_wrong'] = "Formato do Endereço IP inválido!";
-$wb['netmask_error_wrong'] = "Formato da Máscara de Rede inválido!";
-$wb['gateway_error_wrong'] = "Gateway inválido!";
-$wb['hostname_error_empty'] = "Por favor, entre com o nome do Host.";
-$wb['nameservers_error_empty'] = "Por favor, entre com o Servidor DNS.";
-$wb['jailkit_chroot_cron_programs_txt'] = "Cron de aplicações Jailkit em ambiente chroot";
-$wb['config_dir_txt'] = "Pasta de configuração";
-$wb['init_script_txt'] = "Cron init nome do script";
-$wb['crontab_dir_txt'] = "Pasta para crontabs individuais";
-$wb['wget_txt'] = "Pasta para o wget";
-$wb['web_user_txt'] = "Utilizador Apache";
-$wb['web_group_txt'] = "Grupo Apache";
-$wb['security_level_txt'] = "NÃvel de Segurança";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "Utilizador BIND";
-$wb['bind_group_txt'] = "Groupo BIND";
-$wb['bind_zonefiles_dir_txt'] = "Pasta de ficheiros de zona do BIND";
-$wb['named_conf_path_txt'] = "Pasta do BIND named.conf";
-$wb['bind_user_error_empty'] = "Utilizador do BIND está em branco.";
-$wb['bind_group_error_empty'] = "Grupo do BIND está em branco.";
-$wb['bind_zonefiles_dir_error_empty'] = "Pasta de ficheiros de zona está em branco.";
-$wb['named_conf_path_error_empty'] = "Pasta do BIND named.conf.";
-$wb['named_conf_local_path_error_empty'] = "Pasta do BIND named.conf.local está em branco.";
-$wb['mail_filter_syntax_txt'] = "Sintaxe do Mailfilter";
-$wb['pop3_imap_daemon_txt'] = "Daemon POP3/IMAP";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir está em branco.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride está em branco.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Raiz do Chroot Jailkit';
+$wb['jailkit_chroot_app_sections_txt'] = 'Aplicações Jailkit chroot (Sessões)';
+$wb['jailkit_chroot_app_programs_txt'] = 'Aplicações Jailkit em ambiente chroot';
+$wb['website_path_txt'] = 'Pasta do Website';
+$wb['website_symlinks_txt'] = 'Website symlinks: link simbólico';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_basedir_txt'] = 'Website basedir: pasta base ';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost pasta de configuração activo';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI: Pasta inicial';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI: Script inicial';
+$wb['fastcgi_alias_txt'] = 'FastCGI: Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI: Pasta do php.ini ';
+$wb['fastcgi_children_txt'] = 'FastCGI: Filhos';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI: Requisições máximas';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Módulo';
+$wb['maildir_path_txt'] = 'Pasta do Maildir';
+$wb['homedir_path_txt'] = 'Pasta Home';
+$wb['mailuser_uid_txt'] = 'UID utilizador de email';
+$wb['mailuser_gid_txt'] = 'GID utilizador de email';
+$wb['mailuser_name_txt'] = 'Nome utilizador de email';
+$wb['mailuser_group_txt'] = 'Grupo utilizador de email';
+$wb['relayhost_txt'] = 'Host Relay';
+$wb['relayhost_user_txt'] = 'Utilizador do Host Relay';
+$wb['relayhost_password_txt'] = 'Senha do Host Relay';
+$wb['mailbox_size_limit_txt'] = 'Tamanho máximo da Caixa Postal';
+$wb['message_size_limit_txt'] = 'Tamanho máximo de mensagem';
+$wb['ip_address_txt'] = 'Endereço IP';
+$wb['netmask_txt'] = 'Máscara de Rede';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Nome do Host';
+$wb['nameservers_txt'] = 'Servidores DNS';
+$wb['auto_network_configuration_txt'] = 'Configuração de Rede';
+$wb['ip_address_error_wrong'] = 'Formato do Endereço IP inválido!';
+$wb['netmask_error_wrong'] = 'Formato da Máscara de Rede inválido!';
+$wb['gateway_error_wrong'] = 'Gateway inválido!';
+$wb['hostname_error_empty'] = 'Por favor, entre com o nome do Host.';
+$wb['nameservers_error_empty'] = 'Por favor, entre com o Servidor DNS.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Cron de aplicações Jailkit em ambiente chroot';
+$wb['config_dir_txt'] = 'Pasta de configuração';
+$wb['init_script_txt'] = 'Cron init nome do script';
+$wb['crontab_dir_txt'] = 'Pasta para crontabs individuais';
+$wb['wget_txt'] = 'Pasta para o wget';
+$wb['web_user_txt'] = 'Utilizador Apache';
+$wb['web_group_txt'] = 'Grupo Apache';
+$wb['security_level_txt'] = 'NÃvel de Segurança';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'Utilizador BIND';
+$wb['bind_group_txt'] = 'Groupo BIND';
+$wb['bind_zonefiles_dir_txt'] = 'Pasta de ficheiros de zona do BIND';
+$wb['named_conf_path_txt'] = 'Pasta do BIND named.conf';
+$wb['bind_user_error_empty'] = 'Utilizador do BIND está em branco.';
+$wb['bind_group_error_empty'] = 'Grupo do BIND está em branco.';
+$wb['bind_zonefiles_dir_error_empty'] = 'Pasta de ficheiros de zona está em branco.';
+$wb['named_conf_path_error_empty'] = 'Pasta do BIND named.conf.';
+$wb['named_conf_local_path_error_empty'] = 'Pasta do BIND named.conf.local está em branco.';
+$wb['mail_filter_syntax_txt'] = 'Sintaxe do Mailfilter';
+$wb['pop3_imap_daemon_txt'] = 'Daemon POP3/IMAP';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir está em branco.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride está em branco.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng
index def3e0863..c12685f8b 100644
--- a/interface/web/admin/lib/lang/pt_system_config.lng
+++ b/interface/web/admin/lib/lang/pt_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/ro.lng b/interface/web/admin/lib/lang/ro.lng
index 083e6c847..9c598e372 100644
--- a/interface/web/admin/lib/lang/ro.lng
+++ b/interface/web/admin/lib/lang/ro.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Import';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/ro_directive_snippets.lng b/interface/web/admin/lib/lang/ro_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/ro_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ro_directive_snippets_list.lng b/interface/web/admin/lib/lang/ro_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/ro_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index 883b844bc..56ce46cc5 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot home";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sections";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted applications";
-$wb['website_path_txt'] = "Website path";
-$wb['website_symlinks_txt'] = "Website symlinks";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['website_basedir_txt'] = "Website basedir";
-$wb['vhost_conf_dir_txt'] = "Vhost config dir";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost config enabled dir";
-$wb['getmail_config_dir_txt'] = "Getmail config dir";
-$wb['fastcgi_starter_path_txt'] = "FastCGI starter path";
-$wb['fastcgi_starter_script_txt'] = "FastCGI starter script";
-$wb['fastcgi_alias_txt'] = "FastCGI Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini Path";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. Requests";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Module";
-$wb['maildir_path_txt'] = "Maildir Path";
-$wb['homedir_path_txt'] = "Homedir Path";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Mailuser Name";
-$wb['mailuser_group_txt'] = "Mailuser Group";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost User";
-$wb['relayhost_password_txt'] = "Relayhost Password";
-$wb['mailbox_size_limit_txt'] = "Mailbox Size Limit";
-$wb['message_size_limit_txt'] = "Message Size Limit";
-$wb['ip_address_txt'] = "IP Address";
-$wb['netmask_txt'] = "Netmask";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameservers";
-$wb['auto_network_configuration_txt'] = "Network Configuration";
-$wb['ip_address_error_wrong'] = "Invalid IP address format.";
-$wb['netmask_error_wrong'] = "Invalid Netmask format.";
-$wb['gateway_error_wrong'] = "Invalid Gateway format.";
-$wb['hostname_error_empty'] = "Hostname is empty.";
-$wb['nameservers_error_empty'] = "Nameserver is empty.";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted applications";
-$wb['config_dir_txt'] = "Config directory";
-$wb['init_script_txt'] = "Cron init script name";
-$wb['crontab_dir_txt'] = "Path for individual crontabs";
-$wb['wget_txt'] = "Path to wget program";
-$wb['web_user_txt'] = "Apache user";
-$wb['web_group_txt'] = "Apache group";
-$wb['security_level_txt'] = "Security level";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "BIND User";
-$wb['bind_group_txt'] = "BIND Group";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf path";
-$wb['bind_user_error_empty'] = "BIND user is empty.";
-$wb['bind_group_error_empty'] = "BIND group is empty.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is empty.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf path is empty.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local path is empty.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is empty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is empty.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
+$wb['website_path_txt'] = 'Website path';
+$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_basedir_txt'] = 'Website basedir';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Module';
+$wb['maildir_path_txt'] = 'Maildir Path';
+$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Mailuser Name';
+$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
+$wb['message_size_limit_txt'] = 'Message Size Limit';
+$wb['ip_address_txt'] = 'IP Address';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameservers';
+$wb['auto_network_configuration_txt'] = 'Network Configuration';
+$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
+$wb['netmask_error_wrong'] = 'Invalid Netmask format.';
+$wb['gateway_error_wrong'] = 'Invalid Gateway format.';
+$wb['hostname_error_empty'] = 'Hostname is empty.';
+$wb['nameservers_error_empty'] = 'Nameserver is empty.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$wb['config_dir_txt'] = 'Config directory';
+$wb['init_script_txt'] = 'Cron init script name';
+$wb['crontab_dir_txt'] = 'Path for individual crontabs';
+$wb['wget_txt'] = 'Path to wget program';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
+$wb['security_level_txt'] = 'Security level';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'BIND User';
+$wb['bind_group_txt'] = 'BIND Group';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf path';
+$wb['bind_user_error_empty'] = 'BIND user is empty.';
+$wb['bind_group_error_empty'] = 'BIND group is empty.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng
index ddf2e4f03..9bfdf76c7 100644
--- a/interface/web/admin/lib/lang/ro_system_config.lng
+++ b/interface/web/admin/lib/lang/ro_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/ru.lng b/interface/web/admin/lib/lang/ru.lng
index 08286263f..faaa081ba 100644
--- a/interface/web/admin/lib/lang/ru.lng
+++ b/interface/web/admin/lib/lang/ru.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Импорт';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/ru_directive_snippets.lng b/interface/web/admin/lib/lang/ru_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/ru_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ru_directive_snippets_list.lng b/interface/web/admin/lib/lang/ru_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/ru_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 3ad9a1b3c..fd76bf6db 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Путь к Jailkit chroot";
-$wb['jailkit_chroot_app_sections_txt'] = "Раздел программы Jailkit chroot";
-$wb['jailkit_chroot_app_programs_txt'] = "Программы Jailkit chrooted";
-$wb['website_path_txt'] = "Путь web-Ñайта";
-$wb['website_symlinks_txt'] = "Симлинки Web-Ñайта";
-$wb['vhost_conf_dir_txt'] = "Папка конфига Vhost";
-$wb['vhost_conf_enabled_dir_txt'] = "Папка конфига включенного Vhost";
-$wb['getmail_config_dir_txt'] = "Папка конфига Getmail";
-$wb['fastcgi_starter_path_txt'] = "Стартовый путь FastCGI";
-$wb['fastcgi_starter_script_txt'] = "Стартовый Ñкрипт FastCGI";
-$wb['fastcgi_alias_txt'] = "ÐÐ»Ð¸Ð°Ñ FastCGI";
-$wb['fastcgi_phpini_path_txt'] = "Путь FastCGI в php.ini";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "МакÑ.запроÑов Ð´Ð»Ñ FastCGI";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Модуль";
-$wb['maildir_path_txt'] = "Путь Maildir";
-$wb['homedir_path_txt'] = "Путь Homedir";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Ð˜Ð¼Ñ Mailuser";
-$wb['mailuser_group_txt'] = "Группа Mailuser";
-$wb['relayhost_txt'] = "Relay-хоÑÑ‚";
-$wb['relayhost_user_txt'] = "Логин Relay-хоÑта";
-$wb['relayhost_password_txt'] = "Пароль Relay-хоÑта";
-$wb['mailbox_size_limit_txt'] = "Лимит размера Mailbox";
-$wb['message_size_limit_txt'] = "Лимит размера ÑообщениÑ";
-$wb['ip_address_txt'] = "IP-адреÑ";
-$wb['netmask_txt'] = "Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¼Ð°Ñка";
-$wb['gateway_txt'] = "Шлюз";
-$wb['hostname_txt'] = "Ð˜Ð¼Ñ ÑƒÐ·Ð»Ð°";
-$wb['nameservers_txt'] = "DNS Ñервера";
-$wb['auto_network_configuration_txt'] = "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñети";
-$wb['website_basedir_txt'] = "Базовый путь Web-Ñайта";
-$wb['ip_address_error_wrong'] = "Ðеверный формат IP-адреÑа";
-$wb['netmask_error_wrong'] = "Ðеверный формат Ñетевой маÑки";
-$wb['gateway_error_wrong'] = "Ðеверный формат шлюза";
-$wb['hostname_error_empty'] = "ПуÑтое Ð¸Ð¼Ñ Ñ…Ð¾Ñта";
-$wb['nameservers_error_empty'] = "ПуÑтые DNS Ñервера";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted applications";
-$wb['config_dir_txt'] = "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³Ð¾Ð²";
-$wb['init_script_txt'] = "Ð˜Ð¼Ñ Ñкрипта инициализаци Cron";
-$wb['crontab_dir_txt'] = "Путь к личным crontabs";
-$wb['wget_txt'] = "Путь к программе wget";
-$wb['security_level_txt'] = "Уровень безопаÑноÑти";
-$wb['web_user_txt'] = "Пользователь Apache";
-$wb['web_group_txt'] = "Группа Apache";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost порт";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost домен";
-$wb['bind_user_txt'] = "Пользователь BIND";
-$wb['bind_group_txt'] = "Группа BIND";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles директориÑ";
-$wb['named_conf_path_txt'] = "Путь к BIND named.conf";
-$wb['bind_user_error_empty'] = "Пользователь BIND пуÑтой.";
-$wb['bind_group_error_empty'] = "Группа BIND пуÑтаÑ.";
-$wb['bind_zonefiles_dir_error_empty'] = "Папка зон Ð´Ð»Ñ BIND пуÑта.";
-$wb['named_conf_path_error_empty'] = "Путь BIND named.conf пуÑÑ‚.";
-$wb['named_conf_local_path_error_empty'] = "Путь BIND named.conf.local пуÑтой.";
-$wb['mail_filter_syntax_txt'] = "СинтакÑÐ¸Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… фильтров";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP демон";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir пуÑтой.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride пуÑтой.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Путь к Jailkit chroot';
+$wb['jailkit_chroot_app_sections_txt'] = 'Раздел программы Jailkit chroot';
+$wb['jailkit_chroot_app_programs_txt'] = 'Программы Jailkit chrooted';
+$wb['website_path_txt'] = 'Путь web-Ñайта';
+$wb['website_symlinks_txt'] = 'Симлинки Web-Ñайта';
+$wb['vhost_conf_dir_txt'] = 'Папка конфига Vhost';
+$wb['vhost_conf_enabled_dir_txt'] = 'Папка конфига включенного Vhost';
+$wb['getmail_config_dir_txt'] = 'Папка конфига Getmail';
+$wb['fastcgi_starter_path_txt'] = 'Стартовый путь FastCGI';
+$wb['fastcgi_starter_script_txt'] = 'Стартовый Ñкрипт FastCGI';
+$wb['fastcgi_alias_txt'] = 'ÐÐ»Ð¸Ð°Ñ FastCGI';
+$wb['fastcgi_phpini_path_txt'] = 'Путь FastCGI в php.ini';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'МакÑ.запроÑов Ð´Ð»Ñ FastCGI';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Модуль';
+$wb['maildir_path_txt'] = 'Путь Maildir';
+$wb['homedir_path_txt'] = 'Путь Homedir';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Ð˜Ð¼Ñ Mailuser';
+$wb['mailuser_group_txt'] = 'Группа Mailuser';
+$wb['relayhost_txt'] = 'Relay-хоÑÑ‚';
+$wb['relayhost_user_txt'] = 'Логин Relay-хоÑта';
+$wb['relayhost_password_txt'] = 'Пароль Relay-хоÑта';
+$wb['mailbox_size_limit_txt'] = 'Лимит размера Mailbox';
+$wb['message_size_limit_txt'] = 'Лимит размера ÑообщениÑ';
+$wb['ip_address_txt'] = 'IP-адреÑ';
+$wb['netmask_txt'] = 'Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¼Ð°Ñка';
+$wb['gateway_txt'] = 'Шлюз';
+$wb['hostname_txt'] = 'Ð˜Ð¼Ñ ÑƒÐ·Ð»Ð°';
+$wb['nameservers_txt'] = 'DNS Ñервера';
+$wb['auto_network_configuration_txt'] = 'ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñети';
+$wb['website_basedir_txt'] = 'Базовый путь Web-Ñайта';
+$wb['ip_address_error_wrong'] = 'Ðеверный формат IP-адреÑа';
+$wb['netmask_error_wrong'] = 'Ðеверный формат Ñетевой маÑки';
+$wb['gateway_error_wrong'] = 'Ðеверный формат шлюза';
+$wb['hostname_error_empty'] = 'ПуÑтое Ð¸Ð¼Ñ Ñ…Ð¾Ñта';
+$wb['nameservers_error_empty'] = 'ПуÑтые DNS Ñервера';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$wb['config_dir_txt'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³Ð¾Ð²';
+$wb['init_script_txt'] = 'Ð˜Ð¼Ñ Ñкрипта инициализаци Cron';
+$wb['crontab_dir_txt'] = 'Путь к личным crontabs';
+$wb['wget_txt'] = 'Путь к программе wget';
+$wb['security_level_txt'] = 'Уровень безопаÑноÑти';
+$wb['web_user_txt'] = 'Пользователь Apache';
+$wb['web_group_txt'] = 'Группа Apache';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost порт';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost домен';
+$wb['bind_user_txt'] = 'Пользователь BIND';
+$wb['bind_group_txt'] = 'Группа BIND';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles директориÑ';
+$wb['named_conf_path_txt'] = 'Путь к BIND named.conf';
+$wb['bind_user_error_empty'] = 'Пользователь BIND пуÑтой.';
+$wb['bind_group_error_empty'] = 'Группа BIND пуÑтаÑ.';
+$wb['bind_zonefiles_dir_error_empty'] = 'Папка зон Ð´Ð»Ñ BIND пуÑта.';
+$wb['named_conf_path_error_empty'] = 'Путь BIND named.conf пуÑÑ‚.';
+$wb['named_conf_local_path_error_empty'] = 'Путь BIND named.conf.local пуÑтой.';
+$wb['mail_filter_syntax_txt'] = 'СинтакÑÐ¸Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… фильтров';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP демон';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir пуÑтой.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride пуÑтой.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng
index 5e058d31d..39b7139e6 100644
--- a/interface/web/admin/lib/lang/ru_system_config.lng
+++ b/interface/web/admin/lib/lang/ru_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/se.lng b/interface/web/admin/lib/lang/se.lng
index b8d39b543..5c84d33ba 100644
--- a/interface/web/admin/lib/lang/se.lng
+++ b/interface/web/admin/lib/lang/se.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Import';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/se_directive_snippets.lng b/interface/web/admin/lib/lang/se_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/se_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/se_directive_snippets_list.lng b/interface/web/admin/lib/lang/se_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/se_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index acf04e9e7..0d16cedb9 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot home";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sections";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted applications";
-$wb['website_path_txt'] = "Website path";
-$wb['website_symlinks_txt'] = "Website symlinks";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['vhost_conf_dir_txt'] = "Vhost config dir";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost config enabled dir";
-$wb['getmail_config_dir_txt'] = "Getmail config dir";
-$wb['fastcgi_starter_path_txt'] = "FastCGI starter path";
-$wb['fastcgi_starter_script_txt'] = "FastCGI starter script";
-$wb['fastcgi_alias_txt'] = "FastCGI Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini Path";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. Requests";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Module";
-$wb['maildir_path_txt'] = "Maildir Path";
-$wb['homedir_path_txt'] = "Homedir Path";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Mailuser Name";
-$wb['mailuser_group_txt'] = "Mailuser Group";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost User";
-$wb['relayhost_password_txt'] = "Relayhost Password";
-$wb['mailbox_size_limit_txt'] = "Mailbox Size Limit";
-$wb['message_size_limit_txt'] = "Message Size Limit";
-$wb['ip_address_txt'] = "IP Address";
-$wb['netmask_txt'] = "Netmask";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameservers";
-$wb['auto_network_configuration_txt'] = "Network Configuration";
-$wb['website_basedir_txt'] = "Website basedir";
-$wb['ip_address_error_wrong'] = "Invalid IP address format.";
-$wb['netmask_error_wrong'] = "Invalid Netmask format.";
-$wb['gateway_error_wrong'] = "Invalid Gateway format.";
-$wb['hostname_error_empty'] = "Hostname is empty.";
-$wb['nameservers_error_empty'] = "Nameserver is empty.";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted applications";
-$wb['config_dir_txt'] = "Config directory";
-$wb['init_script_txt'] = "Cron init script name";
-$wb['crontab_dir_txt'] = "Path for individual crontabs";
-$wb['wget_txt'] = "Path to wget program";
-$wb['security_level_txt'] = "Security level";
-$wb['web_user_txt'] = "Apache user";
-$wb['web_group_txt'] = "Apache group";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "BIND User";
-$wb['bind_group_txt'] = "BIND Group";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf path";
-$wb['bind_user_error_empty'] = "BIND user is empty.";
-$wb['bind_group_error_empty'] = "BIND group is empty.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is empty.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf path is empty.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local path is empty.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is empty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is empty.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
+$wb['website_path_txt'] = 'Website path';
+$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Module';
+$wb['maildir_path_txt'] = 'Maildir Path';
+$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Mailuser Name';
+$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
+$wb['message_size_limit_txt'] = 'Message Size Limit';
+$wb['ip_address_txt'] = 'IP Address';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameservers';
+$wb['auto_network_configuration_txt'] = 'Network Configuration';
+$wb['website_basedir_txt'] = 'Website basedir';
+$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
+$wb['netmask_error_wrong'] = 'Invalid Netmask format.';
+$wb['gateway_error_wrong'] = 'Invalid Gateway format.';
+$wb['hostname_error_empty'] = 'Hostname is empty.';
+$wb['nameservers_error_empty'] = 'Nameserver is empty.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$wb['config_dir_txt'] = 'Config directory';
+$wb['init_script_txt'] = 'Cron init script name';
+$wb['crontab_dir_txt'] = 'Path for individual crontabs';
+$wb['wget_txt'] = 'Path to wget program';
+$wb['security_level_txt'] = 'Security level';
+$wb['web_user_txt'] = 'Apache user';
+$wb['web_group_txt'] = 'Apache group';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'BIND User';
+$wb['bind_group_txt'] = 'BIND Group';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf path';
+$wb['bind_user_error_empty'] = 'BIND user is empty.';
+$wb['bind_group_error_empty'] = 'BIND group is empty.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng
index ddf2e4f03..9bfdf76c7 100644
--- a/interface/web/admin/lib/lang/se_system_config.lng
+++ b/interface/web/admin/lib/lang/se_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/sk.lng b/interface/web/admin/lib/lang/sk.lng
index fbfd35e30..fa506df9a 100644
--- a/interface/web/admin/lib/lang/sk.lng
+++ b/interface/web/admin/lib/lang/sk.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'Import';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/sk_directive_snippets.lng b/interface/web/admin/lib/lang/sk_directive_snippets.lng
new file mode 100644
index 000000000..ee40ab06f
--- /dev/null
+++ b/interface/web/admin/lib/lang/sk_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["Directive Snippets"] = 'Directive Snippets';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["snippet_txt"] = 'Snippet';
+$wb["active_txt"] = 'Active';
+$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.';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/sk_directive_snippets_list.lng b/interface/web/admin/lib/lang/sk_directive_snippets_list.lng
new file mode 100644
index 000000000..702e7e250
--- /dev/null
+++ b/interface/web/admin/lib/lang/sk_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Directive Snippets';
+$wb["active_txt"] = 'Active';
+$wb["name_txt"] = 'Name of Snippet';
+$wb["type_txt"] = 'Type';
+$wb["add_new_record_txt"] = 'Add Directive Snippet';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index 958048da5..d2f27c7cb 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot domov";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sekcia";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted aplikácia";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted aplikácia";
-$wb['website_path_txt'] = "Website cesta";
-$wb['website_symlinks_txt'] = "Website symlinky";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['website_basedir_txt'] = "Website základny adresár";
-$wb['vhost_conf_dir_txt'] = "Vhost konfig adresár";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost konfig odblokovaný adresár";
-$wb['getmail_config_dir_txt'] = "Getmail konfig adresár";
-$wb['fastcgi_starter_path_txt'] = "FastCGI starter cesta";
-$wb['fastcgi_starter_script_txt'] = "FastCGI starter skript";
-$wb['fastcgi_alias_txt'] = "FastCGI Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini Cesta";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. Requests";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Modul";
-$wb['maildir_path_txt'] = "Maildir Cesta";
-$wb['homedir_path_txt'] = "Cesta k domovskému adresáru";
-$wb['mailuser_uid_txt'] = "Mailuser UID";
-$wb['mailuser_gid_txt'] = "Mailuser GID";
-$wb['mailuser_name_txt'] = "Mailuser Meno";
-$wb['mailuser_group_txt'] = "Mailuser Skupina";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost uživateľ";
-$wb['relayhost_password_txt'] = "Relayhost heslo";
-$wb['mailbox_size_limit_txt'] = "Limit ve?kosti poštovej schránky";
-$wb['message_size_limit_txt'] = "Limit ve?kosti správy";
-$wb['ip_address_txt'] = "IP Adresa";
-$wb['netmask_txt'] = "Netmask";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameservery";
-$wb['auto_network_configuration_txt'] = "Konfigurácia siete";
-$wb['ip_address_error_wrong'] = "IP adresa v neplatnom formáte.";
-$wb['netmask_error_wrong'] = "Maska siete má neplatný formát.";
-$wb['gateway_error_wrong'] = "Neplatný formát Gateway.";
-$wb['hostname_error_empty'] = "Hostname je prázdny.";
-$wb['nameservers_error_empty'] = "Nameserver je prázdny.";
-$wb['config_dir_txt'] = "KonfiguraÄný adresár";
-$wb['init_script_txt'] = "Meno cron init skript ";
-$wb['crontab_dir_txt'] = "Cesta pre jednotlivé crontaby";
-$wb['wget_txt'] = "Cesta k wget programu";
-$wb['web_user_txt'] = "Apache uživateľ";
-$wb['web_group_txt'] = "Apache skupina";
-$wb['security_level_txt'] = "Stupeň zabezpeÄenia";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "BIND User";
-$wb['bind_group_txt'] = "BIND Group";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf path";
-$wb['bind_user_error_empty'] = "BIND user is empty.";
-$wb['bind_group_error_empty'] = "BIND group is empty.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is empty.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf path is empty.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local path is empty.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is empty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is empty.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot domov';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sekcia';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted aplikácia';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted aplikácia';
+$wb['website_path_txt'] = 'Website cesta';
+$wb['website_symlinks_txt'] = 'Website symlinky';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_basedir_txt'] = 'Website základny adresár';
+$wb['vhost_conf_dir_txt'] = 'Vhost konfig adresár';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost konfig odblokovaný adresár';
+$wb['getmail_config_dir_txt'] = 'Getmail konfig adresár';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter cesta';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter skript';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Cesta';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Modul';
+$wb['maildir_path_txt'] = 'Maildir Cesta';
+$wb['homedir_path_txt'] = 'Cesta k domovskému adresáru';
+$wb['mailuser_uid_txt'] = 'Mailuser UID';
+$wb['mailuser_gid_txt'] = 'Mailuser GID';
+$wb['mailuser_name_txt'] = 'Mailuser Meno';
+$wb['mailuser_group_txt'] = 'Mailuser Skupina';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost uživateľ';
+$wb['relayhost_password_txt'] = 'Relayhost heslo';
+$wb['mailbox_size_limit_txt'] = 'Limit ve?kosti poštovej schránky';
+$wb['message_size_limit_txt'] = 'Limit ve?kosti správy';
+$wb['ip_address_txt'] = 'IP Adresa';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameservery';
+$wb['auto_network_configuration_txt'] = 'Konfigurácia siete';
+$wb['ip_address_error_wrong'] = 'IP adresa v neplatnom formáte.';
+$wb['netmask_error_wrong'] = 'Maska siete má neplatný formát.';
+$wb['gateway_error_wrong'] = 'Neplatný formát Gateway.';
+$wb['hostname_error_empty'] = 'Hostname je prázdny.';
+$wb['nameservers_error_empty'] = 'Nameserver je prázdny.';
+$wb['config_dir_txt'] = 'KonfiguraÄný adresár';
+$wb['init_script_txt'] = 'Meno cron init skript ';
+$wb['crontab_dir_txt'] = 'Cesta pre jednotlivé crontaby';
+$wb['wget_txt'] = 'Cesta k wget programu';
+$wb['web_user_txt'] = 'Apache uživateľ';
+$wb['web_group_txt'] = 'Apache skupina';
+$wb['security_level_txt'] = 'Stupeň zabezpeÄenia';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'BIND User';
+$wb['bind_group_txt'] = 'BIND Group';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf path';
+$wb['bind_user_error_empty'] = 'BIND user is empty.';
+$wb['bind_group_error_empty'] = 'BIND group is empty.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng
index bb42a93bb..4be9ebdba 100644
--- a/interface/web/admin/lib/lang/sk_system_config.lng
+++ b/interface/web/admin/lib/lang/sk_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/lib/lang/tr.lng b/interface/web/admin/lib/lang/tr.lng
index 355f04990..a7ce8f6d1 100644
--- a/interface/web/admin/lib/lang/tr.lng
+++ b/interface/web/admin/lib/lang/tr.lng
@@ -46,4 +46,5 @@ $wb['Import'] = 'İçe aktar';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/tr_directive_snippets.lng b/interface/web/admin/lib/lang/tr_directive_snippets.lng
new file mode 100644
index 000000000..d836ab0da
--- /dev/null
+++ b/interface/web/admin/lib/lang/tr_directive_snippets.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['Directive Snippets'] = 'Directive Snippets';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['snippet_txt'] = 'Snippet';
+$wb['active_txt'] = 'Active';
+$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/tr_directive_snippets_list.lng b/interface/web/admin/lib/lang/tr_directive_snippets_list.lng
new file mode 100644
index 000000000..4124ea346
--- /dev/null
+++ b/interface/web/admin/lib/lang/tr_directive_snippets_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Directive Snippets';
+$wb['active_txt'] = 'Active';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['add_new_record_txt'] = 'Add Directive Snippet';
+?>
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index c09906afc..a94949020 100644
--- a/interface/web/admin/lib/lang/tr_server_config.lng
+++ b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -1,171 +1,173 @@
<?php
-$wb['jailkit_chroot_home_txt'] = "Jailkit chroot home";
-$wb['jailkit_chroot_app_sections_txt'] = "Jailkit chroot app sections";
-$wb['jailkit_chroot_app_programs_txt'] = "Jailkit chrooted applications";
-$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit cron chrooted applications";
-$wb['website_path_txt'] = "Website yolu";
-$wb['website_symlinks_txt'] = "Website symlinks";
-$wb['website_symlinks_rel_txt'] = "Make relative symlinks";
-$wb['website_basedir_txt'] = "Website klasörü";
-$wb['vhost_conf_dir_txt'] = "Vhost config dir";
-$wb['vhost_conf_enabled_dir_txt'] = "Vhost config enabled dir";
-$wb['getmail_config_dir_txt'] = "Getmail config dir";
-$wb['fastcgi_starter_path_txt'] = "FastCGI starter path";
-$wb['fastcgi_starter_script_txt'] = "FastCGI starter script";
-$wb['fastcgi_alias_txt'] = "FastCGI Alias";
-$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini Path";
-$wb['fastcgi_children_txt'] = "FastCGI Children";
-$wb['fastcgi_max_requests_txt'] = "FastCGI max. Requests";
-$wb['fastcgi_bin_txt'] = "FastCGI Bin";
-$wb['module_txt'] = "Modül";
-$wb['maildir_path_txt'] = "Mail dizini yolu";
-$wb['homedir_path_txt'] = "Kullanıcı dizini yolu";
-$wb['mailuser_uid_txt'] = "Mail kullanıcısı UID";
-$wb['mailuser_gid_txt'] = "Mail kullanıcısı GID";
-$wb['mailuser_name_txt'] = "Mail kullanıcısı Adı";
-$wb['mailuser_group_txt'] = "Mail kullanıcısı Grubu";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost Kullanıcı";
-$wb['relayhost_password_txt'] = "Relayhost Åžifre";
-$wb['mailbox_size_limit_txt'] = "Mail kutusu boyutu";
-$wb['message_size_limit_txt'] = "Mesaj boyutu";
-$wb['ip_address_txt'] = "IP Adresleri";
-$wb['netmask_txt'] = "Netmask";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameservers";
-$wb['auto_network_configuration_txt'] = "AÄŸ Konfigurasyonu";
-$wb['ip_address_error_wrong'] = "Geçersiz IP adresi formatı.";
-$wb['netmask_error_wrong'] = "Geçersiz Netmask formatı.";
-$wb['gateway_error_wrong'] = "Geçersiz Gateway formatı.";
-$wb['hostname_error_empty'] = "Hostname boÅŸ.";
-$wb['nameservers_error_empty'] = "Nameserver boÅŸ.";
-$wb['config_dir_txt'] = "Config dizini";
-$wb['init_script_txt'] = "Cron init script name";
-$wb['crontab_dir_txt'] = "Path for individual crontabs";
-$wb['wget_txt'] = "Path to wget program";
-$wb['web_user_txt'] = "Apache kullanıcısı";
-$wb['web_group_txt'] = "Apache grubu";
-$wb['security_level_txt'] = "Güvenlik seviyesi";
-$wb['loglevel_txt'] = "Loglevel";
-$wb['apps_vhost_port_txt'] = "Apps-vhost port";
-$wb['apps_vhost_ip_txt'] = "Apps-vhost IP";
-$wb['apps_vhost_servername_txt'] = "Apps-vhost Domain";
-$wb['bind_user_txt'] = "BIND User";
-$wb['bind_group_txt'] = "BIND Group";
-$wb['bind_zonefiles_dir_txt'] = "BIND zonefiles directory";
-$wb['named_conf_path_txt'] = "BIND named.conf path";
-$wb['bind_user_error_empty'] = "BIND user is empty.";
-$wb['bind_group_error_empty'] = "BIND group is empty.";
-$wb['bind_zonefiles_dir_error_empty'] = "BIND zonefiles directory is empty.";
-$wb['named_conf_path_error_empty'] = "BIND named.conf path is empty.";
-$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local path is empty.";
-$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax";
-$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Daemon";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['php_open_basedir_error_empty'] = "PHP open_basedir is empty.";
-$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride";
-$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride is empty.";
-$wb['awstats_conf_dir_txt'] = "awstats conf folder";
-$wb['awstats_data_dir_txt'] = "awstats data folder";
-$wb['awstats_pl_txt'] = "awstats.pl script";
-$wb['awstats_buildstaticpages_pl_txt'] = "awstats_buildstaticpages.pl script";
-$wb['backup_dir_txt'] = "Backup directory";
-$wb['named_conf_local_path_txt'] = "BIND named.conf.local path";
-$wb['php_ini_path_cgi_txt'] = "CGI php.ini path";
-$wb['php_ini_path_apache_txt'] = "Apache php.ini path";
-$wb['check_apache_config_txt'] = "Test apache configuration on restart";
-$wb['CA_path_txt'] = "CA Path";
-$wb['CA_pass_txt'] = "CA passphrase";
-$wb['ufw_enable_txt'] = "Enable";
-$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules";
-$wb['ufw_ipv6_txt'] = "Enable IPv6";
-$wb['ufw_default_input_policy_txt'] = "Default Input Policy";
-$wb['ufw_default_output_policy_txt'] = "Default Output Policy";
-$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy";
-$wb['ufw_default_application_policy_txt'] = "Default Application Policy";
-$wb['ufw_log_level_txt'] = "Log Level";
-$wb['network_config_warning_txt'] = "The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.";
-$wb['fastcgi_config_syntax_txt'] = "FastCGI config syntax";
-$wb['server_type_txt'] = "Server Type";
-$wb['nginx_vhost_conf_dir_txt'] = "Nginx Vhost config dir";
-$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir";
-$wb['nginx_user_txt'] = "Nginx user";
-$wb['nginx_group_txt'] = "Nginx group";
-$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket";
-$wb['backup_dir_error_empty'] = "Backup directory is empty.";
-$wb['maildir_path_error_empty'] = "Maildir Path is empty.";
-$wb['homedir_path_error_empty'] = "Homedir Path is empty.";
-$wb['mailuser_uid_error_empty'] = "Mailuser UID is empty.";
-$wb['mailuser_gid_error_empty'] = "Mailuser GID is empty.";
-$wb['mailuser_name_error_empty'] = "Mailuser Name is empty.";
-$wb['mailuser_group_error_empty'] = "Mailuser Group is empty.";
-$wb['getmail_config_dir_error_empty'] = "Getmail config dir is empty.";
-$wb['website_basedir_error_empty'] = "Website basedir is empty.";
-$wb['website_path_error_empty'] = "Website path is empty.";
-$wb['website_symlinks_error_empty'] = "Website symlinks is empty.";
-$wb['vhost_conf_dir_error_empty'] = "Vhost config dir is empty.";
-$wb['vhost_conf_enabled_dir_error_empty'] = "Vhost config enabled dir is empty.";
-$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx Vhost config dir is empty.";
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx Vhost config enabled dir is empty.";
-$wb['apache_user_error_empty'] = "Apache user is empty.";
-$wb['apache_group_error_empty'] = "Apache group is empty.";
-$wb['nginx_user_error_empty'] = "Nginx user is empty.";
-$wb['nginx_group_error_empty'] = "Nginx group is empty.";
-$wb['php_ini_path_apache_error_empty'] = "Apache php.ini path is empty.";
-$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini path is empty.";
-$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket is empty.";
-$wb['apps_vhost_port_error_empty'] = "Apps-vhost port is empty.";
-$wb['apps_vhost_ip_error_empty'] = "Apps-vhost IP is empty.";
-$wb['fastcgi_starter_path_error_empty'] = "FastCGI starter path is empty.";
-$wb['fastcgi_starter_script_error_empty'] = "FastCGI starter script is empty.";
-$wb['fastcgi_alias_error_empty'] = "FastCGI Alias is empty.";
-$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Path is empty.";
-$wb['fastcgi_children_error_empty'] = "FastCGI Children is empty.";
-$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests is empty.";
-$wb['fastcgi_bin_error_empty'] = "FastCGI Bin is empty.";
-$wb['jailkit_chroot_home_error_empty'] = "Jailkit chroot home is empty.";
-$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit chroot app sections is empty.";
-$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit chrooted applications is empty.";
-$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit cron chrooted applications is empty.";
-$wb['vlogger_config_dir_error_empty'] = "Config directory is empty.";
-$wb['cron_init_script_error_empty'] = "Cron init script name is empty.";
-$wb['crontab_dir_error_empty'] = "Path for individual crontabs is empty.";
-$wb['cron_wget_error_empty'] = "Path to wget program is empty.";
-$wb['php_fpm_init_script_txt'] = "PHP-FPM init script";
-$wb['php_fpm_init_script_error_empty'] = "PHP-FPM init script is empty.";
-$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini path";
-$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini path is empty.";
-$wb['php_fpm_pool_dir_txt'] = "PHP-FPM pool directory";
-$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM pool directory is empty.";
-$wb['php_fpm_start_port_txt'] = "PHP-FPM start port";
-$wb['php_fpm_start_port_error_empty'] = "PHP-FPM start port is empty.";
-$wb['php_fpm_socket_dir_txt'] = "PHP-FPM socket directory";
-$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM socket directory is empty.";
-$wb['try_rescue_txt'] = "Enable service monitoring and restart on failure";
-$wb['do_not_try_rescue_mysql_txt'] = "Disable MySQL monitoring";
-$wb['do_not_try_rescue_mail_txt'] = "Disable Email monitoring";
-$wb['rescue_description_txt'] = "<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!";
-$wb['enable_sni_txt'] = "Enable SNI";
-$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring";
-$wb['set_folder_permissions_on_update_txt'] = "Set folder permissions on update";
-$wb['add_web_users_to_sshusers_group_txt'] = "Add web users to -sshusers- group";
-$wb['connect_userid_to_webid_txt'] = "Connect Linux userid to webid";
-$wb['connect_userid_to_webid_start_txt'] = "Start ID for userid/webid connect";
-$wb['website_autoalias_txt'] = "Website auto alias";
-$wb['website_autoalias_note_txt'] = "Placeholders:";
-$wb['backup_mode_txt'] = "Backup mode";
-$wb['backup_mode_userzip'] = "Backup web files owned by web user as zip";
-$wb['backup_mode_rootgz'] = "Backup all files in web directory as root user";
-$wb['realtime_blackhole_list_txt'] = "Real-time Blackhole List";
-$wb['realtime_blackhole_list_note_txt'] = "(Separate RBL's with commas)";
-$wb['ssl_settings_txt'] = "SSL Settings";
-$wb['permissions_txt'] = "Permissions";
-$wb['php_settings_txt'] = "PHP Settings";
-$wb['apps_vhost_settings_txt'] = "Apps Vhost Settings";
-$wb['awstats_settings_txt'] = "AWStats Settings";
-$wb['firewall_txt'] = "Firewall";
-$wb['mailbox_quota_stats_txt'] = "Mailbox quota statistics";
-$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)";
-$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)";
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
+$wb['website_path_txt'] = 'Website yolu';
+$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_basedir_txt'] = 'Website klasörü';
+$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['getmail_config_dir_txt'] = 'Getmail config dir';
+$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
+$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['fastcgi_children_txt'] = 'FastCGI Children';
+$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
+$wb['module_txt'] = 'Modül';
+$wb['maildir_path_txt'] = 'Mail dizini yolu';
+$wb['homedir_path_txt'] = 'Kullanıcı dizini yolu';
+$wb['mailuser_uid_txt'] = 'Mail kullanıcısı UID';
+$wb['mailuser_gid_txt'] = 'Mail kullanıcısı GID';
+$wb['mailuser_name_txt'] = 'Mail kullanıcısı Adı';
+$wb['mailuser_group_txt'] = 'Mail kullanıcısı Grubu';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost Kullanıcı';
+$wb['relayhost_password_txt'] = 'Relayhost Åžifre';
+$wb['mailbox_size_limit_txt'] = 'Mail kutusu boyutu';
+$wb['message_size_limit_txt'] = 'Mesaj boyutu';
+$wb['ip_address_txt'] = 'IP Adresleri';
+$wb['netmask_txt'] = 'Netmask';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameservers';
+$wb['auto_network_configuration_txt'] = 'AÄŸ Konfigurasyonu';
+$wb['ip_address_error_wrong'] = 'Geçersiz IP adresi formatı.';
+$wb['netmask_error_wrong'] = 'Geçersiz Netmask formatı.';
+$wb['gateway_error_wrong'] = 'Geçersiz Gateway formatı.';
+$wb['hostname_error_empty'] = 'Hostname boÅŸ.';
+$wb['nameservers_error_empty'] = 'Nameserver boÅŸ.';
+$wb['config_dir_txt'] = 'Config dizini';
+$wb['init_script_txt'] = 'Cron init script name';
+$wb['crontab_dir_txt'] = 'Path for individual crontabs';
+$wb['wget_txt'] = 'Path to wget program';
+$wb['web_user_txt'] = 'Apache kullanıcısı';
+$wb['web_group_txt'] = 'Apache grubu';
+$wb['security_level_txt'] = 'Güvenlik seviyesi';
+$wb['loglevel_txt'] = 'Loglevel';
+$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['bind_user_txt'] = 'BIND User';
+$wb['bind_group_txt'] = 'BIND Group';
+$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
+$wb['named_conf_path_txt'] = 'BIND named.conf path';
+$wb['bind_user_error_empty'] = 'BIND user is empty.';
+$wb['bind_group_error_empty'] = 'BIND group is empty.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$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';
?>
diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng
index f99643af3..b07dfd47f 100644
--- a/interface/web/admin/lib/lang/tr_system_config.lng
+++ b/interface/web/admin/lib/lang/tr_system_config.lng
@@ -35,4 +35,10 @@ $wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP user';
$wb['smtp_pass_txt'] = 'SMTP password';
$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
+$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
?>
diff --git a/interface/web/admin/list/directive_snippets.list.php b/interface/web/admin/list/directive_snippets.list.php
index ec023c1ec..593ff80a2 100644
--- a/interface/web/admin/list/directive_snippets.list.php
+++ b/interface/web/admin/list/directive_snippets.list.php
@@ -73,6 +73,6 @@ $liste["item"][] = array( 'field' => "type",
'prefix' => "",
'suffix' => "",
'width' => "",
- 'value' => array('apache' => 'Apache', 'nginx' => 'nginx', 'php' => 'PHP'));
+ 'value' => array('apache' => 'Apache', 'nginx' => 'nginx', 'php' => 'PHP', 'proxy' => 'Proxy'));
?>
\ No newline at end of file
diff --git a/interface/web/admin/users_edit.php b/interface/web/admin/users_edit.php
index ae2298615..487be72ce 100644
--- a/interface/web/admin/users_edit.php
+++ b/interface/web/admin/users_edit.php
@@ -66,6 +66,63 @@ class page_action extends tform_actions {
if(@is_array($this->dataRecord['modules']) && !in_array($this->dataRecord['startmodule'],$this->dataRecord['modules'])) {
$app->tform->errorMessage .= $app->tform->wordbook['startmodule_err'];
}
+ $this->oldDataRecord = $app->tform->getDataRecord($this->id);
+ }
+
+ /*
+ This function is called automatically right after
+ the data was successful updated in the database.
+ */
+ function onAfterUpdate() {
+ global $app, $conf;
+
+ $client = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = ".$this->id);
+ $client_id = $client['client_id'];
+ $username = $app->db->quote($this->dataRecord["username"]);
+ $old_username = $app->db->quote($this->oldDataRecord['username']);
+
+ // username changed
+ if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['username']) && $this->dataRecord['username'] != '' && $this->oldDataRecord['username'] != $this->dataRecord['username']) {
+ $sql = "UPDATE client SET username = '$username' WHERE client_id = $client_id AND username = '$old_username'";
+ $app->db->query($sql);
+ $tmp = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE client_id = $client_id");
+ $app->db->datalogUpdate("sys_group", "name = '$username'", 'groupid', $tmp['groupid']);
+ unset($tmp);
+ }
+
+ // password changed
+ if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord["passwort"]) && $this->dataRecord["passwort"] != '') {
+ $password = $app->db->quote($this->dataRecord["passwort"]);
+ $salt="$1$";
+ $base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+ for ($n=0;$n<8;$n++) {
+ $salt.=$base64_alphabet[mt_rand(0,63)];
+ }
+ $salt.="$";
+ $password = crypt(stripslashes($password),$salt);
+ $sql = "UPDATE client SET password = '$password' WHERE client_id = $client_id AND username = '$username'";
+ $app->db->query($sql);
+ }
+
+ // language changed
+ if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['language']) && $this->dataRecord['language'] != '' && $this->oldDataRecord['language'] != $this->dataRecord['language']) {
+ $language = $app->db->quote($this->dataRecord["language"]);
+ $sql = "UPDATE client SET language = '$language' WHERE client_id = $client_id AND username = '$username'";
+ $app->db->query($sql);
+ }
+
+ // reseller status changed
+ /*
+ if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != $this->oldDataRecord["limit_client"]) {
+ $modules = $conf['interface_modules_enabled'];
+ if($this->dataRecord["limit_client"] > 0) $modules .= ',client';
+ $modules = $app->db->quote($modules);
+ $client_id = $this->id;
+ $sql = "UPDATE sys_user SET modules = '$modules' WHERE client_id = $client_id";
+ $app->db->query($sql);
+ }
+ */
+ parent::onAfterUpdate();
}
}
diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php
index 5015a5517..f86de154c 100644
--- a/interface/web/client/client_del.php
+++ b/interface/web/client/client_del.php
@@ -81,7 +81,7 @@ class page_action extends tform_actions {
$client_group = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = $client_id");
// Get all records (sub-clients, mail, web, etc....) of this client.
- $tables = 'cron,client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain';
+ $tables = 'cron,client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain';
$tables_array = explode(',',$tables);
$client_group_id = $app->functions->intval($client_group['groupid']);
@@ -131,20 +131,20 @@ class page_action extends tform_actions {
$app->db->query("DELETE FROM sys_user WHERE client_id = $client_id");
// Delete all records (sub-clients, mail, web, etc....) of this client.
- $tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain,web_folder,web_folder_user,domain';
+ $tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_folder,web_folder_user,domain';
$tables_array = explode(',',$tables);
$client_group_id = $app->functions->intval($client_group['groupid']);
if($client_group_id > 1) {
foreach($tables_array as $table) {
if($table != '') {
$records = $app->db->queryAllRecords("SELECT * FROM $table WHERE sys_groupid = ".$client_group_id);
- // find the primary ID of the table
+ //* find the primary ID of the table
$table_info = $app->db->tableInfo($table);
$index_field = '';
foreach($table_info as $tmp) {
if($tmp['option'] == 'primary') $index_field = $tmp['name'];
}
- // Delete the records
+ //* Delete the records
if($index_field != '') {
if(is_array($records)) {
foreach($records as $rec) {
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 350244cca..6f7cf533d 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -190,7 +190,7 @@ class page_action extends tform_actions {
the data was successful updated in the database.
*/
function onAfterUpdate() {
- global $app;
+ global $app, $conf;
// username changed
if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['username']) && $this->dataRecord['username'] != '' && $this->oldDataRecord['username'] != $this->dataRecord['username']) {
$username = $app->db->quote($this->dataRecord["username"]);
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 1b66ac754..25623f42f 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -431,6 +431,29 @@ $form["tabs"]['address'] = array (
'rows' => '10',
'cols' => '30'
),
+ 'paypal_email' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}$/i',
+ 'errmsg'=> 'paypal_email_error_isemail'),
+ ),
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => '',
+ 'searchable' => 2
+ ),
##################################
# END Datatable fields
##################################
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index c9079ec6a..b6bbe1c53 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -340,6 +340,83 @@ $form["tabs"]['address'] = array (
'rows' => '',
'cols' => ''
),
+ 'company_id' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '20',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'bank_account_owner' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'bank_account_number' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'bank_code' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'bank_name' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'bank_account_iban' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'bank_account_swift' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
'notes' => array (
'datatype' => 'TEXT',
'formtype' => 'TEXTAREA',
@@ -351,6 +428,29 @@ $form["tabs"]['address'] = array (
'rows' => '10',
'cols' => '30'
),
+ 'paypal_email' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}$/i',
+ 'errmsg'=> 'paypal_email_error_isemail'),
+ ),
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => '',
+ 'searchable' => 2
+ ),
##################################
# END Datatable fields
##################################
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index afda78148..ed601bcca 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/ar_client_circle.lng b/interface/web/client/lib/lang/ar_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/ar_client_circle.lng
+++ b/interface/web/client/lib/lang/ar_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/ar_client_circle_list.lng b/interface/web/client/lib/lang/ar_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/ar_client_circle_list.lng
+++ b/interface/web/client/lib/lang/ar_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng
index 010e5be46..98dacd971 100644
--- a/interface/web/client/lib/lang/ar_reseller.lng
+++ b/interface/web/client/lib/lang/ar_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index f38edc2ed..c959d5204 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -133,4 +133,8 @@ $wb['force_suexec_txt'] = 'SuEXEC forced';
$wb['limit_hterror_txt'] = 'Custom error docs available';
$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
$wb['limit_ssl_txt'] = 'SSL available';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng
index 5798da1cd..5506da3af 100644
--- a/interface/web/client/lib/lang/bg_reseller.lng
+++ b/interface/web/client/lib/lang/bg_reseller.lng
@@ -128,4 +128,6 @@ $wb['force_suexec_txt'] = 'SuEXEC forced';
$wb['limit_hterror_txt'] = 'Custom error docs available';
$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
$wb['limit_ssl_txt'] = 'SSL available';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index 979e73af9..b1aedcebf 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/br_client_circle.lng b/interface/web/client/lib/lang/br_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/br_client_circle.lng
+++ b/interface/web/client/lib/lang/br_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/br_client_circle_list.lng b/interface/web/client/lib/lang/br_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/br_client_circle_list.lng
+++ b/interface/web/client/lib/lang/br_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng
index 3dfeb7570..4e21ef52f 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index f73c7a34a..0d481e2a7 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -28,8 +28,8 @@ $wb['country_txt'] = 'ZemÄ›';
$wb['telephone_txt'] = 'Telefon';
$wb['mobile_txt'] = 'Mobilnà telefon';
$wb['fax_txt'] = 'Fax';
-$wb['email_txt'] = 'Email';
-$wb['internet_txt'] = 'Internet';
+$wb['email_txt'] = 'Kontaktnà email na klienta';
+$wb['internet_txt'] = 'WWW stránky klienta';
$wb['icq_txt'] = 'ICQ';
$wb['notes_txt'] = 'Poznámky';
$wb['company_txt'] = 'SpoleÄnost';
@@ -95,9 +95,9 @@ $wb['limit_traffic_quota_txt'] = 'Přenosová kvóta';
$wb['limit_trafficquota_error_notint'] = 'PÅ™enosová kvót musà být ÄÃslo.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['customer_no_txt'] = 'Customer No.';
-$wb['vat_id_txt'] = 'VAT ID';
-$wb['required_fields_txt'] = '* Required fields';
+$wb['customer_no_txt'] = 'Zákaznické ÄÃslo';
+$wb['vat_id_txt'] = 'DIČ';
+$wb['required_fields_txt'] = '* Povinná pole';
$wb['company_id_txt'] = 'IÄŒO';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
@@ -118,9 +118,9 @@ $wb['force_suexec_txt'] = 'SuEXEC forced';
$wb['limit_hterror_txt'] = 'Custom error docs available';
$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
$wb['limit_ssl_txt'] = 'SSL available';
-$wb['bank_account_number_txt'] = 'Bank account no.';
-$wb['bank_code_txt'] = 'Bank code';
-$wb['bank_name_txt'] = 'Bank name';
+$wb['bank_account_number_txt'] = 'ÄŒÃslo úÄtu';
+$wb['bank_code_txt'] = 'Kód banky';
+$wb['bank_name_txt'] = 'Název banky';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
$wb['web_limits_txt'] = 'Web Limits';
@@ -129,8 +129,12 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$wb['repeat_password_txt'] = 'Opakujte heslo';
+$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
+$wb['password_match_txt'] = 'Hesla se shodujÃ.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bankovnà úÄet vlastnÃka';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng
index 80fd704c0..7b89ab6eb 100644
--- a/interface/web/client/lib/lang/cz_client_circle.lng
+++ b/interface/web/client/lib/lang/cz_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$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 266aced82..2e81e501e 100644
--- a/interface/web/client/lib/lang/cz_client_circle_list.lng
+++ b/interface/web/client/lib/lang/cz_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$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 d1e70dcde..4515806be 100644
--- a/interface/web/client/lib/lang/cz_client_del.lng
+++ b/interface/web/client/lib/lang/cz_client_del.lng
@@ -2,5 +2,5 @@
$wb['confirm_action_txt'] = 'Potvrdit akci';
$wb['delete_explanation'] = 'Tato akce smaže následujÃcà poÄet záznamů pÅ™idružených s tÃmto klientem';
$wb['btn_save_txt'] = 'Smazat klienta';
-$wb['btn_cancel_txt'] = 'Storno bez smazánà klienta';
+$wb['btn_cancel_txt'] = 'Zrušit bez smazánà klienta';
?>
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index 18f26a689..0d7f2a6ec 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -93,9 +93,9 @@ $wb['limit_web_quota_txt'] = 'Web kvóta';
$wb['limit_traffic_quota_txt'] = 'Přenosová kvóta';
$wb['limit_trafficquota_error_notint'] = 'PÅ™enosová kvót musà být ÄÃslo.';
$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
-$wb['customer_no_txt'] = 'Customer No.';
-$wb['vat_id_txt'] = 'VAT ID';
-$wb['required_fields_txt'] = '* Required fields';
+$wb['customer_no_txt'] = 'Zákaznické ÄÃslo';
+$wb['vat_id_txt'] = 'DIČ';
+$wb['required_fields_txt'] = '* Povinná pole';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
@@ -124,8 +124,10 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$wb['repeat_password_txt'] = 'Opakujte heslo';
+$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
+$wb['password_match_txt'] = 'Hesla se shodujÃ.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/de.lng b/interface/web/client/lib/lang/de.lng
index cffdb186b..607a70b32 100644
--- a/interface/web/client/lib/lang/de.lng
+++ b/interface/web/client/lib/lang/de.lng
@@ -23,4 +23,3 @@ $wb['error_domain_in webuse'] = 'Diese Domain kann nicht gelöscht werden, weil
$wb['error_client_can_not_add_domain'] = 'Sie können keine neue Domain anlegen';
$wb['error_client_group_id_empty'] = 'Sie müssen ein Benutzerdefiniertes auswählen<br>';
?>
-
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index d43c98a59..4728d3e2b 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -1,140 +1,142 @@
<?php
-$wb['limit_maildomain_txt'] = "Max. Anzahl an E-Mail Domains";
-$wb['limit_mailbox_txt'] = "Max. Anzahl an Mailboxen";
-$wb['limit_mailalias_txt'] = "Max. Anzahl an E-Mail Aliases";
-$wb['limit_mailforward_txt'] = "Max. Anzahl an E-Mail Weiterleitungen";
-$wb['limit_mailcatchall_txt'] = "Max. Anzahl an E-Mail Catchall Konten";
-$wb['limit_mailrouting_txt'] = "Max. Anzahl an E-Mail Routen";
-$wb['limit_mailfilter_txt'] = "Max. Anzahl an E-Mail Filter";
-$wb['limit_fetchmail_txt'] = "Max. Anzahl an Fetchmail Konten";
-$wb['limit_mailquota_txt'] = "Mailboxbeschränkung";
-$wb['limit_spamfilter_wblist_txt'] = "Max. Anzahl an Spamfilter (White-/Blacklist)";
-$wb['limit_spamfilter_user_txt'] = "Max. Anzahl an Spamfilter Benutzern";
-$wb['limit_spamfilter_policy_txt'] = "Max. Anzahl an Spamfilter Richtlinien";
-$wb['default_mailserver_txt'] = "Standardmailserver";
-$wb['company_name_txt'] = "Firmenname";
-$wb['contact_name_txt'] = "Kontakt";
-$wb['username_txt'] = "Benutzername";
-$wb['password_txt'] = "Passwort";
-$wb['language_txt'] = "Sprache";
-$wb['usertheme_txt'] = "Design";
-$wb['street_txt'] = "Straße";
-$wb['zip_txt'] = "PLZ";
-$wb['city_txt'] = "Ort";
-$wb['state_txt'] = "Bundesland";
-$wb['country_txt'] = "Land";
-$wb['telephone_txt'] = "Telefon";
-$wb['mobile_txt'] = "Mobiltelefon";
-$wb['fax_txt'] = "Fax";
-$wb['email_txt'] = "E-Mail";
-$wb['internet_txt'] = "Internet";
-$wb['icq_txt'] = "ICQ";
-$wb['notes_txt'] = "Notizen";
-$wb['company_txt'] = "Firma";
-$wb['title_txt'] = "Titel";
-$wb['firstname_txt'] = "Vorname";
-$wb['surname_txt'] = "Nachname";
-$wb['limit_client_txt'] = "Max. Anzahl an Kunden";
-$wb['limit_domain_txt'] = "Max. Anzahl an Domains";
-$wb['limit_subdomain_txt'] = "Max. Anzahl an Subdomains";
-$wb['limit_webquota_txt'] = "Max. Webbeschränkung";
-$wb['limit_database_txt'] = "Max. Anzahl an Datenbanken";
-$wb['limit_cron_txt'] = "Max. Anzahl an Cronjobs";
-$wb['limit_cron_type_txt'] = "Erlaubte Cronjob Typen (chrooted und full erlauben auch url)";
-$wb['limit_cron_frequency_txt'] = "Min. Abstand zwischen Ausführungen";
-$wb['ip_address_txt'] = "IP Adresse";
-$wb['limit_client_error_notint'] = "Das Subkunden Limit muss eine Zahl sein.";
-$wb['firstname_error_empty'] = "Vorname ist leer.";
-$wb['contact_error_empty'] = "Kontakt ist leer.";
-$wb['default_webserver_txt'] = "Standardwebserver";
-$wb['limit_web_domain_txt'] = "Max. Anzahl an Webdomains";
-$wb['limit_web_aliasdomain_txt'] = "Max. Anzahl an Webaliasdomains";
-$wb['limit_web_subdomain_txt'] = "Max. Anzahl an Websubdomains";
-$wb['limit_ftp_user_txt'] = "Max. Anzahl an FTP Benutzer";
-$wb['default_dnsserver_txt'] = "Standard DNS Server";
-$wb['limit_dns_zone_txt'] = "Max. Anzahl an DNS Zonen";
-$wb['limit_dns_record_txt'] = "Max. Anzahl an DNS Einträgen";
-$wb['limit_shell_user_txt'] = "Max. Anzahl an Shell Benutzer";
-$wb['username_error_empty'] = "Benutzername ist leer.";
-$wb['username_error_unique'] = "Der Benutzername muss einzigartig sein.";
-$wb['limit_maildomain_error_notint'] = "Das E-Mail Domain Limit muss eine Zahl sein.";
-$wb['limit_mailbox_error_notint'] = "Das Mailbox Limit muss eine Zahl sein.";
-$wb['limit_mailalias_error_notint'] = "Das E-Mail Alias Limit muss eine Zahl sein.";
-$wb['limit_mailforward_error_notint'] = "Das E-Mail Weiterleitung Limit muss eine Zahl sein.";
-$wb['limit_mailcatchall_error_notint'] = "Das E-Mail Catchall Limit muss eine Zahl sein.";
-$wb['limit_mailrouting_error_notint'] = "Das E-Mail Routing Limit muss eine Zahl sein.";
-$wb['limit_mailfilter_error_notint'] = "Das E-Mail Filter Limit muss eine Zahl sein.";
-$wb['limit_mailfetchmail_error_notint'] = "Das Fetchmail Limit muss eine Zahl sein.";
-$wb['limit_mailquota_error_notint'] = "Das E-Mailbeschränkungs Limit muss eine Zahl sein.";
-$wb['limit_spamfilter_wblist_error_notint'] = "Das Spamfilter White-/Blacklist Limit muss eine Zahl sein.";
-$wb['limit_spamfilter_user_error_notint'] = "Das Spamfilter Benutzer Limit muss eine Zahl sein.";
-$wb['limit_spamfilter_policy_error_notint'] = "Das Spamfilter Richtlinien Limit muss eine Zahl sein.";
-$wb['limit_web_domain_error_notint'] = "Das Domain Limit muss eine Zahl sein.";
-$wb['limit_web_aliasdomain_error_notint'] = "Das Aliasdomain Limit muss eine Zahl sein.";
-$wb['limit_web_subdomain_error_notint'] = "Das Subdomain Limit muss eine Zahl sein.";
-$wb['limit_ftp_user_error_notint'] = "Das FTP Benutzer Limit muss eine Zahl sein.";
-$wb['limit_shell_user_error_notint'] = "Das Shell Benutzer Limit muss eine Zahl sein.";
-$wb['limit_dns_zone_error_notint'] = "Das DNS Einträge Limit muss eine Zahl sein.";
-$wb['default_dbserver_txt'] = "Standarddatenbankserver";
-$wb['limit_database_error_notint'] = "Das Datenbank Limit muss eine Zahl sein.";
-$wb['limit_cron_error_notint'] = "Das Cronjob Limit muss eine Zahl sein.";
-$wb['limit_cron_error_frequency'] = "Das Cronjob Intervall muss eine Zahl sein.";
-$wb['username_error_regex'] = "Der Benutzername enthält ungültige Zeichen.";
-$wb['password_strength_txt'] = "Passwortkomplexität";
-$wb['template_master_txt'] = "Mastervorlage";
-$wb['template_additional_txt'] = "Add-Ons";
-$wb['active_template_additional_txt'] = "Aktive Add-Ons";
-$wb['add_additional_template_txt'] = "Zusätzliches Template hinzufügen";
-$wb['delete_additional_template_txt'] = "Zusätzliches Template löschen";
-$wb['ssh_chroot_txt'] = "SSH Chroot Optionen";
-$wb['web_php_options_txt'] = "PHP Optionen";
-$wb['limit_cgi_txt'] = "CGI verfügbar";
-$wb['limit_ssi_txt'] = "SSI verfügbar";
-$wb['limit_perl_txt'] = "Perl verfügbar";
-$wb['limit_ruby_txt'] = "Ruby verfügbar";
-$wb['limit_python_txt'] = "Python verfügbar";
-$wb['force_suexec_txt'] = "SuEXEC erzwungen";
-$wb['limit_hterror_txt'] = "Eigene Fehlerseiten verfügbar";
-$wb['limit_wildcard_txt'] = "Wildcard Subdomain verfügbar";
-$wb['limit_ssl_txt'] = "SSL verfügbar";
-$wb['limit_client_error'] = "Die maximale Anzahl an Kunden wurde erreicht.";
-$wb['limit_mailaliasdomain_txt'] = "Max. Anzahl an Domain Aliases";
-$wb['limit_mailaliasdomain_error_notint'] = "Das E-Mail Domain Alias Limit muss eine Zahl sein.";
-$wb['limit_web_quota_txt'] = "Webbeschränkung";
-$wb['limit_traffic_quota_txt'] = "Trafficbeschränkung";
-$wb['limit_trafficquota_error_notint'] = "Trafficbeschränkung muss eine Zahl sein.";
-$wb['limit_dns_slave_zone_txt'] = "Max. Anzahl an Secondary DNS Zonen";
-$wb['limit_webdav_user_txt'] = "Max. Anzahl an WebDAV Benutzern";
-$wb['limit_webdav_user_error_notint'] = "Das WebDAV Benutzer-Limit muss eine Zahl sein.";
-$wb['limit_dns_slave_zone_error_notint'] = "Das Secondary DNS Zonen Limit muss eine Zahl sein.";
-$wb['customer_no_txt'] = "Kundennummer";
-$wb['vat_id_txt'] = "USt-ID";
-$wb['required_fields_txt'] = "* Benötigte Felder";
-$wb['limit_mailmailinglist_txt'] = "Max. Anzahl an Mailinglisten";
-$wb['limit_mailmailinglist_error_notint'] = "Das Mailinglisten Limit muss eine Zahl sein.";
-$wb['company_id_txt'] = "Firmen/Entrepreneur ID";
-$wb['limit_openvz_vm_txt'] = "Max. Anzahl an virtuellen Servern";
-$wb['limit_openvz_vm_template_id_txt'] = "Template für virtuelle Server erzwingen";
-$wb['limit_openvz_vm_error_notint'] = "Das Limit virtueller Server muss eine Zahl sein.";
-$wb['web_php_options_notempty'] = "Keine PHP Option ausgewählt. Wähle mindestens eine PHP Option.";
-$wb['ssh_chroot_notempty'] = "Keine SSH Chroot Option ausgewählt. Wähle mindestens eine SSH Option.";
-$wb['username_error_collision'] = "Der Benutzername sollte nicht mit dem Wort -web- oder -web- gefolgt von einer Nummer anfangen.";
-$wb['bank_account_number_txt'] = "Kontonummer";
-$wb['bank_account_owner_txt'] = "Kontoinhaber";
-$wb['bank_code_txt'] = "BLZ";
-$wb['bank_name_txt'] = "Bank";
-$wb['bank_account_iban_txt'] = "IBAN";
-$wb['bank_account_swift_txt'] = "BIC";
-$wb['web_limits_txt'] = "Web Limits";
-$wb['email_limits_txt'] = "E-Mail Limits";
-$wb['database_limits_txt'] = "Datenbank Limits";
-$wb['cron_job_limits_txt'] = "Cronjob Limits";
-$wb['dns_limits_txt'] = "DNS Limits";
-$wb['virtualization_limits_txt'] = "Virtualisierungs Limits";
-$wb['generate_password_txt'] = "Passwort erzeugen";
-$wb['repeat_password_txt'] = "Passwort wiederholen";
-$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein.";
-$wb['password_match_txt'] = "Die Passwörter stimmen überein.";
-$wb["customer_no_error_unique"] = 'Die Kundennummer muß einzigartig sein (oder leer).';
+$wb['limit_maildomain_txt'] = 'Max. Anzahl an E-Mail Domains';
+$wb['limit_mailbox_txt'] = 'Max. Anzahl an Mailboxen';
+$wb['limit_mailalias_txt'] = 'Max. Anzahl an E-Mail Aliases';
+$wb['limit_mailforward_txt'] = 'Max. Anzahl an E-Mail Weiterleitungen';
+$wb['limit_mailcatchall_txt'] = 'Max. Anzahl an E-Mail Catchall Konten';
+$wb['limit_mailrouting_txt'] = 'Max. Anzahl an E-Mail Routen';
+$wb['limit_mailfilter_txt'] = 'Max. Anzahl an E-Mail Filter';
+$wb['limit_fetchmail_txt'] = 'Max. Anzahl an Fetchmail Konten';
+$wb['limit_mailquota_txt'] = 'Mailboxbeschränkung';
+$wb['limit_spamfilter_wblist_txt'] = 'Max. Anzahl an Spamfilter (White-/Blacklist)';
+$wb['limit_spamfilter_user_txt'] = 'Max. Anzahl an Spamfilter Benutzern';
+$wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
+$wb['default_mailserver_txt'] = 'Standardmailserver';
+$wb['company_name_txt'] = 'Firmenname';
+$wb['contact_name_txt'] = 'Kontakt';
+$wb['username_txt'] = 'Benutzername';
+$wb['password_txt'] = 'Passwort';
+$wb['language_txt'] = 'Sprache';
+$wb['usertheme_txt'] = 'Design';
+$wb['street_txt'] = 'Straße';
+$wb['zip_txt'] = 'PLZ';
+$wb['city_txt'] = 'Ort';
+$wb['state_txt'] = 'Bundesland';
+$wb['country_txt'] = 'Land';
+$wb['telephone_txt'] = 'Telefon';
+$wb['mobile_txt'] = 'Mobiltelefon';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'E-Mail';
+$wb['internet_txt'] = 'Internet';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Notizen';
+$wb['company_txt'] = 'Firma';
+$wb['title_txt'] = 'Titel';
+$wb['firstname_txt'] = 'Vorname';
+$wb['surname_txt'] = 'Nachname';
+$wb['limit_client_txt'] = 'Max. Anzahl an Kunden';
+$wb['limit_domain_txt'] = 'Max. Anzahl an Domains';
+$wb['limit_subdomain_txt'] = 'Max. Anzahl an Subdomains';
+$wb['limit_webquota_txt'] = 'Max. Webbeschränkung';
+$wb['limit_database_txt'] = 'Max. Anzahl an Datenbanken';
+$wb['limit_cron_txt'] = 'Max. Anzahl an Cronjobs';
+$wb['limit_cron_type_txt'] = 'Erlaubte Cronjob Typen (chrooted und full erlauben auch url)';
+$wb['limit_cron_frequency_txt'] = 'Min. Abstand zwischen Ausführungen';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['limit_client_error_notint'] = 'Das Subkunden Limit muss eine Zahl sein.';
+$wb['firstname_error_empty'] = 'Vorname ist leer.';
+$wb['contact_error_empty'] = 'Kontakt ist leer.';
+$wb['default_webserver_txt'] = 'Standardwebserver';
+$wb['limit_web_domain_txt'] = 'Max. Anzahl an Webdomains';
+$wb['limit_web_aliasdomain_txt'] = 'Max. Anzahl an Webaliasdomains';
+$wb['limit_web_subdomain_txt'] = 'Max. Anzahl an Websubdomains';
+$wb['limit_ftp_user_txt'] = 'Max. Anzahl an FTP Benutzer';
+$wb['default_dnsserver_txt'] = 'Standard DNS Server';
+$wb['limit_dns_zone_txt'] = 'Max. Anzahl an DNS Zonen';
+$wb['limit_dns_record_txt'] = 'Max. Anzahl an DNS Einträgen';
+$wb['limit_shell_user_txt'] = 'Max. Anzahl an Shell Benutzer';
+$wb['username_error_empty'] = 'Benutzername ist leer.';
+$wb['username_error_unique'] = 'Der Benutzername muss einzigartig sein.';
+$wb['limit_maildomain_error_notint'] = 'Das E-Mail Domain Limit muss eine Zahl sein.';
+$wb['limit_mailbox_error_notint'] = 'Das Mailbox Limit muss eine Zahl sein.';
+$wb['limit_mailalias_error_notint'] = 'Das E-Mail Alias Limit muss eine Zahl sein.';
+$wb['limit_mailforward_error_notint'] = 'Das E-Mail Weiterleitung Limit muss eine Zahl sein.';
+$wb['limit_mailcatchall_error_notint'] = 'Das E-Mail Catchall Limit muss eine Zahl sein.';
+$wb['limit_mailrouting_error_notint'] = 'Das E-Mail Routing Limit muss eine Zahl sein.';
+$wb['limit_mailfilter_error_notint'] = 'Das E-Mail Filter Limit muss eine Zahl sein.';
+$wb['limit_mailfetchmail_error_notint'] = 'Das Fetchmail Limit muss eine Zahl sein.';
+$wb['limit_mailquota_error_notint'] = 'Das E-Mailbeschränkungs Limit muss eine Zahl sein.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'Das Spamfilter White-/Blacklist Limit muss eine Zahl sein.';
+$wb['limit_spamfilter_user_error_notint'] = 'Das Spamfilter Benutzer Limit muss eine Zahl sein.';
+$wb['limit_spamfilter_policy_error_notint'] = 'Das Spamfilter Richtlinien Limit muss eine Zahl sein.';
+$wb['limit_web_domain_error_notint'] = 'Das Domain Limit muss eine Zahl sein.';
+$wb['limit_web_aliasdomain_error_notint'] = 'Das Aliasdomain Limit muss eine Zahl sein.';
+$wb['limit_web_subdomain_error_notint'] = 'Das Subdomain Limit muss eine Zahl sein.';
+$wb['limit_ftp_user_error_notint'] = 'Das FTP Benutzer Limit muss eine Zahl sein.';
+$wb['limit_shell_user_error_notint'] = 'Das Shell Benutzer Limit muss eine Zahl sein.';
+$wb['limit_dns_zone_error_notint'] = 'Das DNS Einträge Limit muss eine Zahl sein.';
+$wb['default_dbserver_txt'] = 'Standarddatenbankserver';
+$wb['limit_database_error_notint'] = 'Das Datenbank Limit muss eine Zahl sein.';
+$wb['limit_cron_error_notint'] = 'Das Cronjob Limit muss eine Zahl sein.';
+$wb['limit_cron_error_frequency'] = 'Das Cronjob Intervall muss eine Zahl sein.';
+$wb['username_error_regex'] = 'Der Benutzername enthält ungültige Zeichen.';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['template_master_txt'] = 'Mastervorlage';
+$wb['template_additional_txt'] = 'Add-Ons';
+$wb['active_template_additional_txt'] = 'Aktive Add-Ons';
+$wb['add_additional_template_txt'] = 'Zusätzliches Template hinzufügen';
+$wb['delete_additional_template_txt'] = 'Zusätzliches Template löschen';
+$wb['ssh_chroot_txt'] = 'SSH Chroot Optionen';
+$wb['web_php_options_txt'] = 'PHP Optionen';
+$wb['limit_cgi_txt'] = 'CGI verfügbar';
+$wb['limit_ssi_txt'] = 'SSI verfügbar';
+$wb['limit_perl_txt'] = 'Perl verfügbar';
+$wb['limit_ruby_txt'] = 'Ruby verfügbar';
+$wb['limit_python_txt'] = 'Python verfügbar';
+$wb['force_suexec_txt'] = 'SuEXEC erzwungen';
+$wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar';
+$wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar';
+$wb['limit_ssl_txt'] = 'SSL verfügbar';
+$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
+$wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an Domain Aliases';
+$wb['limit_mailaliasdomain_error_notint'] = 'Das E-Mail Domain Alias Limit muss eine Zahl sein.';
+$wb['limit_web_quota_txt'] = 'Webbeschränkung';
+$wb['limit_traffic_quota_txt'] = 'Trafficbeschränkung';
+$wb['limit_trafficquota_error_notint'] = 'Trafficbeschränkung muss eine Zahl sein.';
+$wb['limit_dns_slave_zone_txt'] = 'Max. Anzahl an Secondary DNS Zonen';
+$wb['limit_webdav_user_txt'] = 'Max. Anzahl an WebDAV Benutzern';
+$wb['limit_webdav_user_error_notint'] = 'Das WebDAV Benutzer-Limit muss eine Zahl sein.';
+$wb['limit_dns_slave_zone_error_notint'] = 'Das Secondary DNS Zonen Limit muss eine Zahl sein.';
+$wb['customer_no_txt'] = 'Kundennummer';
+$wb['vat_id_txt'] = 'USt-ID';
+$wb['required_fields_txt'] = '* Benötigte Felder';
+$wb['limit_mailmailinglist_txt'] = 'Max. Anzahl an Mailinglisten';
+$wb['limit_mailmailinglist_error_notint'] = 'Das Mailinglisten Limit muss eine Zahl sein.';
+$wb['company_id_txt'] = 'Firmen/Entrepreneur ID';
+$wb['limit_openvz_vm_txt'] = 'Max. Anzahl an virtuellen Servern';
+$wb['limit_openvz_vm_template_id_txt'] = 'Template für virtuelle Server erzwingen';
+$wb['limit_openvz_vm_error_notint'] = 'Das Limit virtueller Server muss eine Zahl sein.';
+$wb['web_php_options_notempty'] = 'Keine PHP Option ausgewählt. Wähle mindestens eine PHP Option.';
+$wb['ssh_chroot_notempty'] = 'Keine SSH Chroot Option ausgewählt. Wähle mindestens eine SSH Option.';
+$wb['username_error_collision'] = 'Der Benutzername sollte nicht mit dem Wort -web- oder -web- gefolgt von einer Nummer anfangen.';
+$wb['bank_account_number_txt'] = 'Kontonummer';
+$wb['bank_account_owner_txt'] = 'Kontoinhaber';
+$wb['bank_code_txt'] = 'BLZ';
+$wb['bank_name_txt'] = 'Bank';
+$wb['bank_account_iban_txt'] = 'IBAN';
+$wb['bank_account_swift_txt'] = 'BIC';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'E-Mail Limits';
+$wb['database_limits_txt'] = 'Datenbank Limits';
+$wb['cron_job_limits_txt'] = 'Cronjob Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualisierungs Limits';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
+$wb['customer_no_error_unique'] = 'Die Kundennummer muß einzigartig sein (oder leer).';
+$wb['email_error_isemail'] = 'Bitte geben Sie eine gültige Email-Adresse an.';
+$wb['paypal_email_error_isemail'] = 'Bitte geben Sie eine gültige PayPal-E-Mail-Adresse an.';
+$wb['paypal_email_txt'] = 'PayPal-E-Mail';
?>
-
diff --git a/interface/web/client/lib/lang/de_client_circle.lng b/interface/web/client/lib/lang/de_client_circle.lng
index ef1bc27db..27c5d1561 100644
--- a/interface/web/client/lib/lang/de_client_circle.lng
+++ b/interface/web/client/lib/lang/de_client_circle.lng
@@ -7,4 +7,3 @@ $wb['client_ids_txt'] = 'Kunden/Reseller';
$wb['description_txt'] = 'Beschreibung';
$wb['active_txt'] = 'Aktiv';
?>
-
diff --git a/interface/web/client/lib/lang/de_client_circle_list.lng b/interface/web/client/lib/lang/de_client_circle_list.lng
index d37dcda2c..709b50911 100644
--- a/interface/web/client/lib/lang/de_client_circle_list.lng
+++ b/interface/web/client/lib/lang/de_client_circle_list.lng
@@ -8,4 +8,3 @@ $wb['filter_txt'] = 'Filter';
$wb['delete_txt'] = 'Löschen';
$wb['active_txt'] = 'Aktiv';
?>
-
diff --git a/interface/web/client/lib/lang/de_client_del.lng b/interface/web/client/lib/lang/de_client_del.lng
index 4bc471aac..c6982a2f2 100644
--- a/interface/web/client/lib/lang/de_client_del.lng
+++ b/interface/web/client/lib/lang/de_client_del.lng
@@ -4,4 +4,3 @@ $wb['delete_explanation'] = 'Diese Aktion wird folgende Anzahl an Datensätzen d
$wb['btn_save_txt'] = 'Kunden löschen';
$wb['btn_cancel_txt'] = 'Abbrechen, ohne den Kunden zu löschen';
?>
-
diff --git a/interface/web/client/lib/lang/de_client_message.lng b/interface/web/client/lib/lang/de_client_message.lng
index 457cf6c17..f4def3017 100644
--- a/interface/web/client/lib/lang/de_client_message.lng
+++ b/interface/web/client/lib/lang/de_client_message.lng
@@ -16,4 +16,3 @@ $wb['all_clients_resellers_txt'] = 'Alle Kunden und Reseller';
$wb['all_clients_txt'] = 'Alle Kunden';
$wb['variables_txt'] = 'Variablen:';
?>
-
diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng
index d33571bfa..f7c45fc85 100644
--- a/interface/web/client/lib/lang/de_client_template.lng
+++ b/interface/web/client/lib/lang/de_client_template.lng
@@ -1,88 +1,87 @@
<?php
-$wb['limit_client_error_notint'] = "Das Subkunden Limit muss eine Zahl sein.";
-$wb['limit_maildomain_txt'] = "Max. Anzahl an E-Mail Domains";
-$wb['limit_mailbox_txt'] = "Max. Anzahl an E-Mail Konten";
-$wb['limit_mailalias_txt'] = "Max. Anzahl an E-Mail Aliassen";
-$wb['limit_mailforward_txt'] = "Max. Anzahl an E-Mail Weiterleitungen";
-$wb['limit_mailcatchall_txt'] = "Max. Anzahl an E-Mail Catchall Konten";
-$wb['limit_mailrouting_txt'] = "Max. Anzahl E-Mail Routen";
-$wb['limit_mailfilter_txt'] = "Max. Anzahl an E-Mail Filtern";
-$wb['limit_fetchmail_txt'] = "Max. Anzahl an E-Mail Sammeldienst Konten";
-$wb['limit_mailquota_txt'] = "E-Mail Konto Beschränkung";
-$wb['limit_spamfilter_wblist_txt'] = "Max. Anzahl an Spamfilter (White-/Blacklist)";
-$wb['limit_spamfilter_user_txt'] = "Max. Anzahl Spamfilter Benutzer";
-$wb['limit_spamfilter_policy_txt'] = "Max. Anzahl an Spamfilter Richtlinien";
-$wb['limit_client_txt'] = "Max. Anzahl an Kunden";
-$wb['limit_domain_txt'] = "Max. Anzahl an Domains";
-$wb['limit_subdomain_txt'] = "Max. Anzahl an Subdomains";
-$wb['limit_webquota_txt'] = "Max. Speicherplatzbeschränkung";
-$wb['limit_database_txt'] = "Max. Anzahl an Datenbanken";
-$wb['limit_cron_txt'] = "Max. Anzahl an Cronjobs";
-$wb['limit_cron_type_txt'] = "Max. erlaubter Typ von Cronjobs (chrooted und full erlauben auch url)";
-$wb['limit_cron_frequency_txt'] = "Min. Abstand zwischen Ausführungen";
-$wb['limit_web_domain_txt'] = "Max. Anzahl an Web Domains";
-$wb['limit_web_aliasdomain_txt'] = "Max. Anzahl an Web Aliasdomains";
-$wb['limit_web_subdomain_txt'] = "Max. Anzahl an Web Subdomains";
-$wb['limit_ftp_user_txt'] = "Max. Anzahl an FTP Benutzern";
-$wb['limit_dns_zone_txt'] = "Max. Anzahl an DNS Zonen";
-$wb['limit_dns_record_txt'] = "Max. Anzahl an DNS Einträgen";
-$wb['limit_shell_user_txt'] = "Max. Anzahl an Shell Benutzern";
-$wb['limit_maildomain_error_notint'] = "Das E-Mail Domain Limit muss eine Zahl sein.";
-$wb['limit_mailbox_error_notint'] = "Das E-Mail Konto Limit muss eine Zahl sein.";
-$wb['limit_mailalias_error_notint'] = "Das E-Mail Alias Limit muss eine Zahl sein.";
-$wb['limit_mailforward_error_notint'] = "Das E-Mail Weiterleitung Limit muss eine Zahl sein.";
-$wb['limit_mailcatchall_error_notint'] = "Das E-Mail Catchall Limit muss eine Zahl sein.";
-$wb['limit_mailrouting_error_notint'] = "Das E-Mail Routing Limit muss eine Zahl sein.";
-$wb['limit_mailfilter_error_notint'] = "Das E-Mail Filter Limit muss eine Zahl sein.";
-$wb['limit_mailfetchmail_error_notint'] = "Das E-Mail Sammeldienst Limit muss eine Zahl sein.";
-$wb['limit_mailquota_error_notint'] = "Das E-Mail Beschränkungs Limit muss eine Zahl sein.";
-$wb['limit_spamfilter_wblist_error_notint'] = "Das Spamfilter White-/Blacklist Limit muss eine Zahl sein.";
-$wb['limit_spamfilter_user_error_notint'] = "Das Spamfilter Benutzer Limit muss eine Zahl sein.";
-$wb['limit_spamfilter_policy_error_notint'] = "Das Spamfilter Richtlinien Limit muss eine Zahl sein.";
-$wb['limit_web_domain_error_notint'] = "Das Webseiten Limit muss eine Zahl sein.";
-$wb['limit_web_aliasdomain_error_notint'] = "Das Webseiten Aliasdomain Limit muss eine Zahl sein.";
-$wb['limit_web_subdomain_error_notint'] = "Das Subdomain Limit muss eine Zahl sein.";
-$wb['limit_ftp_user_error_notint'] = "Das FTP Benutzer Limit muss eine Zahl sein.";
-$wb['limit_shell_user_error_notint'] = "Das Shell Benutzer Limit muss eine Zahl sein.";
-$wb['limit_dns_zone_error_notint'] = "Das DNS Einträge Limit muss eine Zahl sein.";
-$wb['limit_database_error_notint'] = "Das Datenbanken Limit muss eine Zahl sein.";
-$wb['limit_cron_error_notint'] = "Das Cronjob Limit muss eine Zahl sein.";
-$wb['limit_cron_error_frequency'] = "Das Cronjob Intervall Limit muss eine Zahl sein.";
-$wb['error_template_name_empty'] = "Bitte geben Sie einen Vorlagenamen ein";
-$wb['limit_mailaliasdomain_txt'] = "Max. Anzahl an Domain Aliase";
-$wb['limit_mailaliasdomain_error_notint'] = "Das E-Mail Domain Alias Limit muss eine Zahl sein.";
-$wb['limit_web_quota_txt'] = "Speicherplatzbeschränkung";
-$wb['limit_traffic_quota_txt'] = "Transfervolumenbeschränkung";
-$wb['limit_trafficquota_error_notint'] = "Transfervolumenbeschränkung muss eine Zahl sein.";
-$wb['limit_dns_slave_zone_txt'] = "Max. Anzahl an Secondary DNS Zonen";
-$wb['limit_webdav_user_txt'] = "Max. Anzahl an WebDAV Benutzern";
-$wb['limit_webdav_user_error_notint'] = "Das WebDAV Benutzer Limit muss eine Zahl sein.";
-$wb['limit_dns_slave_zone_error_notint'] = "Das Secondary DNS Zonen Limit muss eine Zahl sein.";
-$wb['limit_dns_record_error_notint'] = "Das DNS Eintrag Limit muss eine Zahl sein.";
-$wb['template_del_aborted_txt'] = "Löschung abgebrochen. Ein Kunde hat das Template noch ausgewählt.";
-$wb['limit_mailmailinglist_txt'] = "Max. Anzahl an Mailinglisten";
-$wb['limit_mailmailinglist_error_notint'] = "Das Mailinglisten Limit muss eine Zahl sein.";
-$wb['limit_openvz_vm_txt'] = "Max. Anzahl an virtuellen Servern";
-$wb['limit_openvz_vm_template_id_txt'] = "Template für virtuelle Server erzwingen";
-$wb['limit_openvz_vm_error_notint'] = "Das Limit virtueller Server muss eine Zahl sein.";
-$wb['ssh_chroot_txt'] = "SSH Chroot Optionen";
-$wb['web_php_options_txt'] = "PHP Optionen";
-$wb['limit_cgi_txt'] = "CGI verfügbar";
-$wb['limit_ssi_txt'] = "SSI verfügbar";
-$wb['limit_perl_txt'] = "Perl verfügbar";
-$wb['limit_ruby_txt'] = "Ruby verfügbar";
-$wb['limit_python_txt'] = "Python verfügbar";
-$wb['force_suexec_txt'] = "SuEXEC erzwungen";
-$wb['limit_hterror_txt'] = "Eigene Fehlerseiten verfügbar";
-$wb['limit_wildcard_txt'] = "Wildcard Subdomain verfügbar";
-$wb['limit_ssl_txt'] = "SSL verfügbar";
-$wb['template_type_txt'] = "Template Typ";
-$wb['template_name_txt'] = "Template Name";
-$wb['web_limits_txt'] = "Web Limits";
-$wb['email_limits_txt'] = "E-Mail Limits";
-$wb['database_limits_txt'] = "Datenbank Limits";
-$wb['cron_job_limits_txt'] = "Cronjob Limits";
-$wb['dns_limits_txt'] = "DNS Limits";
-$wb['virtualization_limits_txt'] = "Virtualisierungs Limits";
+$wb['limit_client_error_notint'] = 'Das Subkunden Limit muss eine Zahl sein.';
+$wb['limit_maildomain_txt'] = 'Max. Anzahl an E-Mail Domains';
+$wb['limit_mailbox_txt'] = 'Max. Anzahl an E-Mail Konten';
+$wb['limit_mailalias_txt'] = 'Max. Anzahl an E-Mail Aliassen';
+$wb['limit_mailforward_txt'] = 'Max. Anzahl an E-Mail Weiterleitungen';
+$wb['limit_mailcatchall_txt'] = 'Max. Anzahl an E-Mail Catchall Konten';
+$wb['limit_mailrouting_txt'] = 'Max. Anzahl E-Mail Routen';
+$wb['limit_mailfilter_txt'] = 'Max. Anzahl an E-Mail Filtern';
+$wb['limit_fetchmail_txt'] = 'Max. Anzahl an E-Mail Sammeldienst Konten';
+$wb['limit_mailquota_txt'] = 'E-Mail Konto Beschränkung';
+$wb['limit_spamfilter_wblist_txt'] = 'Max. Anzahl an Spamfilter (White-/Blacklist)';
+$wb['limit_spamfilter_user_txt'] = 'Max. Anzahl Spamfilter Benutzer';
+$wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
+$wb['limit_client_txt'] = 'Max. Anzahl an Kunden';
+$wb['limit_domain_txt'] = 'Max. Anzahl an Domains';
+$wb['limit_subdomain_txt'] = 'Max. Anzahl an Subdomains';
+$wb['limit_webquota_txt'] = 'Max. Speicherplatzbeschränkung';
+$wb['limit_database_txt'] = 'Max. Anzahl an Datenbanken';
+$wb['limit_cron_txt'] = 'Max. Anzahl an Cronjobs';
+$wb['limit_cron_type_txt'] = 'Max. erlaubter Typ von Cronjobs (chrooted und full erlauben auch url)';
+$wb['limit_cron_frequency_txt'] = 'Min. Abstand zwischen Ausführungen';
+$wb['limit_web_domain_txt'] = 'Max. Anzahl an Web Domains';
+$wb['limit_web_aliasdomain_txt'] = 'Max. Anzahl an Web Aliasdomains';
+$wb['limit_web_subdomain_txt'] = 'Max. Anzahl an Web Subdomains';
+$wb['limit_ftp_user_txt'] = 'Max. Anzahl an FTP Benutzern';
+$wb['limit_dns_zone_txt'] = 'Max. Anzahl an DNS Zonen';
+$wb['limit_dns_record_txt'] = 'Max. Anzahl an DNS Einträgen';
+$wb['limit_shell_user_txt'] = 'Max. Anzahl an Shell Benutzern';
+$wb['limit_maildomain_error_notint'] = 'Das E-Mail Domain Limit muss eine Zahl sein.';
+$wb['limit_mailbox_error_notint'] = 'Das E-Mail Konto Limit muss eine Zahl sein.';
+$wb['limit_mailalias_error_notint'] = 'Das E-Mail Alias Limit muss eine Zahl sein.';
+$wb['limit_mailforward_error_notint'] = 'Das E-Mail Weiterleitung Limit muss eine Zahl sein.';
+$wb['limit_mailcatchall_error_notint'] = 'Das E-Mail Catchall Limit muss eine Zahl sein.';
+$wb['limit_mailrouting_error_notint'] = 'Das E-Mail Routing Limit muss eine Zahl sein.';
+$wb['limit_mailfilter_error_notint'] = 'Das E-Mail Filter Limit muss eine Zahl sein.';
+$wb['limit_mailfetchmail_error_notint'] = 'Das E-Mail Sammeldienst Limit muss eine Zahl sein.';
+$wb['limit_mailquota_error_notint'] = 'Das E-Mail Beschränkungs Limit muss eine Zahl sein.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'Das Spamfilter White-/Blacklist Limit muss eine Zahl sein.';
+$wb['limit_spamfilter_user_error_notint'] = 'Das Spamfilter Benutzer Limit muss eine Zahl sein.';
+$wb['limit_spamfilter_policy_error_notint'] = 'Das Spamfilter Richtlinien Limit muss eine Zahl sein.';
+$wb['limit_web_domain_error_notint'] = 'Das Webseiten Limit muss eine Zahl sein.';
+$wb['limit_web_aliasdomain_error_notint'] = 'Das Webseiten Aliasdomain Limit muss eine Zahl sein.';
+$wb['limit_web_subdomain_error_notint'] = 'Das Subdomain Limit muss eine Zahl sein.';
+$wb['limit_ftp_user_error_notint'] = 'Das FTP Benutzer Limit muss eine Zahl sein.';
+$wb['limit_shell_user_error_notint'] = 'Das Shell Benutzer Limit muss eine Zahl sein.';
+$wb['limit_dns_zone_error_notint'] = 'Das DNS Einträge Limit muss eine Zahl sein.';
+$wb['limit_database_error_notint'] = 'Das Datenbanken Limit muss eine Zahl sein.';
+$wb['limit_cron_error_notint'] = 'Das Cronjob Limit muss eine Zahl sein.';
+$wb['limit_cron_error_frequency'] = 'Das Cronjob Intervall Limit muss eine Zahl sein.';
+$wb['error_template_name_empty'] = 'Bitte geben Sie einen Vorlagenamen ein';
+$wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an Domain Aliase';
+$wb['limit_mailaliasdomain_error_notint'] = 'Das E-Mail Domain Alias Limit muss eine Zahl sein.';
+$wb['limit_web_quota_txt'] = 'Speicherplatzbeschränkung';
+$wb['limit_traffic_quota_txt'] = 'Transfervolumenbeschränkung';
+$wb['limit_trafficquota_error_notint'] = 'Transfervolumenbeschränkung muss eine Zahl sein.';
+$wb['limit_dns_slave_zone_txt'] = 'Max. Anzahl an Secondary DNS Zonen';
+$wb['limit_webdav_user_txt'] = 'Max. Anzahl an WebDAV Benutzern';
+$wb['limit_webdav_user_error_notint'] = 'Das WebDAV Benutzer Limit muss eine Zahl sein.';
+$wb['limit_dns_slave_zone_error_notint'] = 'Das Secondary DNS Zonen Limit muss eine Zahl sein.';
+$wb['limit_dns_record_error_notint'] = 'Das DNS Eintrag Limit muss eine Zahl sein.';
+$wb['template_del_aborted_txt'] = 'Löschung abgebrochen. Ein Kunde hat das Template noch ausgewählt.';
+$wb['limit_mailmailinglist_txt'] = 'Max. Anzahl an Mailinglisten';
+$wb['limit_mailmailinglist_error_notint'] = 'Das Mailinglisten Limit muss eine Zahl sein.';
+$wb['limit_openvz_vm_txt'] = 'Max. Anzahl an virtuellen Servern';
+$wb['limit_openvz_vm_template_id_txt'] = 'Template für virtuelle Server erzwingen';
+$wb['limit_openvz_vm_error_notint'] = 'Das Limit virtueller Server muss eine Zahl sein.';
+$wb['ssh_chroot_txt'] = 'SSH Chroot Optionen';
+$wb['web_php_options_txt'] = 'PHP Optionen';
+$wb['limit_cgi_txt'] = 'CGI verfügbar';
+$wb['limit_ssi_txt'] = 'SSI verfügbar';
+$wb['limit_perl_txt'] = 'Perl verfügbar';
+$wb['limit_ruby_txt'] = 'Ruby verfügbar';
+$wb['limit_python_txt'] = 'Python verfügbar';
+$wb['force_suexec_txt'] = 'SuEXEC erzwungen';
+$wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar';
+$wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar';
+$wb['limit_ssl_txt'] = 'SSL verfügbar';
+$wb['template_type_txt'] = 'Template Typ';
+$wb['template_name_txt'] = 'Template Name';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'E-Mail Limits';
+$wb['database_limits_txt'] = 'Datenbank Limits';
+$wb['cron_job_limits_txt'] = 'Cronjob Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualisierungs Limits';
?>
-
diff --git a/interface/web/client/lib/lang/de_client_template_list.lng b/interface/web/client/lib/lang/de_client_template_list.lng
index 1fd2c92d3..98195fed1 100644
--- a/interface/web/client/lib/lang/de_client_template_list.lng
+++ b/interface/web/client/lib/lang/de_client_template_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Kundenvorlagen';
$wb['template_type_txt'] = 'Typ';
$wb['template_name_txt'] = 'Vorlagenname';
?>
-
diff --git a/interface/web/client/lib/lang/de_clients_list.lng b/interface/web/client/lib/lang/de_clients_list.lng
index 701eb7995..44c42cd2e 100644
--- a/interface/web/client/lib/lang/de_clients_list.lng
+++ b/interface/web/client/lib/lang/de_clients_list.lng
@@ -8,4 +8,3 @@ $wb['country_txt'] = 'Land';
$wb['add_new_record_txt'] = 'Kunden hinzufügen';
$wb['username_txt'] = 'Benutzername';
?>
-
diff --git a/interface/web/client/lib/lang/de_domain.lng b/interface/web/client/lib/lang/de_domain.lng
index 339c6ffd4..eb4276a3f 100644
--- a/interface/web/client/lib/lang/de_domain.lng
+++ b/interface/web/client/lib/lang/de_domain.lng
@@ -4,4 +4,3 @@ $wb['domain_error_unique'] = 'Die Domain existiert bereits';
$wb['domain_error_regex'] = 'Dieser Domain Name ist nicht gültig';
$wb['Domain'] = 'Domain';
?>
-
diff --git a/interface/web/client/lib/lang/de_domain_list.lng b/interface/web/client/lib/lang/de_domain_list.lng
index 4198e9096..b066bff57 100644
--- a/interface/web/client/lib/lang/de_domain_list.lng
+++ b/interface/web/client/lib/lang/de_domain_list.lng
@@ -4,4 +4,3 @@ $wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
$wb['domain_txt'] = 'Domain';
$wb['user_txt'] = 'Kunde';
?>
-
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index 90d45e3cf..8ee282224 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -1,133 +1,142 @@
<?php
-$wb['limit_maildomain_txt'] = "Max. Anzahl an E-Mail Domains";
-$wb['limit_mailbox_txt'] = "Max. Anzahl an Mailboxen";
-$wb['limit_mailalias_txt'] = "Max. Anzahl an E-Mail Aliases";
-$wb['limit_mailforward_txt'] = "Max. Anzahl an E-Mail Weiterleitungen";
-$wb['limit_mailcatchall_txt'] = "Max. Anzahl an E-Mail Catchall Konten";
-$wb['limit_mailrouting_txt'] = "Max. Anzahl an E-Mail Routen";
-$wb['limit_mailfilter_txt'] = "Max. Anzahl an E-Mail Filtern";
-$wb['limit_fetchmail_txt'] = "Max. Anzahl an Fetchmail Konten";
-$wb['limit_mailquota_txt'] = "Mailbox Beschränkung";
-$wb['limit_spamfilter_wblist_txt'] = "Max. Anzahl an White-/Blacklist Filter";
-$wb['limit_spamfilter_user_txt'] = "Max. Anzahl an Spamfilter Benutzern";
-$wb['limit_spamfilter_policy_txt'] = "Max. Anzahl an Spamfilter Richtlinien";
-$wb['default_mailserver_txt'] = "Standardmailserver";
-$wb['company_name_txt'] = "Firmenname";
-$wb['contact_name_txt'] = "Kontakt";
-$wb['username_txt'] = "Benutzername";
-$wb['password_txt'] = "Passwort";
-$wb['password_strength_txt'] = "Passwortkomplexität";
-$wb['language_txt'] = "Sprache";
-$wb['usertheme_txt'] = "Oberflächen Design";
-$wb['street_txt'] = "Straße";
-$wb['zip_txt'] = "PLZ";
-$wb['city_txt'] = "Ort";
-$wb['state_txt'] = "Bundesland";
-$wb['country_txt'] = "Land";
-$wb['telephone_txt'] = "Telefon";
-$wb['mobile_txt'] = "Mobiltelefon";
-$wb['fax_txt'] = "Fax";
-$wb['email_txt'] = "E-Mail";
-$wb['internet_txt'] = "Internet";
-$wb['icq_txt'] = "ICQ";
-$wb['notes_txt'] = "Notizen";
-$wb['company_txt'] = "Firma";
-$wb['title_txt'] = "Titel";
-$wb['firstname_txt'] = "Vorname";
-$wb['surname_txt'] = "Nachname";
-$wb['limit_domain_txt'] = "Max. Anzahl an Domains";
-$wb['limit_subdomain_txt'] = "Max. Anzahl an Subdomains";
-$wb['limit_webquota_txt'] = "Max. Speicherplatzbeschränkung";
-$wb['limit_database_txt'] = "Max. Anzahl an Datenbanken";
-$wb['limit_cron_txt'] = "Max. Anzahl an Cronjobs";
-$wb['limit_cron_type_txt'] = "Erlaubter Cronjob Typen (chrooted und full erlauben auch url)";
-$wb['limit_cron_frequency_txt'] = "Min. Abstand zwischen Ausführungen";
-$wb['ip_address_txt'] = "IP Adresse";
-$wb['limit_client_error_notint'] = "Das Subkunden Limit muss eine Zahl sein.";
-$wb['firstname_error_empty'] = "Vorname ist leer.";
-$wb['contact_error_empty'] = "Kontakt ist leer.";
-$wb['default_webserver_txt'] = "Standardwebserver";
-$wb['limit_web_domain_txt'] = "Max. Anzahl an Webdomains";
-$wb['limit_web_aliasdomain_txt'] = "Max. Anzahl an Webaliasdomains";
-$wb['limit_web_subdomain_txt'] = "Max. Anzahl an Websubdomains";
-$wb['limit_ftp_user_txt'] = "Max. Anzahl an FTP Benutzern";
-$wb['default_dnsserver_txt'] = "Standard DNS Server";
-$wb['limit_dns_zone_txt'] = "Max. Anzahl an DNS Zonen";
-$wb['limit_dns_record_txt'] = "Max. Anzahl an DNS Einträgen";
-$wb['limit_shell_user_txt'] = "Max. Anzahl an Shell Benutzern";
-$wb['limit_client_txt'] = "Max. Anzahl an Kunden";
-$wb['username_error_empty'] = "Benutzername ist leer.";
-$wb['username_error_unique'] = "Der Benutzername muss einzigartig sein.";
-$wb['limit_maildomain_error_notint'] = "Das E-Mail Domain Limit muss eine Nummer sein.";
-$wb['limit_mailbox_error_notint'] = "Das Mailbox Limit muss eine Nummer sein.";
-$wb['limit_mailalias_error_notint'] = "Das E-Mail Alias Limit muss eine Zahl sein.";
-$wb['limit_mailforward_error_notint'] = "Das E-Mail Weiterleitungs Limit muss eine Zahl sein.";
-$wb['limit_mailcatchall_error_notint'] = "Das E-Mail Catchall Limit muss eine Zahl sein.";
-$wb['limit_mailrouting_error_notint'] = "Das E-Mail Routing Limit muss eine Zahl sein.";
-$wb['limit_mailfilter_error_notint'] = "Das E-Mail Filter Limit muss eine Zahl sein.";
-$wb['limit_mailfetchmail_error_notint'] = "Das Fetchmail Limit muss eine Zahl sein.";
-$wb['limit_mailquota_error_notint'] = "Das E-Mail Beschräkungs Limit muss eine Zahl sein.";
-$wb['limit_spamfilter_wblist_error_notint'] = "Das Spamfilter White-/Blacklist Limit muss eine Zahl sein.";
-$wb['limit_spamfilter_user_error_notint'] = "Das Spamfilter Benutzer Limit muss eine Zahl sein.";
-$wb['limit_spamfilter_policy_error_notint'] = "Das Spamfilter Richtlinien Limit muss eine Zahl sein.";
-$wb['limit_web_domain_error_notint'] = "Das Webseiten Limit muss eine Zahl sein.";
-$wb['limit_web_aliasdomain_error_notint'] = "Das Webseiten Aliasdomain Limit muss eine Zahl sein.";
-$wb['limit_web_subdomain_error_notint'] = "Das Webseiten Subdomain Limit muss eine Zahl sein.";
-$wb['limit_ftp_user_error_notint'] = "Das FTP Benutzer Limit muss eine Zahl sein.";
-$wb['limit_shell_user_error_notint'] = "Das Shell Benutzer Limit muss eine Zahl sein.";
-$wb['limit_dns_zone_error_notint'] = "Das DNS Einträge Limit muss eine Zahl sein.";
-$wb['default_dbserver_txt'] = "Standarddatenbankserver";
-$wb['limit_database_error_notint'] = "Das Datenbank Limit muss eine Zahl sein.";
-$wb['limit_cron_error_notint'] = "Das Cronjob Limit muss eine Zahl sein.";
-$wb['limit_cron_error_frequency'] = "Das Cronjob Intervall Limit muss eine Zahl sein.";
-$wb['username_error_regex'] = "Der Benutzername enthält ungültige Zeichen.";
-$wb['template_master_txt'] = "Mastervorlage";
-$wb['template_additional_txt'] = "Add-Ons";
-$wb['add_additional_template_txt'] = "Zusätzliches Template hinzufügen";
-$wb['delete_additional_template_txt'] = "Zusätzliches Template löschen";
-$wb['ssh_chroot_txt'] = "SSH Chroot Optionen";
-$wb['web_php_options_txt'] = "PHP Optionen";
-$wb['limit_cgi_txt'] = "CGI verfügbar";
-$wb['limit_ssi_txt'] = "SSI verfügbar";
-$wb['limit_perl_txt'] = "Perl verfügbar";
-$wb['limit_ruby_txt'] = "Ruby verfügbar";
-$wb['limit_python_txt'] = "Python verfügbar";
-$wb['force_suexec_txt'] = "SuEXEC erzwungen";
-$wb['limit_hterror_txt'] = "Eigene Fehlerseiten verfügbar";
-$wb['limit_wildcard_txt'] = "Wildcard Subdomain verfügbar";
-$wb['limit_ssl_txt'] = "SSL verfügbar";
-$wb['limit_client_error'] = "Die maximale Anzahl an Kunden wurde erreicht.";
-$wb['limit_client_error_positive'] = "Die Anzahl an Kunden muss > 0 sein";
-$wb['limit_web_quota_txt'] = "Speicherplatzbeschränkung";
-$wb['limit_traffic_quota_txt'] = "Transfervolumenbeschränkung";
-$wb['limit_trafficquota_error_notint'] = "Transfervolumenbeschränkung muss eine Zahl sein.";
-$wb['limit_dns_slave_zone_txt'] = "Max. Anzahl an Secondary DNS Zonen";
-$wb['limit_dns_slave_zone_error_notint'] = "Das Secondary DNS Zonen Limit muss eine Zahl sein.";
-$wb['limit_dns_record_error_notint'] = "Das DNS Eintrag Limit muss eine Zahl sein.";
-$wb['customer_no_txt'] = "Kundennummer";
-$wb['vat_id_txt'] = "USt-ID";
-$wb['required_fields_txt'] = "* Benötigte Felder";
-$wb['limit_webdav_user_txt'] = "Max. Anzahl an WebDAV Benutzern";
-$wb['limit_webdav_user_error_notint'] = "Das WebDAV Benutzer Limit muss eine Zahl sein.";
-$wb['limit_mailmailinglist_txt'] = "Max. Anzahl an Mailinglisten";
-$wb['limit_mailaliasdomain_txt'] = "Max. Anzahl an E-Mail Domainaliases";
-$wb['limit_mailmailinglist_error_notint'] = "Das Mailinglisten Limit muss eine Zahl sein.";
-$wb['limit_openvz_vm_txt'] = "Max. Anzahl an virtuellen Servern";
-$wb['limit_openvz_vm_template_id_txt'] = "Template für virtuelle Server erzwingen";
-$wb['limit_openvz_vm_error_notint'] = "Das Limit virtueller Server muss eine Zahl sein.";
-$wb['web_php_options_notempty'] = "Keine PHP Option ausgewählt. Wähle mindestens eine PHP Option.";
-$wb['ssh_chroot_notempty'] = "Keine SSH Chroot-Option ausgewählt. Wähle mindestens eine SSH Option.";
-$wb['username_error_collision'] = "Der Benutzername sollte nicht mit dem Wort -web- oder -web- gefolgt von einer Nummer anfangen.";
-$wb['web_limits_txt'] = "Web Limits";
-$wb['email_limits_txt'] = "E-Mail Limits";
-$wb['database_limits_txt'] = "Datenbank Limits";
-$wb['cron_job_limits_txt'] = "Cronjob Limits";
-$wb['dns_limits_txt'] = "DNS Limits";
-$wb['virtualization_limits_txt'] = "Virtualisierungs Limits";
-$wb['generate_password_txt'] = "Passwort erzeugen";
-$wb['repeat_password_txt'] = "Passwort wiederholen";
-$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein.";
-$wb['password_match_txt'] = "Die Passwörter stimmen überein.";
-$wb["customer_no_error_unique"] = 'Die Kundennummer muß einzigartig sein (oder leer).';
+$wb['limit_maildomain_txt'] = 'Max. Anzahl an E-Mail Domains';
+$wb['limit_mailbox_txt'] = 'Max. Anzahl an Mailboxen';
+$wb['limit_mailalias_txt'] = 'Max. Anzahl an E-Mail Aliases';
+$wb['limit_mailforward_txt'] = 'Max. Anzahl an E-Mail Weiterleitungen';
+$wb['limit_mailcatchall_txt'] = 'Max. Anzahl an E-Mail Catchall Konten';
+$wb['limit_mailrouting_txt'] = 'Max. Anzahl an E-Mail Routen';
+$wb['limit_mailfilter_txt'] = 'Max. Anzahl an E-Mail Filtern';
+$wb['limit_fetchmail_txt'] = 'Max. Anzahl an Fetchmail Konten';
+$wb['limit_mailquota_txt'] = 'Mailbox Beschränkung';
+$wb['limit_spamfilter_wblist_txt'] = 'Max. Anzahl an White-/Blacklist Filter';
+$wb['limit_spamfilter_user_txt'] = 'Max. Anzahl an Spamfilter Benutzern';
+$wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
+$wb['default_mailserver_txt'] = 'Standardmailserver';
+$wb['company_name_txt'] = 'Firmenname';
+$wb['contact_name_txt'] = 'Kontakt';
+$wb['username_txt'] = 'Benutzername';
+$wb['password_txt'] = 'Passwort';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['language_txt'] = 'Sprache';
+$wb['usertheme_txt'] = 'Oberflächen Design';
+$wb['street_txt'] = 'Straße';
+$wb['zip_txt'] = 'PLZ';
+$wb['city_txt'] = 'Ort';
+$wb['state_txt'] = 'Bundesland';
+$wb['country_txt'] = 'Land';
+$wb['telephone_txt'] = 'Telefon';
+$wb['mobile_txt'] = 'Mobiltelefon';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'E-Mail';
+$wb['internet_txt'] = 'Internet';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Notizen';
+$wb['company_txt'] = 'Firma';
+$wb['title_txt'] = 'Titel';
+$wb['firstname_txt'] = 'Vorname';
+$wb['surname_txt'] = 'Nachname';
+$wb['limit_domain_txt'] = 'Max. Anzahl an Domains';
+$wb['limit_subdomain_txt'] = 'Max. Anzahl an Subdomains';
+$wb['limit_webquota_txt'] = 'Max. Speicherplatzbeschränkung';
+$wb['limit_database_txt'] = 'Max. Anzahl an Datenbanken';
+$wb['limit_cron_txt'] = 'Max. Anzahl an Cronjobs';
+$wb['limit_cron_type_txt'] = 'Erlaubter Cronjob Typen (chrooted und full erlauben auch url)';
+$wb['limit_cron_frequency_txt'] = 'Min. Abstand zwischen Ausführungen';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['limit_client_error_notint'] = 'Das Subkunden Limit muss eine Zahl sein.';
+$wb['firstname_error_empty'] = 'Vorname ist leer.';
+$wb['contact_error_empty'] = 'Kontakt ist leer.';
+$wb['default_webserver_txt'] = 'Standardwebserver';
+$wb['limit_web_domain_txt'] = 'Max. Anzahl an Webdomains';
+$wb['limit_web_aliasdomain_txt'] = 'Max. Anzahl an Webaliasdomains';
+$wb['limit_web_subdomain_txt'] = 'Max. Anzahl an Websubdomains';
+$wb['limit_ftp_user_txt'] = 'Max. Anzahl an FTP Benutzern';
+$wb['default_dnsserver_txt'] = 'Standard DNS Server';
+$wb['limit_dns_zone_txt'] = 'Max. Anzahl an DNS Zonen';
+$wb['limit_dns_record_txt'] = 'Max. Anzahl an DNS Einträgen';
+$wb['limit_shell_user_txt'] = 'Max. Anzahl an Shell Benutzern';
+$wb['limit_client_txt'] = 'Max. Anzahl an Kunden';
+$wb['username_error_empty'] = 'Benutzername ist leer.';
+$wb['username_error_unique'] = 'Der Benutzername muss einzigartig sein.';
+$wb['limit_maildomain_error_notint'] = 'Das E-Mail Domain Limit muss eine Nummer sein.';
+$wb['limit_mailbox_error_notint'] = 'Das Mailbox Limit muss eine Nummer sein.';
+$wb['limit_mailalias_error_notint'] = 'Das E-Mail Alias Limit muss eine Zahl sein.';
+$wb['limit_mailforward_error_notint'] = 'Das E-Mail Weiterleitungs Limit muss eine Zahl sein.';
+$wb['limit_mailcatchall_error_notint'] = 'Das E-Mail Catchall Limit muss eine Zahl sein.';
+$wb['limit_mailrouting_error_notint'] = 'Das E-Mail Routing Limit muss eine Zahl sein.';
+$wb['limit_mailfilter_error_notint'] = 'Das E-Mail Filter Limit muss eine Zahl sein.';
+$wb['limit_mailfetchmail_error_notint'] = 'Das Fetchmail Limit muss eine Zahl sein.';
+$wb['limit_mailquota_error_notint'] = 'Das E-Mail Beschräkungs Limit muss eine Zahl sein.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'Das Spamfilter White-/Blacklist Limit muss eine Zahl sein.';
+$wb['limit_spamfilter_user_error_notint'] = 'Das Spamfilter Benutzer Limit muss eine Zahl sein.';
+$wb['limit_spamfilter_policy_error_notint'] = 'Das Spamfilter Richtlinien Limit muss eine Zahl sein.';
+$wb['limit_web_domain_error_notint'] = 'Das Webseiten Limit muss eine Zahl sein.';
+$wb['limit_web_aliasdomain_error_notint'] = 'Das Webseiten Aliasdomain Limit muss eine Zahl sein.';
+$wb['limit_web_subdomain_error_notint'] = 'Das Webseiten Subdomain Limit muss eine Zahl sein.';
+$wb['limit_ftp_user_error_notint'] = 'Das FTP Benutzer Limit muss eine Zahl sein.';
+$wb['limit_shell_user_error_notint'] = 'Das Shell Benutzer Limit muss eine Zahl sein.';
+$wb['limit_dns_zone_error_notint'] = 'Das DNS Einträge Limit muss eine Zahl sein.';
+$wb['default_dbserver_txt'] = 'Standarddatenbankserver';
+$wb['limit_database_error_notint'] = 'Das Datenbank Limit muss eine Zahl sein.';
+$wb['limit_cron_error_notint'] = 'Das Cronjob Limit muss eine Zahl sein.';
+$wb['limit_cron_error_frequency'] = 'Das Cronjob Intervall Limit muss eine Zahl sein.';
+$wb['username_error_regex'] = 'Der Benutzername enthält ungültige Zeichen.';
+$wb['template_master_txt'] = 'Mastervorlage';
+$wb['template_additional_txt'] = 'Add-Ons';
+$wb['add_additional_template_txt'] = 'Zusätzliches Template hinzufügen';
+$wb['delete_additional_template_txt'] = 'Zusätzliches Template löschen';
+$wb['ssh_chroot_txt'] = 'SSH Chroot Optionen';
+$wb['web_php_options_txt'] = 'PHP Optionen';
+$wb['limit_cgi_txt'] = 'CGI verfügbar';
+$wb['limit_ssi_txt'] = 'SSI verfügbar';
+$wb['limit_perl_txt'] = 'Perl verfügbar';
+$wb['limit_ruby_txt'] = 'Ruby verfügbar';
+$wb['limit_python_txt'] = 'Python verfügbar';
+$wb['force_suexec_txt'] = 'SuEXEC erzwungen';
+$wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar';
+$wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar';
+$wb['limit_ssl_txt'] = 'SSL verfügbar';
+$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
+$wb['limit_client_error_positive'] = 'Die Anzahl an Kunden muss > 0 sein';
+$wb['limit_web_quota_txt'] = 'Speicherplatzbeschränkung';
+$wb['limit_traffic_quota_txt'] = 'Transfervolumenbeschränkung';
+$wb['limit_trafficquota_error_notint'] = 'Transfervolumenbeschränkung muss eine Zahl sein.';
+$wb['limit_dns_slave_zone_txt'] = 'Max. Anzahl an Secondary DNS Zonen';
+$wb['limit_dns_slave_zone_error_notint'] = 'Das Secondary DNS Zonen Limit muss eine Zahl sein.';
+$wb['limit_dns_record_error_notint'] = 'Das DNS Eintrag Limit muss eine Zahl sein.';
+$wb['customer_no_txt'] = 'Kundennummer';
+$wb['vat_id_txt'] = 'USt-ID';
+$wb['required_fields_txt'] = '* Benötigte Felder';
+$wb['limit_webdav_user_txt'] = 'Max. Anzahl an WebDAV Benutzern';
+$wb['limit_webdav_user_error_notint'] = 'Das WebDAV Benutzer Limit muss eine Zahl sein.';
+$wb['limit_mailmailinglist_txt'] = 'Max. Anzahl an Mailinglisten';
+$wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an E-Mail Domainaliases';
+$wb['limit_mailmailinglist_error_notint'] = 'Das Mailinglisten Limit muss eine Zahl sein.';
+$wb['limit_openvz_vm_txt'] = 'Max. Anzahl an virtuellen Servern';
+$wb['limit_openvz_vm_template_id_txt'] = 'Template für virtuelle Server erzwingen';
+$wb['limit_openvz_vm_error_notint'] = 'Das Limit virtueller Server muss eine Zahl sein.';
+$wb['web_php_options_notempty'] = 'Keine PHP Option ausgewählt. Wähle mindestens eine PHP Option.';
+$wb['ssh_chroot_notempty'] = 'Keine SSH Chroot-Option ausgewählt. Wähle mindestens eine SSH Option.';
+$wb['username_error_collision'] = 'Der Benutzername sollte nicht mit dem Wort -web- oder -web- gefolgt von einer Nummer anfangen.';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'E-Mail Limits';
+$wb['database_limits_txt'] = 'Datenbank Limits';
+$wb['cron_job_limits_txt'] = 'Cronjob Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualisierungs Limits';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
+$wb['customer_no_error_unique'] = 'Die Kundennummer muß einzigartig sein (oder leer).';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['paypal_email_error_isemail'] = 'Bitte geben Sie eine gültige PayPal-E-Mail-Adresse an.';
+$wb['paypal_email_txt'] = 'PayPal-E-Mail';
+$wb['company_id_txt'] = 'Firmen/Entrepreneur ID';
+$wb['bank_account_number_txt'] = 'Kontonummer';
+$wb['bank_account_owner_txt'] = 'Kontoinhaber';
+$wb['bank_code_txt'] = 'BLZ';
+$wb['bank_name_txt'] = 'Bank';
+$wb['bank_account_iban_txt'] = 'IBAN';
+$wb['bank_account_swift_txt'] = 'BIC';
?>
-
diff --git a/interface/web/client/lib/lang/de_resellers_list.lng b/interface/web/client/lib/lang/de_resellers_list.lng
index b899434ee..f9084e0eb 100644
--- a/interface/web/client/lib/lang/de_resellers_list.lng
+++ b/interface/web/client/lib/lang/de_resellers_list.lng
@@ -7,4 +7,3 @@ $wb['city_txt'] = 'Ort';
$wb['country_txt'] = 'Land';
$wb['add_new_record_txt'] = 'Neuen Reseller hinzufügen';
?>
-
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 4743a97af..9334c3dd3 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/el_client_circle.lng b/interface/web/client/lib/lang/el_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/el_client_circle.lng
+++ b/interface/web/client/lib/lang/el_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/el_client_circle_list.lng b/interface/web/client/lib/lang/el_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/el_client_circle_list.lng
+++ b/interface/web/client/lib/lang/el_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 578aa428d..8f96b30d7 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index 1334dc4ca..bae3df65d 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -140,4 +140,6 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
$wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb["customer_no_error_unique"] = 'The customer no. must be unique (or empty).';
+$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
+$wb['paypal_email_txt'] = 'PayPal Email';
?>
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index f23cd1896..3d78e3c23 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -132,4 +132,13 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
$wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb["customer_no_error_unique"] = 'The customer no. must be unique (or empty).';
+$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
+$wb['paypal_email_txt'] = 'PayPal Email';
+$wb['company_id_txt'] = 'Company/Entrepreneur ID';
+$wb["bank_account_number_txt"] = 'Bank account no.';
+$wb["bank_account_owner_txt"] = 'Bank account owner';
+$wb["bank_code_txt"] = 'Bank code';
+$wb["bank_name_txt"] = 'Bank name';
+$wb["bank_account_iban_txt"] = 'IBAN';
+$wb["bank_account_swift_txt"] = 'BIC / Swift';
?>
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index 87feac33e..ed2117d1e 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/es_client_circle.lng b/interface/web/client/lib/lang/es_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/es_client_circle.lng
+++ b/interface/web/client/lib/lang/es_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/es_client_circle_list.lng b/interface/web/client/lib/lang/es_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/es_client_circle_list.lng
+++ b/interface/web/client/lib/lang/es_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng
index 81cf63fc5..1b41712de 100644
--- a/interface/web/client/lib/lang/es_reseller.lng
+++ b/interface/web/client/lib/lang/es_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index b6e77cd12..0a7850bde 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/fi_client_circle.lng b/interface/web/client/lib/lang/fi_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/fi_client_circle.lng
+++ b/interface/web/client/lib/lang/fi_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/fi_client_circle_list.lng b/interface/web/client/lib/lang/fi_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/fi_client_circle_list.lng
+++ b/interface/web/client/lib/lang/fi_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng
index a3769aa79..f805a724e 100644
--- a/interface/web/client/lib/lang/fi_reseller.lng
+++ b/interface/web/client/lib/lang/fi_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index 9b852d1a2..2b329011d 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/hr_client_circle.lng b/interface/web/client/lib/lang/hr_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/hr_client_circle.lng
+++ b/interface/web/client/lib/lang/hr_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/hr_client_circle_list.lng b/interface/web/client/lib/lang/hr_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/hr_client_circle_list.lng
+++ b/interface/web/client/lib/lang/hr_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index 385dbd7c9..29db6ef33 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index c0f414629..d5565405e 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/hu_client_circle.lng b/interface/web/client/lib/lang/hu_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/hu_client_circle.lng
+++ b/interface/web/client/lib/lang/hu_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/hu_client_circle_list.lng b/interface/web/client/lib/lang/hu_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/hu_client_circle_list.lng
+++ b/interface/web/client/lib/lang/hu_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng
index 9961a03a5..b978b314f 100644
--- a/interface/web/client/lib/lang/hu_reseller.lng
+++ b/interface/web/client/lib/lang/hu_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index 6bf648566..37859dd9f 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/id_client_circle.lng b/interface/web/client/lib/lang/id_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/id_client_circle.lng
+++ b/interface/web/client/lib/lang/id_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/id_client_circle_list.lng b/interface/web/client/lib/lang/id_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/id_client_circle_list.lng
+++ b/interface/web/client/lib/lang/id_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng
index 815f3f472..2ff564b08 100644
--- a/interface/web/client/lib/lang/id_reseller.lng
+++ b/interface/web/client/lib/lang/id_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index 244283fad..7ed990bb4 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/it_client_circle.lng b/interface/web/client/lib/lang/it_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/it_client_circle.lng
+++ b/interface/web/client/lib/lang/it_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/it_client_circle_list.lng b/interface/web/client/lib/lang/it_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/it_client_circle_list.lng
+++ b/interface/web/client/lib/lang/it_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng
index 010e5be46..98dacd971 100644
--- a/interface/web/client/lib/lang/it_reseller.lng
+++ b/interface/web/client/lib/lang/it_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index edc7de84c..6d9efc94b 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/ja_client_circle.lng b/interface/web/client/lib/lang/ja_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/ja_client_circle.lng
+++ b/interface/web/client/lib/lang/ja_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/ja_client_circle_list.lng b/interface/web/client/lib/lang/ja_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/ja_client_circle_list.lng
+++ b/interface/web/client/lib/lang/ja_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng
index 25fe6a07c..44fa319ee 100644
--- a/interface/web/client/lib/lang/ja_reseller.lng
+++ b/interface/web/client/lib/lang/ja_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index 61bd6fb9c..7472fb414 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/nl_client_circle.lng b/interface/web/client/lib/lang/nl_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/nl_client_circle.lng
+++ b/interface/web/client/lib/lang/nl_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/nl_client_circle_list.lng b/interface/web/client/lib/lang/nl_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/nl_client_circle_list.lng
+++ b/interface/web/client/lib/lang/nl_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng
index 0416c77d1..225f8daa1 100644
--- a/interface/web/client/lib/lang/nl_reseller.lng
+++ b/interface/web/client/lib/lang/nl_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index c5d331492..e53b5a31f 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/pl_client_circle.lng b/interface/web/client/lib/lang/pl_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/pl_client_circle.lng
+++ b/interface/web/client/lib/lang/pl_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$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 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/pl_client_circle_list.lng
+++ b/interface/web/client/lib/lang/pl_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index 9b1d93d4f..fc89794dc 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index 96daaf62b..db30f1c7e 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/pt_client_circle.lng b/interface/web/client/lib/lang/pt_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/pt_client_circle.lng
+++ b/interface/web/client/lib/lang/pt_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/pt_client_circle_list.lng b/interface/web/client/lib/lang/pt_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/pt_client_circle_list.lng
+++ b/interface/web/client/lib/lang/pt_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng
index e59b81dcc..a6744f0b4 100644
--- a/interface/web/client/lib/lang/pt_reseller.lng
+++ b/interface/web/client/lib/lang/pt_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index 9a10b2a68..64af158bb 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/ro_client_circle.lng b/interface/web/client/lib/lang/ro_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/ro_client_circle.lng
+++ b/interface/web/client/lib/lang/ro_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/ro_client_circle_list.lng b/interface/web/client/lib/lang/ro_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/ro_client_circle_list.lng
+++ b/interface/web/client/lib/lang/ro_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng
index 010e5be46..98dacd971 100644
--- a/interface/web/client/lib/lang/ro_reseller.lng
+++ b/interface/web/client/lib/lang/ro_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 9a616aced..62a8f3f2d 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/ru_client_circle.lng b/interface/web/client/lib/lang/ru_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/ru_client_circle.lng
+++ b/interface/web/client/lib/lang/ru_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/ru_client_circle_list.lng b/interface/web/client/lib/lang/ru_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/ru_client_circle_list.lng
+++ b/interface/web/client/lib/lang/ru_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
index 25dc80acb..f728e7841 100644
--- a/interface/web/client/lib/lang/ru_reseller.lng
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index 540b9f2b6..47f36c773 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/se_client_circle.lng b/interface/web/client/lib/lang/se_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/se_client_circle.lng
+++ b/interface/web/client/lib/lang/se_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/se_client_circle_list.lng b/interface/web/client/lib/lang/se_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/se_client_circle_list.lng
+++ b/interface/web/client/lib/lang/se_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
index 010e5be46..98dacd971 100644
--- a/interface/web/client/lib/lang/se_reseller.lng
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index e5793621b..98b3b63c3 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/sk_client_circle.lng b/interface/web/client/lib/lang/sk_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/sk_client_circle.lng
+++ b/interface/web/client/lib/lang/sk_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/sk_client_circle_list.lng b/interface/web/client/lib/lang/sk_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/sk_client_circle_list.lng
+++ b/interface/web/client/lib/lang/sk_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng
index 21d6268af..fa9fcd25e 100644
--- a/interface/web/client/lib/lang/sk_reseller.lng
+++ b/interface/web/client/lib/lang/sk_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index 12933d6aa..96b890c58 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -133,4 +133,8 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/lib/lang/tr_client_circle.lng b/interface/web/client/lib/lang/tr_client_circle.lng
index 80fd704c0..f98a1447f 100644
--- a/interface/web/client/lib/lang/tr_client_circle.lng
+++ b/interface/web/client/lib/lang/tr_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Client Circle"] = 'Client Circle';
-$wb["Circle"] = 'Circle';
-$wb["circle_txt"] = 'Circle';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["client_ids_txt"] = 'Clients/Resellers';
-$wb["description_txt"] = 'Description';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/tr_client_circle_list.lng b/interface/web/client/lib/lang/tr_client_circle_list.lng
index 266aced82..00fd0b399 100644
--- a/interface/web/client/lib/lang/tr_client_circle_list.lng
+++ b/interface/web/client/lib/lang/tr_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb["list_head_txt"] = 'Client Circles';
-$wb["circle_id_txt"] = 'Circle ID';
-$wb["circle_name_txt"] = 'Circle Name';
-$wb["description_txt"] = 'Description';
-$wb["add_new_record_txt"] = 'Add new circle';
-$wb["filter_txt"] = 'Filter';
-$wb["delete_txt"] = 'Delete';
-$wb["active_txt"] = 'Active';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng
index 66e0c22bc..f272a8c5c 100644
--- a/interface/web/client/lib/lang/tr_reseller.lng
+++ b/interface/web/client/lib/lang/tr_reseller.lng
@@ -128,4 +128,6 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
?>
diff --git a/interface/web/client/reseller_edit.php b/interface/web/client/reseller_edit.php
index d482bdb51..83754f3df 100644
--- a/interface/web/client/reseller_edit.php
+++ b/interface/web/client/reseller_edit.php
@@ -190,7 +190,7 @@ class page_action extends tform_actions {
global $app, $conf;
// username changed
- if($conf['demo_mode'] != true && isset($this->dataRecord['username']) && $this->dataRecord['username'] != '' && $this->oldDataRecord['username'] != $this->dataRecord['username']) {
+ if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['username']) && $this->dataRecord['username'] != '' && $this->oldDataRecord['username'] != $this->dataRecord['username']) {
$username = $app->db->quote($this->dataRecord["username"]);
$client_id = $this->id;
$sql = "UPDATE sys_user SET username = '$username' WHERE client_id = $client_id";
@@ -202,7 +202,7 @@ class page_action extends tform_actions {
}
// password changed
- if($conf['demo_mode'] != true && isset($this->dataRecord["password"]) && $this->dataRecord["password"] != '') {
+ if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord["password"]) && $this->dataRecord["password"] != '') {
$password = $app->db->quote($this->dataRecord["password"]);
$client_id = $this->id;
$salt="$1$";
@@ -217,7 +217,7 @@ class page_action extends tform_actions {
}
// language changed
- if($conf['demo_mode'] != true && isset($this->dataRecord['language']) && $this->dataRecord['language'] != '' && $this->oldDataRecord['language'] != $this->dataRecord['language']) {
+ if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['language']) && $this->dataRecord['language'] != '' && $this->oldDataRecord['language'] != $this->dataRecord['language']) {
$language = $app->db->quote($this->dataRecord["language"]);
$client_id = $this->id;
$sql = "UPDATE sys_user SET language = '$language' WHERE client_id = $client_id";
@@ -225,7 +225,7 @@ class page_action extends tform_actions {
}
// ensure that a reseller is not converted to a client in demo mode when client_id <= 2
- if($conf['demo_mode'] == true && $this->id <= 2) {
+ if(isset($conf['demo_mode']) && $conf['demo_mode'] == true && $this->id <= 2) {
if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != -1) {
$app->db->query('UPDATE client set limit_client = -1 WHERE client_id = '.$this->id);
}
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index 9387944de..f9d96f0a3 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -125,6 +125,10 @@
<div class="ctrlHolder">
<label for="bank_account_swift">{tmpl_var name='bank_account_swift_txt'}</label>
<input name="bank_account_swift" id="bank_account_swift" value="{tmpl_var name='bank_account_swift'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="paypal_email">{tmpl_var name='paypal_email_txt'}</label>
+ <input name="paypal_email" id="paypal_email" value="{tmpl_var name='paypal_email'}" size="30" maxlength="255" type="text" class="textInput" />
</div>
<div class="ctrlHolder">
<label for="notes">{tmpl_var name='notes_txt'}</label>
diff --git a/interface/web/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm
index ac6df0742..67eabbea2 100644
--- a/interface/web/client/templates/reseller_edit_address.htm
+++ b/interface/web/client/templates/reseller_edit_address.htm
@@ -97,6 +97,38 @@
<div class="ctrlHolder">
<label for="vat_id">{tmpl_var name='vat_id_txt'}</label>
<input name="vat_id" id="vat_id" value="{tmpl_var name='vat_id'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="company_id">{tmpl_var name='company_id_txt'}</label>
+ <input name="company_id" id="company_id" value="{tmpl_var name='company_id'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="bank_account_owner">{tmpl_var name='bank_account_owner_txt'}</label>
+ <input name="bank_account_owner" id="bank_account_owner" value="{tmpl_var name='bank_account_owner'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="bank_account_number">{tmpl_var name='bank_account_number_txt'}</label>
+ <input name="bank_account_number" id="bank_account_number" value="{tmpl_var name='bank_account_number'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="bank_code">{tmpl_var name='bank_code_txt'}</label>
+ <input name="bank_code" id="bank_code" value="{tmpl_var name='bank_code'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="bank_name">{tmpl_var name='bank_name_txt'}</label>
+ <input name="bank_name" id="bank_name" value="{tmpl_var name='bank_name'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="bank_account_iban">{tmpl_var name='bank_account_iban_txt'}</label>
+ <input name="bank_account_iban" id="bank_account_iban" value="{tmpl_var name='bank_account_iban'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="bank_account_swift">{tmpl_var name='bank_account_swift_txt'}</label>
+ <input name="bank_account_swift" id="bank_account_swift" value="{tmpl_var name='bank_account_swift'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="paypal_email">{tmpl_var name='paypal_email_txt'}</label>
+ <input name="paypal_email" id="paypal_email" value="{tmpl_var name='paypal_email'}" size="30" maxlength="255" type="text" class="textInput" />
</div>
<div class="ctrlHolder">
<label for="notes">{tmpl_var name='notes_txt'}</label>
diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php
index daf235651..343ba9130 100644
--- a/interface/web/dashboard/dashboard.php
+++ b/interface/web/dashboard/dashboard.php
@@ -55,7 +55,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
$name = $tmp['contact_name'];
}
-$welcome = sprintf($wb['welcome_user_txt'], htmlentities($name));
+$welcome = sprintf($wb['welcome_user_txt'], htmlentities($name, ENT_QUOTES, 'UTF-8'));
$app->tpl->setVar('welcome_user', $welcome);
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
index dc5a92473..bedb98f86 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
@@ -2,29 +2,29 @@
$wb['limits_txt'] = 'Limity úÄtu';
$wb['of_txt'] = 'z';
$wb['unlimited_txt'] = 'neomezeno';
-$wb['limit_maildomain_txt'] = 'PoÄet emailových domén';
+$wb['limit_maildomain_txt'] = 'PoÄet e-mailových domén';
$wb['limit_mailbox_txt'] = 'PoÄet mailboxů';
-$wb['limit_mailalias_txt'] = 'PoÄet emailových aliasů';
-$wb['limit_mailaliasdomain_txt'] = 'PoÄet doménových aliasů';
-$wb['limit_mailforward_txt'] = 'PoÄet emailových pÅ™esmÄ›rovánÃ';
-$wb['limit_mailcatchall_txt'] = 'PoÄet externÄ› zÃskávaných emailů';
-$wb['limit_mailrouting_txt'] = 'PoÄet emailových smÄ›rovánÃ';
-$wb['limit_mailfilter_txt'] = 'PoÄet emailových filtrů';
-$wb['limit_fetchmail_txt'] = 'PoÄet zÃskávaných emailů';
-$wb['limit_spamfilter_wblist_txt'] = 'PoÄet záznamů na black/white listu';
+$wb['limit_mailalias_txt'] = 'PoÄet e-mailových aliasů';
+$wb['limit_mailaliasdomain_txt'] = 'PoÄet e-mailových doménových aliasů';
+$wb['limit_mailforward_txt'] = 'PoÄet e-mailových pÅ™esmÄ›rovánÃ';
+$wb['limit_mailcatchall_txt'] = 'PoÄet externÄ› zÃskávaných e-mailů';
+$wb['limit_mailrouting_txt'] = 'PoÄet e-mailových smÄ›rovánÃ';
+$wb['limit_mailfilter_txt'] = 'PoÄet e-mailových filtrů';
+$wb['limit_fetchmail_txt'] = 'PoÄet zÃskávaných e-mailů';
+$wb['limit_spamfilter_wblist_txt'] = 'PoÄet záznamů na Äerných/bÃlých listinách';
$wb['limit_spamfilter_user_txt'] = 'PoÄet uživatelů se spamfiltrem';
$wb['limit_spamfilter_policy_txt'] = 'PoÄet spamových politik';
$wb['limit_cron_txt'] = 'PoÄet cron úloh';
$wb['limit_web_domain_txt'] = 'PoÄet webových stránek';
-$wb['limit_web_aliasdomain_txt'] = 'PoÄet doménových aliasů';
-$wb['limit_web_subdomain_txt'] = 'PoÄet subdomén';
-$wb['limit_ftp_user_txt'] = 'PoÄet FTP uživateů';
-$wb['limit_dns_zone_txt'] = 'PoÄet DNS zón';
+$wb['limit_web_aliasdomain_txt'] = 'PoÄet webových doménových aliasů';
+$wb['limit_web_subdomain_txt'] = 'PoÄet webových subdomén';
+$wb['limit_ftp_user_txt'] = 'PoÄet FTP uživatelů';
+$wb['limit_dns_zone_txt'] = 'PoÄet DNS primárnÃch zón';
$wb['limit_dns_slave_zone_txt'] = 'PoÄet DNS sekundárnÃch zón';
$wb['limit_dns_record_txt'] = 'PoÄet DNS záznamů';
$wb['limit_shell_user_txt'] = 'PoÄet Shell uživatelů';
$wb['limit_webdav_user_txt'] = 'PoÄet Webdav uživatelů';
$wb['limit_client_txt'] = 'PoÄet klientů';
$wb['limit_database_txt'] = 'PoÄet databázÃ';
-$wb['limit_mailmailinglist_txt'] = 'Number of mailing lists';
+$wb['limit_mailmailinglist_txt'] = 'PoÄet e-mailových konferencÃ';
?>
diff --git a/interface/web/dashboard/lib/lang/de.lng b/interface/web/dashboard/lib/lang/de.lng
index 896b1f147..debf75413 100644
--- a/interface/web/dashboard/lib/lang/de.lng
+++ b/interface/web/dashboard/lib/lang/de.lng
@@ -2,4 +2,3 @@
$wb['welcome_user_txt'] = 'Herzlich Willkommen %s';
$wb['available_modules_txt'] = 'Verfügbare Module';
?>
-
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng
index efa5da386..964531ecc 100644
--- a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng
@@ -1,31 +1,30 @@
<?php
-$wb['limits_txt'] = "Kontolimits";
-$wb['of_txt'] = "von";
-$wb['unlimited_txt'] = "unlimitiert";
-$wb['limit_maildomain_txt'] = "Anzahl der E-Mail Domains";
-$wb['limit_mailbox_txt'] = "Anzahl der E-Mail Konten";
-$wb['limit_mailalias_txt'] = "Anzahl der E-Mail Aliases";
-$wb['limit_mailaliasdomain_txt'] = "Anzahl der Domain Aliases";
-$wb['limit_mailforward_txt'] = "Anzahl der E-Mail Weiterleitungen";
-$wb['limit_mailcatchall_txt'] = "Anzahl der E-Mail Catchall Konten";
-$wb['limit_mailrouting_txt'] = "Anzahl der E-Mail Routen";
-$wb['limit_mailfilter_txt'] = "Anzahl der E-Mail Filter";
-$wb['limit_fetchmail_txt'] = "Anzahl der Fetchmail Konten";
-$wb['limit_spamfilter_wblist_txt'] = "Anzahl der Spamfilter (White-/Blacklist)";
-$wb['limit_spamfilter_user_txt'] = "Anzahl der Spamfilter Benutzer";
-$wb['limit_spamfilter_policy_txt'] = "Anzahl der Spamfilter Richtlinien";
-$wb['limit_cron_txt'] = "Anzahl der Cronjobs";
-$wb['limit_web_domain_txt'] = "Anzahl der Web Domains";
-$wb['limit_web_aliasdomain_txt'] = "Anzahl der Web Aliasdomains";
-$wb['limit_web_subdomain_txt'] = "Anzahl der Web Subdomains";
-$wb['limit_ftp_user_txt'] = "Anzahl der FTP Benutzer";
-$wb['limit_dns_zone_txt'] = "Anzahl der DNS Zonen";
-$wb['limit_dns_slave_zone_txt'] = "Anzahl der Secondary DNS Zonen";
-$wb['limit_dns_record_txt'] = "Anzahl der DNS Einträge";
-$wb['limit_shell_user_txt'] = "Anzahl der Shell Benutzer";
-$wb['limit_webdav_user_txt'] = "Anzahl der WebDAV Benutzer";
-$wb['limit_client_txt'] = "Anzahl der Kunden";
-$wb['limit_database_txt'] = "Anzahl der Datenbanken";
-$wb['limit_mailmailinglist_txt'] = "Anzahl der Mailinglisten";
+$wb['limits_txt'] = 'Kontolimits';
+$wb['of_txt'] = 'von';
+$wb['unlimited_txt'] = 'unlimitiert';
+$wb['limit_maildomain_txt'] = 'Anzahl der E-Mail Domains';
+$wb['limit_mailbox_txt'] = 'Anzahl der E-Mail Konten';
+$wb['limit_mailalias_txt'] = 'Anzahl der E-Mail Aliases';
+$wb['limit_mailaliasdomain_txt'] = 'Anzahl der Domain Aliases';
+$wb['limit_mailforward_txt'] = 'Anzahl der E-Mail Weiterleitungen';
+$wb['limit_mailcatchall_txt'] = 'Anzahl der E-Mail Catchall Konten';
+$wb['limit_mailrouting_txt'] = 'Anzahl der E-Mail Routen';
+$wb['limit_mailfilter_txt'] = 'Anzahl der E-Mail Filter';
+$wb['limit_fetchmail_txt'] = 'Anzahl der Fetchmail Konten';
+$wb['limit_spamfilter_wblist_txt'] = 'Anzahl der Spamfilter (White-/Blacklist)';
+$wb['limit_spamfilter_user_txt'] = 'Anzahl der Spamfilter Benutzer';
+$wb['limit_spamfilter_policy_txt'] = 'Anzahl der Spamfilter Richtlinien';
+$wb['limit_cron_txt'] = 'Anzahl der Cronjobs';
+$wb['limit_web_domain_txt'] = 'Anzahl der Web Domains';
+$wb['limit_web_aliasdomain_txt'] = 'Anzahl der Web Aliasdomains';
+$wb['limit_web_subdomain_txt'] = 'Anzahl der Web Subdomains';
+$wb['limit_ftp_user_txt'] = 'Anzahl der FTP Benutzer';
+$wb['limit_dns_zone_txt'] = 'Anzahl der DNS Zonen';
+$wb['limit_dns_slave_zone_txt'] = 'Anzahl der Secondary DNS Zonen';
+$wb['limit_dns_record_txt'] = 'Anzahl der DNS Einträge';
+$wb['limit_shell_user_txt'] = 'Anzahl der Shell Benutzer';
+$wb['limit_webdav_user_txt'] = 'Anzahl der WebDAV Benutzer';
+$wb['limit_client_txt'] = 'Anzahl der Kunden';
+$wb['limit_database_txt'] = 'Anzahl der Datenbanken';
+$wb['limit_mailmailinglist_txt'] = 'Anzahl der Mailinglisten';
?>
-
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng
index d898ac6ec..3d2c6c651 100644
--- a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng
@@ -1,4 +1,3 @@
<?php
$wb['available_modules_txt'] = 'Verfügbare Module';
?>
-
diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng
index 35ab083c7..75bf5a560 100644
--- a/interface/web/designer/lib/lang/cz_form_edit.lng
+++ b/interface/web/designer/lib/lang/cz_form_edit.lng
@@ -6,7 +6,7 @@ $wb['navframe_txt'] = 'NaviFrame';
$wb['startpage_txt'] = 'Výchozà stránka';
$wb['tab_width_txt'] = 'Å ÃÅ™ka záložky';
$wb['save_txt'] = 'Uložit';
-$wb['cancel_txt'] = 'Storno';
+$wb['cancel_txt'] = 'Zrušit';
$wb['header_txt'] = 'Vlastnosti formuláře';
$wb['description_txt'] = 'Popis';
$wb['action_txt'] = 'Akce (skript)';
diff --git a/interface/web/designer/lib/lang/cz_module_edit.lng b/interface/web/designer/lib/lang/cz_module_edit.lng
index d34a668d7..847896d30 100644
--- a/interface/web/designer/lib/lang/cz_module_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_edit.lng
@@ -6,7 +6,7 @@ $wb['navframe_txt'] = 'NaviFrame';
$wb['startpage_txt'] = 'Výchozà stránka';
$wb['tab_width_txt'] = 'Å ÃÅ™ka záložky';
$wb['save_txt'] = 'Uložit';
-$wb['cancel_txt'] = 'Storno';
+$wb['cancel_txt'] = 'Zrušit';
$wb['header_txt'] = 'Vlastnosti modulu';
$wb['description_txt'] = '
<b>Popis</b>
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 ca84267a0..01f5df68f 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
@@ -2,5 +2,5 @@
$wb['title_txt'] = 'Titulek';
$wb['header_txt'] = 'Navi vlastnosti';
$wb['save_txt'] = 'Uložit';
-$wb['cancel_txt'] = 'Storno';
+$wb['cancel_txt'] = 'Zrušit';
?>
diff --git a/interface/web/designer/lib/lang/de.lng b/interface/web/designer/lib/lang/de.lng
index 29f4a51ef..acb6c3546 100644
--- a/interface/web/designer/lib/lang/de.lng
+++ b/interface/web/designer/lib/lang/de.lng
@@ -1,3 +1,2 @@
<?php
?>
-
diff --git a/interface/web/designer/lib/lang/de_form_edit.lng b/interface/web/designer/lib/lang/de_form_edit.lng
index 4eb8e9309..74bf458d9 100644
--- a/interface/web/designer/lib/lang/de_form_edit.lng
+++ b/interface/web/designer/lib/lang/de_form_edit.lng
@@ -22,4 +22,3 @@ $wb['auth_preset_perm_user_txt'] = 'Benutzerberechtigungen';
$wb['auth_preset_perm_group_txt'] = 'Gruppenberechtigungen';
$wb['auth_preset_perm_other_txt'] = 'andere Berechtigungen';
?>
-
diff --git a/interface/web/designer/lib/lang/de_form_list.lng b/interface/web/designer/lib/lang/de_form_list.lng
index 853ce1000..998a64f70 100644
--- a/interface/web/designer/lib/lang/de_form_list.lng
+++ b/interface/web/designer/lib/lang/de_form_list.lng
@@ -5,4 +5,3 @@ $wb['module_txt'] = 'Modul';
$wb['title_txt'] = 'Bezeichnung';
$wb['description_txt'] = 'Beschreibung';
?>
-
diff --git a/interface/web/designer/lib/lang/de_form_show.lng b/interface/web/designer/lib/lang/de_form_show.lng
index c4b2c1d19..b19fd3445 100644
--- a/interface/web/designer/lib/lang/de_form_show.lng
+++ b/interface/web/designer/lib/lang/de_form_show.lng
@@ -16,4 +16,3 @@ $wb['module_del_txt'] = 'Modul und alle Unterverzeichnisse löschen?';
$wb['menu_del_txt'] = 'Menü samt Menüeinträgen löschen?';
$wb['item_del_txt'] = 'Menüeintrag löschen?';
?>
-
diff --git a/interface/web/designer/lib/lang/de_module_edit.lng b/interface/web/designer/lib/lang/de_module_edit.lng
index 09d9f390d..6eacd64b1 100644
--- a/interface/web/designer/lib/lang/de_module_edit.lng
+++ b/interface/web/designer/lib/lang/de_module_edit.lng
@@ -10,4 +10,3 @@ $wb['cancel_txt'] = 'Abbrechen';
$wb['header_txt'] = 'Moduleigenschaften';
$wb['description_txt'] = 'Beschreibung';
?>
-
diff --git a/interface/web/designer/lib/lang/de_module_list.lng b/interface/web/designer/lib/lang/de_module_list.lng
index a09b5139b..604063020 100644
--- a/interface/web/designer/lib/lang/de_module_list.lng
+++ b/interface/web/designer/lib/lang/de_module_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Backend Module';
$wb['module_txt'] = 'Modul';
$wb['title_txt'] = 'Bezeichnung';
?>
-
diff --git a/interface/web/designer/lib/lang/de_module_nav_edit.lng b/interface/web/designer/lib/lang/de_module_nav_edit.lng
index 25e2085cc..d5142f03c 100644
--- a/interface/web/designer/lib/lang/de_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/de_module_nav_edit.lng
@@ -4,4 +4,3 @@ $wb['header_txt'] = 'Navigation Eigenschaften';
$wb['save_txt'] = 'Speichern';
$wb['cancel_txt'] = 'Abbrechen';
?>
-
diff --git a/interface/web/designer/lib/lang/de_module_nav_item_edit.lng b/interface/web/designer/lib/lang/de_module_nav_item_edit.lng
index 6353a7347..8c0c33c1a 100644
--- a/interface/web/designer/lib/lang/de_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/de_module_nav_item_edit.lng
@@ -6,4 +6,3 @@ $wb['header_txt'] = 'Navigation Eigenschaften';
$wb['save_txt'] = 'Speichern';
$wb['cancel_txt'] = 'Abbrechen';
?>
-
diff --git a/interface/web/designer/lib/lang/de_module_show.lng b/interface/web/designer/lib/lang/de_module_show.lng
index d0c4d4b41..f4b2ad11f 100644
--- a/interface/web/designer/lib/lang/de_module_show.lng
+++ b/interface/web/designer/lib/lang/de_module_show.lng
@@ -14,4 +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/dns/lib/lang/ar_dns_wizard.lng b/interface/web/dns/lib/lang/ar_dns_wizard.lng
index b7a12433a..52955fdcc 100644
--- a/interface/web/dns/lib/lang/ar_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ar_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/bg_dns_wizard.lng b/interface/web/dns/lib/lang/bg_dns_wizard.lng
index dc017fd88..e025c4056 100644
--- a/interface/web/dns/lib/lang/bg_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/bg_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/br_dns_wizard.lng b/interface/web/dns/lib/lang/br_dns_wizard.lng
index 9139cbfae..c1d1dd9e9 100644
--- a/interface/web/dns/lib/lang/br_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/br_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng
index 2ba4af414..f143b0b92 100644
--- a/interface/web/dns/lib/lang/cz.lng
+++ b/interface/web/dns/lib/lang/cz.lng
@@ -1,6 +1,6 @@
<?php
-$wb['DNS'] = 'DNS';
-$wb['Zones'] = 'Zóny';
+$wb['DNS'] = 'Primárnà DNS';
+$wb['Zones'] = 'Primárnà DNS zóny';
$wb['DNS A'] = 'DNS A';
$wb['DNS ALIAS'] = 'DNS ALIAS';
$wb['DNS CNAME'] = 'DNS CNAME';
@@ -16,7 +16,7 @@ $wb['DNS TXT Record'] = 'DNS TXT záznam';
$wb['DNS TXT'] = 'DNS TXT';
$wb['DNS Wizard'] = 'DNS průvodce';
$wb['Add DNS Zone'] = 'Přidat DNS zónu';
-$wb['Templates'] = 'Å ablony';
-$wb['Secondary Zones'] = 'Secondary Zones';
-$wb['Import Zone File'] = 'Import Zone File';
+$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_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng
index 2d1fe083e..4020f8a97 100644
--- a/interface/web/dns/lib/lang/cz_dns_import.lng
+++ b/interface/web/dns/lib/lang/cz_dns_import.lng
@@ -1,14 +1,14 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['client_txt'] = 'Client';
-$wb['btn_save_txt'] = 'Import Zonefile';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['domain_txt'] = 'Domain';
+$wb['client_txt'] = 'Klient';
+$wb['btn_save_txt'] = 'Importovat vybraný DNS zonový soubor';
+$wb['btn_cancel_txt'] = 'Zrušit';
+$wb['domain_txt'] = 'Doména';
$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
-$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
-$wb['title'] = 'Import Zone Files';
-$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
-$wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['zonefile_to_import_txt'] = 'Vybrat soubor s DNS zónou ';
+$wb['domain_field_desc_txt'] = 'Může být ponechána nevyplněná, pokud je název domény názvem souboru nebo je v obsahu souboru s DNS zónou.';
+$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_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng
index b34023598..0ce2bc863 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa.lng
@@ -22,13 +22,13 @@ $wb['ns_error_regex'] = 'NS má chybný formát.';
$wb['mbox_error_empty'] = 'Email je prázdný.';
$wb['mbox_error_regex'] = 'Email má chybný formát.';
$wb['also_notify_txt'] = 'Také upozornit';
-$wb['also_notify_error_regex'] = 'Please use an IP address.';
+$wb['also_notify_error_regex'] = 'ProsÃm, použijte IP adresu.';
$wb['update_acl_txt'] = 'Aktualizovat ACL';
$wb['seconds_txt'] = 'vteřin';
$wb['eg_domain_tld'] = 'napÅ™. domena.cz';
$wb['eg_ns1_domain_tld'] = 'napÅ™. ns1.domena.cz';
$wb['eg_webmaster_domain_tld'] = 'napÅ™. webmaster@domena.cz';
-$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Doménu nenà možné mÄ›nit. ProsÃm, kontaktujte svého správce, pokud chcete zmÄ›nit název domény.';
$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.';
$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
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 1dceddcc2..10648a7ec 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'DNS zóny';
+$wb['list_head_txt'] = 'Primárnà DNS zóny';
$wb['active_txt'] = 'AktivnÃ';
$wb['server_id_txt'] = 'Server';
$wb['origin_txt'] = 'Zóna';
diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng
index fbc14f923..930163b4d 100644
--- a/interface/web/dns/lib/lang/cz_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng
@@ -3,7 +3,7 @@ $wb['template_id_txt'] = 'Å ablona';
$wb['server_id_txt'] = 'Server';
$wb['client_txt'] = 'Klient';
$wb['btn_save_txt'] = 'Vytvořit DNS záznam';
-$wb['btn_cancel_txt'] = 'Storno';
+$wb['btn_cancel_txt'] = 'Zrušit';
$wb['domain_txt'] = 'Doména';
$wb['email_txt'] = 'Email';
$wb['ns1_txt'] = 'NS 1';
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng
index 6d5146afc..7d5f345e8 100644
--- a/interface/web/dns/lib/lang/de.lng
+++ b/interface/web/dns/lib/lang/de.lng
@@ -20,4 +20,3 @@ $wb['Templates'] = 'Vorlagen';
$wb['Secondary Zones'] = 'Secondary DNS Zonen';
$wb['Import Zone File'] = 'Zone File Import';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_a.lng b/interface/web/dns/lib/lang/de_dns_a.lng
index 2b9ba55c2..2e21543e8 100644
--- a/interface/web/dns/lib/lang/de_dns_a.lng
+++ b/interface/web/dns/lib/lang/de_dns_a.lng
@@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'IPv4 Adresse ist leer';
$wb['data_error_regex'] = 'IPv4 Adressen-Format ist ungültig';
$wb['data_error_duplicate'] = 'Doppelter A oder CNAME Eintrag';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_a_list.lng b/interface/web/dns/lib/lang/de_dns_a_list.lng
index 0fc441992..6e8f19509 100644
--- a/interface/web/dns/lib/lang/de_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_a_list.lng
@@ -13,4 +13,3 @@ $wb['page_txt'] = 'Seite';
$wb['page_of_txt'] = 'von';
$wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_aaaa.lng b/interface/web/dns/lib/lang/de_dns_aaaa.lng
index c2d0e35f5..854d623cf 100644
--- a/interface/web/dns/lib/lang/de_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/de_dns_aaaa.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
$wb['data_error_empty'] = 'IPv6 Adresse ist leer';
$wb['data_error_regex'] = 'IPv6 Adressen Format ist ungültig';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_alias.lng b/interface/web/dns/lib/lang/de_dns_alias.lng
index 48da14fcf..e950909bb 100644
--- a/interface/web/dns/lib/lang/de_dns_alias.lng
+++ b/interface/web/dns/lib/lang/de_dns_alias.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Der Hostname hat ein falsches Format.';
$wb['data_error_empty'] = 'Ziel Hostname ist leer';
$wb['data_error_regex'] = 'Ziel Hostname Format ist ungültig';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_cname.lng b/interface/web/dns/lib/lang/de_dns_cname.lng
index 48efdef90..a07419485 100644
--- a/interface/web/dns/lib/lang/de_dns_cname.lng
+++ b/interface/web/dns/lib/lang/de_dns_cname.lng
@@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'Ziel Hostname ist leer';
$wb['data_error_regex'] = 'Ziel Hostname Format ist ungültig';
$wb['data_error_duplicate'] = 'Doppelter A oder CNAME Eintrag';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_hinfo.lng b/interface/web/dns/lib/lang/de_dns_hinfo.lng
index e0393c6be..5fb182c98 100644
--- a/interface/web/dns/lib/lang/de_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/de_dns_hinfo.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Der Hostname hat ein falsches Format.';
$wb['data_error_empty'] = 'Host Information ist leer';
$wb['data_error_regex'] = 'Host Information Format ist ungültig';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_import.lng b/interface/web/dns/lib/lang/de_dns_import.lng
index 559f1bc74..63670962a 100644
--- a/interface/web/dns/lib/lang/de_dns_import.lng
+++ b/interface/web/dns/lib/lang/de_dns_import.lng
@@ -12,4 +12,3 @@ $wb['domain_field_desc_txt'] = 'Kann freigelassen werden, falls der Dateiname od
$wb['title'] = 'Zone File importieren';
$wb['no_file_uploaded_error'] = 'Keine Datei hochgeladen';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_mx.lng b/interface/web/dns/lib/lang/de_dns_mx.lng
index d9a77c513..2968a1322 100644
--- a/interface/web/dns/lib/lang/de_dns_mx.lng
+++ b/interface/web/dns/lib/lang/de_dns_mx.lng
@@ -14,4 +14,3 @@ $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';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_ns.lng b/interface/web/dns/lib/lang/de_dns_ns.lng
index 0f61c1693..01662d2f8 100644
--- a/interface/web/dns/lib/lang/de_dns_ns.lng
+++ b/interface/web/dns/lib/lang/de_dns_ns.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Die Zone hat ein falsches Format.';
$wb['data_error_empty'] = 'Nameserver ist leer.';
$wb['data_error_regex'] = 'Nameserver Format ist ungültig.';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_ptr.lng b/interface/web/dns/lib/lang/de_dns_ptr.lng
index 5ff80e322..020c7a328 100644
--- a/interface/web/dns/lib/lang/de_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/de_dns_ptr.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Der Name hat das falsche Format.';
$wb['data_error_empty'] = 'Kanonischer Hostname ist leer';
$wb['data_error_regex'] = 'Kanonischer Hostname Format ist ungültig';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_rp.lng b/interface/web/dns/lib/lang/de_dns_rp.lng
index e7cd52850..8a398d483 100644
--- a/interface/web/dns/lib/lang/de_dns_rp.lng
+++ b/interface/web/dns/lib/lang/de_dns_rp.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
$wb['data_error_empty'] = 'Kontaktperson Feld leer';
$wb['data_error_regex'] = 'Kontaktperson Format ungültig';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_slave.lng b/interface/web/dns/lib/lang/de_dns_slave.lng
index 241290d7b..724d8a3b2 100644
--- a/interface/web/dns/lib/lang/de_dns_slave.lng
+++ b/interface/web/dns/lib/lang/de_dns_slave.lng
@@ -15,4 +15,3 @@ $wb['ns_error_regex'] = 'NS hat ein ungültiges Format.';
$wb['eg_domain_tld'] = 'Format: domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 Format: 1.2.3.4';
?>
-
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 0d80a1b4b..05dee329b 100644
--- a/interface/web/dns/lib/lang/de_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_slave_list.lng
@@ -7,4 +7,3 @@ $wb['ns_txt'] = 'NS';
$wb['add_new_record_txt'] = 'Neue Secondary DNS Zone hinzufügen';
$wb['eg_domain_tld'] = 'Format: domain.tld.';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng
index 9c2f69759..6fdc87565 100644
--- a/interface/web/dns/lib/lang/de_dns_soa.lng
+++ b/interface/web/dns/lib/lang/de_dns_soa.lng
@@ -35,4 +35,3 @@ $wb['expire_range_error'] = 'Min. Expire ist 60 Sekunden.';
$wb['minimum_range_error'] = 'Min. Minimum ist 60 Sekunden.';
$wb['ttl_range_error'] = 'Min. TTL ist 60 Sekunden.';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_soa_list.lng b/interface/web/dns/lib/lang/de_dns_soa_list.lng
index a6df1ee4d..8281fbd22 100644
--- a/interface/web/dns/lib/lang/de_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_soa_list.lng
@@ -8,4 +8,3 @@ $wb['mbox_txt'] = 'E-Mail';
$wb['add_new_record_txt'] = 'Neue DNS Zone (SOA) hinzufügen';
$wb['add_new_record_wizard_txt'] = 'Neue DNS Zone per Assistent hinzufügen';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_srv.lng b/interface/web/dns/lib/lang/de_dns_srv.lng
index 7dbeb8e81..91eba844a 100644
--- a/interface/web/dns/lib/lang/de_dns_srv.lng
+++ b/interface/web/dns/lib/lang/de_dns_srv.lng
@@ -17,4 +17,3 @@ $wb['data_error_regex'] = 'Servereintrag-Format ungültig';
$wb['srv_error_regex'] = 'Ungültiges Server Record Format. Der ServerRecord muss 3 Text Strings getrennt durch Leerzeichen beinhalten.';
$wb['aux_txt'] = 'Priorität';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_template.lng b/interface/web/dns/lib/lang/de_dns_template.lng
index 77cf99618..33d1090cb 100644
--- a/interface/web/dns/lib/lang/de_dns_template.lng
+++ b/interface/web/dns/lib/lang/de_dns_template.lng
@@ -4,4 +4,3 @@ $wb['fields_txt'] = 'Felder';
$wb['template_txt'] = 'Vorlage';
$wb['visible_txt'] = 'Sichtbar';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_template_list.lng b/interface/web/dns/lib/lang/de_dns_template_list.lng
index 3557292fa..a0f2d9a7d 100644
--- a/interface/web/dns/lib/lang/de_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_template_list.lng
@@ -4,4 +4,3 @@ $wb['visible_txt'] = 'Sichtbar';
$wb['name_txt'] = 'Name';
$wb['add_new_record_txt'] = 'Neuen Eintrag hinzufügen';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_txt.lng b/interface/web/dns/lib/lang/de_dns_txt.lng
index 39a5dbfeb..c0638679a 100644
--- a/interface/web/dns/lib/lang/de_dns_txt.lng
+++ b/interface/web/dns/lib/lang/de_dns_txt.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
$wb['data_error_empty'] = 'Text ist leer';
$wb['data_error_regex'] = 'Textformat ungültig';
?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_wizard.lng b/interface/web/dns/lib/lang/de_dns_wizard.lng
index e2d77387e..a9a284f65 100644
--- a/interface/web/dns/lib/lang/de_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/de_dns_wizard.lng
@@ -36,4 +36,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 Treffer';
$wb['globalsearch_searchfield_watermark_txt'] = 'Suche';
$wb['globalsearch_suggestions_text_txt'] = 'Vorschläge';
?>
-
diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng
index 2be17647f..764e4fafa 100644
--- a/interface/web/dns/lib/lang/el_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/el_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/es_dns_wizard.lng b/interface/web/dns/lib/lang/es_dns_wizard.lng
index cc7d3f934..fbf47ec36 100644
--- a/interface/web/dns/lib/lang/es_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/es_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/fi_dns_wizard.lng b/interface/web/dns/lib/lang/fi_dns_wizard.lng
index c503ee462..b83971a88 100755
--- a/interface/web/dns/lib/lang/fi_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/fi_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_wizard.lng b/interface/web/dns/lib/lang/hr_dns_wizard.lng
index 9594665e6..c949ed7ba 100644
--- a/interface/web/dns/lib/lang/hr_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/hr_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/hu_dns_wizard.lng b/interface/web/dns/lib/lang/hu_dns_wizard.lng
index a1d9c6a69..e6d129317 100644
--- a/interface/web/dns/lib/lang/hu_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/hu_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/id_dns_wizard.lng b/interface/web/dns/lib/lang/id_dns_wizard.lng
index a9cddce79..d63453c5d 100644
--- a/interface/web/dns/lib/lang/id_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/id_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/it_dns_wizard.lng b/interface/web/dns/lib/lang/it_dns_wizard.lng
index b7a12433a..52955fdcc 100644
--- a/interface/web/dns/lib/lang/it_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/it_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/ja_dns_wizard.lng b/interface/web/dns/lib/lang/ja_dns_wizard.lng
index a1558a7ce..16d8e2c8c 100644
--- a/interface/web/dns/lib/lang/ja_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ja_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/nl_dns_wizard.lng b/interface/web/dns/lib/lang/nl_dns_wizard.lng
index 88146551d..76c2a7768 100644
--- a/interface/web/dns/lib/lang/nl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/nl_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/pl_dns_wizard.lng b/interface/web/dns/lib/lang/pl_dns_wizard.lng
index 6b76ad55f..1323c43af 100644
--- a/interface/web/dns/lib/lang/pl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/pt_dns_wizard.lng b/interface/web/dns/lib/lang/pt_dns_wizard.lng
index 2fefd282c..4d2a5f83f 100644
--- a/interface/web/dns/lib/lang/pt_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pt_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/ro_dns_wizard.lng b/interface/web/dns/lib/lang/ro_dns_wizard.lng
index c5390b2f3..e8e89b2d5 100644
--- a/interface/web/dns/lib/lang/ro_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ro_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/ru_dns_wizard.lng b/interface/web/dns/lib/lang/ru_dns_wizard.lng
index f02b6b56b..6e37ac72c 100644
--- a/interface/web/dns/lib/lang/ru_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ru_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/se_dns_wizard.lng b/interface/web/dns/lib/lang/se_dns_wizard.lng
index b7a12433a..52955fdcc 100644
--- a/interface/web/dns/lib/lang/se_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/se_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/sk_dns_wizard.lng b/interface/web/dns/lib/lang/sk_dns_wizard.lng
index 9f0cbf226..7568d9c81 100644
--- a/interface/web/dns/lib/lang/sk_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/sk_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/tr_dns_wizard.lng b/interface/web/dns/lib/lang/tr_dns_wizard.lng
index 5e5568df1..7c71708bc 100644
--- a/interface/web/dns/lib/lang/tr_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/tr_dns_wizard.lng
@@ -33,4 +33,6 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index 37247f8b9..792b294f6 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -1,4 +1,20 @@
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons topbuttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');"><span>A</span></button>
diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm
index 1c7046b81..edb980c6a 100644
--- a/interface/web/dns/templates/dns_slave_list.htm
+++ b/interface/web/dns/templates/dns_slave_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_dns_slave">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_slave_edit.php');">
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm
index d70f76aa4..be75125ff 100644
--- a/interface/web/dns/templates/dns_soa_list.htm
+++ b/interface/web/dns/templates/dns_soa_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_dns_soa">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
diff --git a/interface/web/help/lib/lang/de.lng b/interface/web/help/lib/lang/de.lng
index 606b4f039..f9deb2066 100644
--- a/interface/web/help/lib/lang/de.lng
+++ b/interface/web/help/lib/lang/de.lng
@@ -12,4 +12,3 @@ $wb['Manage Sections'] = 'Kategorien verwalten';
$wb['Add a Question & Answer Pair'] = 'Neues Frage/Antwort Paar hinzufügen';
$wb['Manage Questions'] = 'Fragen verwalten';
?>
-
diff --git a/interface/web/help/lib/lang/de_faq_form.lng b/interface/web/help/lib/lang/de_faq_form.lng
index 90c6a4437..35042fa12 100644
--- a/interface/web/help/lib/lang/de_faq_form.lng
+++ b/interface/web/help/lib/lang/de_faq_form.lng
@@ -4,4 +4,3 @@ $wb['faq_question_txt'] = 'Frage';
$wb['faq_answer_txt'] = 'Antwort';
$wb['faq_section_txt'] = 'Kategorie';
?>
-
diff --git a/interface/web/help/lib/lang/de_faq_manage_questions_list.lng b/interface/web/help/lib/lang/de_faq_manage_questions_list.lng
index f3be08c85..b47a69589 100644
--- a/interface/web/help/lib/lang/de_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/de_faq_manage_questions_list.lng
@@ -7,4 +7,3 @@ $wb['faq_sections_txt'] = 'Kategorie';
$wb['faq_faq_questions_txt'] = 'Frequently Asked Questions';
$wb['faq_new_question_txt'] = 'Neues Frage/Antwort Paar hinzufügen';
?>
-
diff --git a/interface/web/help/lib/lang/de_faq_sections_form.lng b/interface/web/help/lib/lang/de_faq_sections_form.lng
index f9f7cd422..873dab2c1 100644
--- a/interface/web/help/lib/lang/de_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/de_faq_sections_form.lng
@@ -1,4 +1,3 @@
<?php
$wb['faq_section_name_txt'] = 'Kategorie Name';
?>
-
diff --git a/interface/web/help/lib/lang/de_help_faq_list.lng b/interface/web/help/lib/lang/de_help_faq_list.lng
index 66fd26c6b..3a240f403 100644
--- a/interface/web/help/lib/lang/de_help_faq_list.lng
+++ b/interface/web/help/lib/lang/de_help_faq_list.lng
@@ -1,4 +1,3 @@
<?php
$wb['edit_txt'] = 'Bearbeiten';
?>
-
diff --git a/interface/web/help/lib/lang/de_help_faq_sections_list.lng b/interface/web/help/lib/lang/de_help_faq_sections_list.lng
index 5d52ec809..190f85a31 100644
--- a/interface/web/help/lib/lang/de_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/de_help_faq_sections_list.lng
@@ -6,4 +6,3 @@ $wb['faq_sections_txt'] = 'Kategorie';
$wb['faq_faq_sections_txt'] = 'FAQ Kategorie';
$wb['faq_new_section_txt'] = 'Neue Kategorie hinzufügen';
?>
-
diff --git a/interface/web/help/lib/lang/de_support_message.lng b/interface/web/help/lib/lang/de_support_message.lng
index 0e34d252f..60d3c0c10 100644
--- a/interface/web/help/lib/lang/de_support_message.lng
+++ b/interface/web/help/lib/lang/de_support_message.lng
@@ -6,4 +6,3 @@ $wb['message_txt'] = 'Nachricht';
$wb['tstamp_txt'] = 'Zeitpunkt';
$wb['reply_txt'] = 'Antworten';
?>
-
diff --git a/interface/web/help/lib/lang/de_support_message_list.lng b/interface/web/help/lib/lang/de_support_message_list.lng
index 88fb3bad2..72734756a 100644
--- a/interface/web/help/lib/lang/de_support_message_list.lng
+++ b/interface/web/help/lib/lang/de_support_message_list.lng
@@ -4,4 +4,3 @@ $wb['sender_id_txt'] = 'Absender';
$wb['subject_txt'] = 'Betreff';
$wb['add_new_record_txt'] = 'Neue Supportnachricht erstellen';
?>
-
diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js
index efe9612e4..735d72eeb 100644
--- a/interface/web/js/jquery.tipsy.js
+++ b/interface/web/js/jquery.tipsy.js
@@ -250,12 +250,13 @@
var input,
self = this,
select = this.element,
+ internal = false,
selected = select.children( ":selected" ),
value = selected.val() ? selected.text() : "",
wrapper = this.wrapper = $( "<span>" )
.addClass( "ui-combobox" )
.insertAfter( select );
-
+
input = $( "<input>" ).css( { "width": (select.is(':visible') ? (elwidth > 15 ? elwidth - 15 : 1) : 350), "height": (elheight > 0 ? elheight : 16) });
select.hide();
input.appendTo( wrapper )
@@ -277,8 +278,8 @@
$.ui.autocomplete.escapeRegex(request.term) +
")(?![^<>]*>)(?![^&;]+;)", "gi"
), "<strong>$1</strong>" )),
- value: text,
- class: (select.hasClass('flags') ? 'country-' + $(this).val().toUpperCase() : $(this).attr('class')),
+ 'value': (text ? text : ''),
+ 'class': (select.hasClass('flags') ? 'country-' + ($(this).val() ? $(this).val().toUpperCase() : '') : $(this).attr('class')),
option: this
};
}) );
@@ -293,7 +294,10 @@
} else if($(select).attr('onchange')) {
eval($(select).attr('onchange'));
} else {
- if(!ui.item.internal) $(select).change();
+ if(!ui.item.internal) {
+ internal = true;
+ $(select).change();
+ }
}
if (jQuery(".panel #Filter").length > 0) {
jQuery(".panel #Filter").trigger('click');
@@ -340,7 +344,21 @@
$(this).autocomplete('option','select').call($(this), event, { item: { option: selected.get(0), internal: true } });
}
})
- .addClass( "ui-widget ui-widget-content ui-corner-left" );
+ .addClass( "ui-widget ui-widget-content ui-corner-left" )
+ .click(function() {
+ // close if already visible
+ if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
+ //input.autocomplete( "close" );
+ 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();
+ });
if(select.hasClass('flags')) input.addClass('flags');
input.data( "autocomplete" )._renderItem = function( ul, item ) {
@@ -348,10 +366,14 @@
.data( "item.autocomplete", item )
.append( "<a>" + item.label + "</a>" )
.appendTo( ul );
- if(item.class) el.addClass(item.class);
+ if(item && item['class'] && el) el.addClass(item['class']);
return el;
};
select.change(function(e) {
+ if(internal == true) {
+ internal = false;
+ return;
+ }
var matcher = new RegExp( "" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "", "i" ),
matchtext = $(this).val();
valid = false,
diff --git a/interface/web/login/lib/lang/ar.lng b/interface/web/login/lib/lang/ar.lng
index 244df64ee..f7362b5be 100644
--- a/interface/web/login/lib/lang/ar.lng
+++ b/interface/web/login/lib/lang/ar.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/bg.lng b/interface/web/login/lib/lang/bg.lng
index 5896170da..cb2795170 100644
--- a/interface/web/login/lib/lang/bg.lng
+++ b/interface/web/login/lib/lang/bg.lng
@@ -20,4 +20,5 @@ $wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/br.lng b/interface/web/login/lib/lang/br.lng
index c07ac0eef..0d2144769 100644
--- a/interface/web/login/lib/lang/br.lng
+++ b/interface/web/login/lib/lang/br.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng
index 4a526ae12..6b4539e95 100644
--- a/interface/web/login/lib/lang/cz.lng
+++ b/interface/web/login/lib/lang/cz.lng
@@ -3,10 +3,10 @@ $wb['error_user_password_empty'] = 'Uživatelské jméno nebo heslo je prázdné
$wb['error_user_password_incorrect'] = 'Uživatelské jméno nebo heslo je špatně.';
$wb['error_user_blocked'] = 'Uživatel blokován.';
$wb['error_user_too_many_logins'] = 'PÅ™ÃliÅ¡ mnoho nesprávných pÅ™ihlášenÃ, zkuste to za 15 minut znova';
-$wb['pass_reset_txt'] = 'Bude Vám vygenerováno a zasláno nové heslo na email, pokud VaÅ¡e adresa zadaná nÞe odpovÃdá adrese ve VaÅ¡em klientském nastavenÃ.';
+$wb['pass_reset_txt'] = 'Bude Vám vygenerováno a zasláno nové heslo na e-mail, pokud VaÅ¡e adresa zadaná nÞe odpovÃdá adrese ve VaÅ¡em klientském nastavenÃ.';
$wb['pw_reset'] = 'Heslo bylo resetováno a zasláno na Váš email.';
-$wb['pw_error'] = 'Uživatelské jméno nebo email neodpovÃdá.';
-$wb['pw_error_noinput'] = 'ProsÃm zadejte uživatelské jméno a email.';
+$wb['pw_error'] = 'Uživatelské jméno nebo e-mail neodpovÃdá.';
+$wb['pw_error_noinput'] = 'ProsÃm zadejte uživatelské jméno a e-mail.';
$wb['pw_reset_mail_msg'] = 'Vaše heslo do ISPConfigu bylo resetováno. Nové heslo je: ';
$wb['pw_reset_mail_title'] = 'Heslo do ISPConfigu bylo resetováno.';
$wb['user_regex_error'] = 'Uživatelské jméno obsahuje nepovolené znaky nebo je delšà než 64 znaků.';
@@ -14,10 +14,11 @@ $wb['pw_error_length'] = 'Heslo je delšà než 64 znaků.';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['password_txt'] = 'Heslo';
$wb['login_button_txt'] = 'Přihlásit se';
-$wb['pw_lost_txt'] = 'Password lost';
-$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
-$wb['login_txt'] = 'Login';
-$wb['pw_reset_txt'] = 'Password reset';
-$wb['pw_button_txt'] = 'Resend password';
-$wb['email_txt'] = 'Email';
+$wb['pw_lost_txt'] = 'Obnovit zapomenuté heslo';
+$wb['error_maintenance_mode'] = 'V souÄasné dobÄ› probÃhá údržba systému ISPConfig. PÅ™ihlášenà zkuste prosÃm pozdÄ›ji. DÄ›kujeme Vám za trpÄ›livost.';
+$wb['login_txt'] = 'PÅ™ihlášenÃ';
+$wb['pw_reset_txt'] = 'Resetovánà (obnova) hesla';
+$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/de.lng b/interface/web/login/lib/lang/de.lng
index 86e22d5a5..31d18efb6 100644
--- a/interface/web/login/lib/lang/de.lng
+++ b/interface/web/login/lib/lang/de.lng
@@ -22,4 +22,3 @@ $wb['email_txt'] = 'E-Mail';
$wb['error_maintenance_mode'] = 'Diese ISPConfig Installation wird gerade gewartet. Wir sind in Kürze wieder für Sie da. Vielen Dank für Ihre Geduld.';
$wb['theme_not_compatible'] = 'Das gewählte Design ist mit dieser ISPConfig Version nicht kompatibel. Bitte prüfen Sie, ob ein Update des Themes verfügbar ist.<br />Es wurde nun automatisch das Standard Design aktiviert.';
?>
-
diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng
index 1eef91fc9..12271aca2 100644
--- a/interface/web/login/lib/lang/el.lng
+++ b/interface/web/login/lib/lang/el.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/es.lng b/interface/web/login/lib/lang/es.lng
index c040e4e34..f6d57057b 100644
--- a/interface/web/login/lib/lang/es.lng
+++ b/interface/web/login/lib/lang/es.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/fi.lng b/interface/web/login/lib/lang/fi.lng
index 79eb5fa63..427f8de9d 100755
--- a/interface/web/login/lib/lang/fi.lng
+++ b/interface/web/login/lib/lang/fi.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/hr.lng b/interface/web/login/lib/lang/hr.lng
index d461a2598..7f84d6f62 100644
--- a/interface/web/login/lib/lang/hr.lng
+++ b/interface/web/login/lib/lang/hr.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/hu.lng b/interface/web/login/lib/lang/hu.lng
index 5a39baaf2..1dc8ef396 100644
--- a/interface/web/login/lib/lang/hu.lng
+++ b/interface/web/login/lib/lang/hu.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/id.lng b/interface/web/login/lib/lang/id.lng
index f7a245f15..5e82059df 100644
--- a/interface/web/login/lib/lang/id.lng
+++ b/interface/web/login/lib/lang/id.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/it.lng b/interface/web/login/lib/lang/it.lng
index 694d73b6d..c69cb52a8 100644
--- a/interface/web/login/lib/lang/it.lng
+++ b/interface/web/login/lib/lang/it.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/ja.lng b/interface/web/login/lib/lang/ja.lng
index 2c1592a51..70ab27c26 100644
--- a/interface/web/login/lib/lang/ja.lng
+++ b/interface/web/login/lib/lang/ja.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/nl.lng b/interface/web/login/lib/lang/nl.lng
index 984b2ce7b..59564e5c3 100644
--- a/interface/web/login/lib/lang/nl.lng
+++ b/interface/web/login/lib/lang/nl.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng
index a52419a6a..2a7e58f6d 100644
--- a/interface/web/login/lib/lang/pl.lng
+++ b/interface/web/login/lib/lang/pl.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/pt.lng b/interface/web/login/lib/lang/pt.lng
index 836c8a1fa..6c5414c88 100644
--- a/interface/web/login/lib/lang/pt.lng
+++ b/interface/web/login/lib/lang/pt.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/ro.lng b/interface/web/login/lib/lang/ro.lng
index 60d3086b6..76b314a43 100644
--- a/interface/web/login/lib/lang/ro.lng
+++ b/interface/web/login/lib/lang/ro.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/ru.lng b/interface/web/login/lib/lang/ru.lng
index 386ac9056..866a95724 100644
--- a/interface/web/login/lib/lang/ru.lng
+++ b/interface/web/login/lib/lang/ru.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/se.lng b/interface/web/login/lib/lang/se.lng
index 244df64ee..f7362b5be 100644
--- a/interface/web/login/lib/lang/se.lng
+++ b/interface/web/login/lib/lang/se.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/sk.lng b/interface/web/login/lib/lang/sk.lng
index 065f181bb..d1fc46d28 100644
--- a/interface/web/login/lib/lang/sk.lng
+++ b/interface/web/login/lib/lang/sk.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/login/lib/lang/tr.lng b/interface/web/login/lib/lang/tr.lng
index 3fe93fc01..00f027ef5 100644
--- a/interface/web/login/lib/lang/tr.lng
+++ b/interface/web/login/lib/lang/tr.lng
@@ -20,4 +20,5 @@ $wb['login_txt'] = 'Login';
$wb['pw_reset_txt'] = 'Password reset';
$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
?>
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 8d27e56ad..16543ca47 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -263,6 +263,11 @@ $form["tabs"]['autoresponder'] = array (
'autoresponder_start_date' => array (
'datatype' => 'DATETIME',
'formtype' => 'DATETIME',
+ 'validators'=> array ( 0 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_autoresponder',
+ 'function' => 'start_date',
+ 'errmsg'=> 'autoresponder_start_date_is_required'),
+ )
),
'autoresponder_end_date' => array (
'datatype' => 'DATETIME',
diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng
index f7583fadb..a0863ceb1 100644
--- a/interface/web/mail/lib/lang/cz.lng
+++ b/interface/web/mail/lib/lang/cz.lng
@@ -6,18 +6,18 @@ $wb['Mail Content Filter'] = 'Obsahový filtr';
$wb['Filter'] = 'Filtr';
$wb['Mail Domain'] = 'Doména e-mailů';
$wb['Domain'] = 'Domény';
-$wb['Email Catchall'] = 'Emailový koš';
+$wb['Email Catchall'] = 'E-mailový koš';
$wb['Email Forward'] = 'Přesměrovánà e-mailů';
$wb['Get Email'] = 'ZÃskat email';
$wb['Spamfilter'] = 'Spamfiltr';
$wb['Email Routing'] = 'SmÄ›rovánÃ';
$wb['Email transport'] = 'Transport';
$wb['Mailbox'] = 'Mailbox';
-$wb['Autoresponder'] = 'Automatické odpovědi';
-$wb['Mail Filter'] = 'Mailový filtr';
+$wb['Autoresponder'] = 'Automatická odpovÄ›Ä';
+$wb['Mail Filter'] = 'E-mailové filtry';
$wb['Custom Rules'] = 'Vlastnà pravidla';
-$wb['Email filter'] = 'Emailový filtr';
-$wb['Email Whitelist'] = 'Email bÃlá listina';
+$wb['Email filter'] = 'E-mailový filtr';
+$wb['Email Whitelist'] = 'E-mail bÃlá listina';
$wb['Whitelist'] = 'BÃlá listina';
$wb['Spamfilter blacklist'] = 'Spamfiltr Äerná listina';
$wb['Spamfilter Config'] = 'Konfigurace spamfiltru';
@@ -32,7 +32,7 @@ $wb['Users'] = 'Uživatelé';
$wb['Spamfilter Whitelist'] = 'Spamfiltr bÃlá listina';
$wb['Email'] = 'Email';
$wb['Email Mailbox'] = 'E-mailové schránky';
-$wb['Email Accounts'] = 'Email úÄty';
+$wb['Email Accounts'] = 'E-mail úÄty';
$wb['User / Domain'] = 'Uživatel / Doména';
$wb['Server Settings'] = 'Nastavenà serveru';
$wb['Fetchmail'] = 'Externà zÃskávánà emailů';
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 e2f87e7ba..b579d2de0 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
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'Email doména';
+$wb['list_head_txt'] = 'E-mail doména';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Přidat doménu';
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 455f7f555..3b24645ec 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
@@ -1,9 +1,9 @@
<?php
-$wb['list_head_txt'] = 'Email koš';
+$wb['list_head_txt'] = 'E-mailový koš';
$wb['active_txt'] = 'AktivnÃ';
$wb['source_txt'] = 'Zdroj';
-$wb['destination_txt'] = 'CÃlová email adresa';
+$wb['destination_txt'] = 'CÃlová e-mailová adresa';
$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Doména';
-$wb['add_new_record_txt'] = 'Přidat koš';
+$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_mailinglist.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
index 76325e91f..d93727466 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
@@ -12,8 +12,8 @@ $wb['listname_txt'] = 'Listname';
$wb['client_txt'] = 'Client';
$wb['email_txt'] = 'Email';
$wb['password_txt'] = 'Password';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$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.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index f949c7a09..2c441f2ab 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -1,10 +1,10 @@
<?php
-$wb['custom_mailfilter_txt'] = 'Vlastnà předpis mailového filtru';
-$wb['email_txt'] = 'Email';
+$wb['custom_mailfilter_txt'] = 'Vlastnà předpis e-mailového filtru';
+$wb['email_txt'] = 'E-mail';
$wb['cryptpwd_txt'] = 'Heslo';
$wb['password_strength_txt'] = 'BezpeÄnost hesla';
$wb['active_txt'] = 'AktivnÃ';
-$wb['email_error_isemail'] = 'Email adresa je chybná.';
+$wb['email_error_isemail'] = 'E-mail adresa je chybná.';
$wb['email_error_unique'] = 'Duplikovánà email adresy.';
$wb['autoresponder_text_txt'] = 'Text';
$wb['autoresponder_txt'] = 'AktivnÃ';
@@ -18,10 +18,10 @@ $wb['quota_error_isint'] = 'Velikost mailboxu musà být ÄÃslo.';
$wb['quota_txt'] = 'Kvóta';
$wb['server_id_txt'] = 'Server_id';
$wb['password_txt'] = 'Heslo';
-$wb['maildir_txt'] = 'Mailový adresář';
+$wb['maildir_txt'] = 'E-mailový adresář';
$wb['postfix_txt'] = 'Povolit pÅ™Ãjem';
$wb['access_txt'] = 'Povolit pÅ™Ãstup';
-$wb['policy_txt'] = 'Spamfiltr';
+$wb['policy_txt'] = 'Spamový filtr';
$wb['no_policy'] = '- nepovoleno -';
$wb['limit_mailbox_txt'] = 'Dosažen maximálnà poÄet mailboxů pro Váš úÄet.';
$wb['limit_mailquota_txt'] = 'Dosažen maximálnà prostor pro mailboxy. Max. dostupné mÃsto v MB je';
@@ -34,17 +34,17 @@ $wb['name_txt'] = 'SkuteÄné jméno';
$wb['name_optional_txt'] = '(volitelné)';
$wb['autoresponder_active'] = 'Povolit automatický odpovÃdaÄ';
$wb['cc_txt'] = 'PÅ™eposÃlat na';
-$wb['cc_error_isemail'] = 'Adresa uvedená v poli PÅ™eposÃlat na je neplatná';
+$wb['cc_error_isemail'] = 'Adresa uvedená v poli pÅ™eposÃlat na je neplatná';
$wb['domain_txt'] = 'Doména';
$wb['now_txt'] = 'NynÃ';
-$wb['login_error_unique'] = 'Login is already taken.';
-$wb['login_error_regex'] = 'Valid characters are A-Z, a-z, 0-9, ., _ and -.';
-$wb['login_txt'] = 'Login (optional)';
-$wb['error_login_email_txt'] = 'This login is not allowed. Please enter a different login or use the mail address as login.';
-$wb['autoresponder_subject_txt'] = 'Email Subject';
-$wb['autoresponder_subject'] = 'Out of office reply';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['login_error_unique'] = 'Přihlášovacà jméno je již obsazeno.';
+$wb['login_error_regex'] = 'Platné znaky jsou A-Z, a-z, 0-9, ., _ a -.';
+$wb['login_txt'] = 'Přihlásit se (volitelně)';
+$wb['error_login_email_txt'] = 'Toto pÅ™ihlášenà nenà povoleno. Zadejte prosÃm jiné pÅ™ihlaÅ¡ovacà nebo použijte mailovou adresu jako pÅ™ihlaÅ¡ovacà jméno.';
+$wb['autoresponder_subject_txt'] = 'Předmět e-mailu';
+$wb['autoresponder_subject'] = 'Oznámenà o nepÅ™Ãtomnosti';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$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 91234a564..ec91e223e 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
@@ -1,5 +1,5 @@
<?php
-$wb['rulename_txt'] = 'Název';
+$wb['rulename_txt'] = 'Název pravidla';
$wb['action_txt'] = 'Akce';
$wb['target_txt'] = 'Složka';
$wb['active_txt'] = 'AktivnÃ';
@@ -7,7 +7,7 @@ $wb['rulename_error_empty'] = 'Název je prázdný.';
$wb['searchterm_is_empty'] = 'Vyhledávacà řádek je prázdný.';
$wb['source_txt'] = 'Zdroj';
$wb['target_error_regex'] = 'CÃl může obsahovat jen tyto znaky: a-z, 0-9, -, ., _, a {mezeru}';
-$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
+$wb['limit_mailfilter_txt'] = 'Byl dosažen max. poÄet e-mailový filtrovacÃch pravidel.';
$wb['subject_txt'] = 'Předmět';
$wb['from_txt'] = 'OdesÃlatel';
$wb['to_txt'] = 'Adresát';
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 19b2802f5..e6dfd006e 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng
@@ -1,8 +1,8 @@
<?php
$wb['list_head_txt'] = 'E-mailové schránky';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
$wb['autoresponder_txt'] = 'Automatická odpovÄ›Ä';
$wb['add_new_record_txt'] = 'Přidat e-mailovou schránku';
$wb['name_txt'] = 'SkuteÄný název';
-$wb['login_txt'] = 'Login';
+$wb['login_txt'] = 'PÅ™ihlášenÃ';
?>
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
index 50b6f4648..5e0c6b779 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
@@ -2,7 +2,7 @@
$wb['server_id_txt'] = 'Server';
$wb['wb_txt'] = 'wb';
$wb['rid_txt'] = 'Uživatel';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
$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_config.lng b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
index 01a9a31c5..0f878cc7d 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
@@ -15,6 +15,6 @@ $wb['mailuser_group_txt'] = 'Mail uživatel skupina';
$wb['relayhost_txt'] = 'Relayhost';
$wb['relayhost_user_txt'] = 'Relayhost uživatel';
$wb['relayhost_password_txt'] = 'Relayhost heslo';
-$wb['mailbox_size_limit_txt'] = 'Limit velikosti mailboxut';
+$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_policy.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
index 0600fe5fc..54d0155d7 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
@@ -7,12 +7,12 @@ $wb['bad_header_lover_txt'] = 'Å patné hlaviÄky';
$wb['bypass_virus_checks_txt'] = 'ObejÃt kontrolu virů';
$wb['bypass_banned_checks_txt'] = 'ObejÃt kontrolu zabanovaných';
$wb['bypass_header_checks_txt'] = 'ObejÃt kontrolu hlaviÄky';
-$wb['virus_quarantine_to_txt'] = 'Předat virus na email';
+$wb['virus_quarantine_to_txt'] = 'Předat virus na e-mail';
$wb['spam_quarantine_to_txt'] = 'Předat spam na email';
-$wb['banned_quarantine_to_txt'] = 'Předat zabanované na email';
-$wb['bad_header_quarantine_to_txt'] = 'PÅ™edat Å¡patnou hlaviÄku na email';
-$wb['clean_quarantine_to_txt'] = 'PÅ™edat Äisté na email';
-$wb['other_quarantine_to_txt'] = 'Předat ostatnà na email';
+$wb['banned_quarantine_to_txt'] = 'Předat zabanované na e-mail';
+$wb['bad_header_quarantine_to_txt'] = 'PÅ™edat Å¡patnou hlaviÄku na e-mail';
+$wb['clean_quarantine_to_txt'] = 'PÅ™edat Äisté na e-mail';
+$wb['other_quarantine_to_txt'] = 'Předat ostatnà na e-mail';
$wb['spam_tag_level_txt'] = 'SPAM tag úroveň';
$wb['spam_tag2_level_txt'] = 'SPAM tag2 úroveň';
$wb['spam_kill_level_txt'] = 'SPAM kill úroveň';
diff --git a/interface/web/mail/lib/lang/de.lng b/interface/web/mail/lib/lang/de.lng
index 29e7cbd11..5180b3f32 100644
--- a/interface/web/mail/lib/lang/de.lng
+++ b/interface/web/mail/lib/lang/de.lng
@@ -1,49 +1,47 @@
<?php
-$wb['Email Alias'] = "E-Mail Alias";
-$wb['Email Blacklist'] = "E-Mail Blacklist";
-$wb['Blacklist'] = "Blacklist";
-$wb['Mail Content Filter'] = "E-Mail Inhaltsfilter";
-$wb['Filter'] = "Filter";
-$wb['Mail Domain'] = "E-Mail Domain";
-$wb['Domain'] = "E-Mail Domain";
-$wb['Email Catchall'] = "E-Mail Catchall";
-$wb['Email Forward'] = "E-Mail Weiterleitung";
-$wb['Get Email'] = "E-Mail Sammeldienst";
-$wb['Spamfilter'] = "Spamfilter";
-$wb['Email Routing'] = "E-Mail Routing";
-$wb['Email transport'] = "E-Mail Transport";
-$wb['Mailbox'] = "E-Mail Konto";
-$wb['Autoresponder'] = "Autoresponder";
-$wb['Mail Filter'] = "E-Mail Filter";
-$wb['Custom Rules'] = "eigene Regeln";
-$wb['Email filter'] = "E-Mail Filter";
-$wb['Email Whitelist'] = "E-Mail Whitelist";
-$wb['Whitelist'] = "Whitelist";
-$wb['Spamfilter blacklist'] = "Spamfilter Blacklist";
-$wb['Spamfilter Config'] = "Spamfilter Konfiguration";
-$wb['Server'] = "Server";
-$wb['Spamfilter policy'] = "Spamfilter Richtlinie";
-$wb['Policy'] = "Richtlinie";
-$wb['Quarantine'] = "Quarantäne";
-$wb['Tag-Level'] = "Tag Level";
-$wb['Other'] = "Andere";
-$wb['Spamfilter users'] = "Spamfilter Benutzer";
-$wb['Users'] = "Benutzer";
-$wb['Spamfilter Whitelist'] = "Spamfilter Whitelist";
-$wb['Email'] = "E-Mail";
-$wb['Email Mailbox'] = "E-Mail Konto";
-$wb['Email Accounts'] = "E-Mail Konten";
-$wb['User / Domain'] = "Benutzer / Domain";
-$wb['Server Settings'] = "Servereinstellungen";
-$wb['Fetchmail'] = "E-Mail Sammeldienst";
-$wb['Mailbox traffic'] = "E-Mail Konto Datenverkehr";
-$wb['Mailbox quota'] = "E-Mail Konto Belegung";
-$wb['Statistics'] = "Statistiken";
-$wb['Postfix Whitelist'] = "Postfix Whitelist";
-$wb['Postfix Blacklist'] = "Postfix Blacklist";
-$wb['Content Filter'] = "Inhaltsfilter";
-$wb['Global Filters'] = "Globale Filter";
-$wb['Domain Alias'] = "E-Mail Domain Alias";
-$wb['Relay Recipients'] = "Relay Empfänger";
+$wb['Email Alias'] = 'E-Mail Alias';
+$wb['Email Blacklist'] = 'E-Mail Blacklist';
+$wb['Blacklist'] = 'Blacklist';
+$wb['Mail Content Filter'] = 'E-Mail Inhaltsfilter';
+$wb['Filter'] = 'Filter';
+$wb['Mail Domain'] = 'E-Mail Domain';
+$wb['Domain'] = 'E-Mail Domain';
+$wb['Email Catchall'] = 'E-Mail Catchall';
+$wb['Email Forward'] = 'E-Mail Weiterleitung';
+$wb['Get Email'] = 'E-Mail Sammeldienst';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Routing'] = 'E-Mail Routing';
+$wb['Email transport'] = 'E-Mail Transport';
+$wb['Mailbox'] = 'E-Mail Konto';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Mail Filter'] = 'E-Mail Filter';
+$wb['Custom Rules'] = 'eigene Regeln';
+$wb['Email filter'] = 'E-Mail Filter';
+$wb['Email Whitelist'] = 'E-Mail Whitelist';
+$wb['Whitelist'] = 'Whitelist';
+$wb['Spamfilter blacklist'] = 'Spamfilter Blacklist';
+$wb['Spamfilter Config'] = 'Spamfilter Konfiguration';
+$wb['Server'] = 'Server';
+$wb['Spamfilter policy'] = 'Spamfilter Richtlinie';
+$wb['Policy'] = 'Richtlinie';
+$wb['Quarantine'] = 'Quarantäne';
+$wb['Tag-Level'] = 'Tag Level';
+$wb['Other'] = 'Andere';
+$wb['Spamfilter users'] = 'Spamfilter Benutzer';
+$wb['Users'] = 'Benutzer';
+$wb['Spamfilter Whitelist'] = 'Spamfilter Whitelist';
+$wb['Email'] = 'E-Mail';
+$wb['Email Mailbox'] = 'E-Mail Konto';
+$wb['Email Accounts'] = 'E-Mail Konten';
+$wb['User / Domain'] = 'Benutzer / Domain';
+$wb['Server Settings'] = 'Servereinstellungen';
+$wb['Fetchmail'] = 'E-Mail Sammeldienst';
+$wb['Mailbox traffic'] = 'E-Mail Konto Datenverkehr';
+$wb['Statistics'] = 'Statistiken';
+$wb['Postfix Whitelist'] = 'Postfix Whitelist';
+$wb['Postfix Blacklist'] = 'Postfix Blacklist';
+$wb['Content Filter'] = 'Inhaltsfilter';
+$wb['Global Filters'] = 'Globale Filter';
+$wb['Domain Alias'] = 'E-Mail Domain Alias';
+$wb['Relay Recipients'] = 'Relay Empfänger';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_alias.lng b/interface/web/mail/lib/lang/de_mail_alias.lng
index 2a0c5d36e..83a1fdf46 100644
--- a/interface/web/mail/lib/lang/de_mail_alias.lng
+++ b/interface/web/mail/lib/lang/de_mail_alias.lng
@@ -1,15 +1,14 @@
<?php
-$wb['email_txt'] = "E-Mail Adresse";
-$wb['destination_txt'] = "Ziel";
-$wb['active_txt'] = "Aktiv";
-$wb['email_error_isemail'] = "E-Mail Adresse ist ungültig";
-$wb['email_error_unique'] = "Doppelte E-Mail Adresse.";
-$wb['no_domain_perm'] = "Sie haben keine Berechtigung für diese Domain.";
-$wb['destination_error_isemail'] = "Zieladresse ist ungültig.";
-$wb['limit_mailalias_txt'] = "Die maximale Anzahl an E-Mail Aliasen für Ihr Konto wurde erreicht.";
-$wb['duplicate_mailbox_txt'] = "Es existiert bereits eineE-Mail Konto mit dieser E-Mail Adresse.";
-$wb['domain_txt'] = "Domain";
-$wb['duplicate_email_alias_txt'] = "Dieser E-Mail Alias existiert bereits.";
-$wb['source_txt'] = "Alias";
+$wb['email_txt'] = 'E-Mail Adresse';
+$wb['destination_txt'] = 'Ziel';
+$wb['active_txt'] = 'Aktiv';
+$wb['email_error_isemail'] = 'E-Mail Adresse ist ungültig';
+$wb['email_error_unique'] = 'Doppelte E-Mail Adresse.';
+$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
+$wb['destination_error_isemail'] = 'Zieladresse ist ungültig.';
+$wb['limit_mailalias_txt'] = 'Die maximale Anzahl an E-Mail Aliasen für Ihr Konto wurde erreicht.';
+$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eineE-Mail Konto mit dieser E-Mail Adresse.';
+$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'Dieser E-Mail Alias existiert bereits.';
+$wb['source_txt'] = 'Alias';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_alias_list.lng b/interface/web/mail/lib/lang/de_mail_alias_list.lng
index 7c0c1145a..e741d02b3 100644
--- a/interface/web/mail/lib/lang/de_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_alias_list.lng
@@ -6,4 +6,3 @@ $wb['destination_txt'] = 'Ziel';
$wb['email_txt'] = 'E-Mail Adresse';
$wb['add_new_record_txt'] = 'Neuen E-Mail Alias hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_aliasdomain.lng b/interface/web/mail/lib/lang/de_mail_aliasdomain.lng
index bf877dafb..f75bd1659 100644
--- a/interface/web/mail/lib/lang/de_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/de_mail_aliasdomain.lng
@@ -1,12 +1,11 @@
<?php
-$wb['source_txt'] = "Quelle";
-$wb['destination_txt'] = "Ziel";
-$wb['active_txt'] = "Aktiv";
-$wb['no_domain_perm'] = "Sie haben keine Rechte für diese Domain.";
-$wb['limit_mailaliasdomain_txt'] = "Die maximale Anzahl an E-Mail Alias Domains für Ihr Konto wurde erreicht.";
-$wb['source_destination_identical_txt'] = "Quell- und Ziel Domain sind identisch.";
-$wb['source_error_empty'] = "Quell Domain ist leer.";
-$wb['source_error_unique'] = "Quell Domain duplizieren.";
-$wb['source_error_regex'] = "Ungültiger Quell Domainname.";
+$wb['source_txt'] = 'Quelle';
+$wb['destination_txt'] = 'Ziel';
+$wb['active_txt'] = 'Aktiv';
+$wb['no_domain_perm'] = 'Sie haben keine Rechte für diese Domain.';
+$wb['limit_mailaliasdomain_txt'] = 'Die maximale Anzahl an E-Mail Alias Domains für Ihr Konto wurde erreicht.';
+$wb['source_destination_identical_txt'] = 'Quell- und Ziel Domain sind identisch.';
+$wb['source_error_empty'] = 'Quell Domain ist leer.';
+$wb['source_error_unique'] = 'Quell Domain duplizieren.';
+$wb['source_error_regex'] = 'Ungültiger Quell Domainname.';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng
index 88a4ae45e..c386d429b 100644
--- a/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng
@@ -1,8 +1,7 @@
<?php
-$wb['list_head_txt'] = "E-Mail Domain Alias";
-$wb['active_txt'] = "Aktiv";
-$wb['source_txt'] = "Quelle";
-$wb['destination_txt'] = "Ziel";
-$wb['add_new_record_txt'] = "Neuen E-Mail Domain Alias hinzufügen";
+$wb['list_head_txt'] = 'E-Mail Domain Alias';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_txt'] = 'Quelle';
+$wb['destination_txt'] = 'Ziel';
+$wb['add_new_record_txt'] = 'Neuen E-Mail Domain Alias hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_blacklist.lng b/interface/web/mail/lib/lang/de_mail_blacklist.lng
index e249b1957..4611dadd0 100644
--- a/interface/web/mail/lib/lang/de_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/de_mail_blacklist.lng
@@ -1,10 +1,9 @@
<?php
-$wb['server_id_txt'] = "Server";
-$wb['source_txt'] = "Blacklist E-Mail Adresse";
-$wb['recipient_txt'] = "Empfänger";
-$wb['active_txt'] = "Aktiv";
-$wb['source_error_notempty'] = "Adresse ist leer.";
-$wb['type_txt'] = "Typ";
-$wb['limit_mailfilter_txt'] = "Die maximale Anzahl an E-Mail Filter für Ihr Konto wurde erreicht.";
+$wb['server_id_txt'] = 'Server';
+$wb['source_txt'] = 'Blacklist E-Mail Adresse';
+$wb['recipient_txt'] = 'Empfänger';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_error_notempty'] = 'Adresse ist leer.';
+$wb['type_txt'] = 'Typ';
+$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filter für Ihr Konto wurde erreicht.';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_blacklist_list.lng b/interface/web/mail/lib/lang/de_mail_blacklist_list.lng
index 03b1b46e7..b16990911 100644
--- a/interface/web/mail/lib/lang/de_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_blacklist_list.lng
@@ -8,4 +8,3 @@ $wb['recipient_txt'] = 'Empfänger';
$wb['add_new_record_txt'] = 'Neuen Blacklist Eintrag hinzufügen';
$wb['access_txt'] = 'Zugriff';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_content_filter.lng b/interface/web/mail/lib/lang/de_mail_content_filter.lng
index 48348b20a..9ea542249 100644
--- a/interface/web/mail/lib/lang/de_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/de_mail_content_filter.lng
@@ -7,4 +7,3 @@ $wb['action_txt'] = 'Aktion';
$wb['active_txt'] = 'Aktiv';
$wb['pattern_error_empty'] = 'Zeichenkette ist leer';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_content_filter_list.lng b/interface/web/mail/lib/lang/de_mail_content_filter_list.lng
index 930f1e537..126f23ce4 100644
--- a/interface/web/mail/lib/lang/de_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_content_filter_list.lng
@@ -6,4 +6,3 @@ $wb['pattern_txt'] = 'Zeichenkette';
$wb['action_txt'] = 'Aktion';
$wb['add_new_record_txt'] = 'Neuen Inhaltsfilter hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng
index 93fdf4e46..ff6da2ab1 100644
--- a/interface/web/mail/lib/lang/de_mail_domain.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain.lng
@@ -1,14 +1,13 @@
<?php
-$wb['server_id_txt'] = "Server";
-$wb['domain_txt'] = "Domain";
-$wb['type_txt'] = "Typ";
-$wb['active_txt'] = "Aktiv";
-$wb['domain_error_empty'] = "Domain ist leer";
-$wb['domain_error_unique'] = "Doppelte Domain.";
-$wb['domain_error_regex'] = "Ungültiger Domainname.";
-$wb['client_txt'] = "Kunde";
-$wb['limit_maildomain_txt'] = "Die maximale Anzahl an E-Mail Domains für Ihr Konto wurde erreicht.";
-$wb['policy_txt'] = "Spamfilter";
-$wb['no_policy'] = "- nicht aktiviert -";
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Typ';
+$wb['active_txt'] = 'Aktiv';
+$wb['domain_error_empty'] = 'Domain ist leer';
+$wb['domain_error_unique'] = 'Doppelte Domain.';
+$wb['domain_error_regex'] = 'Ungültiger Domainname.';
+$wb['client_txt'] = 'Kunde';
+$wb['limit_maildomain_txt'] = 'Die maximale Anzahl an E-Mail Domains für Ihr Konto wurde erreicht.';
+$wb['policy_txt'] = 'Spamfilter';
+$wb['no_policy'] = '- nicht aktiviert -';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng
index 3b3ac491e..403bb90fe 100644
--- a/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng
@@ -1,9 +1,8 @@
<?php
-$wb['list_head_txt'] = "E-Mail Domain";
-$wb['server_id_txt'] = "Server";
-$wb['domain_txt'] = "Domain";
-$wb['add_new_record_txt'] = "Neue Domain hinzufügen";
-$wb['active_txt'] = "Aktiv";
-$wb['sys_groupid_txt'] = "Kunde";
+$wb['list_head_txt'] = 'E-Mail Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
+$wb['active_txt'] = 'Aktiv';
+$wb['sys_groupid_txt'] = 'Kunde';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
index 15ae2fc18..9f37e5669 100644
--- a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
@@ -1,12 +1,11 @@
<?php
-$wb['domain_txt'] = "Domain";
-$wb['destination_txt'] = "Ziel E-Mail";
-$wb['active_txt'] = "Aktiv";
-$wb['domain_error_unique'] = "Es besteht bereits ein Catchall Eintrag für diese Domain.";
-$wb['no_domain_perm'] = "Sie haben keine Berechtigung für diese Domain.";
-$wb['domain_error_regex'] = "Ungültiger Domainname oder ungültige Zeichen im Domainnamen.";
-$wb['limit_mailcatchall_txt'] = "Die maximale Anzahl an Catchall Einträgen für Ihr Konto wurde erreicht.";
-$wb['source_txt'] = "Quelle";
-$wb['destination_error_isemail'] = "Das Ziel ist keine gültige E-Mail Adresse.";
+$wb['domain_txt'] = 'Domain';
+$wb['destination_txt'] = 'Ziel E-Mail';
+$wb['active_txt'] = 'Aktiv';
+$wb['domain_error_unique'] = 'Es besteht bereits ein Catchall Eintrag für diese Domain.';
+$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
+$wb['domain_error_regex'] = 'Ungültiger Domainname oder ungültige Zeichen im Domainnamen.';
+$wb['limit_mailcatchall_txt'] = 'Die maximale Anzahl an Catchall Einträgen für Ihr Konto wurde erreicht.';
+$wb['source_txt'] = 'Quelle';
+$wb['destination_error_isemail'] = 'Das Ziel ist keine gültige E-Mail Adresse.';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng
index 7ce05d321..558cb5c9f 100644
--- a/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng
@@ -7,4 +7,3 @@ $wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Neuen Catchall hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_domain_list.lng b/interface/web/mail/lib/lang/de_mail_domain_list.lng
index a13af2559..ff25a5817 100644
--- a/interface/web/mail/lib/lang/de_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain_list.lng
@@ -1,8 +1,7 @@
<?php
-$wb['list_head_txt'] = "E-Mail Domain";
-$wb['server_id_txt'] = "Server";
-$wb['domain_txt'] = "Domain";
-$wb['add_new_record_txt'] = "Neue Domain hinzufügen";
-$wb['active_txt'] = "Aktiv";
+$wb['list_head_txt'] = 'E-Mail Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
+$wb['active_txt'] = 'Aktiv';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_forward.lng b/interface/web/mail/lib/lang/de_mail_forward.lng
index d611a51eb..a392ac4e3 100644
--- a/interface/web/mail/lib/lang/de_mail_forward.lng
+++ b/interface/web/mail/lib/lang/de_mail_forward.lng
@@ -1,10 +1,9 @@
<?php
-$wb['email_txt'] = "E-Mail Adresse";
-$wb['destination_txt'] = "Ziel E-Mail Adresse";
-$wb['active_txt'] = "Aktiv";
-$wb['limit_mailforward_txt'] = "Die maximale Anzahl an E-Mail Weiterleitungen für Ihr Konto wurde erreicht.";
-$wb['duplicate_mailbox_txt'] = "Es existiert bereits ein E-Mail Konto mit dieser Adresse.";
-$wb['domain_txt'] = "Domain";
-$wb['source_txt'] = "Quell E-Mail Adresse";
+$wb['email_txt'] = 'E-Mail Adresse';
+$wb['destination_txt'] = 'Ziel E-Mail Adresse';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_mailforward_txt'] = 'Die maximale Anzahl an E-Mail Weiterleitungen für Ihr Konto wurde erreicht.';
+$wb['duplicate_mailbox_txt'] = 'Es existiert bereits ein E-Mail Konto mit dieser Adresse.';
+$wb['domain_txt'] = 'Domain';
+$wb['source_txt'] = 'Quell E-Mail Adresse';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_forward_list.lng b/interface/web/mail/lib/lang/de_mail_forward_list.lng
index 01b295061..99b6ab5ea 100644
--- a/interface/web/mail/lib/lang/de_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_forward_list.lng
@@ -6,4 +6,3 @@ $wb['destination_txt'] = 'Ziel';
$wb['email_txt'] = 'E-Mail';
$wb['add_new_record_txt'] = 'Neue E-Mail Weiterleitung hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_get.lng b/interface/web/mail/lib/lang/de_mail_get.lng
index f634a812f..b97265051 100644
--- a/interface/web/mail/lib/lang/de_mail_get.lng
+++ b/interface/web/mail/lib/lang/de_mail_get.lng
@@ -1,19 +1,18 @@
<?php
-$wb['server_id_txt'] = "Server";
-$wb['type_txt'] = "Typ";
-$wb['source_server_txt'] = "POP3/IMAP Server";
-$wb['source_username_txt'] = "Benutzername";
-$wb['source_password_txt'] = "Passwort";
-$wb['source_delete_txt'] = "E-Mails nach Empfang löschen";
-$wb['destination_txt'] = "Ziel";
-$wb['active_txt'] = "Aktiv";
-$wb['limit_fetchmail_txt'] = "Die maximale Anzahl an Sammelkonto Einträgen für Ihr Konto wurde erreicht.";
-$wb['source_server_error_isempty'] = "Server ist leer.";
-$wb['source_username_error_isempty'] = "Benutzername ist leer.";
-$wb['source_password_error_isempty'] = "Passwort ist leer.";
-$wb['destination_error_isemail'] = "Kein Ziel gewählt.";
-$wb['source_server_error_regex'] = "POP3/IMAP Server ist kein gültiger Domainname.";
-$wb['source_read_all_txt'] = "Alle E-Mails abrufen (inkl. bereits gelesene E-Mails)";
-$wb['error_delete_read_all_combination'] = "Unzulässige Kombination von Optionen. Sie können ";
+$wb['server_id_txt'] = 'Server';
+$wb['type_txt'] = 'Typ';
+$wb['source_server_txt'] = 'POP3/IMAP Server';
+$wb['source_username_txt'] = 'Benutzername';
+$wb['source_password_txt'] = 'Passwort';
+$wb['source_delete_txt'] = 'E-Mails nach Empfang löschen';
+$wb['destination_txt'] = 'Ziel';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_fetchmail_txt'] = 'Die maximale Anzahl an Sammelkonto Einträgen für Ihr Konto wurde erreicht.';
+$wb['source_server_error_isempty'] = 'Server ist leer.';
+$wb['source_username_error_isempty'] = 'Benutzername ist leer.';
+$wb['source_password_error_isempty'] = 'Passwort ist leer.';
+$wb['destination_error_isemail'] = 'Kein Ziel gewählt.';
+$wb['source_server_error_regex'] = 'POP3/IMAP Server ist kein gültiger Domainname.';
+$wb['source_read_all_txt'] = 'Alle E-Mails abrufen (inkl. bereits gelesene E-Mails)';
+$wb['error_delete_read_all_combination'] = 'Unzulässige Kombination von Optionen. Sie können ';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_get_list.lng b/interface/web/mail/lib/lang/de_mail_get_list.lng
index ddeba625d..d19235812 100644
--- a/interface/web/mail/lib/lang/de_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_get_list.lng
@@ -1,10 +1,9 @@
<?php
-$wb['list_head_txt'] = "E-Mails von externem POP3 / IMAP Server abholen";
-$wb['active_txt'] = "Aktiv";
-$wb['server_id_txt'] = "Server";
-$wb['source_server_txt'] = "Externer Server";
-$wb['source_username_txt'] = "Benutzername";
-$wb['destination_txt'] = "Ziel";
-$wb['add_new_record_txt'] = "Neues Konto hinzufügen";
+$wb['list_head_txt'] = 'E-Mails von externem POP3 / IMAP Server abholen';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['source_server_txt'] = 'Externer Server';
+$wb['source_username_txt'] = 'Benutzername';
+$wb['destination_txt'] = 'Ziel';
+$wb['add_new_record_txt'] = 'Neues Konto hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_mailinglist.lng b/interface/web/mail/lib/lang/de_mail_mailinglist.lng
index 848ef0848..d854c4930 100644
--- a/interface/web/mail/lib/lang/de_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/de_mail_mailinglist.lng
@@ -17,4 +17,3 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng
index c9959f000..3eee785f2 100644
--- a/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Mailinglisten';
$wb['domain_txt'] = 'Domain';
$wb['listname_txt'] = 'Listenname';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_relay_recipient.lng b/interface/web/mail/lib/lang/de_mail_relay_recipient.lng
index ee1228194..37a240107 100644
--- a/interface/web/mail/lib/lang/de_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/de_mail_relay_recipient.lng
@@ -1,10 +1,9 @@
<?php
-$wb['server_id_txt'] = "Server";
-$wb['source_txt'] = "Relay Empfänger";
-$wb['recipient_txt'] = "Empfänger";
-$wb['active_txt'] = "Aktiv";
-$wb['source_error_notempty'] = "Adresse ist leer.";
-$wb['type_txt'] = "Typ";
-$wb['limit_mailfilter_txt'] = "Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.";
+$wb['server_id_txt'] = 'Server';
+$wb['source_txt'] = 'Relay Empfänger';
+$wb['recipient_txt'] = 'Empfänger';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_error_notempty'] = 'Adresse ist leer.';
+$wb['type_txt'] = 'Typ';
+$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng
index ec6574a59..fc5d6f47c 100644
--- a/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng
@@ -7,4 +7,3 @@ $wb['recipient_txt'] = 'Empfänger';
$wb['add_new_record_txt'] = 'Neuen Relay Empfänger hinzufügen';
$wb['access_txt'] = 'Zugriff';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_spamfilter.lng b/interface/web/mail/lib/lang/de_mail_spamfilter.lng
index f51fe47ff..b133a4129 100644
--- a/interface/web/mail/lib/lang/de_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/de_mail_spamfilter.lng
@@ -1,18 +1,17 @@
<?php
-$wb['email_txt'] = "E-Mail";
-$wb['spam_rewrite_score_int_txt'] = "Rewrite Bewertung";
-$wb['spam_redirect_score_int_txt'] = "Redirect Bewertung";
-$wb['spam_delete_score_int_txt'] = "Bewertung löschen";
-$wb['spam_rewrite_subject_txt'] = "Rewrite Betreff";
-$wb['spam_redirect_maildir_txt'] = "Redirect E-Mail Konto";
-$wb['active_txt'] = "Aktiv";
-$wb['spam_rewrite_txt'] = "Schreibe E-Mail Betreff über dieser Bewertung um.";
-$wb['spam_redirect_txt'] = "Leite E-Mails über dieser Bewertung zur ausgewähltem E-Mail Konto weiter.";
-$wb['spam_delete_txt'] = "Lösche E-Mails über dieser Bewertung.";
-$wb['disable_txt'] = "Tipp: Um eine Filteroption zu deaktivieren, müssen Sie die Bewertung auf 0.00 setzen.";
-$wb['email_error_isemail'] = "E-Mail Adresse ist ungültig.";
-$wb['email_error_unique'] = "Es existiert bereits ein Spamfilter Eintrag für diese E-Mail Adresse.";
-$wb['spam_redirect_maildir_purge_txt'] = "Lösche E-Mail Verzeichnis nach";
-$wb['days_txt'] = "Tagen.";
+$wb['email_txt'] = 'E-Mail';
+$wb['spam_rewrite_score_int_txt'] = 'Rewrite Bewertung';
+$wb['spam_redirect_score_int_txt'] = 'Redirect Bewertung';
+$wb['spam_delete_score_int_txt'] = 'Bewertung löschen';
+$wb['spam_rewrite_subject_txt'] = 'Rewrite Betreff';
+$wb['spam_redirect_maildir_txt'] = 'Redirect E-Mail Konto';
+$wb['active_txt'] = 'Aktiv';
+$wb['spam_rewrite_txt'] = 'Schreibe E-Mail Betreff über dieser Bewertung um.';
+$wb['spam_redirect_txt'] = 'Leite E-Mails über dieser Bewertung zur ausgewähltem E-Mail Konto weiter.';
+$wb['spam_delete_txt'] = 'Lösche E-Mails über dieser Bewertung.';
+$wb['disable_txt'] = 'Tipp: Um eine Filteroption zu deaktivieren, müssen Sie die Bewertung auf 0.00 setzen.';
+$wb['email_error_isemail'] = 'E-Mail Adresse ist ungültig.';
+$wb['email_error_unique'] = 'Es existiert bereits ein Spamfilter Eintrag für diese E-Mail Adresse.';
+$wb['spam_redirect_maildir_purge_txt'] = 'Lösche E-Mail Verzeichnis nach';
+$wb['days_txt'] = 'Tagen.';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng
index 7ccd9f5ff..95c7d406a 100644
--- a/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng
@@ -6,4 +6,3 @@ $wb['server_name_txt'] = 'Servername';
$wb['email_txt'] = 'E-Mail';
$wb['add_new_record_txt'] = 'Neuen Spamfilter Eintrag hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_transport.lng b/interface/web/mail/lib/lang/de_mail_transport.lng
index 096282629..873036f94 100644
--- a/interface/web/mail/lib/lang/de_mail_transport.lng
+++ b/interface/web/mail/lib/lang/de_mail_transport.lng
@@ -1,12 +1,11 @@
<?php
-$wb['server_id_txt'] = "Server";
-$wb['domain_txt'] = "Domain";
-$wb['destination_txt'] = "Ziel";
-$wb['type_txt'] = "Typ";
-$wb['mx_txt'] = "Kein MX Lookup";
-$wb['sort_order_txt'] = "Sortiert nach";
-$wb['active_txt'] = "Aktiv";
-$wb['limit_mailrouting_txt'] = "Die maximale Anzahl an E-Mail Routen für Ihr Konto wurde erreicht.";
-$wb['transport_txt'] = "Transport";
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['destination_txt'] = 'Ziel';
+$wb['type_txt'] = 'Typ';
+$wb['mx_txt'] = 'Kein MX Lookup';
+$wb['sort_order_txt'] = 'Sortiert nach';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_mailrouting_txt'] = 'Die maximale Anzahl an E-Mail Routen für Ihr Konto wurde erreicht.';
+$wb['transport_txt'] = 'Transport';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_transport_list.lng b/interface/web/mail/lib/lang/de_mail_transport_list.lng
index c08235b90..6c9f8656c 100644
--- a/interface/web/mail/lib/lang/de_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_transport_list.lng
@@ -1,10 +1,9 @@
<?php
-$wb['list_head_txt'] = "E-Mail Routing";
-$wb['active_txt'] = "Aktiv";
-$wb['server_id_txt'] = "Server";
-$wb['domain_txt'] = "Domain";
-$wb['transport_txt'] = "Transport";
-$wb['sort_order_txt'] = "Sortiert nach";
-$wb['add_new_record_txt'] = "Neuen Transport hinzufügen";
+$wb['list_head_txt'] = 'E-Mail Routing';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['transport_txt'] = 'Transport';
+$wb['sort_order_txt'] = 'Sortiert nach';
+$wb['add_new_record_txt'] = 'Neuen Transport hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index c31708444..87a55631f 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -1,51 +1,50 @@
<?php
-$wb['custom_mailfilter_txt'] = "Benutzerdefinierte E-Mailfilter Regel";
-$wb['email_txt'] = "E-Mail";
-$wb['cryptpwd_txt'] = "Passwort";
-$wb['active_txt'] = "Aktiv";
-$wb['email_error_isemail'] = "E-Mail Adresse ist ungültig.";
-$wb['email_error_unique'] = "Doppelte E-Mail Adresse.";
-$wb['autoresponder_subject_txt'] = "E-Mail Betreff";
-$wb['autoresponder_subject'] = "Abwesenheitsnotiz";
-$wb['autoresponder_text_txt'] = "Text";
-$wb['autoresponder_txt'] = "Autoresponder";
-$wb['no_domain_perm'] = "Sie haben keine Berechtigung für diese Domain.";
-$wb['error_no_pwd'] = "Passwort ist leer.";
-$wb['quota_error_isint'] = "E-Mailkontogröße muss eine Zahl sein.";
-$wb['quota_txt'] = "Beschränkung";
-$wb['server_id_txt'] = "Server ID";
-$wb['password_txt'] = "Passwort";
-$wb['maildir_txt'] = "E-Mail Verzeichnis";
-$wb['postfix_txt'] = "Aktiviere Empfang";
-$wb['access_txt'] = "Aktiviere Zugriff";
-$wb['policy_txt'] = "Spamfilter";
-$wb['no_policy'] = "- nicht aktiviert -";
-$wb['limit_mailbox_txt'] = "Die maximale Anzahl an E-Mailkonten für Ihr Konto wurde erreicht.";
-$wb['limit_mailquota_txt'] = "Der maximale Speicherplatz für Ihr E-Mail Konto wurde erreicht. Der maximal verfügbare Speicher in MB ist";
-$wb['disableimap_txt'] = "IMAP deaktivieren";
-$wb['disablepop3_txt'] = "POP3 deaktivieren";
-$wb['password_strength_txt'] = "Passwortkomplexität";
-$wb['duplicate_alias_or_forward_txt'] = "Es existiert bereits ein Alias oder eine Weiterleitung mit dieser E-Mail Adresse.";
-$wb['quota_error_value'] = "Ungültige Beschränkungseingabe. Erlaubte Größen sind: 0 für unlimitiert oder Nummern > 1";
-$wb['autoresponder_start_date_txt'] = "Startet am";
-$wb['autoresponder_start_date_ispast'] = "Startdatum kann nicht in der Vergangenheit liegen.";
-$wb['autoresponder_end_date_txt'] = "Endet am";
-$wb['autoresponder_end_date_isgreater'] = "Enddatum muss angegeben werden und muss später als das Startdatum sein.";
-$wb['move_junk_txt'] = "Spam E-Mails in das Junk Verzeichnis verschieben";
-$wb['name_txt'] = "Name";
-$wb['name_optional_txt'] = "(optional)";
-$wb['autoresponder_active'] = "Autoresponder aktivieren";
-$wb['cc_txt'] = "Kopie senden an";
-$wb['cc_error_isemail'] = "Das -Kopie senden an- Feld enthält keine gültige E-Mail Adresse";
-$wb['login_error_unique'] = "Benutzername wird bereits verwendet.";
-$wb['login_error_regex'] = "Zulässige Zeichen sind A-Z, a-z, 0-9, ., _ und -.";
-$wb['login_txt'] = "Anmelden";
-$wb['error_login_email_txt'] = "Dieser Benutzername ist nicht zulässig. Bitte verwenden Sie einen anderen Benutzernamen oder die E-Mail Adresse als Benutzername.";
-$wb['domain_txt'] = "Domain";
-$wb['now_txt'] = "Jetzt";
-$wb['generate_password_txt'] = "Passwort erzeugen";
-$wb['repeat_password_txt'] = "Passwort wiederholen";
-$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein.";
-$wb['password_match_txt'] = "Die Passwörter stimmen überein.";
+$wb['custom_mailfilter_txt'] = 'Benutzerdefinierte E-Mailfilter Regel';
+$wb['email_txt'] = 'E-Mail';
+$wb['cryptpwd_txt'] = 'Passwort';
+$wb['active_txt'] = 'Aktiv';
+$wb['email_error_isemail'] = 'E-Mail Adresse ist ungültig.';
+$wb['email_error_unique'] = 'Doppelte E-Mail Adresse.';
+$wb['autoresponder_subject_txt'] = 'E-Mail Betreff';
+$wb['autoresponder_subject'] = 'Abwesenheitsnotiz';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
+$wb['error_no_pwd'] = 'Passwort ist leer.';
+$wb['quota_error_isint'] = 'E-Mailkontogröße muss eine Zahl sein.';
+$wb['quota_txt'] = 'Beschränkung';
+$wb['server_id_txt'] = 'Server ID';
+$wb['password_txt'] = 'Passwort';
+$wb['maildir_txt'] = 'E-Mail Verzeichnis';
+$wb['postfix_txt'] = 'Aktiviere Empfang';
+$wb['access_txt'] = 'Aktiviere Zugriff';
+$wb['policy_txt'] = 'Spamfilter';
+$wb['no_policy'] = '- nicht aktiviert -';
+$wb['limit_mailbox_txt'] = 'Die maximale Anzahl an E-Mailkonten für Ihr Konto wurde erreicht.';
+$wb['limit_mailquota_txt'] = 'Der maximale Speicherplatz für Ihr E-Mail Konto wurde erreicht. Der maximal verfügbare Speicher in MB ist';
+$wb['disableimap_txt'] = 'IMAP deaktivieren';
+$wb['disablepop3_txt'] = 'POP3 deaktivieren';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['duplicate_alias_or_forward_txt'] = 'Es existiert bereits ein Alias oder eine Weiterleitung mit dieser E-Mail Adresse.';
+$wb['quota_error_value'] = 'Ungültige Beschränkungseingabe. Erlaubte Größen sind: 0 für unlimitiert oder Nummern > 1';
+$wb['autoresponder_start_date_txt'] = 'Startet am';
+$wb['autoresponder_start_date_ispast'] = 'Startdatum kann nicht in der Vergangenheit liegen.';
+$wb['autoresponder_end_date_txt'] = 'Endet am';
+$wb['autoresponder_end_date_isgreater'] = 'Enddatum muss angegeben werden und muss später als das Startdatum sein.';
+$wb['move_junk_txt'] = 'Spam E-Mails in das Junk Verzeichnis verschieben';
+$wb['name_txt'] = 'Name';
+$wb['name_optional_txt'] = '(optional)';
+$wb['autoresponder_active'] = 'Autoresponder aktivieren';
+$wb['cc_txt'] = 'Kopie senden an';
+$wb['cc_error_isemail'] = 'Das -Kopie senden an- Feld enthält keine gültige E-Mail Adresse';
+$wb['login_error_unique'] = 'Benutzername wird bereits verwendet.';
+$wb['login_error_regex'] = 'Zulässige Zeichen sind A-Z, a-z, 0-9, ., _ und -.';
+$wb['login_txt'] = 'Anmelden';
+$wb['error_login_email_txt'] = 'Dieser Benutzername ist nicht zulässig. Bitte verwenden Sie einen anderen Benutzernamen oder die E-Mail Adresse als Benutzername.';
+$wb['domain_txt'] = 'Domain';
+$wb['now_txt'] = 'Jetzt';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_user_filter.lng b/interface/web/mail/lib/lang/de_mail_user_filter.lng
index 116bf264d..38c324eb8 100644
--- a/interface/web/mail/lib/lang/de_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_filter.lng
@@ -1,21 +1,20 @@
<?php
-$wb['rulename_txt'] = "Name";
-$wb['action_txt'] = "Aktion";
-$wb['target_txt'] = "Verzeichnis";
-$wb['active_txt'] = "Aktiv";
-$wb['rulename_error_empty'] = "Name ist leer.";
-$wb['searchterm_is_empty'] = "Suchbegriff ist leer.";
-$wb['source_txt'] = "Quelle";
-$wb['target_error_regex'] = "Das Ziel beinhaltet wahrscheinlich diese Zeichen: a-z, 0-9, -, ., _, und {raum}";
-$wb['limit_mailfilter_txt'] = "Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.";
-$wb['subject_txt'] = "Betreff";
-$wb['from_txt'] = "Von";
-$wb['to_txt'] = "An";
-$wb['contains_txt'] = "Enthält";
-$wb['is_txt'] = "Ist";
-$wb['begins_with_txt'] = "Beginnt mit";
-$wb['ends_with_txt'] = "Endet mit";
-$wb['move_to_txt'] = "Verschieben nach";
-$wb['delete_txt'] = "Löschen";
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Aktion';
+$wb['target_txt'] = 'Verzeichnis';
+$wb['active_txt'] = 'Aktiv';
+$wb['rulename_error_empty'] = 'Name ist leer.';
+$wb['searchterm_is_empty'] = 'Suchbegriff ist leer.';
+$wb['source_txt'] = 'Quelle';
+$wb['target_error_regex'] = 'Das Ziel beinhaltet wahrscheinlich diese Zeichen: a-z, 0-9, -, ., _, und {raum}';
+$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.';
+$wb['subject_txt'] = 'Betreff';
+$wb['from_txt'] = 'Von';
+$wb['to_txt'] = 'An';
+$wb['contains_txt'] = 'Enthält';
+$wb['is_txt'] = 'Ist';
+$wb['begins_with_txt'] = 'Beginnt mit';
+$wb['ends_with_txt'] = 'Endet mit';
+$wb['move_to_txt'] = 'Verschieben nach';
+$wb['delete_txt'] = 'Löschen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_user_filter_list.lng b/interface/web/mail/lib/lang/de_mail_user_filter_list.lng
index 695e404c8..003ed0e24 100644
--- a/interface/web/mail/lib/lang/de_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_filter_list.lng
@@ -5,4 +5,3 @@ $wb['page_txt'] = 'Seite';
$wb['page_of_txt'] = 'von';
$wb['delete_confirmation'] = 'Wollen Sie den Filter wirklich löschen?';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_user_list.lng b/interface/web/mail/lib/lang/de_mail_user_list.lng
index 2a4b775e7..a56fb6da1 100644
--- a/interface/web/mail/lib/lang/de_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_list.lng
@@ -1,9 +1,8 @@
<?php
-$wb['list_head_txt'] = "E-Mail Konto";
-$wb['email_txt'] = "E-Mail Adresse";
-$wb['autoresponder_txt'] = "Autoresponder";
-$wb['add_new_record_txt'] = "Neues E-Mail Konto hinzufügen";
-$wb['name_txt'] = "Realname";
-$wb['login_txt'] = "Anmelden";
+$wb['list_head_txt'] = 'E-Mail Konto';
+$wb['email_txt'] = 'E-Mail Adresse';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['add_new_record_txt'] = 'Neues E-Mail Konto hinzufügen';
+$wb['name_txt'] = 'Realname';
+$wb['login_txt'] = 'Anmelden';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_user_stats_list.lng b/interface/web/mail/lib/lang/de_mail_user_stats_list.lng
index 951fd758e..e9a198394 100644
--- a/interface/web/mail/lib/lang/de_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_stats_list.lng
@@ -1,9 +1,8 @@
<?php
-$wb['list_head_txt'] = "E-Mail Datenverkehr";
-$wb['email_txt'] = "E-Mail Adresse";
-$wb['this_month_txt'] = "Aktuelles Monat";
-$wb['last_month_txt'] = "Vergangenes Monat";
-$wb['this_year_txt'] = "Aktuelles Jahr";
-$wb['last_year_txt'] = "Vergangenes Jahr";
+$wb['list_head_txt'] = 'E-Mail Datenverkehr';
+$wb['email_txt'] = 'E-Mail Adresse';
+$wb['this_month_txt'] = 'Aktuelles Monat';
+$wb['last_month_txt'] = 'Vergangenes Monat';
+$wb['this_year_txt'] = 'Aktuelles Jahr';
+$wb['last_year_txt'] = 'Vergangenes Jahr';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_whitelist.lng b/interface/web/mail/lib/lang/de_mail_whitelist.lng
index 711c645a6..1506deba3 100644
--- a/interface/web/mail/lib/lang/de_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/de_mail_whitelist.lng
@@ -1,10 +1,9 @@
<?php
-$wb['server_id_txt'] = "Server";
-$wb['source_txt'] = "Whitelist E-Mail Adresse";
-$wb['recipient_txt'] = "Empfänger";
-$wb['active_txt'] = "Aktiv";
-$wb['source_error_notempty'] = "E-Mail Adresse ist leer.";
-$wb['type_txt'] = "Typ";
-$wb['limit_mailfilter_txt'] = "Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.";
+$wb['server_id_txt'] = 'Server';
+$wb['source_txt'] = 'Whitelist E-Mail Adresse';
+$wb['recipient_txt'] = 'Empfänger';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_error_notempty'] = 'E-Mail Adresse ist leer.';
+$wb['type_txt'] = 'Typ';
+$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.';
?>
-
diff --git a/interface/web/mail/lib/lang/de_mail_whitelist_list.lng b/interface/web/mail/lib/lang/de_mail_whitelist_list.lng
index cf511a565..bcd4ccb4e 100644
--- a/interface/web/mail/lib/lang/de_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_whitelist_list.lng
@@ -8,4 +8,3 @@ $wb['recipient_txt'] = 'Empfänger';
$wb['add_new_record_txt'] = 'Whitelist Eintrag hinzufügen';
$wb['access_txt'] = 'Zugriff';
?>
-
diff --git a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
index 9be7f067c..1dd4c6e3f 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
@@ -7,4 +7,3 @@ $wb['priority_txt'] = 'Priorität';
$wb['active_txt'] = 'Aktiv';
$wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für ihr Konto wurde erreicht.';
?>
-
diff --git a/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng
index a0fe0722c..7ba623b65 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng
@@ -7,4 +7,3 @@ $wb['rid_txt'] = 'Benutzer';
$wb['email_txt'] = 'Blacklisted E-Mail Adressen';
$wb['add_new_record_txt'] = 'Blacklist Eintrag hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_spamfilter_config.lng b/interface/web/mail/lib/lang/de_spamfilter_config.lng
index 72548e41d..2cf223259 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_config.lng
@@ -1,21 +1,20 @@
<?php
-$wb['getmail_config_dir_txt'] = "Getmail Konfigurationspfad";
-$wb['ip_address_txt'] = "IP Adresse";
-$wb['netmask_txt'] = "Netzmaske";
-$wb['gateway_txt'] = "Gateway";
-$wb['hostname_txt'] = "Hostname";
-$wb['nameservers_txt'] = "Nameserver";
-$wb['module_txt'] = "Server Module";
-$wb['maildir_path_txt'] = "E-Mail Verzeichnis Pfad";
-$wb['homedir_path_txt'] = "Home Verzeichnis Pfad";
-$wb['mailuser_uid_txt'] = "E-Mail Benutzer UID";
-$wb['mailuser_gid_txt'] = "E-Mail Benutzer GID";
-$wb['mailuser_name_txt'] = "E-Mail Benutzer Name";
-$wb['mailuser_group_txt'] = "E-Mail Benutzer Gruppe";
-$wb['relayhost_txt'] = "Relayhost";
-$wb['relayhost_user_txt'] = "Relayhost Benutzer";
-$wb['relayhost_password_txt'] = "Relayhost Passwort";
-$wb['mailbox_size_limit_txt'] = "E-Mail Kontogrössenlimit";
-$wb['message_size_limit_txt'] = "Nachrichtengrössenlimit";
+$wb['getmail_config_dir_txt'] = 'Getmail Konfigurationspfad';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['netmask_txt'] = 'Netzmaske';
+$wb['gateway_txt'] = 'Gateway';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Nameserver';
+$wb['module_txt'] = 'Server Module';
+$wb['maildir_path_txt'] = 'E-Mail Verzeichnis Pfad';
+$wb['homedir_path_txt'] = 'Home Verzeichnis Pfad';
+$wb['mailuser_uid_txt'] = 'E-Mail Benutzer UID';
+$wb['mailuser_gid_txt'] = 'E-Mail Benutzer GID';
+$wb['mailuser_name_txt'] = 'E-Mail Benutzer Name';
+$wb['mailuser_group_txt'] = 'E-Mail Benutzer Gruppe';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost Benutzer';
+$wb['relayhost_password_txt'] = 'Relayhost Passwort';
+$wb['mailbox_size_limit_txt'] = 'E-Mail Kontogrössenlimit';
+$wb['message_size_limit_txt'] = 'Nachrichtengrössenlimit';
?>
-
diff --git a/interface/web/mail/lib/lang/de_spamfilter_config_list.lng b/interface/web/mail/lib/lang/de_spamfilter_config_list.lng
index 579d3155d..db92a4bd0 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_config_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Serverkonfiguration';
$wb['server_name_txt'] = 'Server';
$wb['server_id_txt'] = 'Server ID';
?>
-
diff --git a/interface/web/mail/lib/lang/de_spamfilter_policy.lng b/interface/web/mail/lib/lang/de_spamfilter_policy.lng
index 4d3e985ba..497cb90b9 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_policy.lng
@@ -1,39 +1,38 @@
<?php
-$wb['policy_name_txt'] = "Richtlinienname";
-$wb['virus_lover_txt'] = "Virus Liebhaber";
-$wb['spam_lover_txt'] = "SPAM Liebhaber";
-$wb['banned_files_lover_txt'] = "Banned Files Liebhaber";
-$wb['bad_header_lover_txt'] = "Bad Header Liebhaber";
-$wb['bypass_virus_checks_txt'] = "Umgehe Virus Überprüfungen";
-$wb['bypass_banned_checks_txt'] = "Umgehe Banned Überprüfungen";
-$wb['bypass_header_checks_txt'] = "Umgehe Header Überprüfungen";
-$wb['virus_quarantine_to_txt'] = "Weiterleiten von Viren zur E-Mail Adresse";
-$wb['spam_quarantine_to_txt'] = "Weiterleiten von Spam zur E-Mail Adresse";
-$wb['banned_quarantine_to_txt'] = "Weiterleiten von Banned zur E-Mail Adresse";
-$wb['bad_header_quarantine_to_txt'] = "Weiterleiten von Bad Header zur E-Mail Adresse";
-$wb['clean_quarantine_to_txt'] = "Weiterleiten von sauberen E-Mails zur E-Mail Adresse";
-$wb['other_quarantine_to_txt'] = "Weiterleiten von anderen E-Mails zur E-Mail Adresse";
-$wb['spam_tag_level_txt'] = "SPAM Markierungslevel";
-$wb['spam_tag2_level_txt'] = "SPAM Markierungslevel 2";
-$wb['spam_kill_level_txt'] = "SPAM Markierungslevel Kill";
-$wb['spam_dsn_cutoff_level_txt'] = "SPAM Markierungslevel DNS Cutoff";
-$wb['spam_quarantine_cutoff_level_txt'] = "SPAM Markierungslevel Quarantine Cutoff";
-$wb['spam_modifies_subj_txt'] = "SPAM ändert Betreff";
-$wb['spam_subject_tag_txt'] = "SPAM Betreff Markierung";
-$wb['spam_subject_tag2_txt'] = "SPAM Betreff Markierung 2";
-$wb['addr_extension_virus_txt'] = "Adresserweiterung Virus";
-$wb['addr_extension_spam_txt'] = "Adresserweiterung SPAM";
-$wb['addr_extension_banned_txt'] = "Adresserweiterung Banned";
-$wb['addr_extension_bad_header_txt'] = "Adresserweiterung Bad Header";
-$wb['warnvirusrecip_txt'] = "Warne Virus Empfänger";
-$wb['warnbannedrecip_txt'] = "Warne Banned Empfänger";
-$wb['warnbadhrecip_txt'] = "Warne Bad Header Empfänger";
-$wb['newvirus_admin_txt'] = "Newvirus Administrator";
-$wb['virus_admin_txt'] = "Virus Administrator";
-$wb['banned_admin_txt'] = "Banned Administrator";
-$wb['bad_header_admin_txt'] = "Bad Header Administrator";
-$wb['spam_admin_txt'] = "SPAM Administrator";
-$wb['message_size_limit_txt'] = "Nachrichtengrößen Limit";
-$wb['banned_rulenames_txt'] = "Banned Richtliniennamen";
+$wb['policy_name_txt'] = 'Richtlinienname';
+$wb['virus_lover_txt'] = 'Virus Liebhaber';
+$wb['spam_lover_txt'] = 'SPAM Liebhaber';
+$wb['banned_files_lover_txt'] = 'Banned Files Liebhaber';
+$wb['bad_header_lover_txt'] = 'Bad Header Liebhaber';
+$wb['bypass_virus_checks_txt'] = 'Umgehe Virus Überprüfungen';
+$wb['bypass_banned_checks_txt'] = 'Umgehe Banned Überprüfungen';
+$wb['bypass_header_checks_txt'] = 'Umgehe Header Überprüfungen';
+$wb['virus_quarantine_to_txt'] = 'Weiterleiten von Viren zur E-Mail Adresse';
+$wb['spam_quarantine_to_txt'] = 'Weiterleiten von Spam zur E-Mail Adresse';
+$wb['banned_quarantine_to_txt'] = 'Weiterleiten von Banned zur E-Mail Adresse';
+$wb['bad_header_quarantine_to_txt'] = 'Weiterleiten von Bad Header zur E-Mail Adresse';
+$wb['clean_quarantine_to_txt'] = 'Weiterleiten von sauberen E-Mails zur E-Mail Adresse';
+$wb['other_quarantine_to_txt'] = 'Weiterleiten von anderen E-Mails zur E-Mail Adresse';
+$wb['spam_tag_level_txt'] = 'SPAM Markierungslevel';
+$wb['spam_tag2_level_txt'] = 'SPAM Markierungslevel 2';
+$wb['spam_kill_level_txt'] = 'SPAM Markierungslevel Kill';
+$wb['spam_dsn_cutoff_level_txt'] = 'SPAM Markierungslevel DNS Cutoff';
+$wb['spam_quarantine_cutoff_level_txt'] = 'SPAM Markierungslevel Quarantine Cutoff';
+$wb['spam_modifies_subj_txt'] = 'SPAM ändert Betreff';
+$wb['spam_subject_tag_txt'] = 'SPAM Betreff Markierung';
+$wb['spam_subject_tag2_txt'] = 'SPAM Betreff Markierung 2';
+$wb['addr_extension_virus_txt'] = 'Adresserweiterung Virus';
+$wb['addr_extension_spam_txt'] = 'Adresserweiterung SPAM';
+$wb['addr_extension_banned_txt'] = 'Adresserweiterung Banned';
+$wb['addr_extension_bad_header_txt'] = 'Adresserweiterung Bad Header';
+$wb['warnvirusrecip_txt'] = 'Warne Virus Empfänger';
+$wb['warnbannedrecip_txt'] = 'Warne Banned Empfänger';
+$wb['warnbadhrecip_txt'] = 'Warne Bad Header Empfänger';
+$wb['newvirus_admin_txt'] = 'Newvirus Administrator';
+$wb['virus_admin_txt'] = 'Virus Administrator';
+$wb['banned_admin_txt'] = 'Banned Administrator';
+$wb['bad_header_admin_txt'] = 'Bad Header Administrator';
+$wb['spam_admin_txt'] = 'SPAM Administrator';
+$wb['message_size_limit_txt'] = 'Nachrichtengrößen Limit';
+$wb['banned_rulenames_txt'] = 'Banned Richtliniennamen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng
index 02083ef5d..b5ec8e98c 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng
@@ -7,4 +7,3 @@ $wb['banned_files_lover_txt'] = 'Gesperrte Dateien Liebhaber';
$wb['bad_header_lover_txt'] = 'Ungültige Header Liebhaber';
$wb['add_new_record_txt'] = 'Richtlinien Eintrag hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_spamfilter_users.lng b/interface/web/mail/lib/lang/de_spamfilter_users.lng
index 92c60b07b..d31d0e1fe 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_users.lng
@@ -1,9 +1,8 @@
<?php
-$wb['server_id_txt'] = "Server";
-$wb['priority_txt'] = "Priorität";
-$wb['policy_id_txt'] = "Richtlinie";
-$wb['email_txt'] = "E-Mail (Zeichenkette)";
-$wb['fullname_txt'] = "Name";
-$wb['local_txt'] = "Lokal";
+$wb['server_id_txt'] = 'Server';
+$wb['priority_txt'] = 'Priorität';
+$wb['policy_id_txt'] = 'Richtlinie';
+$wb['email_txt'] = 'E-Mail (Zeichenkette)';
+$wb['fullname_txt'] = 'Name';
+$wb['local_txt'] = 'Lokal';
?>
-
diff --git a/interface/web/mail/lib/lang/de_spamfilter_users_list.lng b/interface/web/mail/lib/lang/de_spamfilter_users_list.lng
index 89a598328..8e53193f7 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_users_list.lng
@@ -8,4 +8,3 @@ $wb['fullname_txt'] = 'Name';
$wb['email_txt'] = 'E-Mail Adresse';
$wb['add_new_record_txt'] = 'Spamfilterbenutzer hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
index 4a95035d7..d388432c6 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
@@ -1,10 +1,9 @@
<?php
-$wb['server_id_txt'] = "Server";
-$wb['wb_txt'] = "wb";
-$wb['rid_txt'] = "Benutzer";
-$wb['email_txt'] = "E-Mail";
-$wb['priority_txt'] = "Priorität";
-$wb['active_txt'] = "Aktiv";
-$wb['limit_spamfilter_wblist_txt'] = "Die maximale Anzahl an White- oder Blacklist Einträgen für Ihr Konto wurde erreicht.";
+$wb['server_id_txt'] = 'Server';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Benutzer';
+$wb['email_txt'] = 'E-Mail';
+$wb['priority_txt'] = 'Priorität';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für Ihr Konto wurde erreicht.';
?>
-
diff --git a/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng
index ed8a22089..4d7769d2a 100644
--- a/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng
@@ -7,4 +7,3 @@ $wb['rid_txt'] = 'Benutzer';
$wb['email_txt'] = 'Whitelisted E-Mail Adresse';
$wb['add_new_record_txt'] = 'Whitelist Eintrag hinzufügen';
?>
-
diff --git a/interface/web/mail/lib/lang/de_user_quota_stats_list.lng b/interface/web/mail/lib/lang/de_user_quota_stats_list.lng
index 7279daed3..9a23a9716 100755
--- a/interface/web/mail/lib/lang/de_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/de_user_quota_stats_list.lng
@@ -1,8 +1,7 @@
<?php
-$wb['list_head_txt'] = "E-Mail Kontobeschränkung";
-$wb['quota_txt'] = "Verfügbarer Speicherplatz";
-$wb['name_txt'] = "Name";
-$wb['email_txt'] = "E-Mail Adresse";
-$wb['used_txt'] = "Verbrauchter Speicherplatz";
+$wb['list_head_txt'] = 'E-Mail Kontobeschränkung';
+$wb['quota_txt'] = 'Verfügbarer Speicherplatz';
+$wb['name_txt'] = 'Name';
+$wb['email_txt'] = 'E-Mail Adresse';
+$wb['used_txt'] = 'Verbrauchter Speicherplatz';
?>
-
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm
index 5761b50e3..5ac6862fd 100644
--- a/interface/web/mail/templates/mail_alias_list.htm
+++ b/interface/web/mail/templates/mail_alias_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_mail_alias">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_alias_edit.php');">
diff --git a/interface/web/mail/templates/mail_aliasdomain_list.htm b/interface/web/mail/templates/mail_aliasdomain_list.htm
index 8adc9f38a..d053af03e 100644
--- a/interface/web/mail/templates/mail_aliasdomain_list.htm
+++ b/interface/web/mail/templates/mail_aliasdomain_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_mail_aliasdomain">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_aliasdomain_edit.php');">
diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm
index fc5f3ac0d..b09f91f98 100644
--- a/interface/web/mail/templates/mail_blacklist_list.htm
+++ b/interface/web/mail/templates/mail_blacklist_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_mail_blacklist">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_blacklist_edit.php');">
diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm
index 9109884f5..ef002fb4f 100644
--- a/interface/web/mail/templates/mail_content_filter_list.htm
+++ b/interface/web/mail/templates/mail_content_filter_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_mail_content_filter">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_content_filter_edit.php');">
diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm
index e9732f56c..3cb15d286 100644
--- a/interface/web/mail/templates/mail_domain_catchall_list.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_mail_domain_catchall">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_domain_catchall_edit.php');">
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm
index e1dc4bfa6..4f6e3a1a8 100644
--- a/interface/web/mail/templates/mail_domain_list.htm
+++ b/interface/web/mail/templates/mail_domain_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_mail_domain">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_domain_edit.php');">
diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm
index 230880204..a7a98a037 100644
--- a/interface/web/mail/templates/mail_forward_list.htm
+++ b/interface/web/mail/templates/mail_forward_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_mail_forward">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_forward_edit.php');">
diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm
index 05f8bbd10..8031b55c3 100644
--- a/interface/web/mail/templates/mail_get_list.htm
+++ b/interface/web/mail/templates/mail_get_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_mail_get">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_get_edit.php');">
diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm
index 05c48d4de..b24683c71 100644
--- a/interface/web/mail/templates/mail_mailinglist_list.htm
+++ b/interface/web/mail/templates/mail_mailinglist_list.htm
@@ -3,6 +3,22 @@
<div class="panel panel_list_mail_mailinglist">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_mailinglist_edit.php');">
diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm
index e5b614b12..2493b0320 100644
--- a/interface/web/mail/templates/mail_relay_recipient_list.htm
+++ b/interface/web/mail/templates/mail_relay_recipient_list.htm
@@ -3,6 +3,22 @@
<div class="panel panel_list_mail_relay_recipient">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_relay_recipient_edit.php');">
diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm
index d7d7e0906..fd12fa49a 100644
--- a/interface/web/mail/templates/mail_transport_list.htm
+++ b/interface/web/mail/templates/mail_transport_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_mail_transport">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_transport_edit.php');">
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm
index cd10e4dc8..3bda1a295 100644
--- a/interface/web/mail/templates/mail_user_filter_list.htm
+++ b/interface/web/mail/templates/mail_user_filter_list.htm
@@ -1,5 +1,21 @@
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
index 553cc816b..0febd19c3 100644
--- a/interface/web/mail/templates/mail_user_list.htm
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_mail_user">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_user_edit.php');">
@@ -26,8 +42,8 @@
</tr>
<tr class="filter">
<td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
- <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
<tmpl_if name="enable_custom_login"><td class="tbl_col_login"><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if>
+ <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
<td class="tbl_col_autoresponder"><select name="search_autoresponder">{tmpl_var name='search_autoresponder'}</select></td>
<td class="tbl_col_buttons">
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
diff --git a/interface/web/mailuser/lib/lang/ar.lng b/interface/web/mailuser/lib/lang/ar.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/ar.lng
+++ b/interface/web/mailuser/lib/lang/ar.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/ar_index.lng b/interface/web/mailuser/lib/lang/ar_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/ar_index.lng
+++ b/interface/web/mailuser/lib/lang/ar_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_cc.lng b/interface/web/mailuser/lib/lang/ar_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/ar_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/ar_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/ar_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/ar_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/ar_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_password.lng b/interface/web/mailuser/lib/lang/ar_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/ar_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/ar_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/ar_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/ar_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/ar_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/br.lng b/interface/web/mailuser/lib/lang/br.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/br.lng
+++ b/interface/web/mailuser/lib/lang/br.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/br_index.lng b/interface/web/mailuser/lib/lang/br_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/br_index.lng
+++ b/interface/web/mailuser/lib/lang/br_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/br_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/br_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/br_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/br_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/br_mail_user_cc.lng b/interface/web/mailuser/lib/lang/br_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/br_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/br_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/br_mail_user_filter.lng b/interface/web/mailuser/lib/lang/br_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/br_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/br_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/br_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/br_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/br_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/br_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/br_mail_user_password.lng b/interface/web/mailuser/lib/lang/br_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/br_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/br_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/br_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/br_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/br_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/br_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng
index 5b711141e..d610b3f87 100644
--- a/interface/web/mailuser/lib/lang/cz.lng
+++ b/interface/web/mailuser/lib/lang/cz.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'E-mailový úÄet';
+$wb['Overview'] = 'Přehled';
+$wb['Password'] = 'Heslo';
+$wb['Autoresponder'] = 'Automatická odpovÄ›Ä';
+$wb['Send copy'] = 'Poslat kopii na e-mail';
+$wb['Spamfilter'] = 'Spamový filter';
+$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 35c6aae8e..45af56ee8 100644
--- a/interface/web/mailuser/lib/lang/cz_index.lng
+++ b/interface/web/mailuser/lib/lang/cz_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Nastavenà e-mailové schránky';
+$wb['page_desc_txt'] = 'Zde můžete upravit nastavenà pro e-mailový úÄet.';
+$wb['email_txt'] = 'E-mailová adresa';
+$wb['login_txt'] = 'Přihlášen';
+$wb['server_address_txt'] = 'Adresa e-mailového serveru';
+$wb['cc_txt'] = 'Poslat kopii na e-mail (CC)';
+$wb['quota_txt'] = 'Velikost poštovnà schránky';
+$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 a736abf69..ef3aeb42d 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
-$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
-$wb['autoresponder_subject_txt'] = 'Betreff';
+$wb['mailbox_autoresponder_txt'] = 'Automatická odpovÄ›Ä';
+$wb['autoresponder_subject'] = 'Oznámenà o nepÅ™Ãtomnosti';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'AktivnÃ';
+$wb['autoresponder_start_date_txt'] = 'ZaÄÃt od';
+$wb['autoresponder_start_date_isfuture'] = 'Datum zahájenà nesmà být v minulosti.';
+$wb['autoresponder_end_date_txt'] = 'SkonÄit';
+$wb['autoresponder_end_date_isgreater'] = 'Datum ukonÄenà musà být nastaven a musà být pozdÄ›jÅ¡Ã než datum zahájenÃ.';
+$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 0073c7164..36f11a9ba 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Poslat kopii na e-mailovou adresu';
+$wb['cc_txt'] = 'Poslat kopii na e-mail';
+$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 296a47ec5..57b9d61c0 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
@@ -1,20 +1,20 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
-$wb['subject_txt'] = 'Subject';
-$wb['from_txt'] = 'From';
-$wb['to_txt'] = 'To';
-$wb['contains_txt'] = 'Contains';
-$wb['is_txt'] = 'Is';
-$wb['begins_with_txt'] = 'Begins with';
-$wb['ends_with_txt'] = 'Ends with';
-$wb['move_to_txt'] = 'Move to';
-$wb['delete_txt'] = 'Delete';
+$wb['rulename_txt'] = 'Název pravidla';
+$wb['action_txt'] = 'Akce';
+$wb['target_txt'] = 'Složka';
+$wb['active_txt'] = 'AktivnÃ';
+$wb['rulename_error_empty'] = 'Název pravidla je prázdný.';
+$wb['searchterm_is_empty'] = 'Hledaný výraz je prázdný.';
+$wb['source_txt'] = 'Zdroj';
+$wb['target_error_regex'] = 'CÃl může obsahovat jen tyto znaky: a-z, 0-9, -, ., _, a {mezeru}';
+$wb['limit_mailfilter_txt'] = 'Byl dosažen max. poÄet e-mailový filtrovacÃch pravidel.';
+$wb['subject_txt'] = 'Předmět';
+$wb['from_txt'] = 'OdesÃlatel';
+$wb['to_txt'] = 'Adresát';
+$wb['contains_txt'] = 'Obsahuje';
+$wb['is_txt'] = 'Je';
+$wb['begins_with_txt'] = 'ZaÄÃná na';
+$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 3d147a525..3c2593d6d 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
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'E-mailová filtrovacà pravidla';
+$wb['rulename_txt'] = 'Název pravidla';
+$wb['add_new_record_txt'] = 'Přidat nové pravidlo';
+$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 43c114a81..36555a203 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+$wb['mailbox_password_txt'] = 'E-malový úÄet heslo';
+$wb['password_txt'] = 'Heslo';
+$wb['password_strength_txt'] = 'SÃla hesla';
+$wb['email_txt'] = 'E-mail';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$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 8f95dd37a..f0f5bb52a 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamový filter';
+$wb['spamfilter_txt'] = 'Spamový filter';
+$wb['email_txt'] = 'E-mail';
+$wb['no_policy'] = '- nepovoleno -';
+$wb['policy_txt'] = 'Politika';
+?>
diff --git a/interface/web/mailuser/lib/lang/de.lng b/interface/web/mailuser/lib/lang/de.lng
index 412abe788..326c7495f 100644
--- a/interface/web/mailuser/lib/lang/de.lng
+++ b/interface/web/mailuser/lib/lang/de.lng
@@ -7,4 +7,3 @@ $wb['Send copy'] = 'Kopie senden an';
$wb['Spamfilter'] = 'Spamfilter';
$wb['Email Filters'] = 'E-Mail Filter';
?>
-
diff --git a/interface/web/mailuser/lib/lang/de_index.lng b/interface/web/mailuser/lib/lang/de_index.lng
index 90c97720f..19ebf9db1 100644
--- a/interface/web/mailuser/lib/lang/de_index.lng
+++ b/interface/web/mailuser/lib/lang/de_index.lng
@@ -1,13 +1,12 @@
<?php
-$wb['page_head_txt'] = "E-Mail Konten Einstellungen";
-$wb['page_desc_txt'] = "Hier können Sie die Einstellungen des E-Mail Kontos ändern.";
-$wb['email_txt'] = "E-Mail Adresse";
-$wb['login_txt'] = "Login";
-$wb['server_address_txt'] = "E-Mailserver Adresse";
-$wb['cc_txt'] = "Kopie senden an (CC)";
-$wb['quota_txt'] = "E-Mail Kontogröße";
-$wb['unlimited_txt'] = "Unlimitiert";
-$wb['mb_txt'] = "MB";
-$wb['none_txt'] = "Niemanden";
+$wb['page_head_txt'] = 'E-Mail Konten Einstellungen';
+$wb['page_desc_txt'] = 'Hier können Sie die Einstellungen des E-Mail Kontos ändern.';
+$wb['email_txt'] = 'E-Mail Adresse';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'E-Mailserver Adresse';
+$wb['cc_txt'] = 'Kopie senden an (CC)';
+$wb['quota_txt'] = 'E-Mail Kontogröße';
+$wb['unlimited_txt'] = 'Unlimitiert';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'Niemanden';
?>
-
diff --git a/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng
index ce28da041..f8d4e46b1 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng
@@ -11,4 +11,3 @@ $wb['autoresponder_active'] = 'Autoresponder aktivieren';
$wb['now_txt'] = 'Jetzt';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
-
diff --git a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
index 6292bb574..b85077ea7 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
@@ -5,4 +5,3 @@ $wb['email_txt'] = 'E-Mail';
$wb['cc_error_isemail'] = 'E-Mail Adresse ungültig im -Kopie senden an- Feld';
$wb['email_is_cc_error'] = 'E-Mail Adresse und ';
?>
-
diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
index 9b86cc66a..fd93e6465 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
@@ -1,21 +1,20 @@
<?php
-$wb['rulename_txt'] = "Name";
-$wb['action_txt'] = "Aktion";
-$wb['target_txt'] = "Verzeichnis";
-$wb['active_txt'] = "Aktiv";
-$wb['rulename_error_empty'] = "Name ist leer.";
-$wb['searchterm_is_empty'] = "Suchbegriff ist leer.";
-$wb['source_txt'] = "Quelle";
-$wb['target_error_regex'] = "Das Ziel darf nur die folgenden Zeichen enthalten: a-z, 0-9, -, ., _, und {space}";
-$wb['limit_mailfilter_txt'] = "Die max. Anzahl an E-Mailfiltern ist erreicht.";
-$wb['subject_txt'] = "Betreff";
-$wb['from_txt'] = "Von";
-$wb['to_txt'] = "An";
-$wb['contains_txt'] = "Enthält";
-$wb['is_txt'] = "Ist";
-$wb['begins_with_txt'] = "Startet mit";
-$wb['ends_with_txt'] = "Endet mit";
-$wb['move_to_txt'] = "Verschieben nach";
-$wb['delete_txt'] = "Löschen";
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Aktion';
+$wb['target_txt'] = 'Verzeichnis';
+$wb['active_txt'] = 'Aktiv';
+$wb['rulename_error_empty'] = 'Name ist leer.';
+$wb['searchterm_is_empty'] = 'Suchbegriff ist leer.';
+$wb['source_txt'] = 'Quelle';
+$wb['target_error_regex'] = 'Das Ziel darf nur die folgenden Zeichen enthalten: a-z, 0-9, -, ., _, und {space}';
+$wb['limit_mailfilter_txt'] = 'Die max. Anzahl an E-Mailfiltern ist erreicht.';
+$wb['subject_txt'] = 'Betreff';
+$wb['from_txt'] = 'Von';
+$wb['to_txt'] = 'An';
+$wb['contains_txt'] = 'Enthält';
+$wb['is_txt'] = 'Ist';
+$wb['begins_with_txt'] = 'Startet mit';
+$wb['ends_with_txt'] = 'Endet mit';
+$wb['move_to_txt'] = 'Verschieben nach';
+$wb['delete_txt'] = 'Löschen';
?>
-
diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng
index f43891ef7..d0be3c560 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng
@@ -6,4 +6,3 @@ $wb['page_txt'] = 'Seite';
$wb['page_of_txt'] = 'von';
$wb['delete_confirmation'] = 'Möchten Sie die E-Mail Filter Regel wirklich löschen?';
?>
-
diff --git a/interface/web/mailuser/lib/lang/de_mail_user_password.lng b/interface/web/mailuser/lib/lang/de_mail_user_password.lng
index e2890c960..d9fdfe552 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_password.lng
@@ -1,11 +1,10 @@
<?php
-$wb['mailbox_password_txt'] = "E-Mail Konto Passwort";
-$wb['password_txt'] = "Passwort";
-$wb['password_strength_txt'] = "Passwortkomplexität";
-$wb['email_txt'] = "E-Mail";
-$wb['generate_password_txt'] = "Passwort erzeugen";
-$wb['repeat_password_txt'] = "Passwort wiederholen";
-$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein.";
-$wb['password_match_txt'] = "Die Passwörter stimmen überein.";
+$wb['mailbox_password_txt'] = 'E-Mail Konto Passwort';
+$wb['password_txt'] = 'Passwort';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['email_txt'] = 'E-Mail';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
-
diff --git a/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng
index 019679a82..47ac53a00 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng
@@ -5,4 +5,3 @@ $wb['email_txt'] = 'E-Mail';
$wb['no_policy'] = '- nicht aktiviert -';
$wb['policy_txt'] = 'Richtlinie';
?>
-
diff --git a/interface/web/mailuser/lib/lang/el.lng b/interface/web/mailuser/lib/lang/el.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/el.lng
+++ b/interface/web/mailuser/lib/lang/el.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/el_index.lng b/interface/web/mailuser/lib/lang/el_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/el_index.lng
+++ b/interface/web/mailuser/lib/lang/el_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_cc.lng b/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_password.lng b/interface/web/mailuser/lib/lang/el_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/es.lng b/interface/web/mailuser/lib/lang/es.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/es.lng
+++ b/interface/web/mailuser/lib/lang/es.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/es_index.lng b/interface/web/mailuser/lib/lang/es_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/es_index.lng
+++ b/interface/web/mailuser/lib/lang/es_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/es_mail_user_cc.lng b/interface/web/mailuser/lib/lang/es_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/es_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/es_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/es_mail_user_filter.lng b/interface/web/mailuser/lib/lang/es_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/es_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/es_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/es_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/es_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/es_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/es_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/es_mail_user_password.lng b/interface/web/mailuser/lib/lang/es_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/es_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/es_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/fi.lng b/interface/web/mailuser/lib/lang/fi.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/fi.lng
+++ b/interface/web/mailuser/lib/lang/fi.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/fi_index.lng b/interface/web/mailuser/lib/lang/fi_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/fi_index.lng
+++ b/interface/web/mailuser/lib/lang/fi_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_cc.lng b/interface/web/mailuser/lib/lang/fi_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/fi_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/fi_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng b/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/fi_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/fi_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/fi_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_password.lng b/interface/web/mailuser/lib/lang/fi_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/fi_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/fi_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/fi_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/fi_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/fi_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/hr.lng b/interface/web/mailuser/lib/lang/hr.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/hr.lng
+++ b/interface/web/mailuser/lib/lang/hr.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/hr_index.lng b/interface/web/mailuser/lib/lang/hr_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/hr_index.lng
+++ b/interface/web/mailuser/lib/lang/hr_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng b/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/hr_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_password.lng b/interface/web/mailuser/lib/lang/hr_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/hu.lng b/interface/web/mailuser/lib/lang/hu.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/hu.lng
+++ b/interface/web/mailuser/lib/lang/hu.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/hu_index.lng b/interface/web/mailuser/lib/lang/hu_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/hu_index.lng
+++ b/interface/web/mailuser/lib/lang/hu_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_cc.lng b/interface/web/mailuser/lib/lang/hu_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/hu_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/hu_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng b/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/hu_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/hu_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/hu_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_password.lng b/interface/web/mailuser/lib/lang/hu_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/hu_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/hu_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/hu_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/hu_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/hu_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/id.lng b/interface/web/mailuser/lib/lang/id.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/id.lng
+++ b/interface/web/mailuser/lib/lang/id.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/id_index.lng b/interface/web/mailuser/lib/lang/id_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/id_index.lng
+++ b/interface/web/mailuser/lib/lang/id_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/id_mail_user_cc.lng b/interface/web/mailuser/lib/lang/id_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/id_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/id_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/id_mail_user_filter.lng b/interface/web/mailuser/lib/lang/id_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/id_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/id_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/id_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/id_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/id_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/id_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/id_mail_user_password.lng b/interface/web/mailuser/lib/lang/id_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/id_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/id_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/id_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/id_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/id_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/id_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/it.lng b/interface/web/mailuser/lib/lang/it.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/it.lng
+++ b/interface/web/mailuser/lib/lang/it.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/it_index.lng b/interface/web/mailuser/lib/lang/it_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/it_index.lng
+++ b/interface/web/mailuser/lib/lang/it_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_cc.lng b/interface/web/mailuser/lib/lang/it_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_filter.lng b/interface/web/mailuser/lib/lang/it_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/it_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_password.lng b/interface/web/mailuser/lib/lang/it_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/ja.lng b/interface/web/mailuser/lib/lang/ja.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/ja.lng
+++ b/interface/web/mailuser/lib/lang/ja.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/ja_index.lng b/interface/web/mailuser/lib/lang/ja_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/ja_index.lng
+++ b/interface/web/mailuser/lib/lang/ja_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_cc.lng b/interface/web/mailuser/lib/lang/ja_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/ja_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/ja_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/ja_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/ja_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/ja_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_password.lng b/interface/web/mailuser/lib/lang/ja_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/ja_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/ja_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/ja_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/ja_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/ja_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/nl.lng b/interface/web/mailuser/lib/lang/nl.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/nl.lng
+++ b/interface/web/mailuser/lib/lang/nl.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/nl_index.lng b/interface/web/mailuser/lib/lang/nl_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/nl_index.lng
+++ b/interface/web/mailuser/lib/lang/nl_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/nl_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/nl_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/nl_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/nl_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/nl_mail_user_cc.lng b/interface/web/mailuser/lib/lang/nl_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/nl_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/nl_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng b/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/nl_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/nl_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/nl_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/nl_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/nl_mail_user_password.lng b/interface/web/mailuser/lib/lang/nl_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/nl_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/nl_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/nl_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/nl_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/nl_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/nl_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/pl.lng b/interface/web/mailuser/lib/lang/pl.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/pl.lng
+++ b/interface/web/mailuser/lib/lang/pl.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/pl_index.lng b/interface/web/mailuser/lib/lang/pl_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/pl_index.lng
+++ b/interface/web/mailuser/lib/lang/pl_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
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 a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
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 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the 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 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
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 3d147a525..fb6b9dfa5 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
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
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 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
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 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/pt.lng b/interface/web/mailuser/lib/lang/pt.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/pt.lng
+++ b/interface/web/mailuser/lib/lang/pt.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/pt_index.lng b/interface/web/mailuser/lib/lang/pt_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/pt_index.lng
+++ b/interface/web/mailuser/lib/lang/pt_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_cc.lng b/interface/web/mailuser/lib/lang/pt_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/pt_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/pt_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng b/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/pt_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/pt_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/pt_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_password.lng b/interface/web/mailuser/lib/lang/pt_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/pt_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/pt_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/pt_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/pt_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/pt_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/ro.lng b/interface/web/mailuser/lib/lang/ro.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/ro.lng
+++ b/interface/web/mailuser/lib/lang/ro.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/ro_index.lng b/interface/web/mailuser/lib/lang/ro_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/ro_index.lng
+++ b/interface/web/mailuser/lib/lang/ro_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_cc.lng b/interface/web/mailuser/lib/lang/ro_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/ro_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/ro_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/ro_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/ro_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/ro_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_password.lng b/interface/web/mailuser/lib/lang/ro_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/ro_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/ro_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/ro_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/ro_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/ro_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/ru.lng b/interface/web/mailuser/lib/lang/ru.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/ru.lng
+++ b/interface/web/mailuser/lib/lang/ru.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/ru_index.lng b/interface/web/mailuser/lib/lang/ru_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/ru_index.lng
+++ b/interface/web/mailuser/lib/lang/ru_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ru_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/ru_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/ru_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_cc.lng b/interface/web/mailuser/lib/lang/ru_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/ru_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/ru_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/ru_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/ru_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/ru_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_password.lng b/interface/web/mailuser/lib/lang/ru_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/ru_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/ru_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/ru_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/ru_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/ru_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/se.lng b/interface/web/mailuser/lib/lang/se.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/se.lng
+++ b/interface/web/mailuser/lib/lang/se.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/se_index.lng b/interface/web/mailuser/lib/lang/se_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/se_index.lng
+++ b/interface/web/mailuser/lib/lang/se_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/se_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_cc.lng b/interface/web/mailuser/lib/lang/se_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_filter.lng b/interface/web/mailuser/lib/lang/se_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/se_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_password.lng b/interface/web/mailuser/lib/lang/se_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/sk.lng b/interface/web/mailuser/lib/lang/sk.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/sk.lng
+++ b/interface/web/mailuser/lib/lang/sk.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/sk_index.lng b/interface/web/mailuser/lib/lang/sk_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/sk_index.lng
+++ b/interface/web/mailuser/lib/lang/sk_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_cc.lng b/interface/web/mailuser/lib/lang/sk_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/sk_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/sk_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng b/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/sk_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/sk_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/sk_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_password.lng b/interface/web/mailuser/lib/lang/sk_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/sk_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/sk_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/sk_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/sk_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/sk_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/tr.lng b/interface/web/mailuser/lib/lang/tr.lng
index 5b711141e..114dec9b9 100644
--- a/interface/web/mailuser/lib/lang/tr.lng
+++ b/interface/web/mailuser/lib/lang/tr.lng
@@ -1,9 +1,9 @@
<?php
-$wb["Email Account"] = 'Email Account';
-$wb["Overview"] = 'Overview';
-$wb["Password"] = 'Password';
-$wb["Autoresponder"] = 'Autoresponder';
-$wb["Send copy"] = 'Send copy';
-$wb["Spamfilter"] = 'Spamfilter';
-$wb["Email Filters"] = 'Email Filters';
-?>
\ No newline at end of file
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/tr_index.lng b/interface/web/mailuser/lib/lang/tr_index.lng
index 35c6aae8e..29fe9ea4f 100644
--- a/interface/web/mailuser/lib/lang/tr_index.lng
+++ b/interface/web/mailuser/lib/lang/tr_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb["page_head_txt"] = 'Mailbox settings';
-$wb["page_desc_txt"] = 'Here you can edit the settings for the email account.';
-$wb["email_txt"] = 'Email address';
-$wb["login_txt"] = 'Login';
-$wb["server_address_txt"] = 'Mailserver address';
-$wb["cc_txt"] = 'Send copy to (CC)';
-$wb["quota_txt"] = 'Mailbox size';
-$wb["unlimited_txt"] = 'Unlimited';
-$wb["mb_txt"] = 'MB';
-$wb["none_txt"] = 'None';
-?>
\ No newline at end of file
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng
index a736abf69..79f386a7d 100644
--- a/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb["mailbox_autoresponder_txt"] = 'Autoresponder';
-$wb["autoresponder_subject"] = 'Out of office reply';
-$wb["autoresponder_text_txt"] = 'Text';
-$wb["autoresponder_txt"] = 'Active';
-$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
-$wb["autoresponder_end_date_txt"] = 'End by';
-$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt']='Now';
+$wb['now_txt'] = 'Now';
$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_cc.lng b/interface/web/mailuser/lib/lang/tr_mail_user_cc.lng
index 0073c7164..dc2165a4f 100644
--- a/interface/web/mailuser/lib/lang/tr_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/tr_mail_user_cc.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_cc_txt"] = 'Send copy to email address';
-$wb["cc_txt"] = 'Send copy to';
-$wb["email_txt"] = 'Email';
-$wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
-$wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
+$wb['email_txt'] = 'Email';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
+?>
diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng
index 296a47ec5..2e74ffd4f 100644
--- a/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng
@@ -1,13 +1,13 @@
<?php
-$wb["rulename_txt"] = 'Name';
-$wb["action_txt"] = 'Action';
-$wb["target_txt"] = 'Folder';
-$wb["active_txt"] = 'Active';
-$wb["rulename_error_empty"] = 'Name is empty.';
-$wb["searchterm_is_empty"] = 'Search term is empty.';
-$wb["source_txt"] = 'Source';
-$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
$wb['subject_txt'] = 'Subject';
$wb['from_txt'] = 'From';
$wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/tr_mail_user_filter_list.lng
index 3d147a525..fb6b9dfa5 100644
--- a/interface/web/mailuser/lib/lang/tr_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/tr_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb["list_head_txt"] = 'Email filter rules';
-$wb["rulename_txt"] = 'Name';
-$wb["add_new_record_txt"] = 'Add new Filter';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["delete_confirmation"] = 'Do you really want to delete the mailfilter?';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+?>
diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_password.lng b/interface/web/mailuser/lib/lang/tr_mail_user_password.lng
index 43c114a81..cdf9674e7 100644
--- a/interface/web/mailuser/lib/lang/tr_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/tr_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb["mailbox_password_txt"] = 'Mailbox password';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Email';
$wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/tr_mail_user_spamfilter.lng
index 8f95dd37a..be4bad905 100644
--- a/interface/web/mailuser/lib/lang/tr_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/tr_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
-$wb["spamfilter_txt"] = 'Spamfilter';
-$wb["email_txt"] = 'Email';
-$wb["no_policy"] = '- not enabled -';
-$wb["policy_txt"] = 'Policy';
-?>
\ No newline at end of file
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Email';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng
index 7e79c6eaa..821909d28 100644
--- a/interface/web/monitor/lib/lang/cz.lng
+++ b/interface/web/monitor/lib/lang/cz.lng
@@ -34,10 +34,10 @@ $wb['Show Server load'] = 'Zobrazit zatÞenà serveru';
$wb['Show Disk usage'] = 'Zobrazit využità disku';
$wb['Show Memory usage'] = 'Zobrazit využità paměti';
$wb['Show Services'] = 'Zobrazit služby';
-$wb['Show Mail-Queue'] = 'Zobrazit mailovou fronto';
-$wb['Show Mail-Log'] = 'Zobrazit mailový log';
-$wb['Show Mail warn-Log'] = 'Zobrazit mailový log varovánÃ';
-$wb['Show Mail err-Log'] = 'Zobrazit mailový log chyb';
+$wb['Show Mail-Queue'] = 'Zobrazit e-mailovou frontu';
+$wb['Show Mail-Log'] = 'Zobrazit e-mailový log';
+$wb['Show Mail warn-Log'] = 'Zobrazit e-mailový log varovánÃ';
+$wb['Show Mail err-Log'] = 'Zobrazit e-mailový log chyb';
$wb['Show System-Log'] = 'Zobrazit systémový log';
$wb['Show ISPC Cron-Log'] = 'Zobrazit ISPConfig cron log';
$wb['Show Freshclam-Log'] = 'Zobrazit Freshclam log';
@@ -54,9 +54,9 @@ $wb['monitor_diskusage_used_txt'] = 'Užito';
$wb['monitor_diskusage_available_txt'] = 'Volné';
$wb['monitor_diskusage_usage_txt'] = 'UžitÃ%';
$wb['monitor_diskusage_mounted_txt'] = 'Připojeno na';
-$wb['monitor_logs_mail_txt'] = 'Mail - Log';
-$wb['monitor_logs_mailwarn_txt'] = 'Mail-Varovánà - Log';
-$wb['monitor_logs_mailerr_txt'] = 'Mail-Chyby - Log';
+$wb['monitor_logs_mail_txt'] = 'E-mail - Log';
+$wb['monitor_logs_mailwarn_txt'] = 'E-mail - Varovánà - Log';
+$wb['monitor_logs_mailerr_txt'] = 'E-mail - Chyby - Log';
$wb['monitor_logs_messages_txt'] = 'Systénové zprávy - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig cron - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
@@ -94,11 +94,11 @@ $wb['monitor_serverstate_loaghigher_txt'] = 'Server pod vyÅ¡Å¡Ãm zatÞenÃm';
$wb['monitor_serverstate_loadhighest_txt'] = 'Server pod nejvyÅ¡Å¡Ãm zatÞenÃm';
$wb['monitor_serverstate_loadunknown_txt'] = 'ZatÞená serveru: ???';
$wb['monitor_serverstate_mailqok_txt'] = 'ZatÞená mailové fronty je vpořádku';
-$wb['monitor_serverstate_mailqheavy_txt'] = 'Mailová fronta těžce zatÞena';
-$wb['monitor_serverstate_mailqhigh_txt'] = 'Mailová fronta vysoce zatÞena';
-$wb['monitor_serverstate_mailqhigher_txt'] = 'Mailová fronta je pod vyÅ¡Å¡Ãm zatÞenÃm';
-$wb['monitor_serverstate_mailqhighest_txt'] = 'Mailová fronta pod nejvyÅ¡Å¡Ãm zatÞenÃm';
-$wb['monitor_serverstate_mailqunknown_txt'] = 'Mailová fronta: ???';
+$wb['monitor_serverstate_mailqheavy_txt'] = 'E-mailová fronta těžce zatÞena';
+$wb['monitor_serverstate_mailqhigh_txt'] = 'E-mailová fronta vysoce zatÞena';
+$wb['monitor_serverstate_mailqhigher_txt'] = 'E-mailová fronta je pod vyÅ¡Å¡Ãm zatÞenÃm';
+$wb['monitor_serverstate_mailqhighest_txt'] = 'E-mailová fronta pod nejvyÅ¡Å¡Ãm zatÞenÃm';
+$wb['monitor_serverstate_mailqunknown_txt'] = 'E-mailová fronta: ???';
$wb['monitor_serverstate_raidok_txt'] = 'RAID pole je vpořádku';
$wb['monitor_serverstate_raidresync_txt'] = 'RAID pole je v RESYNC módu';
$wb['monitor_serverstate_raidfault_txt'] = 'RAID pole má jeden POÅ KOZENà disk. Vyměňte jej co nejdÅ™Ãve!';
@@ -129,7 +129,7 @@ $wb['monitor_settings_refreshsq_txt'] = 'ObnovovánÃ:';
$wb['monitor_settings_server_txt'] = 'Server';
$wb['monitor_title_cpuinfo_txt'] = 'CPU informace';
$wb['monitor_title_updatestate_txt'] = 'Stav aktualizace';
-$wb['monitor_title_mailq_txt'] = 'Mailová fronta';
+$wb['monitor_title_mailq_txt'] = 'E-mailová fronta';
$wb['monitor_title_raidstate_txt'] = 'Stav pole RAID';
$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter log';
$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban log';
@@ -142,8 +142,8 @@ $wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in
$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter';
$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter';
$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information';
-$wb['monitor_title_iptables_txt'] = 'IPTables Rules';
-$wb['Show fail2ban-Log'] = 'Show fail2ban-Log';
-$wb['Show IPTables'] = 'Show IPTables';
+$wb['monitor_title_iptables_txt'] = 'IPTables Pravidla';
+$wb['Show fail2ban-Log'] = 'Zobrazit Fail2Ban Log';
+$wb['Show IPTables'] = 'Zobrazit IPTables pravidla';
$wb['Show OpenVz VE BeanCounter'] = 'Show 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 c356f651c..c9e9a8655 100644
--- a/interface/web/monitor/lib/lang/cz_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'Fronta úlog';
+$wb['list_head_txt'] = 'Fronta úloh';
$wb['tstamp_txt'] = 'Datum';
$wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB tabulka';
diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng
index 38096b63d..6a3083e13 100644
--- a/interface/web/monitor/lib/lang/de.lng
+++ b/interface/web/monitor/lib/lang/de.lng
@@ -1,150 +1,149 @@
<?php
-$wb['Memory usage'] = "Speicherauslastung";
-$wb['Server online since'] = "Server ist online seit";
-$wb['Users online'] = "Benutzer online";
-$wb['System load 1 minute'] = "Systemlast 1 Minute";
-$wb['System load 5 minutes'] = "Systemlast 5 Minuten";
-$wb['System load 15 minutes'] = "Systemlast 15 Minuten";
-$wb['Server Load'] = "Serverauslastung";
-$wb['Disk usage'] = "Festplattenbelegung";
-$wb['no_data_serverload_txt'] = "Derzeit stehen keine Daten über die Serverlast zur Verfügung. Bitte später erneut überprüfen.";
-$wb['no_data_memusage_txt'] = "Derzeit stehen keine Daten über die Speicherauslastung zur Verfügung. Bitte später erneut überprüfen.";
-$wb['no_data_diskusage_txt'] = "Derzeit stehen keine Daten über die Festplattenbelegung zur Verfügung. Bitte später erneut überprüfen.";
-$wb['no_data_cpuinfo_txt'] = "Derzeit stehen keine Daten über die CPU zur Verfügung. Bitte später erneut überprüfen.";
-$wb['no_data_services_txt'] = "Derzeit stehen keine Daten über die Dienste zur Verfügung. Bitte später erneut überprüfen.";
-$wb['no_logdata_txt'] = "Derzeit stehen keine Protokolldaten zur Verfügung. Bitte später erneut überprüfen.";
-$wb['Monitoring'] = "Ãœberwachung";
-$wb['Server to Monitor'] = "Zu überwachende Server";
-$wb['Logfiles'] = "Protokolldateien";
-$wb['Status of services'] = "Dienststatus";
-$wb['No Refresh'] = "keine Aktualisierung";
-$wb['minutes'] = "Minuten";
-$wb['Show Overview'] = "Ãœbersicht zeigen";
-$wb['System State (All Servers)'] = "Systemstatus (Alle Server)";
-$wb['Hardware-Information'] = "Hardwareinformationen";
-$wb['Show CPU info'] = "CPU Informationen";
-$wb['Server State'] = "Serverstatus";
-$wb['Show Update State'] = "Updatestatus anzeigen";
-$wb['Show RAID state'] = "RAID Status anzeigen";
-$wb['Show Server load'] = "Serverauslastung anzeigen";
-$wb['Show Disk usage'] = "Festplattenbelegung anzeigen";
-$wb['Show Memory usage'] = "Speicherauslastung anzeigen";
-$wb['Show Services'] = "Dienste anzeigen";
-$wb['Show Mail-Queue'] = "E-Mail Warteschlange anzeigen";
-$wb['Show Mail-Log'] = "E-Mail Protokoll anzeigen";
-$wb['Show Mail warn-Log'] = "E-Mail Warn Protokoll anzeigen";
-$wb['Show Mail err-Log'] = "E-Mail Fehler Protokoll anzeigen";
-$wb['Show System-Log'] = "System Protokoll anzeigen";
-$wb['Show Freshclam-Log'] = "Freshclam Protokoll anzeigen";
-$wb['Show Clamav-Log'] = "ClamAV Protokoll anzeigen";
-$wb['Show ISPConfig-Log'] = "ISPConfig Protokoll anzeigen";
-$wb['Show RKHunter-Log'] = "RKHunter Protokoll anzeigen";
-$wb['Show Jobqueue'] = "Jobwarteschlange anzeigen";
-$wb['Show ISPC Cron-Log'] = "Cron Protokoll anzeigen";
-$wb['no_data_updates_txt'] = "Derzeit stehen keine Daten über Updates zur Verfügung. Bitte später erneut überprüfen.";
-$wb['no_data_raid_txt'] = "Derzeit stehen keine Daten über RAID zur Verfügung. Bitte später erneut überprüfen.";
-$wb['no_data_rkhunter_txt'] = "Derzeit stehen keine Daten von RKHunter zur Verfügung. Bitte später erneut überprüfen.";
-$wb['no_data_mailq_txt'] = "Derzeit stehen keine Daten der EMail Warteschlange zur Verfügung.Bitte später erneut überprüfen.";
-$wb['monitor_general_serverstate_txt'] = "Serverstatus";
-$wb['monitor_general_systemstate_txt'] = "Systemstatus";
-$wb['monitor_diskusage_filesystem_txt'] = "Dateisystem";
-$wb['monitor_diskusage_type_txt'] = "Typ";
-$wb['monitor_diskusage_size_txt'] = "Größe";
-$wb['monitor_diskusage_used_txt'] = "In Verwendung";
-$wb['monitor_diskusage_available_txt'] = "verfügbar";
-$wb['monitor_diskusage_usage_txt'] = "Verwendung in %";
-$wb['monitor_diskusage_mounted_txt'] = "gemountet unter";
-$wb['monitor_logs_mail_txt'] = "E-Mail Protokoll";
-$wb['monitor_logs_mailwarn_txt'] = "E-Mail Warnung Protokoll";
-$wb['monitor_logs_mailerr_txt'] = "Mail Fehler Protokoll";
-$wb['monitor_logs_messages_txt'] = "Systemmeldungen Protokoll";
-$wb['monitor_logs_ispccron_txt'] = "Cron Protokoll";
-$wb['monitor_logs_freshclam_txt'] = "Freshclam Protokoll";
-$wb['monitor_logs_clamav_txt'] = "ClamAV Protokoll";
-$wb['monitor_logs_ispc_txt'] = "ISPConfig Protokoll";
-$wb['monitor_norkhunter_txt'] = "RKHunter ist nicht installiert, deshalb gibt es keine Protokolldatei";
-$wb['monitor_serverstate_server_txt'] = "Server";
-$wb['monitor_serverstate_state_txt'] = "Status";
-$wb['monitor_serverstate_unknown_txt'] = "unbekannt";
-$wb['monitor_serverstate_info_txt'] = "Info";
-$wb['monitor_serverstate_warning_txt'] = "Warnung";
-$wb['monitor_serverstate_critical_txt'] = "kritisch";
-$wb['monitor_serverstate_error_txt'] = "Fehler";
-$wb['monitor_serverstate_moreinfo_txt'] = "Mehr Informationen...";
-$wb['monitor_serverstate_more_txt'] = "mehr...";
-$wb['monitor_serverstate_fclamok_txt'] = "Ihr Virenschutz ist in Ordnung.";
-$wb['monitor_serverstate_fclamoutdated_txt'] = "Ihr Virenschutz ist VERALTET!";
-$wb['monitor_serverstate_fclamunknown_txt'] = "Freshclam: ???";
-$wb['monitor_serverstate_hdok_txt'] = "Die Festplattenauslastung ist in Ordnung";
-$wb['monitor_serverstate_hdgoingfull_txt'] = "Die Festplatte ist bald voll";
-$wb['monitor_serverstate_hdnearlyfull_txt'] = "Die Festplatte wird langsam voll";
-$wb['monitor_serverstate_hdveryfull_txt'] = "Die Festplatte ist sehr voll";
-$wb['monitor_serverstate_hdfull_txt'] = "Die Festplatte hat keinen Platz mehr frei";
-$wb['monitor_serverstate_hdunknown_txt'] = "Festplatte: ???";
-$wb['monitor_serverstate_listok_txt'] = "in Ordnung";
-$wb['monitor_serverstate_listinfo_txt'] = "Information";
-$wb['monitor_serverstate_listwarning_txt'] = "Warnung";
-$wb['monitor_serverstate_listcritical_txt'] = "kritisch";
-$wb['monitor_serverstate_listerror_txt'] = "Fehler";
-$wb['monitor_serverstate_listunknown_txt'] = "unbekannt";
-$wb['monitor_serverstate_loadok_txt'] = "Die Serverauslastung ist in Ordnung";
-$wb['monitor_serverstate_loadheavy_txt'] = "Der Server ist extrem ausgelastet";
-$wb['monitor_serverstate_loadhigh_txt'] = "Der Server ist stark ausgelastet";
-$wb['monitor_serverstate_loaghigher_txt'] = "Der Server ist stärker ausgelastet";
-$wb['monitor_serverstate_loadhighest_txt'] = "Der Server ist höchst ausgelastet";
-$wb['monitor_serverstate_loadunknown_txt'] = "Serverauslastung: ???";
-$wb['monitor_serverstate_mailqok_txt'] = "Die E-Mail Wartenschlangenauslastung ist in Ordnung";
-$wb['monitor_serverstate_mailqheavy_txt'] = "Die E-Mail Wartenschlange ist extrem ausgelastet";
-$wb['monitor_serverstate_mailqhigh_txt'] = "Die E-Mail Wartenschlange ist stark ausgelastet";
-$wb['monitor_serverstate_mailqhigher_txt'] = "Die E-Mail Wartenschlange ist stärker ausgelastet";
-$wb['monitor_serverstate_mailqhighest_txt'] = "Die E-Mail Wartenschlange ist höchst ausgelastet";
-$wb['monitor_serverstate_mailqunknown_txt'] = "E-Mail Wartenschlange: ???";
-$wb['monitor_serverstate_raidok_txt'] = "Das RAID ist in Ordnung";
-$wb['monitor_serverstate_raidresync_txt'] = "Das RAID ist im RESYNC Modus";
-$wb['monitor_serverstate_raidfault_txt'] = "Das RAID hat eine DEFEKTE Festplatte. Bitte schnellstmöglich ersetzen!";
-$wb['monitor_serverstate_raiderror_txt'] = "Das RAID funktioniert nicht mehr";
-$wb['monitor_serverstate_raidunknown_txt'] = "RAID Status: ???";
-$wb['monitor_serverstate_servicesonline_txt'] = "Alle benötigten Dienste sind online";
-$wb['monitor_serverstate_servicesoffline_txt'] = "Einer oder mehrere benötigte Dienste sind offline";
-$wb['monitor_serverstate_servicesunknown_txt'] = "Dienste: ???";
-$wb['monitor_serverstate_syslogok_txt'] = "Das System Protokoll ist in Ordnung";
-$wb['monitor_serverstate_syslogwarning_txt'] = "Es gibt Warnungen im System Protokoll";
-$wb['monitor_serverstate_syslogerror_txt'] = "Es gibt Fehler im System Protokoll";
-$wb['monitor_serverstate_syslogunknown_txt'] = "System Protokoll: ???";
-$wb['monitor_serverstate_updatesok_txt'] = "Ihr System ist aktuell";
-$wb['monitor_serverstate_updatesneeded_txt'] = "Eine oder mehrere Komponenten benötigen ein Update";
-$wb['monitor_serverstate_updatesunknown_txt'] = "System Update: ???";
-$wb['monitor_services_online_txt'] = "Online";
-$wb['monitor_services_offline_txt'] = "Offline";
-$wb['monitor_services_web_txt'] = "Web Server:";
-$wb['monitor_services_ftp_txt'] = "FTP Server:";
-$wb['monitor_services_smtp_txt'] = "SMTP Server:";
-$wb['monitor_services_pop_txt'] = "POP3 Server:";
-$wb['monitor_services_imap_txt'] = "IMAP Server:";
-$wb['monitor_services_mydns_txt'] = "DNS Server:";
-$wb['monitor_services_mysql_txt'] = "MySQL Server:";
-$wb['monitor_settings_datafromdate_txt'] = "Daten vom: ";
-$wb['monitor_settings_datetimeformat_txt'] = "d.m.Y H:i";
-$wb['monitor_settings_refreshsq_txt'] = "Aktualisierungsrate:";
-$wb['monitor_settings_server_txt'] = "Server";
-$wb['monitor_title_cpuinfo_txt'] = "CPU Informationen";
-$wb['monitor_title_updatestate_txt'] = "Updatestatus";
-$wb['monitor_title_mailq_txt'] = "E-Mail Warteschlange";
-$wb['monitor_title_raidstate_txt'] = "RAID Status";
-$wb['monitor_title_rkhunterlog_txt'] = "RKHunter Protokoll";
-$wb['monitor_updates_nosupport_txt'] = "Ihre Distribution wird für die Überwachung nicht unterstützt";
-$wb['monitor_title_fail2ban_txt'] = "Fail2Ban Protokoll";
-$wb['monitor_nosupportedraid1_txt'] = "At the moment, we support mdadm or mpt-status for monitoring the RAID.<br>We cant find any of them at your server.<br><br>This means we can not support your RAID yet.";
-$wb['monitor_serverstate_beancounterok_txt'] = "The beancounter is ok";
-$wb['monitor_serverstate_beancounterinfo_txt'] = "There are vew failure in the beancounter";
-$wb['monitor_serverstate_beancounterwarning_txt'] = "There are some failure in the beancounter";
-$wb['monitor_serverstate_beancountercritical_txt'] = "There are many failure in the beancounter";
-$wb['monitor_serverstate_beancountererror_txt'] = "There are too much failure in the beancounter";
-$wb['monitor_title_beancounter_txt'] = "OpenVz VE BeanCounter";
-$wb['monitor_beancounter_nosupport_txt'] = "This server is not a OpenVz VE and has no beancounter information";
-$wb['monitor_title_iptables_txt'] = "IPTables Regeln";
-$wb['Show fail2ban-Log'] = "Fail2ban Protokoll anzeigen";
-$wb['Show IPTables'] = "IPTables anzeigen";
-$wb['Show OpenVz VE BeanCounter'] = "OpenVz VE BeanCounter anzeigen";
+$wb['Memory usage'] = 'Speicherauslastung';
+$wb['Server online since'] = 'Server ist online seit';
+$wb['Users online'] = 'Benutzer online';
+$wb['System load 1 minute'] = 'Systemlast 1 Minute';
+$wb['System load 5 minutes'] = 'Systemlast 5 Minuten';
+$wb['System load 15 minutes'] = 'Systemlast 15 Minuten';
+$wb['Server Load'] = 'Serverauslastung';
+$wb['Disk usage'] = 'Festplattenbelegung';
+$wb['no_data_serverload_txt'] = 'Derzeit stehen keine Daten über die Serverlast zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_memusage_txt'] = 'Derzeit stehen keine Daten über die Speicherauslastung zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_diskusage_txt'] = 'Derzeit stehen keine Daten über die Festplattenbelegung zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_cpuinfo_txt'] = 'Derzeit stehen keine Daten über die CPU zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_services_txt'] = 'Derzeit stehen keine Daten über die Dienste zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_logdata_txt'] = 'Derzeit stehen keine Protokolldaten zur Verfügung. Bitte später erneut überprüfen.';
+$wb['Monitoring'] = 'Ãœberwachung';
+$wb['Server to Monitor'] = 'Zu überwachende Server';
+$wb['Logfiles'] = 'Protokolldateien';
+$wb['Status of services'] = 'Dienststatus';
+$wb['No Refresh'] = 'keine Aktualisierung';
+$wb['minutes'] = 'Minuten';
+$wb['Show Overview'] = 'Ãœbersicht zeigen';
+$wb['System State (All Servers)'] = 'Systemstatus (Alle Server)';
+$wb['Hardware-Information'] = 'Hardwareinformationen';
+$wb['Show CPU info'] = 'CPU Informationen';
+$wb['Server State'] = 'Serverstatus';
+$wb['Show Update State'] = 'Updatestatus anzeigen';
+$wb['Show RAID state'] = 'RAID Status anzeigen';
+$wb['Show Server load'] = 'Serverauslastung anzeigen';
+$wb['Show Disk usage'] = 'Festplattenbelegung anzeigen';
+$wb['Show Memory usage'] = 'Speicherauslastung anzeigen';
+$wb['Show Services'] = 'Dienste anzeigen';
+$wb['Show Mail-Queue'] = 'E-Mail Warteschlange anzeigen';
+$wb['Show Mail-Log'] = 'E-Mail Protokoll anzeigen';
+$wb['Show Mail warn-Log'] = 'E-Mail Warn Protokoll anzeigen';
+$wb['Show Mail err-Log'] = 'E-Mail Fehler Protokoll anzeigen';
+$wb['Show System-Log'] = 'System Protokoll anzeigen';
+$wb['Show Freshclam-Log'] = 'Freshclam Protokoll anzeigen';
+$wb['Show Clamav-Log'] = 'ClamAV Protokoll anzeigen';
+$wb['Show ISPConfig-Log'] = 'ISPConfig Protokoll anzeigen';
+$wb['Show RKHunter-Log'] = 'RKHunter Protokoll anzeigen';
+$wb['Show Jobqueue'] = 'Jobwarteschlange anzeigen';
+$wb['Show ISPC Cron-Log'] = 'Cron Protokoll anzeigen';
+$wb['no_data_updates_txt'] = 'Derzeit stehen keine Daten über Updates zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_raid_txt'] = 'Derzeit stehen keine Daten über RAID zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_rkhunter_txt'] = 'Derzeit stehen keine Daten von RKHunter zur Verfügung. Bitte später erneut überprüfen.';
+$wb['no_data_mailq_txt'] = 'Derzeit stehen keine Daten der EMail Warteschlange zur Verfügung.Bitte später erneut überprüfen.';
+$wb['monitor_general_serverstate_txt'] = 'Serverstatus';
+$wb['monitor_general_systemstate_txt'] = 'Systemstatus';
+$wb['monitor_diskusage_filesystem_txt'] = 'Dateisystem';
+$wb['monitor_diskusage_type_txt'] = 'Typ';
+$wb['monitor_diskusage_size_txt'] = 'Größe';
+$wb['monitor_diskusage_used_txt'] = 'In Verwendung';
+$wb['monitor_diskusage_available_txt'] = 'verfügbar';
+$wb['monitor_diskusage_usage_txt'] = 'Verwendung in %';
+$wb['monitor_diskusage_mounted_txt'] = 'gemountet unter';
+$wb['monitor_logs_mail_txt'] = 'E-Mail Protokoll';
+$wb['monitor_logs_mailwarn_txt'] = 'E-Mail Warnung Protokoll';
+$wb['monitor_logs_mailerr_txt'] = 'Mail Fehler Protokoll';
+$wb['monitor_logs_messages_txt'] = 'Systemmeldungen Protokoll';
+$wb['monitor_logs_ispccron_txt'] = 'Cron Protokoll';
+$wb['monitor_logs_freshclam_txt'] = 'Freshclam Protokoll';
+$wb['monitor_logs_clamav_txt'] = 'ClamAV Protokoll';
+$wb['monitor_logs_ispc_txt'] = 'ISPConfig Protokoll';
+$wb['monitor_norkhunter_txt'] = 'RKHunter ist nicht installiert, deshalb gibt es keine Protokolldatei';
+$wb['monitor_serverstate_server_txt'] = 'Server';
+$wb['monitor_serverstate_state_txt'] = 'Status';
+$wb['monitor_serverstate_unknown_txt'] = 'unbekannt';
+$wb['monitor_serverstate_info_txt'] = 'Info';
+$wb['monitor_serverstate_warning_txt'] = 'Warnung';
+$wb['monitor_serverstate_critical_txt'] = 'kritisch';
+$wb['monitor_serverstate_error_txt'] = 'Fehler';
+$wb['monitor_serverstate_moreinfo_txt'] = 'Mehr Informationen...';
+$wb['monitor_serverstate_more_txt'] = 'mehr...';
+$wb['monitor_serverstate_fclamok_txt'] = 'Ihr Virenschutz ist in Ordnung.';
+$wb['monitor_serverstate_fclamoutdated_txt'] = 'Ihr Virenschutz ist VERALTET!';
+$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???';
+$wb['monitor_serverstate_hdok_txt'] = 'Die Festplattenauslastung ist in Ordnung';
+$wb['monitor_serverstate_hdgoingfull_txt'] = 'Die Festplatte ist bald voll';
+$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Die Festplatte wird langsam voll';
+$wb['monitor_serverstate_hdveryfull_txt'] = 'Die Festplatte ist sehr voll';
+$wb['monitor_serverstate_hdfull_txt'] = 'Die Festplatte hat keinen Platz mehr frei';
+$wb['monitor_serverstate_hdunknown_txt'] = 'Festplatte: ???';
+$wb['monitor_serverstate_listok_txt'] = 'in Ordnung';
+$wb['monitor_serverstate_listinfo_txt'] = 'Information';
+$wb['monitor_serverstate_listwarning_txt'] = 'Warnung';
+$wb['monitor_serverstate_listcritical_txt'] = 'kritisch';
+$wb['monitor_serverstate_listerror_txt'] = 'Fehler';
+$wb['monitor_serverstate_listunknown_txt'] = 'unbekannt';
+$wb['monitor_serverstate_loadok_txt'] = 'Die Serverauslastung ist in Ordnung';
+$wb['monitor_serverstate_loadheavy_txt'] = 'Der Server ist extrem ausgelastet';
+$wb['monitor_serverstate_loadhigh_txt'] = 'Der Server ist stark ausgelastet';
+$wb['monitor_serverstate_loaghigher_txt'] = 'Der Server ist stärker ausgelastet';
+$wb['monitor_serverstate_loadhighest_txt'] = 'Der Server ist höchst ausgelastet';
+$wb['monitor_serverstate_loadunknown_txt'] = 'Serverauslastung: ???';
+$wb['monitor_serverstate_mailqok_txt'] = 'Die E-Mail Wartenschlangenauslastung ist in Ordnung';
+$wb['monitor_serverstate_mailqheavy_txt'] = 'Die E-Mail Wartenschlange ist extrem ausgelastet';
+$wb['monitor_serverstate_mailqhigh_txt'] = 'Die E-Mail Wartenschlange ist stark ausgelastet';
+$wb['monitor_serverstate_mailqhigher_txt'] = 'Die E-Mail Wartenschlange ist stärker ausgelastet';
+$wb['monitor_serverstate_mailqhighest_txt'] = 'Die E-Mail Wartenschlange ist höchst ausgelastet';
+$wb['monitor_serverstate_mailqunknown_txt'] = 'E-Mail Wartenschlange: ???';
+$wb['monitor_serverstate_raidok_txt'] = 'Das RAID ist in Ordnung';
+$wb['monitor_serverstate_raidresync_txt'] = 'Das RAID ist im RESYNC Modus';
+$wb['monitor_serverstate_raidfault_txt'] = 'Das RAID hat eine DEFEKTE Festplatte. Bitte schnellstmöglich ersetzen!';
+$wb['monitor_serverstate_raiderror_txt'] = 'Das RAID funktioniert nicht mehr';
+$wb['monitor_serverstate_raidunknown_txt'] = 'RAID Status: ???';
+$wb['monitor_serverstate_servicesonline_txt'] = 'Alle benötigten Dienste sind online';
+$wb['monitor_serverstate_servicesoffline_txt'] = 'Einer oder mehrere benötigte Dienste sind offline';
+$wb['monitor_serverstate_servicesunknown_txt'] = 'Dienste: ???';
+$wb['monitor_serverstate_syslogok_txt'] = 'Das System Protokoll ist in Ordnung';
+$wb['monitor_serverstate_syslogwarning_txt'] = 'Es gibt Warnungen im System Protokoll';
+$wb['monitor_serverstate_syslogerror_txt'] = 'Es gibt Fehler im System Protokoll';
+$wb['monitor_serverstate_syslogunknown_txt'] = 'System Protokoll: ???';
+$wb['monitor_serverstate_updatesok_txt'] = 'Ihr System ist aktuell';
+$wb['monitor_serverstate_updatesneeded_txt'] = 'Eine oder mehrere Komponenten benötigen ein Update';
+$wb['monitor_serverstate_updatesunknown_txt'] = 'System Update: ???';
+$wb['monitor_services_online_txt'] = 'Online';
+$wb['monitor_services_offline_txt'] = 'Offline';
+$wb['monitor_services_web_txt'] = 'Web Server:';
+$wb['monitor_services_ftp_txt'] = 'FTP Server:';
+$wb['monitor_services_smtp_txt'] = 'SMTP Server:';
+$wb['monitor_services_pop_txt'] = 'POP3 Server:';
+$wb['monitor_services_imap_txt'] = 'IMAP Server:';
+$wb['monitor_services_mydns_txt'] = 'DNS Server:';
+$wb['monitor_services_mysql_txt'] = 'MySQL Server:';
+$wb['monitor_settings_datafromdate_txt'] = 'Daten vom: ';
+$wb['monitor_settings_datetimeformat_txt'] = 'd.m.Y H:i';
+$wb['monitor_settings_refreshsq_txt'] = 'Aktualisierungsrate:';
+$wb['monitor_settings_server_txt'] = 'Server';
+$wb['monitor_title_cpuinfo_txt'] = 'CPU Informationen';
+$wb['monitor_title_updatestate_txt'] = 'Updatestatus';
+$wb['monitor_title_mailq_txt'] = 'E-Mail Warteschlange';
+$wb['monitor_title_raidstate_txt'] = 'RAID Status';
+$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter Protokoll';
+$wb['monitor_updates_nosupport_txt'] = 'Ihre Distribution wird für die Überwachung nicht unterstützt';
+$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Protokoll';
+$wb['monitor_nosupportedraid1_txt'] = 'At the moment, we support mdadm or mpt-status for monitoring the RAID.<br>We cant find any of them at your server.<br><br>This means we can not support your RAID yet.';
+$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok';
+$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter';
+$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter';
+$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter';
+$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter';
+$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter';
+$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information';
+$wb['monitor_title_iptables_txt'] = 'IPTables Regeln';
+$wb['Show fail2ban-Log'] = 'Fail2ban Protokoll anzeigen';
+$wb['Show IPTables'] = 'IPTables anzeigen';
+$wb['Show OpenVz VE BeanCounter'] = 'OpenVz VE BeanCounter anzeigen';
?>
-
diff --git a/interface/web/monitor/lib/lang/de_datalog_list.lng b/interface/web/monitor/lib/lang/de_datalog_list.lng
index 8939cab06..0b6bf9a4b 100644
--- a/interface/web/monitor/lib/lang/de_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/de_datalog_list.lng
@@ -6,4 +6,3 @@ $wb['dbtable_txt'] = 'Datenbanktabelle';
$wb['action_txt'] = 'Aktion';
$wb['status_txt'] = 'Status';
?>
-
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index 53702bd29..1194596fd 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -100,6 +100,15 @@ $type = $_GET["type"];
$json .= '"}';
}
+ if($type == 'getredirecttype'){
+ $json = '{"redirecttype":"';
+ $sql = "SELECT redirect_type FROM web_domain WHERE domain_id = $web_id";
+ $redirect = $app->db->queryOneRecord($sql);
+ $json .= $redirect['redirect_type'];
+ unset($redirect);
+ $json .= '"}';
+ }
+
if($type == 'get_ipv4'){
$result = array();
@@ -119,6 +128,26 @@ $type = $_GET["type"];
$json = $app->functions->json_encode($result);
}
+
+ if($type == 'getdatabaseusers') {
+ $json = '{';
+
+ $sql = "SELECT sys_groupid FROM web_domain WHERE domain_id = $web_id";
+ $group = $app->db->queryOneRecord($sql);
+ if($group) {
+ $sql = "SELECT database_user_id, database_user FROM web_database_user WHERE sys_groupid = '" . $group['sys_groupid'] . "'";
+ $records = $app->db->queryAllRecords($sql);
+
+ foreach($records as $record) {
+ $json .= '"'.$record['database_user_id'].'": "'.$record['database_user'].'",';
+ }
+ unset($records);
+ unset($group);
+ }
+
+ if(substr($json,-1) == ',') $json = substr($json,0,-1);
+ $json .= '}';
+ }
//}
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index 959b018dc..393ec3854 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -166,7 +166,22 @@ class page_action extends tform_actions {
}
}
- }
+ } else {
+ // check if client of database parent domain is client of db user!
+ $web_group = $app->db->queryOneRecord("SELECT sys_groupid FROM web_domain WHERE domain_id = '".$app->functions->intval($this->dataRecord['parent_domain_id'])."'");
+ if($this->dataRecord['database_user_id']) {
+ $group = $app->db->queryOneRecord("SELECT sys_groupid FROM web_database_user WHERE database_user_id = '".$app->functions->intval($this->dataRecord['database_user_id'])."'");
+ if($group['sys_groupid'] != $web_group['sys_groupid']) {
+ $app->error($app->tform->wordbook['database_client_differs_txt']);
+ }
+ }
+ if($this->dataRecord['database_ro_user_id']) {
+ $group = $app->db->queryOneRecord("SELECT sys_groupid FROM web_database_user WHERE database_user_id = '".$app->functions->intval($this->dataRecord['database_ro_user_id'])."'");
+ if($group['sys_groupid'] != $web_group['sys_groupid']) {
+ $app->error($app->tform->wordbook['database_client_differs_txt']);
+ }
+ }
+ }
parent::onSubmit();
diff --git a/interface/web/sites/database_phpmyadmin.php b/interface/web/sites/database_phpmyadmin.php
index 51b8820e1..0bd379db9 100644
--- a/interface/web/sites/database_phpmyadmin.php
+++ b/interface/web/sites/database_phpmyadmin.php
@@ -45,7 +45,7 @@ $databaseId = $app->functions->intval($_GET['id']);
/*
* Get the data to connect to the database
*/
-$dbData = $app->db->queryOneRecord("SELECT server_id FROM web_database WHERE database_id = " . $databaseId);
+$dbData = $app->db->queryOneRecord("SELECT server_id, database_name FROM web_database WHERE database_id = " . $databaseId);
$serverId = $app->functions->intval($dbData['server_id']);
if ($serverId == 0){
die ("No DB-Server found!");
@@ -64,7 +64,7 @@ $web_config = $app->getconf->get_server_config($serverId,'web');
if($global_config['phpmyadmin_url'] != '') {
$phpmyadmin_url = $global_config['phpmyadmin_url'];
- $phpmyadmin_url = str_replace('[SERVERNAME]',$serverData['server_name'],$phpmyadmin_url);
+ $phpmyadmin_url = str_replace(array('[SERVERNAME]', '[DATABASENAME]'),array($serverData['server_name'], $dbData['database_name']),$phpmyadmin_url);
header('Location:'.$phpmyadmin_url);
} else {
isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http';
diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php
index c486a5aae..86b1382a0 100644
--- a/interface/web/sites/database_user_edit.php
+++ b/interface/web/sites/database_user_edit.php
@@ -146,6 +146,7 @@ class page_action extends tform_actions {
}
$this->dataRecord['server_id'] = $conf['server_id'];
+ $this->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM web_database_user WHERE database_user_id = '".$this->id."'");
parent::onBeforeUpdate();
}
@@ -205,13 +206,11 @@ class page_action extends tform_actions {
$app->db->query("UPDATE web_database_user SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE database_user_id = ".$this->id);
}
- $old_rec = $app->db->queryOneRecord("SELECT * FROM web_database_user WHERE database_user_id = '".$this->id."'");
-
$records = $app->db->queryAllRecords("SELECT DISTINCT server_id FROM web_database WHERE database_user_id = '".$app->functions->intval($this->id)."' UNION SELECT DISTINCT server_id FROM web_database WHERE database_ro_user_id = '".$app->functions->intval($this->id)."'");
foreach($records as $rec) {
$new_rec = $this->dataRecord;
$new_rec['server_id'] = $rec['server_id'];
- $app->db->datalogSave('web_database_user', 'UPDATE', 'database_user_id', $this->id, $old_rec, $new_rec);
+ $app->db->datalogSave('web_database_user', 'UPDATE', 'database_user_id', $this->id, $this->oldDataRecord, $new_rec);
}
unset($new_rec);
}
diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php
index 71365a15a..aa28bf135 100644
--- a/interface/web/sites/form/web_aliasdomain.tform.php
+++ b/interface/web/sites/form/web_aliasdomain.tform.php
@@ -116,7 +116,7 @@ $form["tabs"]['domain'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => 'y',
- 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent')
+ 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
),
'redirect_path' => array (
'datatype' => 'VARCHAR',
@@ -141,6 +141,12 @@ $form["tabs"]['domain'] = array (
),
'value' => array('none' => 'none_txt', 'www' => 'www.', '*' => '*.')
),
+ 'seo_redirect' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
+ ),
'active' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
@@ -153,5 +159,32 @@ $form["tabs"]['domain'] = array (
)
);
+if($_SESSION["s"]["user"]["typ"] == 'admin') {
+
+$form["tabs"]['advanced'] = array (
+ 'title' => "Options",
+ 'width' => 100,
+ 'template' => "templates/web_aliasdomain_advanced.htm",
+ 'readonly' => false,
+ 'fields' => array (
+ ##################################
+ # Begin Datatable fields
+ ##################################
+ 'proxy_directives' => array (
+ 'datatype' => 'TEXT',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
+ ##################################
+ # ENDE Datatable fields
+ ##################################
+ )
+);
+
+}
+
?>
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index ca9b852ff..86bc116b9 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -292,7 +292,7 @@ $form["tabs"]['redirect'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
- 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent')
+ 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
),
'redirect_path' => array (
'datatype' => 'VARCHAR',
@@ -310,7 +310,7 @@ $form["tabs"]['redirect'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
- 'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'non_www_to_www_txt', 'www_to_non_www' => 'www_to_non_www_txt')
+ 'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
),
##################################
# ENDE Datatable fields
@@ -697,7 +697,15 @@ $form["tabs"]['advanced'] = array (
'value' => '',
'width' => '30',
'maxlength' => '255'
- )
+ ),
+ 'proxy_directives' => array (
+ 'datatype' => 'TEXT',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
##################################
# ENDE Datatable fields
##################################
diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php
index 970c12b23..20c5b14d7 100644
--- a/interface/web/sites/form/web_subdomain.tform.php
+++ b/interface/web/sites/form/web_subdomain.tform.php
@@ -117,7 +117,7 @@ $form["tabs"]['domain'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => 'y',
- 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent')
+ 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
),
'redirect_path' => array (
'datatype' => 'VARCHAR',
@@ -143,5 +143,32 @@ $form["tabs"]['domain'] = array (
)
);
+if($_SESSION["s"]["user"]["typ"] == 'admin') {
+
+$form["tabs"]['advanced'] = array (
+ 'title' => "Options",
+ 'width' => 100,
+ 'template' => "templates/web_subdomain_advanced.htm",
+ 'readonly' => false,
+ 'fields' => array (
+ ##################################
+ # Begin Datatable fields
+ ##################################
+ 'proxy_directives' => array (
+ 'datatype' => 'TEXT',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
+ ##################################
+ # ENDE Datatable fields
+ ##################################
+ )
+);
+
+}
+
?>
diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php
index f85c5f40d..9c6bfa6a6 100644
--- a/interface/web/sites/form/web_vhost_subdomain.tform.php
+++ b/interface/web/sites/form/web_vhost_subdomain.tform.php
@@ -291,7 +291,7 @@ $form["tabs"]['redirect'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
- 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent')
+ 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
),
'redirect_path' => array (
'datatype' => 'VARCHAR',
@@ -309,7 +309,7 @@ $form["tabs"]['redirect'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
- 'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'non_www_to_www_txt', 'www_to_non_www' => 'www_to_non_www_txt')
+ 'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
),
##################################
# ENDE Datatable fields
@@ -696,7 +696,15 @@ $form["tabs"]['advanced'] = array (
'value' => '',
'width' => '30',
'maxlength' => '255'
- )
+ ),
+ 'proxy_directives' => array (
+ 'datatype' => 'TEXT',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
##################################
# ENDE Datatable fields
##################################
diff --git a/interface/web/sites/lib/lang/ar.lng b/interface/web/sites/lib/lang/ar.lng
index 3b321160c..1459b344e 100644
--- a/interface/web/sites/lib/lang/ar.lng
+++ b/interface/web/sites/lib/lang/ar.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Website';
$wb['Subdomain'] = 'Subdomain for website';
$wb['Aliasdomain'] = 'Aliasdomain for website';
$wb['Database'] = 'Databases';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTP-Accounts';
$wb['Webdav-User'] = 'WebDAV-Users';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domain';
$wb['Redirect'] = 'Redirect';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/ar_aps.lng b/interface/web/sites/lib/lang/ar_aps.lng
index d0ecb771f..8ce5b20eb 100644
--- a/interface/web/sites/lib/lang/ar_aps.lng
+++ b/interface/web/sites/lib/lang/ar_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/ar_aps_instances_list.lng b/interface/web/sites/lib/lang/ar_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/ar_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/ar_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/ar_aps_packages_list.lng b/interface/web/sites/lib/lang/ar_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/ar_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/ar_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/ar_database.lng b/interface/web/sites/lib/lang/ar_database.lng
index b7f15c3ff..9df3e74ca 100644
--- a/interface/web/sites/lib/lang/ar_database.lng
+++ b/interface/web/sites/lib/lang/ar_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/ar_database_user.lng b/interface/web/sites/lib/lang/ar_database_user.lng
new file mode 100644
index 000000000..66a071834
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['database_user_txt'] = 'Database user';
+$wb['database_password_txt'] = 'Database password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Active';
+$wb['database_user_error_empty'] = 'Database user is empty.';
+$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$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/ar_database_user_admin_list.lng b/interface/web/sites/lib/lang/ar_database_user_admin_list.lng
new file mode 100644
index 000000000..d7f88c4c3
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Database User';
+$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/ar_database_user_list.lng b/interface/web/sites/lib/lang/ar_database_user_list.lng
new file mode 100644
index 000000000..8c226496a
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$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/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_backup_list.lng b/interface/web/sites/lib/lang/ar_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/ar_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/ar_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_domain.lng b/interface/web/sites/lib/lang/ar_web_domain.lng
index faf7b9abb..462b10633 100644
--- a/interface/web/sites/lib/lang/ar_web_domain.lng
+++ b/interface/web/sites/lib/lang/ar_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng
index b217f80cc..28d4e1fbd 100644
--- a/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'This month';
$wb['last_month_txt'] = 'Last month';
$wb['this_year_txt'] = 'This year';
$wb['last_year_txt'] = 'Last year';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/ar_web_subdomain.lng b/interface/web/sites/lib/lang/ar_web_subdomain.lng
index 726e1c105..a64b8824b 100644
--- a/interface/web/sites/lib/lang/ar_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/ar_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
new file mode 100644
index 000000000..4a0279e9f
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
@@ -0,0 +1,113 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Active';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
+$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
+$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
+$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..1c16bcda2
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$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/bg.lng b/interface/web/sites/lib/lang/bg.lng
index 839358bdc..1a17867fa 100644
--- a/interface/web/sites/lib/lang/bg.lng
+++ b/interface/web/sites/lib/lang/bg.lng
@@ -21,9 +21,13 @@ $wb['Web traffic'] = 'Уеб Трафик';
$wb['Webdav-User'] = 'Webdav User';
$wb['Webdav'] = 'Webdav';
$wb['Website quota (Harddisk)'] = 'УебÑайт квота (Harddisk)';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['Folder'] = 'Protected Folders';
$wb['Folder users'] = 'Protected Folder Users';
$wb['Command Line'] = 'Command Line';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/bg_aps.lng b/interface/web/sites/lib/lang/bg_aps.lng
index c935b7ac0..8ce5b20eb 100644
--- a/interface/web/sites/lib/lang/bg_aps.lng
+++ b/interface/web/sites/lib/lang/bg_aps.lng
@@ -26,8 +26,6 @@ $wb['settings_txt'] = 'Settings';
$wb['install_package_txt'] = 'Install this package';
$wb['installation_txt'] = 'Installation';
$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
$wb['acceptance_txt'] = 'Acceptance';
$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
$wb['install_language_txt'] = 'Interface language';
@@ -54,4 +52,6 @@ $wb['installation_error_txt'] = 'Install error';
$wb['installation_success_txt'] = 'Installed';
$wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
?>
diff --git a/interface/web/sites/lib/lang/bg_database.lng b/interface/web/sites/lib/lang/bg_database.lng
index 569b2f5d9..9fa82b950 100644
--- a/interface/web/sites/lib/lang/bg_database.lng
+++ b/interface/web/sites/lib/lang/bg_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/bg_database_user.lng b/interface/web/sites/lib/lang/bg_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/bg_database_user_admin_list.lng b/interface/web/sites/lib/lang/bg_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/bg_database_user_list.lng b/interface/web/sites/lib/lang/bg_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/bg_web_aliasdomain.lng b/interface/web/sites/lib/lang/bg_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/bg_web_domain.lng b/interface/web/sites/lib/lang/bg_web_domain.lng
index 0d3612943..3c680d2ab 100644
--- a/interface/web/sites/lib/lang/bg_web_domain.lng
+++ b/interface/web/sites/lib/lang/bg_web_domain.lng
@@ -104,4 +104,9 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
$wb['ssl_key_txt'] = 'SSL Key';
$wb['perl_txt'] = 'Perl';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng b/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng
index b217f80cc..28d4e1fbd 100644
--- a/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'This month';
$wb['last_month_txt'] = 'Last month';
$wb['this_year_txt'] = 'This year';
$wb['last_year_txt'] = 'Last year';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/bg_web_subdomain.lng b/interface/web/sites/lib/lang/bg_web_subdomain.lng
index 4f776b5a2..58675bc8d 100644
--- a/interface/web/sites/lib/lang/bg_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/bg_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Грешен път за редирект. ВалидниÑÑ‚ Ð°Ð´Ñ€ÐµÑ Ñ‚Ñ€Ñбва да бъде примерно: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'Без редирект';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/br.lng b/interface/web/sites/lib/lang/br.lng
index bed77cde5..63bc91445 100644
--- a/interface/web/sites/lib/lang/br.lng
+++ b/interface/web/sites/lib/lang/br.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Website';
$wb['Subdomain'] = 'Sub-domÃnio';
$wb['Aliasdomain'] = 'Alias de DomÃnio';
$wb['Database'] = 'Bancos de Dados';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'Usuário FTP';
$wb['Webdav-User'] = 'Usuário Webdav';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domain';
$wb['Redirect'] = 'Redirecionamento';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/br_aps.lng b/interface/web/sites/lib/lang/br_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/br_aps.lng
+++ b/interface/web/sites/lib/lang/br_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/br_aps_instances_list.lng b/interface/web/sites/lib/lang/br_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/br_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/br_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/br_aps_packages_list.lng b/interface/web/sites/lib/lang/br_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/br_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/br_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/br_database.lng b/interface/web/sites/lib/lang/br_database.lng
index 551ba22ab..82019b3f3 100644
--- a/interface/web/sites/lib/lang/br_database.lng
+++ b/interface/web/sites/lib/lang/br_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/br_database_user.lng b/interface/web/sites/lib/lang/br_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/br_database_user_admin_list.lng b/interface/web/sites/lib/lang/br_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/br_database_user_list.lng b/interface/web/sites/lib/lang/br_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain.lng b/interface/web/sites/lib/lang/br_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/br_web_backup_list.lng b/interface/web/sites/lib/lang/br_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/br_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/br_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng
index a1a0b7967..8d78cada9 100644
--- a/interface/web/sites/lib/lang/br_web_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/br_web_sites_stats_list.lng b/interface/web/sites/lib/lang/br_web_sites_stats_list.lng
index 903c90571..acc22859b 100644
--- a/interface/web/sites/lib/lang/br_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/br_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Este mês';
$wb['last_month_txt'] = 'Último mês';
$wb['this_year_txt'] = 'Este ano';
$wb['last_year_txt'] = 'Último ano';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/br_web_subdomain.lng b/interface/web/sites/lib/lang/br_web_subdomain.lng
index 7cb1fd149..b18d2fdf2 100644
--- a/interface/web/sites/lib/lang/br_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/br_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Caminho de redirecionamento inválido. Exemplo de caminho válido: /test/ ou http://www.dominio.ext/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng
index d9fdd4c9f..344c229fc 100644
--- a/interface/web/sites/lib/lang/cz.lng
+++ b/interface/web/sites/lib/lang/cz.lng
@@ -4,18 +4,17 @@ $wb['Website'] = 'Webová stránka';
$wb['Subdomain'] = 'Subdoména pro webovou stránku';
$wb['Aliasdomain'] = 'Alias doména pro webovou stránku';
$wb['Database'] = 'Databáze';
-$wb['Database Users'] = 'Database Users';
-$wb['Web Access'] = 'Web Access';
-$wb['FTP-User'] = 'FTP uživatel';
-$wb['Webdav-User'] = 'WebDAV-Users';
-$wb['Folder'] = 'Protected Folders';
-$wb['Folder users'] = 'Protected Folder Users';
-$wb['Command Line'] = 'Command Line';
-$wb['Shell-User'] = 'Shell uživatel';
+$wb['Web Access'] = 'Webový pÅ™Ãstup';
+$wb['FTP-User'] = 'FTP uživatelé';
+$wb['Webdav-User'] = 'WebDAV uživatelé';
+$wb['Folder'] = 'Chráněné adresáře heslem';
+$wb['Folder users'] = 'Chráněné adresáře uživatelé ';
+$wb['Command Line'] = 'PÅ™Ãkazová řádka';
+$wb['Shell-User'] = 'Shell uživatelé';
$wb['Cron Jobs'] = 'Cron úlohy';
$wb['Statistics'] = 'Statistiky';
$wb['Web traffic'] = 'Přenesená data';
-$wb['Website quota (Harddisk)'] = 'Website quota (Harddisk)';
+$wb['Website quota (Harddisk)'] = 'Webová kvóta (mÃsto na disku)';
$wb['Cron'] = 'Cron';
$wb['Stats'] = 'Statistiky';
$wb['Shell'] = 'Shell';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Doména';
$wb['Redirect'] = 'PÅ™esmÄ›rovánÃ';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Stránky';
+$wb['Database User'] = 'Uživatelé databáze';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng
index d0ecb771f..1ed9e616d 100644
--- a/interface/web/sites/lib/lang/cz_aps.lng
+++ b/interface/web/sites/lib/lang/cz_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Přehled';
+$wb['administration_txt'] = 'Správa';
+$wb['available_packages_txt'] = 'Dostupn̩ bal̀ky';
+$wb['installed_packages_txt'] = 'Nainstalovan̩ bal̀ky';
+$wb['yes_txt'] = 'Ano';
+$wb['no_txt'] = 'Ne';
+$wb['invalid_id_txt'] = 'Žádné platné ID nebyly poskytnuty.';
+$wb['details_txt'] = 'Podrobnosti';
+$wb['version_txt'] = 'Verze';
+$wb['category_txt'] = 'Kategorie';
+$wb['homepage_txt'] = 'Úvodnà stránka';
+$wb['supported_languages_txt'] = 'Podporované jazyky';
+$wb['description_txt'] = 'Popis';
+$wb['config_script_txt'] = 'KonfiguraÄnà skript';
+$wb['installed_size_txt'] = 'Velikost po instalaci';
+$wb['license_txt'] = 'Licence';
+$wb['screenshots_txt'] = 'SnÃmky obrazovky';
+$wb['changelog_txt'] = 'ZmÄ›ny ve verzÃch';
+$wb['server_requirements_txt'] = 'Požadavky na server';
+$wb['php_extensions_txt'] = 'PHP rozÅ¡ÃÅ™enÃ';
+$wb['php_settings_txt'] = 'PHP nastavenÃ';
+$wb['supported_php_versions_txt'] = 'Podporované PHP verze';
+$wb['database_txt'] = 'Databáze';
+$wb['settings_txt'] = 'NastavenÃ';
+$wb['install_package_txt'] = 'Nainstalujte tento balÃÄek';
+$wb['installation_txt'] = 'Instalace';
+$wb['install_location_txt'] = 'UmÃstÄ›nà instalace';
+$wb['acceptance_txt'] = 'Souhlas';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Jazyk rozhranÃ';
+$wb['new_database_password_txt'] = 'Nové databázové heslo';
+$wb['basic_settings_txt'] = 'Základnà nastavenÃ';
+$wb['package_settings_txt'] = 'Nastavenà balÃÄku';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Instalace plánované';
+$wb['installation_error_txt'] = 'Chyba instalace';
+$wb['installation_success_txt'] = 'Nainstalované';
+$wb['installation_remove_txt'] = 'Odstraněnà plánu';
+$wb['packagelist_update_finished_txt'] = 'APS aktualizace balÃÄku dokonÄena.';
+$wb['btn_install_txt'] = 'Instalovat';
+$wb['btn_cancel_txt'] = 'Zrušit';
+?>
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 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
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 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng
index 8d3a7d08b..adde2cf1b 100644
--- a/interface/web/sites/lib/lang/cz_database.lng
+++ b/interface/web/sites/lib/lang/cz_database.lng
@@ -22,19 +22,23 @@ $wb['database_name_change_txt'] = 'Jméno databáze nemůže být změněno';
$wb['database_charset_change_txt'] = 'Znaková sada databáze nemůže být změněna';
$wb['database_name_error_len'] = 'Název databáze - {db} - je pÅ™ÃliÅ¡ dlouhý. Maximálnà délka vÄetnÄ› prefixu je 64 znaků.';
$wb['database_user_error_len'] = 'Jméno uživatele - {user}- je pÅ™ÃliÅ¡ dlouhé. Maximálnà délka vÄetnÄ› prefixu je 16 znaků.';
-$wb['parent_domain_id_txt'] = 'Site';
+$wb['parent_domain_id_txt'] = 'Přiřadit k web doméně';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
-$wb['select_site_txt'] = '- Select Site -';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['select_site_txt'] = '- Vybrat web doménu -';
+$wb['btn_save_txt'] = 'Uložit';
+$wb['btn_cancel_txt'] = 'Zrušit';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$wb['repeat_password_txt'] = 'Opakujte heslo';
+$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
+$wb['password_match_txt'] = 'Hesla se shodujÃ.';
$wb['globalsearch_resultslimit_of_txt'] = 'of';
$wb['globalsearch_resultslimit_results_txt'] = 'results';
$wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
+$wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
+$wb['database_ro_user_txt'] = 'Uživatel databáze - jen právo ke ÄtenÃ';
+$wb['optional_txt'] = 'Volitelný';
+$wb['select_dbuser_txt'] = 'Vyberte uživatele databáze';
+$wb['no_dbuser_txt'] = 'Žádný';
?>
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 3f05f65e6..a0069404d 100644
--- a/interface/web/sites/lib/lang/cz_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb['list_head_txt'] = 'Database';
-$wb['active_txt'] = 'Active';
-$wb['remote_access_txt'] = 'Remote Access';
+$wb['list_head_txt'] = 'Databáze';
+$wb['active_txt'] = 'AktivnÃ';
+$wb['remote_access_txt'] = 'Vzdálený pÅ™Ãstup';
$wb['server_id_txt'] = 'Server';
-$wb['database_user_txt'] = 'Database user';
-$wb['database_name_txt'] = 'Database name';
-$wb['add_new_record_txt'] = 'Add new Database';
-$wb['sys_groupid_txt'] = 'Client';
+$wb['database_user_txt'] = 'Uživatel databáze';
+$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_user.lng b/interface/web/sites/lib/lang/cz_database_user.lng
new file mode 100644
index 000000000..3b5dea58f
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['database_user_txt'] = 'Uživatel databáze';
+$wb['database_password_txt'] = 'Heslo databazového uživatele';
+$wb['password_strength_txt'] = 'BezpeÄnost hesla';
+$wb['client_txt'] = 'Klient';
+$wb['active_txt'] = 'AktivnÃ';
+$wb['database_user_error_empty'] = 'Uživatel databáze je prázdný.';
+$wb['database_user_error_unique'] = 'Uživatel databáze s tÃmto názvem již existuje na serveru. MusÃte zadat jedineÄný název, napÅ™. můžete pÅ™edÅ™adit své doménové jméno k uživatelskému jménu.';
+$wb['database_user_error_regex'] = 'Neplatné uživatelské jméno databáze. Uživatelské jméno může obsahovat tyto znaky: az, AZ, 0-9 a podtržÃtko. Délka: 2 až 64 znaků.';
+$wb['database_user_error_len'] = 'Jméno uživatele databáze - {user} - je pÅ™ÃliÅ¡ dlouhé. Max. délka jména uživatele databáze vÄ. prefixu může být 16 znaků.';
+$wb['btn_save_txt'] = 'Uložit';
+$wb['btn_cancel_txt'] = 'Zrušit';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$wb['repeat_password_txt'] = 'Opakujte heslo';
+$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
+$wb['password_match_txt'] = 'Hesla se shodujÃ.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$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/cz_database_user_admin_list.lng b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
new file mode 100644
index 000000000..8703e713e
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Uživatel databáze';
+$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
new file mode 100644
index 000000000..42cf36d70
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$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 7ebf57cd6..876ad5108 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user.lng
@@ -27,8 +27,8 @@ $wb['parent_domain_id_error_empty'] = 'Nevybrána žádná webová stránka.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
$wb['dir_dot_error'] = 'No .. in path allowed.';
$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$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.lng b/interface/web/sites/lib/lang/cz_shell_user.lng
index b07a4e512..97b8a0d08 100644
--- a/interface/web/sites/lib/lang/cz_shell_user.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user.lng
@@ -22,8 +22,8 @@ $wb['pgroup_txt'] = 'Web: Skupina';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
$wb['dir_dot_error'] = 'No .. in path allowed.';
$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$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_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
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 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/cz_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng
index d8ed8b6a7..f7a450eb0 100644
--- a/interface/web/sites/lib/lang/cz_web_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain.lng
@@ -100,8 +100,13 @@ $wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$wb['repeat_password_txt'] = 'Opakujte heslo';
+$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
+$wb['password_match_txt'] = 'Hesla se shodujÃ.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/cz_web_folder.lng b/interface/web/sites/lib/lang/cz_web_folder.lng
index 93cd40a08..fcf9e0453 100644
--- a/interface/web/sites/lib/lang/cz_web_folder.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder.lng
@@ -2,6 +2,6 @@
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
$wb['path_txt'] = 'Path';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['path_error_regex'] = 'Invalid folder path.';
?>
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 76d97029b..8702d5d6a 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng
@@ -1,7 +1,7 @@
<?php
-$wb['list_head_txt'] = 'Folder';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Složky / adresáře';
+$wb['active_txt'] = 'AktivnÃ';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['path_txt'] = 'Path';
+$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 bf5665396..2adfc2d2e 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng
@@ -2,11 +2,11 @@
$wb['web_folder_id_txt'] = 'Folder';
$wb['username_txt'] = 'Username';
$wb['password_txt'] = 'Password';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['folder_error_empty'] = 'No web folder selecetd.';
$wb['password_strength_txt'] = 'Password strength';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$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 9a7286a95..14bec62c8 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
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Folder User';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['web_folder_id_txt'] = 'Folder';
$wb['username_txt'] = 'Username';
?>
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 4c897abab..71f0d9a38 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
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Tento mÄ›sÃc';
$wb['last_month_txt'] = 'Minulý mÄ›sÃc';
$wb['this_year_txt'] = 'Tento rok';
$wb['last_year_txt'] = 'Minulý rok';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng
index 1dbd2c67e..bb2005ebc 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Neplatná cesta pÅ™esmÄ›rovánÃ. Platné pÅ™esmÄ›rovánà je napÅ™Ãklad: /test/ nebo http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'Žádné pÅ™esmÄ›rovánÃ';
$wb['no_flag_txt'] = 'Žádný pÅ™Ãznak';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
new file mode 100644
index 000000000..79a44de5d
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
@@ -0,0 +1,113 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'AktivnÃ';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'The max. PoÄet webových stránek for your account is reached.';
+$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
+$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
+$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
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
new file mode 100644
index 000000000..36d7b8669
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'AktivnÃ';
+$wb['server_id_txt'] = 'Server';
+$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/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng
index 329eb60b7..18db84a40 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user.lng
@@ -5,7 +5,7 @@ $wb['parent_domain_id_txt'] = 'Website';
$wb['username_txt'] = 'Username';
$wb['password_txt'] = 'Password';
$wb['password_strength_txt'] = 'Password strength';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['limit_webdav_user_txt'] = 'The max. number of webdav users for your account is reached.';
$wb['username_error_empty'] = 'Username is empty.';
$wb['username_error_unique'] = 'The username must be unique.';
@@ -14,8 +14,8 @@ $wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
$wb['dir_dot_error'] = 'No .. in path allowed.';
$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$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 bac283b0a..791710e8d 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Webdav-User';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
$wb['username_txt'] = 'Username';
diff --git a/interface/web/sites/lib/lang/de.lng b/interface/web/sites/lib/lang/de.lng
index ba7f57c99..3d260c0a6 100644
--- a/interface/web/sites/lib/lang/de.lng
+++ b/interface/web/sites/lib/lang/de.lng
@@ -1,34 +1,33 @@
<?php
-$wb['Websites'] = "Webseiten";
-$wb['Website'] = "Webseite";
-$wb['Subdomain'] = "Subdomains";
-$wb['Aliasdomain'] = "Aliasdomains";
-$wb['Database'] = "Datenbanken";
-$wb['Database User'] = "Datenbank Benutzer";
-$wb['Web Access'] = "Web Zugriff";
-$wb['FTP-User'] = "FTP Benutzer";
-$wb['Webdav-User'] = "WebDAV Benutzer";
-$wb['Folder'] = "Geschützte Ordner";
-$wb['Folder users'] = "Geschützte Ordner Benutzer";
-$wb['Command Line'] = "Kommando Zeile";
-$wb['Shell-User'] = "Shell Benutzer";
-$wb['Cron Jobs'] = "Cronjobs";
-$wb['Statistics'] = "Statistik";
-$wb['Web traffic'] = "Web Datentransfer";
-$wb['Website quota (Harddisk)'] = "Webseitenbeschränkung (Festplatte)";
-$wb['Cron'] = "Cron";
-$wb['Stats'] = "Statistiken";
-$wb['Shell'] = "Shell";
-$wb['Webdav'] = "WebDAV";
-$wb['FTP'] = "FTP";
-$wb['Options'] = "Optionen";
-$wb['Domain'] = "Domain";
-$wb['Redirect'] = "Umleitung";
-$wb['SSL'] = "SSL";
-$wb['Sites'] = "Seiten";
-$wb['APS Installer'] = "APS Installationsassistent";
-$wb['Available packages'] = "Verfügbare Pakete";
-$wb['Installed packages'] = "Installierte Pakete";
-$wb['Update Packagelist'] = "Paketliste aktualisieren";
+$wb['Websites'] = 'Webseiten';
+$wb['Website'] = 'Webseite';
+$wb['Subdomain'] = 'Subdomains';
+$wb['Aliasdomain'] = 'Aliasdomains';
+$wb['Database'] = 'Datenbanken';
+$wb['Database User'] = 'Datenbank Benutzer';
+$wb['Web Access'] = 'Web Zugriff';
+$wb['FTP-User'] = 'FTP Benutzer';
+$wb['Webdav-User'] = 'WebDAV Benutzer';
+$wb['Folder'] = 'Geschützte Ordner';
+$wb['Folder users'] = 'Geschützte Ordner Benutzer';
+$wb['Command Line'] = 'Kommando Zeile';
+$wb['Shell-User'] = 'Shell Benutzer';
+$wb['Cron Jobs'] = 'Cronjobs';
+$wb['Statistics'] = 'Statistik';
+$wb['Web traffic'] = 'Web Datentransfer';
+$wb['Website quota (Harddisk)'] = 'Webseitenbeschränkung (Festplatte)';
+$wb['Cron'] = 'Cron';
+$wb['Stats'] = 'Statistiken';
+$wb['Shell'] = 'Shell';
+$wb['Webdav'] = 'WebDAV';
+$wb['FTP'] = 'FTP';
+$wb['Options'] = 'Optionen';
+$wb['Domain'] = 'Domain';
+$wb['Redirect'] = 'Umleitung';
+$wb['SSL'] = 'SSL';
+$wb['Sites'] = 'Seiten';
+$wb['APS Installer'] = 'APS Installationsassistent';
+$wb['Available packages'] = 'Verfügbare Pakete';
+$wb['Installed packages'] = 'Installierte Pakete';
+$wb['Update Packagelist'] = 'Paketliste aktualisieren';
?>
-
diff --git a/interface/web/sites/lib/lang/de_aps.lng b/interface/web/sites/lib/lang/de_aps.lng
index 5263f8d5a..76bd17f73 100644
--- a/interface/web/sites/lib/lang/de_aps.lng
+++ b/interface/web/sites/lib/lang/de_aps.lng
@@ -55,4 +55,3 @@ $wb['installation_success_txt'] = 'Installiert';
$wb['installation_remove_txt'] = 'Deinstallation vorgemerkt';
$wb['packagelist_update_finished_txt'] = 'APS Paketlistenupdate beendet.';
?>
-
diff --git a/interface/web/sites/lib/lang/de_aps_instances_list.lng b/interface/web/sites/lib/lang/de_aps_instances_list.lng
index 753ba3b8a..e5f8b7b7f 100644
--- a/interface/web/sites/lib/lang/de_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/de_aps_instances_list.lng
@@ -11,4 +11,3 @@ $wb['filter_txt'] = 'Suche';
$wb['delete_txt'] = 'Löschen';
$wb['reinstall_txt'] = 'Neuinstallieren';
?>
-
diff --git a/interface/web/sites/lib/lang/de_aps_packages_list.lng b/interface/web/sites/lib/lang/de_aps_packages_list.lng
index ab21a1477..6cada812b 100644
--- a/interface/web/sites/lib/lang/de_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/de_aps_packages_list.lng
@@ -6,4 +6,3 @@ $wb['category_txt'] = 'Kategorie';
$wb['status_txt'] = 'Verfügbar';
$wb['filter_txt'] = 'Suche';
?>
-
diff --git a/interface/web/sites/lib/lang/de_cron.lng b/interface/web/sites/lib/lang/de_cron.lng
index d89e2dcd4..8cebfa9c5 100644
--- a/interface/web/sites/lib/lang/de_cron.lng
+++ b/interface/web/sites/lib/lang/de_cron.lng
@@ -19,4 +19,3 @@ $wb['run_wday_error_format'] = 'Das Format für Wochentage ist nicht korrekt.';
$wb['command_error_format'] = 'Das Format für den Befehl ist nicht korrekt. Beachten Sie, dass bei einem URL Aufruf nur http und https erlaubt ist.';
$wb['unknown_fieldtype_error'] = 'Es wurde ein unbekanntes Feld verwendet.';
?>
-
diff --git a/interface/web/sites/lib/lang/de_cron_list.lng b/interface/web/sites/lib/lang/de_cron_list.lng
index 029cd59b7..687505b4a 100644
--- a/interface/web/sites/lib/lang/de_cron_list.lng
+++ b/interface/web/sites/lib/lang/de_cron_list.lng
@@ -11,4 +11,3 @@ $wb['command_txt'] = 'Befehl';
$wb['add_new_cron_txt'] = 'Neuen Cronjob anlegen';
$wb['parent_domain_id_txt'] = 'Webseite';
?>
-
diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng
index 5bec72467..70b7721d1 100644
--- a/interface/web/sites/lib/lang/de_database.lng
+++ b/interface/web/sites/lib/lang/de_database.lng
@@ -14,6 +14,7 @@ $wb['remote_ips_txt'] = 'Remote zugriff IP Adressen (mit Komma trennen, keine Ei
$wb['database_remote_error_ips'] = 'Mindestens eine der eingegebenen IP Adressen ist ungültig.';
$wb['client_txt'] = 'Kunde';
$wb['active_txt'] = 'Aktiv';
+$wb['database_client_differs_txt'] = 'Der Kunde dieser Datenbank passt nicht zum Kunden des Datenbankusers.';
$wb['database_name_error_empty'] = 'Datenbankname ist leer.';
$wb['database_name_error_unique'] = 'Es existiert bereits eine Datenbank mit diesem Namen am Server. Um einen eindeutigen Namen zu erhalten können sie z.B. den Domainnamen vor dem Datenbanknamen verwenden.';
$wb['database_name_error_regex'] = 'Ungültiger Datenbankname. Der Datenbankname darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.';
@@ -42,4 +43,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 Treffer';
$wb['globalsearch_searchfield_watermark_txt'] = 'Suche';
$wb['globalsearch_suggestions_text_txt'] = 'Vorschläge';
?>
-
diff --git a/interface/web/sites/lib/lang/de_database_admin_list.lng b/interface/web/sites/lib/lang/de_database_admin_list.lng
index af17ba88a..3f7542a30 100644
--- a/interface/web/sites/lib/lang/de_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/de_database_admin_list.lng
@@ -8,4 +8,3 @@ $wb['database_name_txt'] = 'Datenbankname';
$wb['add_new_record_txt'] = 'Neue Datenbank hinzufügen';
$wb['sys_groupid_txt'] = 'Kunde';
?>
-
diff --git a/interface/web/sites/lib/lang/de_database_list.lng b/interface/web/sites/lib/lang/de_database_list.lng
index 29959817a..bae444c42 100644
--- a/interface/web/sites/lib/lang/de_database_list.lng
+++ b/interface/web/sites/lib/lang/de_database_list.lng
@@ -7,4 +7,3 @@ $wb['database_name_txt'] = 'Datenbankname';
$wb['add_new_record_txt'] = 'Neue Datenbank hinzufügen';
$wb['database_user_txt'] = 'Database user';
?>
-
diff --git a/interface/web/sites/lib/lang/de_database_user.lng b/interface/web/sites/lib/lang/de_database_user.lng
index ca05e60d2..78884bc3b 100644
--- a/interface/web/sites/lib/lang/de_database_user.lng
+++ b/interface/web/sites/lib/lang/de_database_user.lng
@@ -21,4 +21,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 Treffer';
$wb['globalsearch_searchfield_watermark_txt'] = 'Suche';
$wb['globalsearch_suggestions_text_txt'] = 'Vorschläge';
?>
-
diff --git a/interface/web/sites/lib/lang/de_database_user_admin_list.lng b/interface/web/sites/lib/lang/de_database_user_admin_list.lng
index 4cbdc9dbd..82c09fcf1 100644
--- a/interface/web/sites/lib/lang/de_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/de_database_user_admin_list.lng
@@ -4,4 +4,3 @@ $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
$wb['database_user_txt'] = 'Datenbank Benutzer';
$wb['sys_groupid_txt'] = 'Kunde';
?>
-
diff --git a/interface/web/sites/lib/lang/de_database_user_list.lng b/interface/web/sites/lib/lang/de_database_user_list.lng
index d746d2f2c..7ee8222dc 100644
--- a/interface/web/sites/lib/lang/de_database_user_list.lng
+++ b/interface/web/sites/lib/lang/de_database_user_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Datenbank Benutzer';
$wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
$wb['database_user_txt'] = 'Datenbank Benutzer';
?>
-
diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng
index 80072ec49..c367ffffb 100644
--- a/interface/web/sites/lib/lang/de_ftp_user.lng
+++ b/interface/web/sites/lib/lang/de_ftp_user.lng
@@ -1,35 +1,34 @@
<?php
-$wb['uid_txt'] = "Benutzerkennung (UID)";
-$wb['gid_txt'] = "Benutzergruppe (GID)";
-$wb['dir_txt'] = "Verzeichnis";
-$wb['quota_files_txt'] = "Dateibeschränkung";
-$wb['quota_files_unity_txt'] = "Dateien";
-$wb['ul_ratio_txt'] = "Uploadrate";
-$wb['dl_ratio_txt'] = "Downloadrate";
-$wb['ul_bandwidth_txt'] = "Uploadbandbreite";
-$wb['dl_bandwidth_txt'] = "Downloadbandbreite";
-$wb['server_id_txt'] = "Server";
-$wb['parent_domain_id_txt'] = "Domain";
-$wb['username_txt'] = "Benutzername";
-$wb['password_txt'] = "Passwort";
-$wb['quota_size_txt'] = "Festplatten Quota";
-$wb['active_txt'] = "Aktiv";
-$wb['limit_ftp_user_txt'] = "Die maximale Anzahl an FTP Benutzer für Ihr Konto wurde erreicht.";
-$wb['username_error_empty'] = "Benutzername ist leer.";
-$wb['username_error_unique'] = "Der Benutzername muss einzigartig sein.";
-$wb['username_error_regex'] = "Der Benutzername enthält nicht erlaubte Zeichen.";
-$wb['quota_size_error_empty'] = "Beschränkung ist leer.";
-$wb['uid_error_empty'] = "GID ist leer.";
-$wb['directory_error_empty'] = "Verzeichnis ist leer.";
-$wb['password_strength_txt'] = "Passwortkomplexität";
-$wb['directory_error_notinweb'] = "Das Verzeichnis befindet sich nicht innerhalb des Verzeichnisses der Website.";
-$wb['parent_domain_id_error_empty'] = "Keine Domain ausgewählt.";
-$wb['quota_size_error_regex'] = "Beschränkung: Geben Sie -1 ein für unlimitiert oder eine Zahl > 0";
-$wb['dir_dot_error'] = "Kein .. im Pfad erlaubt.";
-$wb['dir_slashdot_error'] = "Kein ./ im Pfad erlaubt.";
-$wb['generate_password_txt'] = "Passwort erzeugen";
-$wb['repeat_password_txt'] = "Passwort wiederholen";
-$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein.";
-$wb['password_match_txt'] = "Die Passwörter stimmen überein.";
+$wb['uid_txt'] = 'Benutzerkennung (UID)';
+$wb['gid_txt'] = 'Benutzergruppe (GID)';
+$wb['dir_txt'] = 'Verzeichnis';
+$wb['quota_files_txt'] = 'Dateibeschränkung';
+$wb['quota_files_unity_txt'] = 'Dateien';
+$wb['ul_ratio_txt'] = 'Uploadrate';
+$wb['dl_ratio_txt'] = 'Downloadrate';
+$wb['ul_bandwidth_txt'] = 'Uploadbandbreite';
+$wb['dl_bandwidth_txt'] = 'Downloadbandbreite';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Domain';
+$wb['username_txt'] = 'Benutzername';
+$wb['password_txt'] = 'Passwort';
+$wb['quota_size_txt'] = 'Festplatten Quota';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_ftp_user_txt'] = 'Die maximale Anzahl an FTP Benutzer für Ihr Konto wurde erreicht.';
+$wb['username_error_empty'] = 'Benutzername ist leer.';
+$wb['username_error_unique'] = 'Der Benutzername muss einzigartig sein.';
+$wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.';
+$wb['quota_size_error_empty'] = 'Beschränkung ist leer.';
+$wb['uid_error_empty'] = 'GID ist leer.';
+$wb['directory_error_empty'] = 'Verzeichnis ist leer.';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['directory_error_notinweb'] = 'Das Verzeichnis befindet sich nicht innerhalb des Verzeichnisses der Website.';
+$wb['parent_domain_id_error_empty'] = 'Keine Domain ausgewählt.';
+$wb['quota_size_error_regex'] = 'Beschränkung: Geben Sie -1 ein für unlimitiert oder eine Zahl > 0';
+$wb['dir_dot_error'] = 'Kein .. im Pfad erlaubt.';
+$wb['dir_slashdot_error'] = 'Kein ./ im Pfad erlaubt.';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
-
diff --git a/interface/web/sites/lib/lang/de_ftp_user_list.lng b/interface/web/sites/lib/lang/de_ftp_user_list.lng
index d39ff1f52..8d1b0817a 100644
--- a/interface/web/sites/lib/lang/de_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/de_ftp_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Domain';
$wb['username_txt'] = 'Benutzername';
$wb['add_new_record_txt'] = 'Neuen FTP Benutzer hinzufügen';
?>
-
diff --git a/interface/web/sites/lib/lang/de_shell_user.lng b/interface/web/sites/lib/lang/de_shell_user.lng
index c9cb6bd4f..20d82cc3e 100644
--- a/interface/web/sites/lib/lang/de_shell_user.lng
+++ b/interface/web/sites/lib/lang/de_shell_user.lng
@@ -27,4 +27,3 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
-
diff --git a/interface/web/sites/lib/lang/de_shell_user_list.lng b/interface/web/sites/lib/lang/de_shell_user_list.lng
index 176a4e597..c953cf6b0 100644
--- a/interface/web/sites/lib/lang/de_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/de_shell_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webseite';
$wb['username_txt'] = 'Benutzername';
$wb['add_new_record_txt'] = 'Neuen Shell Benutzer hinzufügen';
?>
-
diff --git a/interface/web/sites/lib/lang/de_user_quota_stats_list.lng b/interface/web/sites/lib/lang/de_user_quota_stats_list.lng
index 671b1c010..74a0b1747 100644
--- a/interface/web/sites/lib/lang/de_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/de_user_quota_stats_list.lng
@@ -1,10 +1,9 @@
<?php
-$wb['list_head_txt'] = "Webseiten Festplattenbeschränkung";
-$wb['domain_txt'] = "Domain / Webseite";
-$wb['system_user_txt'] = "Linux Benutzer";
-$wb['used_txt'] = "Verwendeter Speicherplatz";
-$wb['hard_txt'] = "Hard Limit";
-$wb['soft_txt'] = "Soft Limit";
-$wb['files_txt'] = "Dateien";
+$wb['list_head_txt'] = 'Webseiten Festplattenbeschränkung';
+$wb['domain_txt'] = 'Domain / Webseite';
+$wb['system_user_txt'] = 'Linux Benutzer';
+$wb['used_txt'] = 'Verwendeter Speicherplatz';
+$wb['hard_txt'] = 'Hard Limit';
+$wb['soft_txt'] = 'Soft Limit';
+$wb['files_txt'] = 'Dateien';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
index 914474660..df8ebc683 100644
--- a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
@@ -12,4 +12,3 @@ $wb['no_redirect_txt'] = 'Kein Redirect';
$wb['no_flag_txt'] = 'Kein Flag';
$wb['none_txt'] = 'keine';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_backup_list.lng b/interface/web/sites/lib/lang/de_web_backup_list.lng
index 44f0b8b06..4cc06d82e 100644
--- a/interface/web/sites/lib/lang/de_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/de_web_backup_list.lng
@@ -13,4 +13,3 @@ $wb['restore_pending_txt'] = 'Es liegt bereits ein Backup Wiederherstellungs Job
$wb['backup_type_mysql'] = 'MySQL Datenbank';
$wb['backup_type_web'] = 'Webseiten Dateien';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
index c26522e5f..3c64f65c0 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -1,113 +1,114 @@
<?php
-$wb['ssl_state_txt'] = "Bundesland";
-$wb['ssl_locality_txt'] = "Ort";
-$wb['ssl_organisation_txt'] = "Firma";
-$wb['ssl_organisation_unit_txt'] = "Abteilung";
-$wb['ssl_country_txt'] = "Land";
-$wb['ssl_key_txt'] = "SSL Key";
-$wb['ssl_request_txt'] = "SSL Request";
-$wb['ssl_cert_txt'] = "SSL Zertifikat";
-$wb['ssl_bundle_txt'] = "SSL Bundle";
-$wb['ssl_action_txt'] = "SSL Aktion";
-$wb['server_id_txt'] = "Server";
-$wb['domain_txt'] = "Domain";
-$wb['type_txt'] = "Typ";
-$wb['parent_domain_id_txt'] = "Zugehörige Webseite";
-$wb['web_folder_error_regex'] = "Ungültige Verzeichnisangabe, bitte keinen / eingeben.";
-$wb['redirect_type_txt'] = "Weiterleitungstyp";
-$wb['redirect_path_txt'] = "Weiterleitungspfad";
-$wb['active_txt'] = "Aktiv";
-$wb['document_root_txt'] = "Documentroot";
-$wb['system_user_txt'] = "Linux Benutzer";
-$wb['system_group_txt'] = "Linux Gruppe";
-$wb['ip_address_txt'] = "IP Adresse";
-$wb['vhost_type_txt'] = "VHost Type";
-$wb['hd_quota_txt'] = "Speicherplatzbeschränkung";
-$wb['traffic_quota_txt'] = "Transfervolumenbeschränkung";
-$wb['cgi_txt'] = "CGI";
-$wb['ssi_txt'] = "SSI";
-$wb['ssl_txt'] = "SSL";
-$wb['suexec_txt'] = "SuEXEC";
-$wb['php_txt'] = "PHP";
-$wb['client_txt'] = "Kunde";
-$wb['limit_web_domain_txt'] = "Die maximale Anzahl an Webdomains für Ihr Konto wurde erreicht.";
-$wb['limit_web_aliasdomain_txt'] = "Die maximale Anzahl an Aliasdomains für Ihr Konto wurde erreicht.";
-$wb['limit_web_subdomain_txt'] = "Die maximale Anzahl an Subdomains für Ihr Konto wurde erreicht.";
-$wb['apache_directives_txt'] = "Apache Direktiven";
-$wb['domain_error_empty'] = "Domain ist leer.";
-$wb['domain_error_unique'] = "Domain muss eindeutig sein";
-$wb['domain_error_regex'] = "Domain Name ungültig.";
-$wb['domain_error_autosub'] = "Es existiert bereits eine Subdomain mit diesen Einstellungen.";
-$wb['hd_quota_error_empty'] = "Speicherplatzbeschränkung ist leer.";
-$wb['traffic_quota_error_empty'] = "Transfervolumenbeschränkung ist leer.";
-$wb['errordocs_txt'] = "Eigene Fehlerseiten";
-$wb['error_ssl_state_empty'] = "SSL Status ist leer.";
-$wb['error_ssl_locality_empty'] = "Ort (SSL) ist leer.";
-$wb['error_ssl_organisation_empty'] = "Organisation (SSL) ist leer.";
-$wb['error_ssl_organisation_unit_empty'] = "Abteilung (SSL) ist leer.";
-$wb['error_ssl_country_empty'] = "Land (SSL) ist leer.";
-$wb['subdomain_txt'] = "Auto Subdomain";
-$wb['client_group_id_txt'] = "Kunde";
-$wb['stats_password_txt'] = "Webstatistik Passwort";
-$wb['ssl_domain_txt'] = "SSL Domain";
-$wb['allow_override_txt'] = "Allow Override";
-$wb['limit_web_quota_free_txt'] = "Max. mögliche Speicherplatzbeschränkung";
-$wb['ssl_state_error_regex'] = "Ungültige SSL State. Gültige Zeichen sind: a-z, 0-9 und .,-_";
-$wb['ssl_locality_error_regex'] = "Ungültige SSL Locality. Gülige Zeichen sind: a-z, 0-9 und .,-_";
-$wb['ssl_organisation_error_regex'] = "Ungültige SSL Organisation. Gültige Zeichen sind: a-z, 0-9 und .,-_";
-$wb['ssl_organistaion_unit_error_regex'] = "Ungültige SSL Organisation Unit. Gültige Zeichen sind: a-z, 0-9 und .,-_";
-$wb['ssl_country_error_regex'] = "Ungültiges SSL Land. Gültige Zeichen sind: A-Z";
-$wb['limit_traffic_quota_free_txt'] = "Max. mögliche Transfervolumenbeschränkung";
-$wb['redirect_error_regex'] = "Ungültiger Weiterleitungspfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/";
-$wb['php_open_basedir_txt'] = "PHP open_basedir";
-$wb['backup_interval_txt'] = "Backup Intervall";
-$wb['backup_copies_txt'] = "Anzahl an Backups";
-$wb['traffic_quota_exceeded_txt'] = "Transfervolumen verbraucht.";
-$wb['ruby_txt'] = "Ruby";
-$wb['stats_user_txt'] = "Webstatistik Benutzername";
-$wb['stats_type_txt'] = "Webstatistik Programm";
-$wb['custom_php_ini_txt'] = "Individuelle php.ini Einstellungen";
-$wb['error_ssl_cert_empty'] = "SSL Zertifikat Feld ist leer.";
-$wb['none_txt'] = "Keine";
-$wb['disabled_txt'] = "Deaktiviert";
-$wb['no_redirect_txt'] = "Kein Redirect";
-$wb['no_flag_txt'] = "Kein Flag";
-$wb['save_certificate_txt'] = "Zertifikat speichern";
-$wb['create_certificate_txt'] = "Zertifikat erstellen";
-$wb['delete_certificate_txt'] = "Zertifikat löschen";
-$wb['nginx_directives_txt'] = "nginx Direktiven";
-$wb['seo_redirect_txt'] = "SEO Redirect";
-$wb['non_www_to_www_txt'] = "Nicht-www -> www";
-$wb['www_to_non_www_txt'] = "www -> Nicht-www";
-$wb['php_fpm_use_socket_txt'] = "Benutze Socket für PHP-FPM";
-$wb['ipv6_address_txt'] = "IPv6 Adresse";
-$wb['error_no_sni_txt'] = "SNI für SSL ist auf diesem Server nicht aktiviert. Sie können daher nur ein SSL Zertifikat pro IP Adresse eintragen.";
-$wb['python_txt'] = "Python";
-$wb['perl_txt'] = "Perl";
-$wb['pm_max_children_txt'] = "PHP-FPM pm.max_children";
-$wb['pm_start_servers_txt'] = "PHP-FPM pm.start_servers";
-$wb['pm_min_spare_servers_txt'] = "PHP-FPM pm.min_spare_servers";
-$wb['pm_max_spare_servers_txt'] = "PHP-FPM pm.max_spare_servers";
-$wb['error_php_fpm_pm_settings_txt'] = "Die Werte der PHP-FPM pm Einstellungen müssen wie folgt sein: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0";
-$wb['pm_max_children_error_regex'] = "PHP-FPM pm.max_children muß eine positive ganze Zahl sein.";
-$wb['pm_start_servers_error_regex'] = "PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.";
-$wb['pm_min_spare_servers_error_regex'] = "PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.";
-$wb['pm_max_spare_servers_error_regex'] = "PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.";
-$wb['hd_quota_error_regex'] = "Speicherplatzbeschränkung ist ungültig.";
-$wb['traffic_quota_error_regex'] = "Transfervolumenbeschränkung ist ungültig.";
-$wb['fastcgi_php_version_txt'] = "PHP Version";
-$wb['pm_txt'] = "PHP-FPM FastCGI Prozess Manager";
-$wb['pm_process_idle_timeout_txt'] = "PHP-FPM pm.process_idle_timeout";
-$wb['pm_max_requests_txt'] = "PHP-FPM pm.max_requests";
-$wb['pm_process_idle_timeout_error_regex'] = "PHP-FPM pm.process_idle_timeout muß eine positive ganze Zahl sein.";
-$wb['pm_max_requests_error_regex'] = "PHP-FPM pm.max_requests muß eine ganze Zahl >= 0 sein.";
-$wb['pm_ondemand_hint_txt'] = "Bitte beachten Sie, daß Ihre PHP Version >= 5.3.9 sein muß, wenn Sie den ondemand Process-Manager nutzen möchten. Wenn Sie ondemand für eine ältere PHP Version auswählen, wird PHP nicht mehr starten!";
-$wb['generate_password_txt'] = "Passwort erzeugen";
-$wb['repeat_password_txt'] = "Passwort wiederholen";
-$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein.";
-$wb['password_match_txt'] = "Die Passwörter stimmen überein.";
-$wb['available_php_directive_snippets_txt'] = "Verfügbare PHP Direktiven Schnipsel:";
-$wb['available_apache_directive_snippets_txt'] = "Verfügbare Apache Direktiven Schnipsel:";
-$wb['available_nginx_directive_snippets_txt'] = "Verfügbare nginx Direktiven Schnipsel:";
+$wb['ssl_state_txt'] = 'Bundesland';
+$wb['ssl_locality_txt'] = 'Ort';
+$wb['ssl_organisation_txt'] = 'Firma';
+$wb['ssl_organisation_unit_txt'] = 'Abteilung';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Zertifikat';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Aktion';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
+$wb['web_folder_error_regex'] = 'Ungültige Verzeichnisangabe, bitte keinen / eingeben.';
+$wb['redirect_type_txt'] = 'Weiterleitungstyp';
+$wb['redirect_path_txt'] = 'Weiterleitungspfad';
+$wb['active_txt'] = 'Aktiv';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux Benutzer';
+$wb['system_group_txt'] = 'Linux Gruppe';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Speicherplatzbeschränkung';
+$wb['traffic_quota_txt'] = 'Transfervolumenbeschränkung';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Kunde';
+$wb['limit_web_domain_txt'] = 'Die maximale Anzahl an Webdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_aliasdomain_txt'] = 'Die maximale Anzahl an Aliasdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_subdomain_txt'] = 'Die maximale Anzahl an Subdomains für Ihr Konto wurde erreicht.';
+$wb['apache_directives_txt'] = 'Apache Direktiven';
+$wb['domain_error_empty'] = 'Domain ist leer.';
+$wb['domain_error_unique'] = 'Domain muss eindeutig sein';
+$wb['domain_error_regex'] = 'Domain Name ungültig.';
+$wb['domain_error_autosub'] = 'Es existiert bereits eine Subdomain mit diesen Einstellungen.';
+$wb['hd_quota_error_empty'] = 'Speicherplatzbeschränkung ist leer.';
+$wb['traffic_quota_error_empty'] = 'Transfervolumenbeschränkung ist leer.';
+$wb['errordocs_txt'] = 'Eigene Fehlerseiten';
+$wb['error_ssl_state_empty'] = 'SSL Status ist leer.';
+$wb['error_ssl_locality_empty'] = 'Ort (SSL) ist leer.';
+$wb['error_ssl_organisation_empty'] = 'Organisation (SSL) ist leer.';
+$wb['error_ssl_organisation_unit_empty'] = 'Abteilung (SSL) ist leer.';
+$wb['error_ssl_country_empty'] = 'Land (SSL) ist leer.';
+$wb['subdomain_txt'] = 'Auto Subdomain';
+$wb['client_group_id_txt'] = 'Kunde';
+$wb['stats_password_txt'] = 'Webstatistik Passwort';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Max. mögliche Speicherplatzbeschränkung';
+$wb['ssl_state_error_regex'] = 'Ungültige SSL State. Gültige Zeichen sind: a-z, 0-9 und .,-_';
+$wb['ssl_locality_error_regex'] = 'Ungültige SSL Locality. Gülige Zeichen sind: a-z, 0-9 und .,-_';
+$wb['ssl_organisation_error_regex'] = 'Ungültige SSL Organisation. Gültige Zeichen sind: a-z, 0-9 und .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL Organisation Unit. Gültige Zeichen sind: a-z, 0-9 und .,-_';
+$wb['ssl_country_error_regex'] = 'Ungültiges SSL Land. Gültige Zeichen sind: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. mögliche Transfervolumenbeschränkung';
+$wb['redirect_error_regex'] = 'Ungültiger Weiterleitungspfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['backup_interval_txt'] = 'Backup Intervall';
+$wb['backup_copies_txt'] = 'Anzahl an Backups';
+$wb['traffic_quota_exceeded_txt'] = 'Transfervolumen verbraucht.';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistik Benutzername';
+$wb['stats_type_txt'] = 'Webstatistik Programm';
+$wb['custom_php_ini_txt'] = 'Individuelle php.ini Einstellungen';
+$wb['error_ssl_cert_empty'] = 'SSL Zertifikat Feld ist leer.';
+$wb['none_txt'] = 'Keine';
+$wb['disabled_txt'] = 'Deaktiviert';
+$wb['no_redirect_txt'] = 'Kein Redirect';
+$wb['no_flag_txt'] = 'Kein Flag';
+$wb['save_certificate_txt'] = 'Zertifikat speichern';
+$wb['create_certificate_txt'] = 'Zertifikat erstellen';
+$wb['delete_certificate_txt'] = 'Zertifikat löschen';
+$wb['nginx_directives_txt'] = 'nginx Direktiven';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Nicht-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> Nicht-www';
+$wb['php_fpm_use_socket_txt'] = 'Benutze Socket für PHP-FPM';
+$wb['ipv6_address_txt'] = 'IPv6 Adresse';
+$wb['error_no_sni_txt'] = 'SNI für SSL ist auf diesem Server nicht aktiviert. Sie können daher nur ein SSL Zertifikat pro IP Adresse eintragen.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Die Werte der PHP-FPM pm Einstellungen müssen wie folgt sein: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muß eine positive ganze Zahl sein.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.';
+$wb['hd_quota_error_regex'] = 'Speicherplatzbeschränkung ist ungültig.';
+$wb['traffic_quota_error_regex'] = 'Transfervolumenbeschränkung ist ungültig.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM FastCGI Prozess Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout muß eine positive ganze Zahl sein.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests muß eine ganze Zahl >= 0 sein.';
+$wb['pm_ondemand_hint_txt'] = 'Bitte beachten Sie, daß Ihre PHP Version >= 5.3.9 sein muß, wenn Sie den ondemand Process-Manager nutzen möchten. Wenn Sie ondemand für eine ältere PHP Version auswählen, wird PHP nicht mehr starten!';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
+$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP Direktiven Schnipsel:';
+$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache Direktiven Schnipsel:';
+$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:';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_domain_admin_list.lng b/interface/web/sites/lib/lang/de_web_domain_admin_list.lng
index 276696c70..d9dc65c6c 100644
--- a/interface/web/sites/lib/lang/de_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/de_web_domain_admin_list.lng
@@ -7,4 +7,3 @@ $wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Neue Webseite hinzufügen';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_domain_list.lng b/interface/web/sites/lib/lang/de_web_domain_list.lng
index b722783e7..ce56a1cd1 100644
--- a/interface/web/sites/lib/lang/de_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_domain_list.lng
@@ -6,4 +6,3 @@ $wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_folder.lng b/interface/web/sites/lib/lang/de_web_folder.lng
index 615e34050..8defc36f4 100644
--- a/interface/web/sites/lib/lang/de_web_folder.lng
+++ b/interface/web/sites/lib/lang/de_web_folder.lng
@@ -5,4 +5,3 @@ $wb['path_txt'] = 'Pfad';
$wb['active_txt'] = 'Aktiv';
$wb['path_error_regex'] = 'Ungültiger Pfad.';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_folder_list.lng b/interface/web/sites/lib/lang/de_web_folder_list.lng
index 2ac8f0399..5491202ac 100644
--- a/interface/web/sites/lib/lang/de_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/de_web_folder_list.lng
@@ -5,4 +5,3 @@ $wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Webseite';
$wb['path_txt'] = 'Pfad';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_folder_user.lng b/interface/web/sites/lib/lang/de_web_folder_user.lng
index d570a0673..9562168e1 100644
--- a/interface/web/sites/lib/lang/de_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/de_web_folder_user.lng
@@ -10,4 +10,3 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_folder_user_list.lng b/interface/web/sites/lib/lang/de_web_folder_user_list.lng
index cd41dbff3..5357760eb 100644
--- a/interface/web/sites/lib/lang/de_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/de_web_folder_user_list.lng
@@ -4,4 +4,3 @@ $wb['active_txt'] = 'Aktiv';
$wb['web_folder_id_txt'] = 'Ordner';
$wb['username_txt'] = 'Benutzername';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng
index c6e52310a..f7d8d424c 100644
--- a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng
@@ -1,10 +1,9 @@
<?php
-$wb['list_head_txt'] = "Web Datenverkehr";
-$wb['domain_txt'] = "Domain";
-$wb['this_month_txt'] = "diesen Monat";
-$wb['last_month_txt'] = "letzten Monat";
-$wb['this_year_txt'] = "dieses Jahr";
-$wb['last_year_txt'] = "letztes Jahr";
-$wb['sum_txt'] = "Summe";
+$wb['list_head_txt'] = 'Web Datenverkehr';
+$wb['domain_txt'] = 'Domain';
+$wb['this_month_txt'] = 'diesen Monat';
+$wb['last_month_txt'] = 'letzten Monat';
+$wb['this_year_txt'] = 'dieses Jahr';
+$wb['last_year_txt'] = 'letztes Jahr';
+$wb['sum_txt'] = 'Summe';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng
index e64f3f47e..a91329172 100644
--- a/interface/web/sites/lib/lang/de_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_subdomain.lng
@@ -12,8 +12,8 @@ $wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Typ';
$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
-$wb['redirect_type_txt'] = 'Redirect Typ';
-$wb['redirect_path_txt'] = 'Redirect Pfad';
+$wb['redirect_type_txt'] = 'Weiterleitungstyp';
+$wb['redirect_path_txt'] = 'Weiterleitungspfad';
$wb['active_txt'] = 'Aktiv';
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux Benutzer';
@@ -40,5 +40,6 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Ungültiger redirect Pfad. Gültige Pfade sind beispielsweise: /test/ oder http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'Kein Redirect';
$wb['no_flag_txt'] = 'Kein Flag';
+$wb['proxy_directives_txt'] = 'Proxy Direktiven';
+$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_subdomain_list.lng
index 91970764d..042b9f02c 100644
--- a/interface/web/sites/lib/lang/de_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_subdomain_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webseite';
$wb['domain_txt'] = 'Subdomain';
$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
index e0b840c77..e41b71757 100644
--- a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
@@ -110,5 +110,9 @@ $wb['generate_password_txt'] = 'Passwort erzeugen';
$wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
+$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP Direktiven Schnipsel:';
+$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache Direktiven Schnipsel:';
+$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:';
?>
-
diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng
index 91970764d..042b9f02c 100644
--- a/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webseite';
$wb['domain_txt'] = 'Subdomain';
$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
?>
-
diff --git a/interface/web/sites/lib/lang/de_webdav_user.lng b/interface/web/sites/lib/lang/de_webdav_user.lng
index 381c0a077..eeefda85e 100644
--- a/interface/web/sites/lib/lang/de_webdav_user.lng
+++ b/interface/web/sites/lib/lang/de_webdav_user.lng
@@ -19,4 +19,3 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
-
diff --git a/interface/web/sites/lib/lang/de_webdav_user_list.lng b/interface/web/sites/lib/lang/de_webdav_user_list.lng
index 84b9fadcf..927bfbb2d 100644
--- a/interface/web/sites/lib/lang/de_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/de_webdav_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webseite';
$wb['username_txt'] = 'Benutzername';
$wb['add_new_record_txt'] = 'Neuen WebDAV Benutzer hinzufügen';
?>
-
diff --git a/interface/web/sites/lib/lang/el.lng b/interface/web/sites/lib/lang/el.lng
index 0064e4111..55ccc325e 100644
--- a/interface/web/sites/lib/lang/el.lng
+++ b/interface/web/sites/lib/lang/el.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Website';
$wb['Subdomain'] = 'Subdomain για το website';
$wb['Aliasdomain'] = 'Ψευδώνυμο domain για το website';
$wb['Database'] = 'Βάση ΔεδομÎνων';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'ΧÏήστης FTP';
$wb['Webdav-User'] = 'ΧÏήστης Webdav';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domain';
$wb['Redirect'] = 'ΑνακατεÏθυνση';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/el_aps.lng b/interface/web/sites/lib/lang/el_aps.lng
index d0ecb771f..8ce5b20eb 100644
--- a/interface/web/sites/lib/lang/el_aps.lng
+++ b/interface/web/sites/lib/lang/el_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/el_aps_instances_list.lng b/interface/web/sites/lib/lang/el_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/el_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/el_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/el_aps_packages_list.lng b/interface/web/sites/lib/lang/el_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/el_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/el_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng
index 0dafa21a1..fd79f1c86 100644
--- a/interface/web/sites/lib/lang/el_database.lng
+++ b/interface/web/sites/lib/lang/el_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/el_database_user.lng b/interface/web/sites/lib/lang/el_database_user.lng
new file mode 100644
index 000000000..66a071834
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['database_user_txt'] = 'Database user';
+$wb['database_password_txt'] = 'Database password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Active';
+$wb['database_user_error_empty'] = 'Database user is empty.';
+$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$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/el_database_user_admin_list.lng b/interface/web/sites/lib/lang/el_database_user_admin_list.lng
new file mode 100644
index 000000000..d7f88c4c3
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Database User';
+$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/el_database_user_list.lng b/interface/web/sites/lib/lang/el_database_user_list.lng
new file mode 100644
index 000000000..8c226496a
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$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/el_web_aliasdomain.lng b/interface/web/sites/lib/lang/el_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/el_web_backup_list.lng b/interface/web/sites/lib/lang/el_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/el_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/el_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng
index 073e56185..f8ca7e038 100644
--- a/interface/web/sites/lib/lang/el_web_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
index 0e8c50aae..991664601 100644
--- a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Αυτό το μήνα';
$wb['last_month_txt'] = 'Το τελευταίο μήνα';
$wb['this_year_txt'] = 'Αυτό το χÏόνο';
$wb['last_year_txt'] = 'Τον τελευταίο χÏόνο';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng
index 792c9321b..ce9f947b6 100644
--- a/interface/web/sites/lib/lang/el_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Η διαδÏομή ανακατεÏθυνσης δεν είναι ÎγκυÏη. ΈγκυÏες διαδÏομÎÏ‚ είναι για παÏάδειγμα οι: /test/ ή http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'ΧωÏίς ΑνακατεÏθυνση';
$wb['no_flag_txt'] = 'ΧωÏίς Σημαία';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
new file mode 100644
index 000000000..4a0279e9f
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
@@ -0,0 +1,113 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Active';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
+$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
+$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
+$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..1c16bcda2
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$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/en_database.lng b/interface/web/sites/lib/lang/en_database.lng
index a494efcef..288f89547 100644
--- a/interface/web/sites/lib/lang/en_database.lng
+++ b/interface/web/sites/lib/lang/en_database.lng
@@ -15,6 +15,7 @@ $wb["remote_ips_txt"] = 'Remote Access IPs (separate by , and leave blank for <i
$wb["database_remote_error_ips"] = 'At least one of the entered ip addresses is invalid.';
$wb["client_txt"] = 'Client';
$wb["active_txt"] = 'Active';
+$wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.';
$wb["database_name_error_empty"] = 'Database name is empty.';
$wb["database_name_error_unique"] = 'There is already a database with this name on the server. To get a unique name, e.g. prepend your domain name to the database name.';
$wb["database_name_error_regex"] = 'Invalid database name. The database name may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
index 12ed41b06..5a1b65102 100644
--- a/interface/web/sites/lib/lang/en_web_domain.lng
+++ b/interface/web/sites/lib/lang/en_web_domain.lng
@@ -109,4 +109,6 @@ $wb['password_match_txt'] = 'The passwords do match.';
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$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:';
?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_subdomain.lng b/interface/web/sites/lib/lang/en_web_subdomain.lng
index a6c3103e6..72059a48c 100644
--- a/interface/web/sites/lib/lang/en_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/en_web_subdomain.lng
@@ -40,4 +40,6 @@ $wb["host_txt"] = 'Host';
$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
index d993af80b..7ebe9e6b2 100644
--- a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
@@ -111,4 +111,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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:';
?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es.lng b/interface/web/sites/lib/lang/es.lng
index c83842ba7..16c5043b0 100644
--- a/interface/web/sites/lib/lang/es.lng
+++ b/interface/web/sites/lib/lang/es.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Website';
$wb['Subdomain'] = 'Subdominio';
$wb['Aliasdomain'] = 'Alias de dominio';
$wb['Database'] = 'Base de datos';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'Usuario FTP';
$wb['Webdav-User'] = 'Usuario de Webdav';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Dominio';
$wb['Redirect'] = 'Redirección';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sitios';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/es_aps.lng b/interface/web/sites/lib/lang/es_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/es_aps.lng
+++ b/interface/web/sites/lib/lang/es_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/es_aps_instances_list.lng b/interface/web/sites/lib/lang/es_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/es_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/es_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/es_aps_packages_list.lng b/interface/web/sites/lib/lang/es_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/es_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/es_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/es_database.lng b/interface/web/sites/lib/lang/es_database.lng
index f70b3fb8e..61af654f5 100644
--- a/interface/web/sites/lib/lang/es_database.lng
+++ b/interface/web/sites/lib/lang/es_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/es_database_user.lng b/interface/web/sites/lib/lang/es_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/es_database_user_admin_list.lng b/interface/web/sites/lib/lang/es_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_database_user_list.lng b/interface/web/sites/lib/lang/es_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_web_aliasdomain.lng b/interface/web/sites/lib/lang/es_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/es_web_backup_list.lng b/interface/web/sites/lib/lang/es_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/es_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/es_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/es_web_domain.lng b/interface/web/sites/lib/lang/es_web_domain.lng
index d7eb5e8ec..44e4aa996 100644
--- a/interface/web/sites/lib/lang/es_web_domain.lng
+++ b/interface/web/sites/lib/lang/es_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/es_web_sites_stats_list.lng b/interface/web/sites/lib/lang/es_web_sites_stats_list.lng
index 8c31b6fc5..a8bfb3390 100644
--- a/interface/web/sites/lib/lang/es_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/es_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Este mes';
$wb['last_month_txt'] = 'Último mes';
$wb['this_year_txt'] = 'Este año';
$wb['last_year_txt'] = 'Último año';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/es_web_subdomain.lng b/interface/web/sites/lib/lang/es_web_subdomain.lng
index ccd40fa63..eaaae93c5 100644
--- a/interface/web/sites/lib/lang/es_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/es_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Alojamiento';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/fi.lng b/interface/web/sites/lib/lang/fi.lng
index abbc0558d..38d854e09 100755
--- a/interface/web/sites/lib/lang/fi.lng
+++ b/interface/web/sites/lib/lang/fi.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Verkkotunnukset';
$wb['Subdomain'] = 'Aliverkkotunnus';
$wb['Aliasdomain'] = 'Aliasverkkotunnus';
$wb['Database'] = 'Tietokanta';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTP-käyttäjätunnus';
$wb['Webdav-User'] = 'WebDAV-Users';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Verkkotunnus';
$wb['Redirect'] = 'Edelleenohjaus';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Verkkotunnukset';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/fi_aps.lng b/interface/web/sites/lib/lang/fi_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/fi_aps.lng
+++ b/interface/web/sites/lib/lang/fi_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/fi_aps_instances_list.lng b/interface/web/sites/lib/lang/fi_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/fi_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/fi_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/fi_aps_packages_list.lng b/interface/web/sites/lib/lang/fi_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/fi_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/fi_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/fi_database.lng b/interface/web/sites/lib/lang/fi_database.lng
index 89a1f82a0..9826ddb13 100755
--- a/interface/web/sites/lib/lang/fi_database.lng
+++ b/interface/web/sites/lib/lang/fi_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/fi_database_user.lng b/interface/web/sites/lib/lang/fi_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/fi_database_user_admin_list.lng b/interface/web/sites/lib/lang/fi_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/fi_database_user_list.lng b/interface/web/sites/lib/lang/fi_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain.lng b/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_backup_list.lng b/interface/web/sites/lib/lang/fi_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/fi_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_domain.lng
index 2d3e9aeac..5fe839dc2 100755
--- a/interface/web/sites/lib/lang/fi_web_domain.lng
+++ b/interface/web/sites/lib/lang/fi_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng b/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng
index 3d9b079bf..d8b0eb377 100755
--- a/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Tässä kuussa';
$wb['last_month_txt'] = 'Viime kuussa';
$wb['this_year_txt'] = 'Tänä vuonna';
$wb['last_year_txt'] = 'Viime vuonna';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain.lng b/interface/web/sites/lib/lang/fi_web_subdomain.lng
index e35b15f42..db2b43457 100755
--- a/interface/web/sites/lib/lang/fi_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/fi_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Isäntäkone';
$wb['redirect_error_regex'] = 'VIrheellinen edelleenohjausosoite. Kelvollisia ovat esimerkiksi: /testi/ tai http://www.domain.tld/testi/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/hr.lng b/interface/web/sites/lib/lang/hr.lng
index 6c052f14b..038ca18a5 100644
--- a/interface/web/sites/lib/lang/hr.lng
+++ b/interface/web/sites/lib/lang/hr.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Web stranice';
$wb['Subdomain'] = 'Poddomena';
$wb['Aliasdomain'] = 'Alias za web stranicu';
$wb['Database'] = 'Baza';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTP korisnik';
$wb['Webdav-User'] = 'Webdav korisnik';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domena';
$wb['Redirect'] = 'Preusmjeravanje';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/hr_aps.lng b/interface/web/sites/lib/lang/hr_aps.lng
index d0ecb771f..8ce5b20eb 100644
--- a/interface/web/sites/lib/lang/hr_aps.lng
+++ b/interface/web/sites/lib/lang/hr_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/hr_aps_instances_list.lng b/interface/web/sites/lib/lang/hr_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/hr_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/hr_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/hr_aps_packages_list.lng b/interface/web/sites/lib/lang/hr_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/hr_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/hr_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/hr_database.lng b/interface/web/sites/lib/lang/hr_database.lng
index 876fca319..53d49a830 100644
--- a/interface/web/sites/lib/lang/hr_database.lng
+++ b/interface/web/sites/lib/lang/hr_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/hr_database_user.lng b/interface/web/sites/lib/lang/hr_database_user.lng
new file mode 100644
index 000000000..66a071834
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['database_user_txt'] = 'Database user';
+$wb['database_password_txt'] = 'Database password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Active';
+$wb['database_user_error_empty'] = 'Database user is empty.';
+$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$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/hr_database_user_admin_list.lng b/interface/web/sites/lib/lang/hr_database_user_admin_list.lng
new file mode 100644
index 000000000..d7f88c4c3
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Database User';
+$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/hr_database_user_list.lng b/interface/web/sites/lib/lang/hr_database_user_list.lng
new file mode 100644
index 000000000..8c226496a
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$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/hr_web_aliasdomain.lng b/interface/web/sites/lib/lang/hr_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_backup_list.lng b/interface/web/sites/lib/lang/hr_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/hr_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_domain.lng b/interface/web/sites/lib/lang/hr_web_domain.lng
index 1e88439f5..ee3b386e3 100644
--- a/interface/web/sites/lib/lang/hr_web_domain.lng
+++ b/interface/web/sites/lib/lang/hr_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng
index 9cec89fbc..5cec1bbcb 100644
--- a/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Ovaj mjesec';
$wb['last_month_txt'] = 'Prošli mjesec';
$wb['this_year_txt'] = 'Ovu godinu';
$wb['last_year_txt'] = 'Prošlu godinu';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng
index adc3ecb92..8663cc38a 100644
--- a/interface/web/sites/lib/lang/hr_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/hr_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Neispravna putanja redirekcije. Ispravne redirekcije su npr.: /test/ ili http://www.domena.tld/test/';
$wb['no_redirect_txt'] = 'Bez redirekcije';
$wb['no_flag_txt'] = 'Bez markiranja';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
new file mode 100644
index 000000000..4a0279e9f
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
@@ -0,0 +1,113 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Active';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
+$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
+$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
+$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..1c16bcda2
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$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/hu.lng b/interface/web/sites/lib/lang/hu.lng
index 19c434ee0..00341d740 100644
--- a/interface/web/sites/lib/lang/hu.lng
+++ b/interface/web/sites/lib/lang/hu.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Weboldalak';
$wb['Subdomain'] = 'Subdomain for website';
$wb['Aliasdomain'] = 'Aliasdomain';
$wb['Database'] = 'Adatbázis';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTP Felhasználó';
$wb['Webdav-User'] = 'Webdav Felhasználó';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domain';
$wb['Redirect'] = 'ÃtirányÃtás';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/hu_aps.lng b/interface/web/sites/lib/lang/hu_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/hu_aps.lng
+++ b/interface/web/sites/lib/lang/hu_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/hu_aps_instances_list.lng b/interface/web/sites/lib/lang/hu_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/hu_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/hu_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/hu_aps_packages_list.lng b/interface/web/sites/lib/lang/hu_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/hu_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/hu_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/hu_database.lng b/interface/web/sites/lib/lang/hu_database.lng
index b19135721..9bb8ce228 100644
--- a/interface/web/sites/lib/lang/hu_database.lng
+++ b/interface/web/sites/lib/lang/hu_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/hu_database_user.lng b/interface/web/sites/lib/lang/hu_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/hu_database_user_admin_list.lng b/interface/web/sites/lib/lang/hu_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/hu_database_user_list.lng b/interface/web/sites/lib/lang/hu_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/hu_web_aliasdomain.lng b/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_backup_list.lng b/interface/web/sites/lib/lang/hu_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/hu_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/hu_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_domain.lng b/interface/web/sites/lib/lang/hu_web_domain.lng
index 422f57cb5..4dc7d3a6d 100644
--- a/interface/web/sites/lib/lang/hu_web_domain.lng
+++ b/interface/web/sites/lib/lang/hu_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng b/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng
index 4d1c1591d..99c5c0a53 100644
--- a/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Ebben a hónapban';
$wb['last_month_txt'] = 'Előző hónapban';
$wb['this_year_txt'] = 'Ebben az évben';
$wb['last_year_txt'] = 'Előző évben';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/hu_web_subdomain.lng b/interface/web/sites/lib/lang/hu_web_subdomain.lng
index d74f192a6..de88b560d 100644
--- a/interface/web/sites/lib/lang/hu_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/hu_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Ãllomás';
$wb['no_redirect_txt'] = 'Nincs átirányÃtás';
$wb['no_flag_txt'] = 'No flag';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/id.lng b/interface/web/sites/lib/lang/id.lng
index ce57256dd..2303ab003 100644
--- a/interface/web/sites/lib/lang/id.lng
+++ b/interface/web/sites/lib/lang/id.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Situs Web';
$wb['Subdomain'] = 'Subdomain Situs Web';
$wb['Aliasdomain'] = 'Alias Domain Situs Web';
$wb['Database'] = 'Databases';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'Pengguna FTP';
$wb['Webdav-User'] = 'Pengguna Webdav';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domain';
$wb['Redirect'] = 'Pengalihan';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/id_aps.lng b/interface/web/sites/lib/lang/id_aps.lng
index d0ecb771f..8ce5b20eb 100644
--- a/interface/web/sites/lib/lang/id_aps.lng
+++ b/interface/web/sites/lib/lang/id_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/id_aps_instances_list.lng b/interface/web/sites/lib/lang/id_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/id_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/id_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/id_aps_packages_list.lng b/interface/web/sites/lib/lang/id_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/id_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/id_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/id_database.lng b/interface/web/sites/lib/lang/id_database.lng
index 13ecd063a..012d63dc1 100644
--- a/interface/web/sites/lib/lang/id_database.lng
+++ b/interface/web/sites/lib/lang/id_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/id_database_user.lng b/interface/web/sites/lib/lang/id_database_user.lng
new file mode 100644
index 000000000..66a071834
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['database_user_txt'] = 'Database user';
+$wb['database_password_txt'] = 'Database password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Active';
+$wb['database_user_error_empty'] = 'Database user is empty.';
+$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$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/id_database_user_admin_list.lng b/interface/web/sites/lib/lang/id_database_user_admin_list.lng
new file mode 100644
index 000000000..d7f88c4c3
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Database User';
+$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/id_database_user_list.lng b/interface/web/sites/lib/lang/id_database_user_list.lng
new file mode 100644
index 000000000..8c226496a
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$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/id_web_aliasdomain.lng b/interface/web/sites/lib/lang/id_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/id_web_backup_list.lng b/interface/web/sites/lib/lang/id_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/id_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/id_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/id_web_domain.lng b/interface/web/sites/lib/lang/id_web_domain.lng
index 9979fb501..35d12e5f1 100644
--- a/interface/web/sites/lib/lang/id_web_domain.lng
+++ b/interface/web/sites/lib/lang/id_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/id_web_sites_stats_list.lng b/interface/web/sites/lib/lang/id_web_sites_stats_list.lng
index d338b2de7..8fcf2bd62 100644
--- a/interface/web/sites/lib/lang/id_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/id_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Bulan ini';
$wb['last_month_txt'] = 'Sebulan terakhir';
$wb['this_year_txt'] = 'Tahun ini';
$wb['last_year_txt'] = 'Setahun terakhir';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/id_web_subdomain.lng b/interface/web/sites/lib/lang/id_web_subdomain.lng
index dc0ac0002..4d0241c52 100644
--- a/interface/web/sites/lib/lang/id_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/id_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Path pengalihan tidak valid. Contoh pengalihan yang valid: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
new file mode 100644
index 000000000..4a0279e9f
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
@@ -0,0 +1,113 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Active';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
+$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
+$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
+$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..1c16bcda2
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$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/it.lng b/interface/web/sites/lib/lang/it.lng
index 87ab303fb..1b2bbeae7 100644
--- a/interface/web/sites/lib/lang/it.lng
+++ b/interface/web/sites/lib/lang/it.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Siti';
$wb['Subdomain'] = 'Sottodomini';
$wb['Aliasdomain'] = 'Alias dominio';
$wb['Database'] = 'Databases';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'Utente FTP';
$wb['Webdav-User'] = 'Utente Webdav';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Dominio';
$wb['Redirect'] = 'Redirect';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sito web';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/it_aps.lng b/interface/web/sites/lib/lang/it_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/it_aps.lng
+++ b/interface/web/sites/lib/lang/it_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/it_aps_instances_list.lng b/interface/web/sites/lib/lang/it_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/it_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/it_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/it_aps_packages_list.lng b/interface/web/sites/lib/lang/it_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/it_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/it_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/it_database.lng b/interface/web/sites/lib/lang/it_database.lng
index 5c2c55247..d49c2f1a1 100644
--- a/interface/web/sites/lib/lang/it_database.lng
+++ b/interface/web/sites/lib/lang/it_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/it_database_user.lng b/interface/web/sites/lib/lang/it_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/it_database_user_admin_list.lng b/interface/web/sites/lib/lang/it_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/it_database_user_list.lng b/interface/web/sites/lib/lang/it_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/it_web_aliasdomain.lng b/interface/web/sites/lib/lang/it_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/it_web_backup_list.lng b/interface/web/sites/lib/lang/it_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/it_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/it_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_domain.lng
index 963433520..5ea7b4b51 100644
--- a/interface/web/sites/lib/lang/it_web_domain.lng
+++ b/interface/web/sites/lib/lang/it_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/it_web_sites_stats_list.lng b/interface/web/sites/lib/lang/it_web_sites_stats_list.lng
index b217f80cc..28d4e1fbd 100644
--- a/interface/web/sites/lib/lang/it_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/it_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'This month';
$wb['last_month_txt'] = 'Last month';
$wb['this_year_txt'] = 'This year';
$wb['last_year_txt'] = 'Last year';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/it_web_subdomain.lng b/interface/web/sites/lib/lang/it_web_subdomain.lng
index 1914bafcc..6b2e96e37 100644
--- a/interface/web/sites/lib/lang/it_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/it_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ja.lng b/interface/web/sites/lib/lang/ja.lng
index f45499673..672d1f8c9 100644
--- a/interface/web/sites/lib/lang/ja.lng
+++ b/interface/web/sites/lib/lang/ja.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'ウェブサイト';
$wb['Subdomain'] = 'サブドメイン';
$wb['Aliasdomain'] = 'エイリアスドメイン';
$wb['Database'] = 'データベース';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTPユーザー';
$wb['Webdav-User'] = 'WebDAV-Users';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'ウェブサイト';
$wb['Redirect'] = 'リダイレクト';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'サイト';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/ja_aps.lng b/interface/web/sites/lib/lang/ja_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/ja_aps.lng
+++ b/interface/web/sites/lib/lang/ja_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/ja_aps_instances_list.lng b/interface/web/sites/lib/lang/ja_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/ja_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/ja_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/ja_aps_packages_list.lng b/interface/web/sites/lib/lang/ja_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/ja_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/ja_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/ja_database.lng b/interface/web/sites/lib/lang/ja_database.lng
index b7f15c3ff..9df3e74ca 100644
--- a/interface/web/sites/lib/lang/ja_database.lng
+++ b/interface/web/sites/lib/lang/ja_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/ja_database_user.lng b/interface/web/sites/lib/lang/ja_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/ja_database_user_admin_list.lng b/interface/web/sites/lib/lang/ja_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ja_database_user_list.lng b/interface/web/sites/lib/lang/ja_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ja_web_aliasdomain.lng b/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_backup_list.lng b/interface/web/sites/lib/lang/ja_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/ja_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/ja_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_domain.lng b/interface/web/sites/lib/lang/ja_web_domain.lng
index ca740a387..7fd425a6b 100644
--- a/interface/web/sites/lib/lang/ja_web_domain.lng
+++ b/interface/web/sites/lib/lang/ja_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng
index 53a9ae367..f0fc5fcfb 100644
--- a/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = '今月';
$wb['last_month_txt'] = '先月';
$wb['this_year_txt'] = '今年';
$wb['last_year_txt'] = '去年';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/ja_web_subdomain.lng b/interface/web/sites/lib/lang/ja_web_subdomain.lng
index 5fb3be7f2..49c9e8042 100644
--- a/interface/web/sites/lib/lang/ja_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/ja_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'ホスト';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/nl.lng b/interface/web/sites/lib/lang/nl.lng
index a25c6b0d1..a8e257b28 100644
--- a/interface/web/sites/lib/lang/nl.lng
+++ b/interface/web/sites/lib/lang/nl.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Website';
$wb['Subdomain'] = 'Subdomein voor website';
$wb['Aliasdomain'] = 'Aliasdomein voor website';
$wb['Database'] = 'Databases';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTP-gebruiker';
$wb['Webdav-User'] = 'Webdav-gebruiker';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domain';
$wb['Redirect'] = 'Redirect';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/nl_aps.lng b/interface/web/sites/lib/lang/nl_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/nl_aps.lng
+++ b/interface/web/sites/lib/lang/nl_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/nl_aps_instances_list.lng b/interface/web/sites/lib/lang/nl_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/nl_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/nl_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/nl_aps_packages_list.lng b/interface/web/sites/lib/lang/nl_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/nl_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/nl_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng
index 29bd3e3ca..9ddff5995 100644
--- a/interface/web/sites/lib/lang/nl_database.lng
+++ b/interface/web/sites/lib/lang/nl_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/nl_database_user.lng b/interface/web/sites/lib/lang/nl_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/nl_database_user_admin_list.lng b/interface/web/sites/lib/lang/nl_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/nl_database_user_list.lng b/interface/web/sites/lib/lang/nl_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain.lng b/interface/web/sites/lib/lang/nl_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_backup_list.lng b/interface/web/sites/lib/lang/nl_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/nl_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng
index dab3b1b97..aa1f5ba13 100644
--- a/interface/web/sites/lib/lang/nl_web_domain.lng
+++ b/interface/web/sites/lib/lang/nl_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng
index a3cccd363..a0568db64 100644
--- a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Deze maand';
$wb['last_month_txt'] = 'Vorige maand';
$wb['this_year_txt'] = 'Dit jaar';
$wb['last_year_txt'] = 'Vorig jaar';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng
index 1d680133d..c08f63ffc 100644
--- a/interface/web/sites/lib/lang/nl_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/nl_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Ongeldig redirect pad. Geldige redirects zijn bijvoorbeeld: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng
index 68ca3e0fa..c1fd82215 100644
--- a/interface/web/sites/lib/lang/pl.lng
+++ b/interface/web/sites/lib/lang/pl.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Strona www';
$wb['Subdomain'] = 'Subdomain for website';
$wb['Aliasdomain'] = 'Aliasdomain for website';
$wb['Database'] = 'Baza danych';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'Użytkownik FTP';
$wb['Webdav-User'] = 'Użytkownik Webdav';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Strona www';
$wb['Redirect'] = 'Przekierowanie';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/pl_aps.lng b/interface/web/sites/lib/lang/pl_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/pl_aps.lng
+++ b/interface/web/sites/lib/lang/pl_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
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 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/pl_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/pl_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
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 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/pl_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/pl_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng
index 3d81ec2d1..7b86ce76a 100644
--- a/interface/web/sites/lib/lang/pl_database.lng
+++ b/interface/web/sites/lib/lang/pl_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/pl_database_user.lng b/interface/web/sites/lib/lang/pl_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pl_database_user_list.lng b/interface/web/sites/lib/lang/pl_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
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 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/pl_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng
index 47aa144a7..f245bf989 100644
--- a/interface/web/sites/lib/lang/pl_web_domain.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
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 e7b96d715..6769ac0f7 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
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Ten miesiÄ…c';
$wb['last_month_txt'] = 'Ostatni miesiÄ…c';
$wb['this_year_txt'] = 'Ten rok';
$wb['last_year_txt'] = 'Ostatni rok';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng
index a0e7222b6..ccf2c5756 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Serwer';
$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne przekierowanie to np.: /test/ lub http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'Bez przekierowania';
$wb['no_flag_txt'] = 'Bez flagi';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
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
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pt.lng b/interface/web/sites/lib/lang/pt.lng
index c3d08976e..8804e4670 100644
--- a/interface/web/sites/lib/lang/pt.lng
+++ b/interface/web/sites/lib/lang/pt.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Website';
$wb['Subdomain'] = 'Sub-domÃnio';
$wb['Aliasdomain'] = 'Alias de DomÃnio';
$wb['Database'] = 'Base de Dados';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTP-Accounts';
$wb['Webdav-User'] = 'WebDAV-Users';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domain';
$wb['Redirect'] = 'Redireccionamento';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/pt_aps.lng b/interface/web/sites/lib/lang/pt_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/pt_aps.lng
+++ b/interface/web/sites/lib/lang/pt_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/pt_aps_instances_list.lng b/interface/web/sites/lib/lang/pt_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/pt_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/pt_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/pt_aps_packages_list.lng b/interface/web/sites/lib/lang/pt_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/pt_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/pt_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/pt_database.lng b/interface/web/sites/lib/lang/pt_database.lng
index 8beedb1ad..d7d0e726c 100644
--- a/interface/web/sites/lib/lang/pt_database.lng
+++ b/interface/web/sites/lib/lang/pt_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/pt_database_user.lng b/interface/web/sites/lib/lang/pt_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/pt_database_user_admin_list.lng b/interface/web/sites/lib/lang/pt_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pt_database_user_list.lng b/interface/web/sites/lib/lang/pt_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pt_web_aliasdomain.lng b/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_backup_list.lng b/interface/web/sites/lib/lang/pt_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/pt_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/pt_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_domain.lng b/interface/web/sites/lib/lang/pt_web_domain.lng
index 09538c4ae..c3010f90c 100644
--- a/interface/web/sites/lib/lang/pt_web_domain.lng
+++ b/interface/web/sites/lib/lang/pt_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng
index 903c90571..acc22859b 100644
--- a/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Este mês';
$wb['last_month_txt'] = 'Último mês';
$wb['this_year_txt'] = 'Este ano';
$wb['last_year_txt'] = 'Último ano';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/pt_web_subdomain.lng b/interface/web/sites/lib/lang/pt_web_subdomain.lng
index c34bdfdf9..219f79397 100644
--- a/interface/web/sites/lib/lang/pt_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/pt_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Pasta de redireccionamento inválida. Exemplos de redireccionamentos válidos: /test/ or http://www.dominio.pt/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ro.lng b/interface/web/sites/lib/lang/ro.lng
index 6de127284..a201188ff 100644
--- a/interface/web/sites/lib/lang/ro.lng
+++ b/interface/web/sites/lib/lang/ro.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Website-uri';
$wb['Subdomain'] = 'Subdomain for website';
$wb['Aliasdomain'] = 'Aliasdomain for website';
$wb['Database'] = 'Databases';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTP-Accounts';
$wb['Webdav-User'] = 'WebDAV-Users';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domain';
$wb['Redirect'] = 'Redirect';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/ro_aps.lng b/interface/web/sites/lib/lang/ro_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/ro_aps.lng
+++ b/interface/web/sites/lib/lang/ro_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/ro_aps_instances_list.lng b/interface/web/sites/lib/lang/ro_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/ro_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/ro_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/ro_aps_packages_list.lng b/interface/web/sites/lib/lang/ro_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/ro_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/ro_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/ro_database.lng b/interface/web/sites/lib/lang/ro_database.lng
index e138f0cc2..41bdd37ea 100644
--- a/interface/web/sites/lib/lang/ro_database.lng
+++ b/interface/web/sites/lib/lang/ro_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/ro_database_user.lng b/interface/web/sites/lib/lang/ro_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/ro_database_user_admin_list.lng b/interface/web/sites/lib/lang/ro_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ro_database_user_list.lng b/interface/web/sites/lib/lang/ro_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ro_web_aliasdomain.lng b/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_backup_list.lng b/interface/web/sites/lib/lang/ro_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/ro_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/ro_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain.lng b/interface/web/sites/lib/lang/ro_web_domain.lng
index 89362a056..3028e2762 100644
--- a/interface/web/sites/lib/lang/ro_web_domain.lng
+++ b/interface/web/sites/lib/lang/ro_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng
index b217f80cc..28d4e1fbd 100644
--- a/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'This month';
$wb['last_month_txt'] = 'Last month';
$wb['this_year_txt'] = 'This year';
$wb['last_year_txt'] = 'Last year';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/ro_web_subdomain.lng b/interface/web/sites/lib/lang/ro_web_subdomain.lng
index 453596ce4..d340c7247 100644
--- a/interface/web/sites/lib/lang/ro_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/ro_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ru.lng b/interface/web/sites/lib/lang/ru.lng
index 93011fa99..07ed81a04 100644
--- a/interface/web/sites/lib/lang/ru.lng
+++ b/interface/web/sites/lib/lang/ru.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Web-Ñайты';
$wb['Subdomain'] = 'Субдомен';
$wb['Aliasdomain'] = 'ÐÐ»Ð¸Ð°Ñ Ð´Ð¾Ð¼ÐµÐ½Ð°';
$wb['Database'] = 'База данных';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'Пользователь FTP';
$wb['Webdav-User'] = 'WebDAV-Users';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Домен';
$wb['Redirect'] = 'Редирект';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Сайт';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/ru_aps.lng b/interface/web/sites/lib/lang/ru_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/ru_aps.lng
+++ b/interface/web/sites/lib/lang/ru_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/ru_aps_instances_list.lng b/interface/web/sites/lib/lang/ru_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/ru_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/ru_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/ru_aps_packages_list.lng b/interface/web/sites/lib/lang/ru_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/ru_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/ru_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/ru_database.lng b/interface/web/sites/lib/lang/ru_database.lng
index 56dc57046..8d7308e68 100644
--- a/interface/web/sites/lib/lang/ru_database.lng
+++ b/interface/web/sites/lib/lang/ru_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/ru_database_user.lng b/interface/web/sites/lib/lang/ru_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/ru_database_user_admin_list.lng b/interface/web/sites/lib/lang/ru_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ru_database_user_list.lng b/interface/web/sites/lib/lang/ru_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ru_web_aliasdomain.lng b/interface/web/sites/lib/lang/ru_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_backup_list.lng b/interface/web/sites/lib/lang/ru_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/ru_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_domain.lng
index d43a9a420..85fe99d2d 100644
--- a/interface/web/sites/lib/lang/ru_web_domain.lng
+++ b/interface/web/sites/lib/lang/ru_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng
index 8a6ddb176..271ea9185 100644
--- a/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Ðтот меÑÑц';
$wb['last_month_txt'] = 'ПоÑледний меÑÑц';
$wb['this_year_txt'] = 'Ðтот год';
$wb['last_year_txt'] = 'ПоÑледний год';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/ru_web_subdomain.lng b/interface/web/sites/lib/lang/ru_web_subdomain.lng
index 2e780e0be..ad197f8e5 100644
--- a/interface/web/sites/lib/lang/ru_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/ru_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'ХоÑÑ‚';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/se.lng b/interface/web/sites/lib/lang/se.lng
index 3b321160c..1459b344e 100644
--- a/interface/web/sites/lib/lang/se.lng
+++ b/interface/web/sites/lib/lang/se.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Website';
$wb['Subdomain'] = 'Subdomain for website';
$wb['Aliasdomain'] = 'Aliasdomain for website';
$wb['Database'] = 'Databases';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTP-Accounts';
$wb['Webdav-User'] = 'WebDAV-Users';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domain';
$wb['Redirect'] = 'Redirect';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/se_aps.lng b/interface/web/sites/lib/lang/se_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/se_aps.lng
+++ b/interface/web/sites/lib/lang/se_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/se_aps_instances_list.lng b/interface/web/sites/lib/lang/se_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/se_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/se_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/se_aps_packages_list.lng b/interface/web/sites/lib/lang/se_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/se_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/se_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/se_database.lng b/interface/web/sites/lib/lang/se_database.lng
index 2e09eb80a..ce20ef74b 100644
--- a/interface/web/sites/lib/lang/se_database.lng
+++ b/interface/web/sites/lib/lang/se_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/se_database_user.lng b/interface/web/sites/lib/lang/se_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/se_database_user_admin_list.lng b/interface/web/sites/lib/lang/se_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/se_database_user_list.lng b/interface/web/sites/lib/lang/se_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain.lng b/interface/web/sites/lib/lang/se_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/se_web_backup_list.lng b/interface/web/sites/lib/lang/se_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/se_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/se_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng
index 65da41f8c..9a8a8b1df 100644
--- a/interface/web/sites/lib/lang/se_web_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/se_web_sites_stats_list.lng b/interface/web/sites/lib/lang/se_web_sites_stats_list.lng
index b217f80cc..28d4e1fbd 100644
--- a/interface/web/sites/lib/lang/se_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/se_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'This month';
$wb['last_month_txt'] = 'Last month';
$wb['this_year_txt'] = 'This year';
$wb['last_year_txt'] = 'Last year';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/se_web_subdomain.lng b/interface/web/sites/lib/lang/se_web_subdomain.lng
index 1e8c751cd..2b7a2fcbc 100644
--- a/interface/web/sites/lib/lang/se_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/se_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/sk.lng b/interface/web/sites/lib/lang/sk.lng
index de6e565ba..5b66ce228 100644
--- a/interface/web/sites/lib/lang/sk.lng
+++ b/interface/web/sites/lib/lang/sk.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Webstránky';
$wb['Subdomain'] = 'Subdomény';
$wb['Aliasdomain'] = 'Aliasdomény';
$wb['Database'] = 'Databázy';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTP-uživateľ';
$wb['Webdav-User'] = 'WebDAV-Users';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Webstránky';
$wb['Redirect'] = 'Presmerovanie';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Stránky';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/sk_aps.lng b/interface/web/sites/lib/lang/sk_aps.lng
index d0ecb771f..f6d9ed6ed 100644
--- a/interface/web/sites/lib/lang/sk_aps.lng
+++ b/interface/web/sites/lib/lang/sk_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/sk_aps_instances_list.lng b/interface/web/sites/lib/lang/sk_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/sk_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/sk_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/sk_aps_packages_list.lng b/interface/web/sites/lib/lang/sk_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/sk_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/sk_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/sk_database.lng b/interface/web/sites/lib/lang/sk_database.lng
index 01a484604..ffaf83a18 100644
--- a/interface/web/sites/lib/lang/sk_database.lng
+++ b/interface/web/sites/lib/lang/sk_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/sk_database_user.lng b/interface/web/sites/lib/lang/sk_database_user.lng
new file mode 100644
index 000000000..6c4ee7c69
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb["database_user_txt"] = 'Database user';
+$wb["database_password_txt"] = 'Database password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["client_txt"] = 'Client';
+$wb["active_txt"] = 'Active';
+$wb["database_user_error_empty"] = 'Database user is empty.';
+$wb["database_user_error_unique"] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = "of";
+$wb['globalsearch_resultslimit_results_txt'] = "results";
+$wb['globalsearch_noresults_text_txt'] = "No results.";
+$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/sk_database_user_admin_list.lng b/interface/web/sites/lib/lang/sk_database_user_admin_list.lng
new file mode 100644
index 000000000..4c17da126
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb["list_head_txt"] = 'Database User';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new User';
+$wb["sys_groupid_txt"] = 'Client';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/sk_database_user_list.lng b/interface/web/sites/lib/lang/sk_database_user_list.lng
new file mode 100644
index 000000000..549374b6a
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Database user';
+$wb["database_user_txt"] = 'Database user';
+$wb["add_new_record_txt"] = 'Add new user';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/sk_web_aliasdomain.lng b/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_backup_list.lng b/interface/web/sites/lib/lang/sk_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/sk_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/sk_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_domain.lng b/interface/web/sites/lib/lang/sk_web_domain.lng
index 3acbf00dc..5e3d650d2 100644
--- a/interface/web/sites/lib/lang/sk_web_domain.lng
+++ b/interface/web/sites/lib/lang/sk_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng b/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng
index a2d4bbe48..80f9585a0 100644
--- a/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Tento mesiac';
$wb['last_month_txt'] = 'Minulý mesiac';
$wb['this_year_txt'] = 'Tento rok';
$wb['last_year_txt'] = 'Minulý rok';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/sk_web_subdomain.lng b/interface/web/sites/lib/lang/sk_web_subdomain.lng
index 1a23d23fb..165beb675 100644
--- a/interface/web/sites/lib/lang/sk_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/sk_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
new file mode 100644
index 000000000..d993af80b
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
@@ -0,0 +1,114 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb["type_txt"] = 'Type';
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["redirect_type_txt"] = 'Redirect Type';
+$wb["redirect_path_txt"] = 'Redirect Path';
+$wb["active_txt"] = 'Active';
+$wb["document_root_txt"] = 'Documentroot';
+$wb["system_user_txt"] = 'Linux User';
+$wb["system_group_txt"] = 'Linux Group';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
+$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
+$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
+$wb["apache_directives_txt"] = 'Apache Directives';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -> www';
+$wb["www_to_non_www_txt"] = 'www -> non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..8273dbd06
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/tr.lng b/interface/web/sites/lib/lang/tr.lng
index cf093d82d..920b23fea 100644
--- a/interface/web/sites/lib/lang/tr.lng
+++ b/interface/web/sites/lib/lang/tr.lng
@@ -4,7 +4,6 @@ $wb['Website'] = 'Websitesi';
$wb['Subdomain'] = 'Subdomain';
$wb['Aliasdomain'] = 'Aliasdomain';
$wb['Database'] = 'Veritabanı';
-$wb['Database Users'] = 'Database Users';
$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'FTP Kullanıcısı';
$wb['Webdav-User'] = 'WebDAV-Users';
@@ -26,4 +25,9 @@ $wb['Domain'] = 'Domain';
$wb['Redirect'] = 'Yönlendirme';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
?>
diff --git a/interface/web/sites/lib/lang/tr_aps.lng b/interface/web/sites/lib/lang/tr_aps.lng
index d0ecb771f..8ce5b20eb 100644
--- a/interface/web/sites/lib/lang/tr_aps.lng
+++ b/interface/web/sites/lib/lang/tr_aps.lng
@@ -1,57 +1,57 @@
-<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
-$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-?>
\ No newline at end of file
+<?php
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/sites/lib/lang/tr_aps_instances_list.lng b/interface/web/sites/lib/lang/tr_aps_instances_list.lng
index 3b9c7e943..052d834a7 100644
--- a/interface/web/sites/lib/lang/tr_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/tr_aps_instances_list.lng
@@ -1,13 +1,13 @@
-<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
+?>
diff --git a/interface/web/sites/lib/lang/tr_aps_packages_list.lng b/interface/web/sites/lib/lang/tr_aps_packages_list.lng
index 12cc30d02..68c378085 100644
--- a/interface/web/sites/lib/lang/tr_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/tr_aps_packages_list.lng
@@ -1,8 +1,8 @@
-<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
-?>
\ No newline at end of file
+<?php
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
+?>
diff --git a/interface/web/sites/lib/lang/tr_database.lng b/interface/web/sites/lib/lang/tr_database.lng
index b69980eb3..15b061c35 100644
--- a/interface/web/sites/lib/lang/tr_database.lng
+++ b/interface/web/sites/lib/lang/tr_database.lng
@@ -37,4 +37,8 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
?>
diff --git a/interface/web/sites/lib/lang/tr_database_user.lng b/interface/web/sites/lib/lang/tr_database_user.lng
new file mode 100644
index 000000000..66a071834
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['database_user_txt'] = 'Database user';
+$wb['database_password_txt'] = 'Database password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Active';
+$wb['database_user_error_empty'] = 'Database user is empty.';
+$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$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/tr_database_user_admin_list.lng b/interface/web/sites/lib/lang/tr_database_user_admin_list.lng
new file mode 100644
index 000000000..d7f88c4c3
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Database User';
+$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/tr_database_user_list.lng b/interface/web/sites/lib/lang/tr_database_user_list.lng
new file mode 100644
index 000000000..8c226496a
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$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/tr_web_aliasdomain.lng b/interface/web/sites/lib/lang/tr_web_aliasdomain.lng
new file mode 100644
index 000000000..0060ecaea
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_aliasdomain.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_backup_list.lng b/interface/web/sites/lib/lang/tr_web_backup_list.lng
index 1ac668762..9a10ca6d0 100644
--- a/interface/web/sites/lib/lang/tr_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/tr_web_backup_list.lng
@@ -12,5 +12,4 @@ $wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_domain.lng b/interface/web/sites/lib/lang/tr_web_domain.lng
index 509ca53df..e253e92d4 100644
--- a/interface/web/sites/lib/lang/tr_web_domain.lng
+++ b/interface/web/sites/lib/lang/tr_web_domain.lng
@@ -104,4 +104,9 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
?>
diff --git a/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng
index e795c5157..71f48187e 100644
--- a/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng
@@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Bu ay';
$wb['last_month_txt'] = 'Geçen ay';
$wb['this_year_txt'] = 'Bu yıl';
$wb['last_year_txt'] = 'Geçen yıl';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/tr_web_subdomain.lng b/interface/web/sites/lib/lang/tr_web_subdomain.lng
index 85d02c7e4..69842d902 100644
--- a/interface/web/sites/lib/lang/tr_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/tr_web_subdomain.lng
@@ -39,4 +39,5 @@ $wb['host_txt'] = 'Host';
$wb['redirect_error_regex'] = 'Geçersiz yönlendirme yolu. Geçerli yönlendirmeler örneğin: /test/ veya http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng
new file mode 100644
index 000000000..4a0279e9f
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng
@@ -0,0 +1,113 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Active';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
+$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
+$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
+$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng
new file mode 100644
index 000000000..1c16bcda2
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index de2899c1c..8ef4ff29b 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -97,6 +97,26 @@
</div>
<script language="JavaScript" type="text/javascript">
+ <tmpl_if name="is_admin">
+ function reloadDatabaseUsers() {
+ var parentDomainId = jQuery('#parent_domain_id').val()
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : parentDomainId, 'type': 'getdatabaseusers'}, function(data) {
+ var options = '<option value=""></option>';
+ $.each(data, function(key, val) {
+ options += '<option value="'+key+'"'+ ($('#database_user_id').val() == key ? ' selected="selected"' : '') +'>'+val+'</option>';
+ });
+ $('#database_user_id').html(options).change();
+
+ options = '<option value=""></option>';
+ $.each(data, function(key, val) {
+ options += '<option value="'+key+'"'+ ($('#database_ro_user_id').val() == key ? ' selected="selected"' : '') +'>'+val+'</option>';
+ });
+ $('#database_ro_user_id').html(options).change();
+ });
+ }
+ jQuery('#parent_domain_id').change(function() { reloadDatabaseUsers(); });
+ reloadDatabaseUsers();
+ </tmpl_if>
jQuery('#remote_ips').ispconfigSearch({
dataSrc: '/sites/ajax_get_json.php?type=get_ipv4',
resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm
index bcd9209b3..50e450f1d 100644
--- a/interface/web/sites/templates/database_list.htm
+++ b/interface/web/sites/templates/database_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_database">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/database_edit.php');">
diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm
index f1d80af89..96fc86a5a 100644
--- a/interface/web/sites/templates/database_user_list.htm
+++ b/interface/web/sites/templates/database_user_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_database">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/database_user_edit.php');">
diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm
index 9621e9675..b5449f854 100644
--- a/interface/web/sites/templates/ftp_user_list.htm
+++ b/interface/web/sites/templates/ftp_user_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_ftp_user">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/ftp_user_edit.php');">
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm
index 2ed2c5e35..b713f1eb7 100644
--- a/interface/web/sites/templates/shell_user_list.htm
+++ b/interface/web/sites/templates/shell_user_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_shell_user">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/shell_user_edit.php');">
diff --git a/interface/web/sites/templates/web_aliasdomain_advanced.htm b/interface/web/sites/templates/web_aliasdomain_advanced.htm
new file mode 100644
index 000000000..293b87124
--- /dev/null
+++ b/interface/web/sites/templates/web_aliasdomain_advanced.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels"><legend>Options</legend>
+ <div class="ctrlHolder proxy">
+ <label for="proxy_directives">{tmpl_var name='proxy_directives_txt'}</label>
+ <textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+ var webId = jQuery('input[name="id"]').val();
+ adjustForm();
+
+ function adjustForm(){
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getredirecttype"}, function(data) {
+ if(data.redirecttype == "proxy"){
+ jQuery('.proxy').show();
+ } else {
+ jQuery('.proxy').hide();
+ }
+ });
+ }
+
+</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm
index 3f800596f..66c2c40dd 100644
--- a/interface/web/sites/templates/web_aliasdomain_edit.htm
+++ b/interface/web/sites/templates/web_aliasdomain_edit.htm
@@ -36,6 +36,12 @@
<select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
{tmpl_var name='subdomain'}
</select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
+ <select name="seo_redirect" id="seo_redirect" class="selectInput">
+ {tmpl_var name='seo_redirect'}
+ </select>
</div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='active_txt'}</p>
@@ -63,6 +69,19 @@
webId = $(this).val();
getServerId(webId);
});
+
+ if(jQuery('#redirect_type').val() == 'proxy'){
+ jQuery('.tabbox_tabs ul li:last').show();
+ } else {
+ jQuery('.tabbox_tabs ul li:last').hide();
+ }
+ jQuery('#redirect_type').change(function(){
+ if(jQuery(this).val() == 'proxy'){
+ jQuery('.tabbox_tabs ul li:last').show();
+ } else {
+ jQuery('.tabbox_tabs ul li:last').hide();
+ }
+ });
function getServerId(webId){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
@@ -89,23 +108,27 @@
jQuery('#redirect_type option[value="break"]').show();
jQuery('#redirect_type option[value="redirect"]').show();
jQuery('#redirect_type option[value="permanent"]').show();
+ jQuery('#redirect_type option[value="proxy"]').show();
jQuery('#redirect_type option[value="last"]').attr('disabled',false);
jQuery('#redirect_type option[value="break"]').attr('disabled',false);
jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
+ jQuery('#redirect_type option[value="proxy"]').attr('disabled',false);
- if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
} else {
jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="last"]').hide();
jQuery('#redirect_type option[value="break"]').hide();
jQuery('#redirect_type option[value="redirect"]').hide();
jQuery('#redirect_type option[value="permanent"]').hide();
+ jQuery('#redirect_type option[value="proxy"]').hide();
jQuery('#redirect_type option[value="R"]').show();
jQuery('#redirect_type option[value="L"]').show();
@@ -117,7 +140,7 @@
jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
}
});
}
diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm
index 1de97c402..ba9c92d62 100644
--- a/interface/web/sites/templates/web_aliasdomain_list.htm
+++ b/interface/web/sites/templates/web_aliasdomain_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_web_aliasdomain">
<div class="pnl_listsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_aliasdomain_edit.php');">
diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm
index fec38c5b3..f612f28d2 100644
--- a/interface/web/sites/templates/web_domain_advanced.htm
+++ b/interface/web/sites/templates/web_domain_advanced.htm
@@ -76,6 +76,10 @@
<div class="ctrlHolder nginx">
<label for="nginx_directives">{tmpl_var name='nginx_directives_txt'}</label>
<textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea> <b>{tmpl_var name="available_nginx_directive_snippets_txt"}</b><br><br> {tmpl_var name="nginx_directive_snippets_txt"}
+ </div>
+ <div class="ctrlHolder proxy">
+ <label for="proxy_directives">{tmpl_var name='proxy_directives_txt'}</label>
+ <textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
</div>
</fieldset>
@@ -140,6 +144,13 @@
} else {
jQuery('.phpfpm').hide();
}
+ });
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getredirecttype"}, function(data) {
+ if(data.redirecttype == "proxy"){
+ jQuery('.proxy').show();
+ } else {
+ jQuery('.proxy').hide();
+ }
});
}
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index fe8e316f2..31c96cc8c 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -231,12 +231,8 @@
}
<tmpl_if name="readonly_tab">
- jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').attr('disabled', 'disabled');
- jQuery('div.tabbox_tabs').find('a').click(function() {
- jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').removeAttr('disabled');
- });
+ jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').click(function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); });
jQuery('#dom-edit-submit').click(function() {
- jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').removeAttr('disabled');
submitForm('pageForm','sites/web_domain_edit.php');
});
<tmpl_else>
diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm
index 362060dfe..c66eaf244 100644
--- a/interface/web/sites/templates/web_domain_list.htm
+++ b/interface/web/sites/templates/web_domain_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_web_domain">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_domain_edit.php');">
diff --git a/interface/web/sites/templates/web_domain_redirect.htm b/interface/web/sites/templates/web_domain_redirect.htm
index ddbdc04bb..0f69395ed 100644
--- a/interface/web/sites/templates/web_domain_redirect.htm
+++ b/interface/web/sites/templates/web_domain_redirect.htm
@@ -17,7 +17,7 @@
</div>
<div class="ctrlHolder">
<label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
- <select name="seo_redirect" id="seo_redirect" class="selectInput formLengthHalf">
+ <select name="seo_redirect" id="seo_redirect" class="selectInput">
{tmpl_var name='seo_redirect'}
</select>
</div>
@@ -57,18 +57,20 @@
jQuery('#redirect_type option[value="L"]').hide();
jQuery('#redirect_type option[value="R,L"]').hide();
jQuery('#redirect_type option[value="R=301,L"]').hide();
- if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
} else {
jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="last"]').hide();
jQuery('#redirect_type option[value="break"]').hide();
jQuery('#redirect_type option[value="redirect"]').hide();
jQuery('#redirect_type option[value="permanent"]').hide();
- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ jQuery('#redirect_type option[value="proxy"]').hide();
+ if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
}
});
}
diff --git a/interface/web/sites/templates/web_folder_list.htm b/interface/web/sites/templates/web_folder_list.htm
index af362337f..6c8b54c4a 100644
--- a/interface/web/sites/templates/web_folder_list.htm
+++ b/interface/web/sites/templates/web_folder_list.htm
@@ -3,6 +3,22 @@
<div class="panel panel_list_web_folder">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_folder_edit.php');">
diff --git a/interface/web/sites/templates/web_folder_user_list.htm b/interface/web/sites/templates/web_folder_user_list.htm
index c36281aab..2868ec126 100644
--- a/interface/web/sites/templates/web_folder_user_list.htm
+++ b/interface/web/sites/templates/web_folder_user_list.htm
@@ -3,6 +3,22 @@
<div class="panel panel_list_web_folder_user">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_folder_user_edit.php');">
diff --git a/interface/web/sites/templates/web_subdomain_advanced.htm b/interface/web/sites/templates/web_subdomain_advanced.htm
new file mode 100644
index 000000000..d2beb4275
--- /dev/null
+++ b/interface/web/sites/templates/web_subdomain_advanced.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_subdomain">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels"><legend>Options</legend>
+ <div class="ctrlHolder proxy">
+ <label for="proxy_directives">{tmpl_var name='proxy_directives_txt'}</label>
+ <textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+ var webId = jQuery('input[name="id"]').val();
+ adjustForm();
+
+ function adjustForm(){
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getredirecttype"}, function(data) {
+ if(data.redirecttype == "proxy"){
+ jQuery('.proxy').show();
+ } else {
+ jQuery('.proxy').hide();
+ }
+ });
+ }
+
+</script>
diff --git a/interface/web/sites/templates/web_subdomain_edit.htm b/interface/web/sites/templates/web_subdomain_edit.htm
index d0ab5648c..a8abb213c 100644
--- a/interface/web/sites/templates/web_subdomain_edit.htm
+++ b/interface/web/sites/templates/web_subdomain_edit.htm
@@ -65,6 +65,19 @@
webId = $(this).val();
getServerId(webId);
});
+
+ if(jQuery('#redirect_type').val() == 'proxy'){
+ jQuery('.tabbox_tabs ul li:last').show();
+ } else {
+ jQuery('.tabbox_tabs ul li:last').hide();
+ }
+ jQuery('#redirect_type').change(function(){
+ if(jQuery(this).val() == 'proxy'){
+ jQuery('.tabbox_tabs ul li:last').show();
+ } else {
+ jQuery('.tabbox_tabs ul li:last').hide();
+ }
+ });
function getServerId(webId){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
@@ -91,23 +104,27 @@
jQuery('#redirect_type option[value="break"]').show();
jQuery('#redirect_type option[value="redirect"]').show();
jQuery('#redirect_type option[value="permanent"]').show();
+ jQuery('#redirect_type option[value="proxy"]').show();
jQuery('#redirect_type option[value="last"]').attr('disabled',false);
jQuery('#redirect_type option[value="break"]').attr('disabled',false);
jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
+ jQuery('#redirect_type option[value="proxy"]').attr('disabled',false);
- if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
} else {
jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="last"]').hide();
jQuery('#redirect_type option[value="break"]').hide();
jQuery('#redirect_type option[value="redirect"]').hide();
jQuery('#redirect_type option[value="permanent"]').hide();
+ jQuery('#redirect_type option[value="proxy"]').hide();
jQuery('#redirect_type option[value="R"]').show();
jQuery('#redirect_type option[value="L"]').show();
@@ -119,7 +136,7 @@
jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
}
});
}
diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm
index 03ca2b3b8..3cf21647d 100644
--- a/interface/web/sites/templates/web_subdomain_list.htm
+++ b/interface/web/sites/templates/web_subdomain_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_web_subdomain">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_subdomain_edit.php');">
diff --git a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
index d71e30b1b..cffd3fa37 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
@@ -67,15 +67,19 @@
</div>
<div class="ctrlHolder">
<label for="custom_php_ini">{tmpl_var name='custom_php_ini_txt'}</label>
- <textarea name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea>
+ <textarea name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea> <b>{tmpl_var name="available_php_directive_snippets_txt"}</b><br><br> {tmpl_var name="php_directive_snippets_txt"}
</div>
<div class="ctrlHolder apache">
<label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
- <textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea>
+ <textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea> <b>{tmpl_var name="available_apache_directive_snippets_txt"}</b><br><br> {tmpl_var name="apache_directive_snippets_txt"}
</div>
<div class="ctrlHolder nginx">
<label for="nginx_directives">{tmpl_var name='nginx_directives_txt'}</label>
- <textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea>
+ <textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea> <b>{tmpl_var name="available_nginx_directive_snippets_txt"}</b><br><br> {tmpl_var name="nginx_directive_snippets_txt"}
+ </div>
+ <div class="ctrlHolder proxy">
+ <label for="proxy_directives">{tmpl_var name='proxy_directives_txt'}</label>
+ <textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
</div>
</fieldset>
@@ -140,6 +144,13 @@
} else {
jQuery('.phpfpm').hide();
}
+ });
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getredirecttype"}, function(data) {
+ if(data.redirecttype == "proxy"){
+ jQuery('.proxy').show();
+ } else {
+ jQuery('.proxy').hide();
+ }
});
}
diff --git a/interface/web/sites/templates/web_vhost_subdomain_edit.htm b/interface/web/sites/templates/web_vhost_subdomain_edit.htm
index 60d887ea8..5212b5d86 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_edit.htm
@@ -205,12 +205,8 @@
}
<tmpl_if name="readonly_tab">
- jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').attr('disabled', 'disabled');
- jQuery('div.tabbox_tabs').find('a').click(function() {
- jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').removeAttr('disabled');
- });
+ jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').click(function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); });
jQuery('#dom-edit-submit').click(function() {
- jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').removeAttr('disabled');
submitForm('pageForm','sites/web_vhost_subdomain_edit.php');
});
<tmpl_else>
diff --git a/interface/web/sites/templates/web_vhost_subdomain_list.htm b/interface/web/sites/templates/web_vhost_subdomain_list.htm
index 6db8d059e..9c197493c 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_list.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_web_subdomain">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_vhost_subdomain_edit.php');">
diff --git a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
index ac504f124..5f441467b 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
@@ -57,18 +57,20 @@
jQuery('#redirect_type option[value="L"]').hide();
jQuery('#redirect_type option[value="R,L"]').hide();
jQuery('#redirect_type option[value="R=301,L"]').hide();
- if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
} else {
jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="last"]').hide();
jQuery('#redirect_type option[value="break"]').hide();
jQuery('#redirect_type option[value="redirect"]').hide();
jQuery('#redirect_type option[value="permanent"]').hide();
- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ jQuery('#redirect_type option[value="proxy"]').hide();
+ if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
}
});
}
diff --git a/interface/web/sites/templates/webdav_user_list.htm b/interface/web/sites/templates/webdav_user_list.htm
index 82004d924..ef17b48db 100644
--- a/interface/web/sites/templates/webdav_user_list.htm
+++ b/interface/web/sites/templates/webdav_user_list.htm
@@ -4,6 +4,22 @@
<div class="panel panel_list_webdav_user">
<div class="pnl_toolsarea">
+ <tmpl_if name='datalog_changes_count' op='>' value='0'>
+ <div>
+ <div class="systemmonitor-state state-info">
+ <div class="status"></div>
+ <div class="statusMsg">
+ {tmpl_var name="datalog_changes_txt"}
+ <ul>
+ <tmpl_loop name="datalog_changes">
+ <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
+ </tmpl_loop>
+ </ul>
+ {tmpl_var name="datalog_changes_end_txt"}
+ </div>
+ </div><br />
+ </div>
+ </tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/webdav_user_edit.php');">
diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php
index 6025fc956..d3315eb48 100644
--- a/interface/web/sites/web_aliasdomain_edit.php
+++ b/interface/web/sites/web_aliasdomain_edit.php
@@ -112,7 +112,20 @@ class page_action extends tform_actions {
}
$app->tpl->setVar("domain_option",$domain_select);
}
-
+
+ if($_SESSION["s"]["user"]["typ"] == 'admin') {
+ // Directive Snippets
+ $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
+ $proxy_directive_snippets_txt = '';
+ if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
+ foreach($proxy_directive_snippets as $proxy_directive_snippet){
+ $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
+ }
+ }
+ if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
+ $app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt);
+ }
+
parent::onShowEnd();
}
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 8ac503abe..758c05fc3 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -379,6 +379,16 @@ class page_action extends tform_actions {
if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------';
$app->tpl->setVar("nginx_directive_snippets_txt",$nginx_directive_snippets_txt);
}
+
+ $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
+ $proxy_directive_snippets_txt = '';
+ if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
+ foreach($proxy_directive_snippets as $proxy_directive_snippet){
+ $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
+ }
+ }
+ if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
+ $app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt);
}
$ssl_domain_select = '';
diff --git a/interface/web/sites/web_subdomain_edit.php b/interface/web/sites/web_subdomain_edit.php
index 577078b08..5fb990b19 100644
--- a/interface/web/sites/web_subdomain_edit.php
+++ b/interface/web/sites/web_subdomain_edit.php
@@ -120,6 +120,19 @@ class page_action extends tform_actions {
}
$app->tpl->setVar("domain",$this->dataRecord["domain"]);
+ if($_SESSION["s"]["user"]["typ"] == 'admin') {
+ // Directive Snippets
+ $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
+ $proxy_directive_snippets_txt = '';
+ if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
+ foreach($proxy_directive_snippets as $proxy_directive_snippet){
+ $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
+ }
+ }
+ if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
+ $app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt);
+ }
+
parent::onShowEnd();
}
diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php
index 56ba15db0..9089befd2 100644
--- a/interface/web/sites/web_vhost_subdomain_edit.php
+++ b/interface/web/sites/web_vhost_subdomain_edit.php
@@ -197,6 +197,51 @@ class page_action extends tform_actions {
unset($php_records);
foreach($read_limits as $limit) $app->tpl->setVar($limit, ($limit == 'force_suexec' ? 'n' : 'y'));
+
+ // Directive Snippets
+ $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'");
+ $php_directive_snippets_txt = '';
+ if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
+ foreach($php_directive_snippets as $php_directive_snippet){
+ $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$php_directive_snippet['snippet'].'</pre></a> ';
+ }
+ }
+ if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------';
+ $app->tpl->setVar("php_directive_snippets_txt",$php_directive_snippets_txt);
+
+ if($server_type == 'apache'){
+ $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'");
+ $apache_directive_snippets_txt = '';
+ if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
+ foreach($apache_directive_snippets as $apache_directive_snippet){
+ $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$apache_directive_snippet['snippet'].'</pre></a> ';
+ }
+ }
+ if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------';
+ $app->tpl->setVar("apache_directive_snippets_txt",$apache_directive_snippets_txt);
+ }
+
+ if($server_type == 'nginx'){
+ $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'");
+ $nginx_directive_snippets_txt = '';
+ if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
+ foreach($nginx_directive_snippets as $nginx_directive_snippet){
+ $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$nginx_directive_snippet['snippet'].'</pre></a> ';
+ }
+ }
+ if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------';
+ $app->tpl->setVar("nginx_directive_snippets_txt",$nginx_directive_snippets_txt);
+ }
+
+ $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
+ $proxy_directive_snippets_txt = '';
+ if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
+ foreach($proxy_directive_snippets as $proxy_directive_snippet){
+ $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
+ }
+ }
+ if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
+ $app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt);
}
$ssl_domain_select = '';
@@ -279,6 +324,12 @@ class page_action extends tform_actions {
global $app, $conf;
// Get the record of the parent domain
+ if(!@$this->dataRecord["parent_domain_id"] && $this->id) {
+ $tmp = $app->db->queryOneRecord("SELECT parent_domain_id FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
+ if($tmp) $this->dataRecord["parent_domain_id"] = $tmp['parent_domain_id'];
+ unset($tmp);
+ }
+
$parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
// Set a few fixed values
@@ -318,8 +369,11 @@ class page_action extends tform_actions {
$this->dataRecord['web_folder'] = strtolower($this->dataRecord['web_folder']);
- $forbidden_folders = array('', 'cgi-bin', 'web', 'log', 'private', 'ssl', 'tmp', 'webdav');
- if(in_array($this->dataRecord['web_folder'], $forbidden_folders)) {
+ $forbidden_folders = array('', 'cgi-bin', 'log', 'private', 'ssl', 'tmp', 'webdav');
+ $check_folder = strtolower($this->dataRecord['web_folder']);
+ if(substr($check_folder, 0, 1) === '/') $check_folder = substr($check_folder, 1); // strip / at beginning to check against forbidden entries
+ if(strpos($check_folder, '/') !== false) $check_folder = substr($check_folder, 0, strpos($check_folder, '/')); // get the first part of the path to check it
+ if(in_array($check_folder, $forbidden_folders)) {
$app->tform->errorMessage .= $app->tform->lng("web_folder_invalid_txt")."<br>";
}
// check for duplicate folder usage
@@ -477,7 +531,7 @@ class page_action extends tform_actions {
$app->uses("getconf");
$web_rec = $app->tform->getDataRecord($this->id);
$web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]),'web');
- var_dump($this->parent_domain_record, $web_rec);
+ //var_dump($this->parent_domain_record, $web_rec);
// Set the values for document_root, system_user and system_group
$system_user = $app->db->quote($this->parent_domain_record['system_user']);
$system_group = $app->db->quote($this->parent_domain_record['system_group']);
diff --git a/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng
index dbfdce3ae..52f10189e 100644
--- a/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng
@@ -6,4 +6,3 @@ $wb['password_strength_3_txt'] = 'Gut';
$wb['password_strength_4_txt'] = 'Stark';
$wb['password_strength_5_txt'] = 'Sehr stark';
?>
-
diff --git a/interface/web/themes/default/css/jquery-ui-1.8.16.custom.css b/interface/web/themes/default/css/jquery-ui-1.8.16.custom.css
index 88353fe6a..ca3403900 100644
--- a/interface/web/themes/default/css/jquery-ui-1.8.16.custom.css
+++ b/interface/web/themes/default/css/jquery-ui-1.8.16.custom.css
@@ -66,7 +66,7 @@
/* Interaction states
----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; /*color: #2e6e9e;*/ }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1d5987; }
.ui-state-hover a, .ui-state-hover a:hover { color: #1d5987; text-decoration: none; }
@@ -329,6 +329,7 @@
display:block;
padding:.2em .4em;
line-height:1.5;
+ white-space: nowrap;
zoom:1;
}
.ui-menu .ui-menu-item a.ui-state-hover,
diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css
index 0801b687b..96815d0d5 100644
--- a/interface/web/themes/default/css/styles.css
+++ b/interface/web/themes/default/css/styles.css
@@ -778,6 +778,9 @@ div.group-icon {
.group-admin { background-position: 0 -380px; }
.group-user { background-position: 0 -400px; }
+span.marked { color: #cc0000; }
+span.small { font-size: 0.9em; }
+
#ajaxloader {
position: absolute;
width: 325px;
@@ -917,8 +920,9 @@ select.flags option[value=EC], select.flags option[value=ec], .country-EC {backg
select.flags option[value=EE], select.flags option[value=ee], .country-EE {background-position:0 -1387px}
select.flags option[value=EG], select.flags option[value=eg], .country-EG {background-position:0 -1409px}
select.flags option[value=EH], select.flags option[value=eh], .country-EH {background-position:0 -1431px}
-select.flags option[value=ER], select.flags option[value=er], .country-ER {background-position:0 -1497px}
-select.flags option[value=ES], select.flags option[value=ET], select.flags option[value=es], select.flags option[value=et], .country-ES, .country-ET {background-position:0 -1519px}
+select.flags option[value=ER], select.flags option[value=er], .country-ER {background-position:0 -1475px}
+select.flags option[value=ES], select.flags option[value=es], .country-ES {background-position:0 -1497px}
+select.flags option[value=ET], select.flags option[value=ET], select.flags option[value=et], .country-ET {background-position:0 -1519px}
select.flags option[value=FI], select.flags option[value=fi], .country-FI {background-position:0 -1585px}
select.flags option[value=FJ], select.flags option[value=fj], .country-FJ {background-position:0 -1607px}
select.flags option[value=FK], select.flags option[value=fk], .country-FK {background-position:0 -1629px}
@@ -1778,7 +1782,9 @@ p.value {
}
.ui-widget { font-family: "Trebuchet MS", Arial, sans-serif; font-size: 100%; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Trebuchet MS", Arial, sans-serif; font-size: 100%; }
-ul.ui-autocomplete { max-height: 250px; overflow-y: auto; min-width: 50px;}
+ul.ui-autocomplete { max-height: 250px; overflow-y: auto; min-width: 65px;}
.ui-combobox { position: relative; display: inline-block; margin-right: 17px; }
.ui-combobox-toggle { position: absolute !important; top: 0; bottom: 0; margin-left: -1px; padding: 1px !important; background: none repeat scroll 0 0 #FFFFFF !important; border: 1px solid #DFDFDF !important;}
-.ui-combobox-input { background: none repeat scroll 0 0 #FFFFFF !important; border: 1px solid #DFDFDF !important; padding: 1px; font-weight: normal !important; }
\ No newline at end of file
+.ui-combobox-input { background: none repeat scroll 0 0 #FFFFFF !important; border: 1px solid #DFDFDF !important; padding: 1px; font-weight: normal !important; }
+.panel_install_package .ui-combobox { float: left; }
+.clear-float { clear: both; }
\ No newline at end of file
diff --git a/interface/web/tools/lib/lang/ar_index.lng b/interface/web/tools/lib/lang/ar_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/ar_index.lng
+++ b/interface/web/tools/lib/lang/ar_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/ar_interface.lng b/interface/web/tools/lib/lang/ar_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/ar_interface.lng
+++ b/interface/web/tools/lib/lang/ar_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/ar_tpl_default.lng b/interface/web/tools/lib/lang/ar_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/ar_tpl_default.lng
+++ b/interface/web/tools/lib/lang/ar_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/bg_tpl_default.lng b/interface/web/tools/lib/lang/bg_tpl_default.lng
index e378db88b..c06246304 100644
--- a/interface/web/tools/lib/lang/bg_tpl_default.lng
+++ b/interface/web/tools/lib/lang/bg_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb['tpl_default_head_txt'] = 'Default Theme settings';
-$wb['tpl_default_desc_txt'] = 'Modify default-theme specific options';
-$wb['language_txt'] = 'Language';
-$wb['startmodule_txt'] = 'Startmodule';
-$wb['app_theme_txt'] = 'Design';
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
?>
diff --git a/interface/web/tools/lib/lang/br_index.lng b/interface/web/tools/lib/lang/br_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/br_index.lng
+++ b/interface/web/tools/lib/lang/br_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/br_interface.lng b/interface/web/tools/lib/lang/br_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/br_interface.lng
+++ b/interface/web/tools/lib/lang/br_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/br_tpl_default.lng b/interface/web/tools/lib/lang/br_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/br_tpl_default.lng
+++ b/interface/web/tools/lib/lang/br_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng
index bc993807e..66bcaf49a 100644
--- a/interface/web/tools/lib/lang/cz.lng
+++ b/interface/web/tools/lib/lang/cz.lng
@@ -3,11 +3,11 @@ $wb['User Settings'] = 'Uživatelská nastavenÃ';
$wb['Settings'] = 'NastavenÃ';
$wb['ISPConfig Tools'] = 'ISPConfig nástroje';
$wb['Password and Language'] = 'Heslo a jazyk';
-$wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.';
-$wb['Resync'] = 'Resync';
-$wb['Sync Tools'] = 'Sync Tools';
-$wb['Import'] = 'Import';
-$wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail';
+$wb['ispconfig_tools_note'] = 'Tento modul umožňuje změnit heslo a jazyk pro zahájenà resynchronizace DNS záznamů.';
+$wb['Resync'] = 'Resynchronizace';
+$wb['Sync Tools'] = 'SynchronizaÄnà nástroje';
+$wb['Import'] = 'Importovat';
+$wb['ISPConfig 3 mail'] = 'ISPConfig 3 vzdalený e-mail server';
$wb['PDNS Tupa'] = 'PowerDNS Tupa';
-$wb['Interface'] = 'Interface';
+$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 ce47c4da4..8ebf71795 100644
--- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
@@ -1,23 +1,23 @@
<?php
-$wb['head_txt'] = 'Import email configuration from ISPConfig 3';
-$wb['legend_txt'] = 'Remote server connection details';
-$wb['legend2_txt'] = 'Import email domain';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync clientdb config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['btn_start_txt'] = 'Start Import';
-$wb['btn_connect_txt'] = 'Connect to remote server';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['client_group_id_txt'] = 'Local client';
-$wb['mail_domain_txt'] = 'Remote email domain';
-$wb['import_mailbox_txt'] = 'Import mailbox';
-$wb['import_aliasdomain_txt'] = 'Import alias domain';
-$wb['import_alias_txt'] = 'Import email alias';
+$wb['head_txt'] = 'Importovat nastavenà e-mailu z ISPConfig 3';
+$wb['legend_txt'] = 'Detaily připojenà ke vzdálenému serveru';
+$wb['legend2_txt'] = 'Nahrát / importovat e-mail doménu';
+$wb['resync_sites_txt'] = 'Resynchronizovat webové stránky';
+$wb['resync_ftp_txt'] = 'Resynchronizovat FTP uživatele';
+$wb['resync_shell_txt'] = 'Resynchronizovat shell uživatele';
+$wb['resync_cron_txt'] = 'Resynchronizovat cron úlohy';
+$wb['resync_db_txt'] = 'Resynchronizovat clientdb konfigurace';
+$wb['resync_mailbox_txt'] = 'Resynchronizovat e-mailové schránky';
+$wb['resync_dns_txt'] = 'Resynchronizovat DNS záznamy';
+$wb['btn_start_txt'] = 'Zahájit ImportovánÃ';
+$wb['btn_connect_txt'] = 'Připojit ke vzdálenému serveru';
+$wb['btn_cancel_txt'] = 'Zrušit';
+$wb['client_group_id_txt'] = 'Lokálnà klient';
+$wb['mail_domain_txt'] = 'Vzdálená e-mailová doména';
+$wb['import_mailbox_txt'] = 'Importovat e-mailovou schránku';
+$wb['import_aliasdomain_txt'] = 'Importovat doménový alias';
+$wb['import_alias_txt'] = 'Importovat e-mailový alias';
$wb['import_forward_txt'] = 'Import forward';
-$wb['import_user_filter_txt'] = 'Import user filter';
-$wb['import_spamfilter_txt'] = 'Import spamfilter';
+$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 9fa2544ee..5ebf1ec34 100644
--- a/interface/web/tools/lib/lang/cz_index.lng
+++ b/interface/web/tools/lib/lang/cz_index.lng
@@ -1,4 +1,4 @@
<?php
-$wb['page_head_txt'] = 'ISPConfig Tools';
-$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+$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 b15c7334b..507b7c3cb 100644
--- a/interface/web/tools/lib/lang/cz_interface.lng
+++ b/interface/web/tools/lib/lang/cz_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Nastavenà rozhranÃ';
+$wb['interface_desc_txt'] = 'Možnost úpravy rozhranÃ';
+$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 ed9476720..96d622e28 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -1,13 +1,13 @@
<?php
-$wb['head_txt'] = 'Resync Tool';
-$wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync clientdb config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['btn_start_txt'] = 'Start';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['head_txt'] = 'ResynchronizaÄnà nástroje';
+$wb['legend_txt'] = 'Resynchronizace';
+$wb['resync_sites_txt'] = 'Resynchronizovat webové stránky';
+$wb['resync_ftp_txt'] = 'Resynchronizovat FTP uživatele';
+$wb['resync_shell_txt'] = 'Resynchronizovat shell uživatele';
+$wb['resync_cron_txt'] = 'Resynchronizovat cron úlohy';
+$wb['resync_db_txt'] = 'Resynchronizovat clientdb konfigurace';
+$wb['resync_mailbox_txt'] = 'Resynchronizovat e-mailové schránky';
+$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 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/cz_tpl_default.lng
+++ b/interface/web/tools/lib/lang/cz_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/cz_usersettings.lng b/interface/web/tools/lib/lang/cz_usersettings.lng
index 8396e01a4..dec46b7a0 100644
--- a/interface/web/tools/lib/lang/cz_usersettings.lng
+++ b/interface/web/tools/lib/lang/cz_usersettings.lng
@@ -5,8 +5,8 @@ $wb['language_txt'] = 'Jazyk';
$wb['password_mismatch'] = 'Hesla se neshodujÃ.';
$wb['Form to edit the user password and language.'] = 'Úprava uživatelského hesla a jazyka rozhranÃ.';
$wb['Settings'] = 'NastavenÃ';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$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/de.lng b/interface/web/tools/lib/lang/de.lng
index 4748b925b..4f0aea421 100644
--- a/interface/web/tools/lib/lang/de.lng
+++ b/interface/web/tools/lib/lang/de.lng
@@ -11,4 +11,3 @@ $wb['Import'] = 'Import';
$wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail';
$wb['PDNS Tupa'] = 'PowerDNS Tupa';
?>
-
diff --git a/interface/web/tools/lib/lang/de_import_ispconfig.lng b/interface/web/tools/lib/lang/de_import_ispconfig.lng
index 63994e1dd..f9e171de3 100644
--- a/interface/web/tools/lib/lang/de_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/de_import_ispconfig.lng
@@ -21,4 +21,3 @@ $wb['import_forward_txt'] = 'Weiterleitungen importieren';
$wb['import_user_filter_txt'] = 'Benutzer Filter importieren';
$wb['import_spamfilter_txt'] = 'Spamfilter importieren';
?>
-
diff --git a/interface/web/tools/lib/lang/de_index.lng b/interface/web/tools/lib/lang/de_index.lng
index 701985b5d..d36ff7192 100644
--- a/interface/web/tools/lib/lang/de_index.lng
+++ b/interface/web/tools/lib/lang/de_index.lng
@@ -2,4 +2,3 @@
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Benutzereinstellungen ändern';
?>
-
diff --git a/interface/web/tools/lib/lang/de_interface.lng b/interface/web/tools/lib/lang/de_interface.lng
index a94ba14e0..58dce22f2 100644
--- a/interface/web/tools/lib/lang/de_interface.lng
+++ b/interface/web/tools/lib/lang/de_interface.lng
@@ -1,8 +1,7 @@
<?php
-$wb['interface_head_txt'] = "Interface Einstellungen";
-$wb['interface_desc_txt'] = "Passen Sie die Benutzeroberfläche für sich an";
-$wb['language_txt'] = "Sprache";
-$wb['startmodule_txt'] = "Startmodul";
-$wb['app_theme_txt'] = "Design";
+$wb['interface_head_txt'] = 'Interface Einstellungen';
+$wb['interface_desc_txt'] = 'Passen Sie die Benutzeroberfläche für sich an';
+$wb['language_txt'] = 'Sprache';
+$wb['startmodule_txt'] = 'Startmodul';
+$wb['app_theme_txt'] = 'Design';
?>
-
diff --git a/interface/web/tools/lib/lang/de_resync.lng b/interface/web/tools/lib/lang/de_resync.lng
index d90a3e9c4..634027cf3 100644
--- a/interface/web/tools/lib/lang/de_resync.lng
+++ b/interface/web/tools/lib/lang/de_resync.lng
@@ -11,4 +11,3 @@ $wb['resync_dns_txt'] = 'Resync DNS Einträge';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Zurück';
?>
-
diff --git a/interface/web/tools/lib/lang/de_tpl_default.lng b/interface/web/tools/lib/lang/de_tpl_default.lng
index 72c45ce7e..45de148b3 100644
--- a/interface/web/tools/lib/lang/de_tpl_default.lng
+++ b/interface/web/tools/lib/lang/de_tpl_default.lng
@@ -1,8 +1,7 @@
<?php
-$wb['no_settings_txt'] = "Es gibt keine Einstellmöglichkeiten für das Standard Design.";
-$wb['btn_start_txt'] = "Speichern";
-$wb['btn_cancel_txt'] = "Zurück";
-$wb['list_head_txt'] = "Standard Design Einstellungen";
-$wb['list_desc_txt'] = "Spezielle Optionen des standard Designs ändern";
+$wb['no_settings_txt'] = 'Es gibt keine Einstellmöglichkeiten für das Standard Design.';
+$wb['btn_start_txt'] = 'Speichern';
+$wb['btn_cancel_txt'] = 'Zurück';
+$wb['list_head_txt'] = 'Standard Design Einstellungen';
+$wb['list_desc_txt'] = 'Spezielle Optionen des standard Designs ändern';
?>
-
diff --git a/interface/web/tools/lib/lang/de_usersettings.lng b/interface/web/tools/lib/lang/de_usersettings.lng
index 167a0f7df..908bbf6d5 100644
--- a/interface/web/tools/lib/lang/de_usersettings.lng
+++ b/interface/web/tools/lib/lang/de_usersettings.lng
@@ -10,4 +10,3 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
-
diff --git a/interface/web/tools/lib/lang/el_index.lng b/interface/web/tools/lib/lang/el_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/el_index.lng
+++ b/interface/web/tools/lib/lang/el_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/el_interface.lng b/interface/web/tools/lib/lang/el_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/el_interface.lng
+++ b/interface/web/tools/lib/lang/el_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/el_tpl_default.lng b/interface/web/tools/lib/lang/el_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/el_tpl_default.lng
+++ b/interface/web/tools/lib/lang/el_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/es_index.lng b/interface/web/tools/lib/lang/es_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/es_index.lng
+++ b/interface/web/tools/lib/lang/es_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/es_interface.lng b/interface/web/tools/lib/lang/es_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/es_interface.lng
+++ b/interface/web/tools/lib/lang/es_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/es_tpl_default.lng b/interface/web/tools/lib/lang/es_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/es_tpl_default.lng
+++ b/interface/web/tools/lib/lang/es_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/fi_index.lng b/interface/web/tools/lib/lang/fi_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/fi_index.lng
+++ b/interface/web/tools/lib/lang/fi_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/fi_interface.lng b/interface/web/tools/lib/lang/fi_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/fi_interface.lng
+++ b/interface/web/tools/lib/lang/fi_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/fi_tpl_default.lng b/interface/web/tools/lib/lang/fi_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/fi_tpl_default.lng
+++ b/interface/web/tools/lib/lang/fi_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/hr_index.lng b/interface/web/tools/lib/lang/hr_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/hr_index.lng
+++ b/interface/web/tools/lib/lang/hr_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/hr_interface.lng b/interface/web/tools/lib/lang/hr_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/hr_interface.lng
+++ b/interface/web/tools/lib/lang/hr_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/hr_tpl_default.lng b/interface/web/tools/lib/lang/hr_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/hr_tpl_default.lng
+++ b/interface/web/tools/lib/lang/hr_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/hu_index.lng b/interface/web/tools/lib/lang/hu_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/hu_index.lng
+++ b/interface/web/tools/lib/lang/hu_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/hu_interface.lng b/interface/web/tools/lib/lang/hu_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/hu_interface.lng
+++ b/interface/web/tools/lib/lang/hu_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/hu_tpl_default.lng b/interface/web/tools/lib/lang/hu_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/hu_tpl_default.lng
+++ b/interface/web/tools/lib/lang/hu_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/id_index.lng b/interface/web/tools/lib/lang/id_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/id_index.lng
+++ b/interface/web/tools/lib/lang/id_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/id_interface.lng b/interface/web/tools/lib/lang/id_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/id_interface.lng
+++ b/interface/web/tools/lib/lang/id_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/id_tpl_default.lng b/interface/web/tools/lib/lang/id_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/id_tpl_default.lng
+++ b/interface/web/tools/lib/lang/id_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/it_index.lng b/interface/web/tools/lib/lang/it_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/it_index.lng
+++ b/interface/web/tools/lib/lang/it_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/it_interface.lng b/interface/web/tools/lib/lang/it_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/it_interface.lng
+++ b/interface/web/tools/lib/lang/it_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/it_tpl_default.lng b/interface/web/tools/lib/lang/it_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/it_tpl_default.lng
+++ b/interface/web/tools/lib/lang/it_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/ja_index.lng b/interface/web/tools/lib/lang/ja_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/ja_index.lng
+++ b/interface/web/tools/lib/lang/ja_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/ja_interface.lng b/interface/web/tools/lib/lang/ja_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/ja_interface.lng
+++ b/interface/web/tools/lib/lang/ja_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/ja_tpl_default.lng b/interface/web/tools/lib/lang/ja_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/ja_tpl_default.lng
+++ b/interface/web/tools/lib/lang/ja_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/nl_index.lng b/interface/web/tools/lib/lang/nl_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/nl_index.lng
+++ b/interface/web/tools/lib/lang/nl_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/nl_interface.lng b/interface/web/tools/lib/lang/nl_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/nl_interface.lng
+++ b/interface/web/tools/lib/lang/nl_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/nl_tpl_default.lng b/interface/web/tools/lib/lang/nl_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/nl_tpl_default.lng
+++ b/interface/web/tools/lib/lang/nl_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/pl_index.lng b/interface/web/tools/lib/lang/pl_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/pl_index.lng
+++ b/interface/web/tools/lib/lang/pl_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/pl_interface.lng b/interface/web/tools/lib/lang/pl_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/pl_interface.lng
+++ b/interface/web/tools/lib/lang/pl_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/pl_tpl_default.lng b/interface/web/tools/lib/lang/pl_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/pl_tpl_default.lng
+++ b/interface/web/tools/lib/lang/pl_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/pt_index.lng b/interface/web/tools/lib/lang/pt_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/pt_index.lng
+++ b/interface/web/tools/lib/lang/pt_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/pt_interface.lng b/interface/web/tools/lib/lang/pt_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/pt_interface.lng
+++ b/interface/web/tools/lib/lang/pt_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/pt_tpl_default.lng b/interface/web/tools/lib/lang/pt_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/pt_tpl_default.lng
+++ b/interface/web/tools/lib/lang/pt_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/ro_index.lng b/interface/web/tools/lib/lang/ro_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/ro_index.lng
+++ b/interface/web/tools/lib/lang/ro_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/ro_interface.lng b/interface/web/tools/lib/lang/ro_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/ro_interface.lng
+++ b/interface/web/tools/lib/lang/ro_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/ro_tpl_default.lng b/interface/web/tools/lib/lang/ro_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/ro_tpl_default.lng
+++ b/interface/web/tools/lib/lang/ro_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/ru_index.lng b/interface/web/tools/lib/lang/ru_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/ru_index.lng
+++ b/interface/web/tools/lib/lang/ru_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/ru_interface.lng b/interface/web/tools/lib/lang/ru_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/ru_interface.lng
+++ b/interface/web/tools/lib/lang/ru_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/ru_tpl_default.lng b/interface/web/tools/lib/lang/ru_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/ru_tpl_default.lng
+++ b/interface/web/tools/lib/lang/ru_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/se_index.lng b/interface/web/tools/lib/lang/se_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/se_index.lng
+++ b/interface/web/tools/lib/lang/se_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/se_interface.lng b/interface/web/tools/lib/lang/se_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/se_interface.lng
+++ b/interface/web/tools/lib/lang/se_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/se_tpl_default.lng b/interface/web/tools/lib/lang/se_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/se_tpl_default.lng
+++ b/interface/web/tools/lib/lang/se_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/sk_index.lng b/interface/web/tools/lib/lang/sk_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/sk_index.lng
+++ b/interface/web/tools/lib/lang/sk_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/sk_interface.lng b/interface/web/tools/lib/lang/sk_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/sk_interface.lng
+++ b/interface/web/tools/lib/lang/sk_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/sk_tpl_default.lng b/interface/web/tools/lib/lang/sk_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/sk_tpl_default.lng
+++ b/interface/web/tools/lib/lang/sk_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/tools/lib/lang/tr_index.lng b/interface/web/tools/lib/lang/tr_index.lng
index 9fa2544ee..a3ef38f21 100644
--- a/interface/web/tools/lib/lang/tr_index.lng
+++ b/interface/web/tools/lib/lang/tr_index.lng
@@ -1,4 +1,4 @@
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/tr_interface.lng b/interface/web/tools/lib/lang/tr_interface.lng
index b15c7334b..aab4fc89f 100644
--- a/interface/web/tools/lib/lang/tr_interface.lng
+++ b/interface/web/tools/lib/lang/tr_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb["interface_head_txt"] = 'Interface Settings';
-$wb["interface_desc_txt"] = 'Modify your interface';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
+?>
diff --git a/interface/web/tools/lib/lang/tr_tpl_default.lng b/interface/web/tools/lib/lang/tr_tpl_default.lng
index 81c443e6d..c06246304 100644
--- a/interface/web/tools/lib/lang/tr_tpl_default.lng
+++ b/interface/web/tools/lib/lang/tr_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb["tpl_default_head_txt"] = 'Default Theme settings';
-$wb["tpl_default_desc_txt"] = 'Modify default-theme specific options';
-$wb["language_txt"] = 'Language';
-$wb["startmodule_txt"] = 'Startmodule';
-$wb["app_theme_txt"] = 'Design';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
+?>
diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
index 256750f19..458877dca 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
@@ -3,7 +3,7 @@ $wb['template_name_txt'] = 'Template name';
$wb['template_file_txt'] = 'Template filename';
$wb['server_id_txt'] = 'Server';
$wb['allservers_txt'] = 'Exists on all servers';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['description_txt'] = 'Description';
$wb['template_name_error_empty'] = 'Template name is empty.';
$wb['template_file_error_empty'] = 'Template filename is empty.';
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 6471ec0e2..4977e7245 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'OpenVZ OSTemplate';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['template_name_txt'] = 'Template name';
$wb['server_id_txt'] = 'Server';
$wb['allservers_txt'] = 'Exists on all servers';
diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng
index d285512dc..bd4209d4a 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template.lng
@@ -33,7 +33,7 @@ $wb['cpu_units_txt'] = 'CPU units';
$wb['cpu_num_txt'] = 'CPU cores';
$wb['cpu_limit_txt'] = 'CPU limit %';
$wb['io_priority_txt'] = 'I/O priority';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['description_txt'] = 'Description';
$wb['numproc_desc_txt'] = 'Number of processes and threads.';
$wb['numtcpsock_desc_txt'] = 'Number of TCP sockets.';
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 de4045c36..d1e8e5e92 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
@@ -1,5 +1,5 @@
<?php
$wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['template_name_txt'] = 'Template name';
?>
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng
index f2be022dd..1b54aa901 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng
@@ -16,7 +16,7 @@ $wb['ip_address_txt'] = 'IP address';
$wb['hostname_txt'] = 'Hostname';
$wb['vm_password_txt'] = 'VM Password';
$wb['start_boot_txt'] = 'Start at boot';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['description_txt'] = 'Description';
$wb['client_group_id_txt'] = 'Client';
$wb['veid_txt'] = 'VEID';
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 2238e2b8f..6ff57ee18 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Virtual server';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'AktivnÃ';
$wb['server_id_txt'] = 'Hostserver';
$wb['ostemplate_id_txt'] = 'OSTemplate';
$wb['template_id_txt'] = 'Template';
diff --git a/interface/web/vm/lib/lang/de.lng b/interface/web/vm/lib/lang/de.lng
index 536ad315a..474d2ac7b 100644
--- a/interface/web/vm/lib/lang/de.lng
+++ b/interface/web/vm/lib/lang/de.lng
@@ -5,4 +5,3 @@ $wb['VM Templates'] = 'VM-Templates';
$wb['IP addresses'] = 'IP-Adressen';
$wb['OpenVZ'] = 'OpenVZ';
?>
-
diff --git a/interface/web/vm/lib/lang/de_openvz_action.lng b/interface/web/vm/lib/lang/de_openvz_action.lng
index c0a5c0e51..f40d2f28b 100644
--- a/interface/web/vm/lib/lang/de_openvz_action.lng
+++ b/interface/web/vm/lib/lang/de_openvz_action.lng
@@ -14,4 +14,3 @@ $wb['ostemplate_name_error'] = 'Der Name des OSTemplates enthält ungültige Zei
$wb['ostemplate_name_unique_error'] = 'Es existiert bereits ein OSTemplate mit diesem Namen.';
$wb['ostemplate_exec_txt'] = 'Der Befehl um das OSTemplate zu erstellen wurde an den VM-Host gesendet. Es kann einige Minuten dauern bis das OSTemplate verfügbar ist.';
?>
-
diff --git a/interface/web/vm/lib/lang/de_openvz_ip.lng b/interface/web/vm/lib/lang/de_openvz_ip.lng
index b7b1498b7..48c9a520c 100644
--- a/interface/web/vm/lib/lang/de_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/de_openvz_ip.lng
@@ -7,4 +7,3 @@ $wb['ip_error_wrong'] = 'Bitte tragen Sie eine gültige IPv4-Adresse ein.';
$wb['ip_error_unique'] = 'Diese IP-Adresse existiert bereits.';
$wb['IP address'] = 'IP-Adresse';
?>
-
diff --git a/interface/web/vm/lib/lang/de_openvz_ip_list.lng b/interface/web/vm/lib/lang/de_openvz_ip_list.lng
index d214e9515..f4302d813 100644
--- a/interface/web/vm/lib/lang/de_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/de_openvz_ip_list.lng
@@ -5,4 +5,3 @@ $wb['vm_id_txt'] = 'VM';
$wb['ip_address_txt'] = 'IP-Adresse';
$wb['reserved_txt'] = 'Reserviert';
?>
-
diff --git a/interface/web/vm/lib/lang/de_openvz_ostemplate.lng b/interface/web/vm/lib/lang/de_openvz_ostemplate.lng
index e0fb9396d..8e4cfcb97 100644
--- a/interface/web/vm/lib/lang/de_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/de_openvz_ostemplate.lng
@@ -9,4 +9,3 @@ $wb['template_name_error_empty'] = 'Template-Name ist leer.';
$wb['template_file_error_empty'] = 'Template-Dateiname ist leer.';
$wb['Template'] = 'Template';
?>
-
diff --git a/interface/web/vm/lib/lang/de_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/de_openvz_ostemplate_list.lng
index 09a174ee8..dff6bd2de 100644
--- a/interface/web/vm/lib/lang/de_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/de_openvz_ostemplate_list.lng
@@ -6,4 +6,3 @@ $wb['server_id_txt'] = 'Server';
$wb['allservers_txt'] = 'Existiert auf allen Servern';
$wb['ostemplate_id_txt'] = 'ID';
?>
-
diff --git a/interface/web/vm/lib/lang/de_openvz_template.lng b/interface/web/vm/lib/lang/de_openvz_template.lng
index 9e76ecaac..329a10601 100644
--- a/interface/web/vm/lib/lang/de_openvz_template.lng
+++ b/interface/web/vm/lib/lang/de_openvz_template.lng
@@ -91,4 +91,3 @@ $wb['swappages_error_empty'] = 'Swappages ist leer.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Erweitert';
?>
-
diff --git a/interface/web/vm/lib/lang/de_openvz_template_list.lng b/interface/web/vm/lib/lang/de_openvz_template_list.lng
index 682f2cc3c..9e32b341b 100644
--- a/interface/web/vm/lib/lang/de_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/de_openvz_template_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
$wb['active_txt'] = 'Aktiv';
$wb['template_name_txt'] = 'Template-Name';
?>
-
diff --git a/interface/web/vm/lib/lang/de_openvz_vm.lng b/interface/web/vm/lib/lang/de_openvz_vm.lng
index b45a79fef..c773885c6 100644
--- a/interface/web/vm/lib/lang/de_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/de_openvz_vm.lng
@@ -38,4 +38,3 @@ $wb['template_nameserver_error_empty'] = 'Nameserver ist leer.';
$wb['Virtual server'] = 'Virtueller Server';
$wb['Advanced'] = 'Erweitert';
?>
-
diff --git a/interface/web/vm/lib/lang/de_openvz_vm_list.lng b/interface/web/vm/lib/lang/de_openvz_vm_list.lng
index aecb4621e..0b3ac30c7 100644
--- a/interface/web/vm/lib/lang/de_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/de_openvz_vm_list.lng
@@ -8,4 +8,3 @@ $wb['hostname_txt'] = 'Hostname';
$wb['ip_address_txt'] = 'IP-Adresse';
$wb['veid_txt'] = 'VEID';
?>
-
diff --git a/remoting_client/examples/client_add.php b/remoting_client/examples/client_add.php
index e95e89677..25412ec0a 100644
--- a/remoting_client/examples/client_add.php
+++ b/remoting_client/examples/client_add.php
@@ -15,7 +15,7 @@ try {
}
//* Set the function parameters.
- $random_rs_id = 1;
+ $reseller_id = 0; // this id has to be 0 if the client shall not be assigned to admin or if the client is a reseller
$params = array(
'company_name' => 'awesomecompany',
'contact_name' => 'name',
@@ -33,7 +33,7 @@ try {
'internet' => '',
'icq' => '111111111',
'notes' => 'awesome',
- 'dafault_mailserver' => 1,
+ 'default_mailserver' => 1,
'limit_maildomain' => -1,
'limit_mailbox' => -1,
'limit_mailalias' => -1,
@@ -68,9 +68,9 @@ try {
'limit_cron_type' => 'url',
'limit_cron_frequency' => 5,
'limit_traffic_quota' => -1,
- 'limit_client' => 0,
+ 'limit_client' => 0, // If this value is > 0, then the client is a reseller
'parent_client_id' => 0,
- 'username' => 'guy',
+ 'username' => 'guy3',
'password' => 'brush',
'language' => 'en',
'usertheme' => 'default',
@@ -79,7 +79,7 @@ try {
'created_at' => 0
);
- $affected_rows = $client->client_add($session_id, $random_rs_id, $params);
+ $affected_rows = $client->client_add($session_id, $reseller_id, $params);
echo "Client: ".$affected_rows."<br>";
diff --git a/remoting_client/examples/client_delete_everything.php b/remoting_client/examples/client_delete_everything.php
index e11e77217..4399f5e6e 100644
--- a/remoting_client/examples/client_delete_everything.php
+++ b/remoting_client/examples/client_delete_everything.php
@@ -21,7 +21,7 @@ try {
//* Delete client
$affected_rows = $client->client_delete_everything($session_id, $client_id);
- echo "Client ".$client_id." has been deleted.<br>";
+ //echo "Client ".$client_id." has been deleted.<br>";
//print_r($affected_rows);
if($client->logout($session_id)) {
diff --git a/remoting_client/examples/mail_user_add.php b/remoting_client/examples/mail_user_add.php
index 1333bfb89..1351eef07 100644
--- a/remoting_client/examples/mail_user_add.php
+++ b/remoting_client/examples/mail_user_add.php
@@ -25,7 +25,7 @@ try {
'uid' => 5000,
'gid' => 5000,
'maildir' => '/var/vmail/test.int/joe',
- 'quota' => 10000000000,
+ 'quota' => 5242880,
'cc' => '',
'homedir' => '/var/vmail',
'autoresponder' => 'n',
diff --git a/remoting_client/examples/soap_config.php b/remoting_client/examples/soap_config.php
index 348767701..ad0d46e85 100644
--- a/remoting_client/examples/soap_config.php
+++ b/remoting_client/examples/soap_config.php
@@ -4,11 +4,13 @@ $username = 'admin';
$password = 'admin';
/*
-$soap_location = 'http://localhost:8080/ispconfig3/interface/web/remote/index.php';
-$soap_uri = 'http://localhost:8080/ispconfig3/interface/web/remote/';
+$soap_location = 'http://localhost:8080/ispconfig3_3.0.5/interface/web/remote/index.php';
+$soap_uri = 'http://localhost:8080/ispconfig3_3.0.5/interface/web/remote/';
*/
+
$soap_location = 'http://192.168.0.105:8080/remote/index.php';
$soap_uri = 'http://192.168.0.105:8080/remote/';
+
?>
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 86f3cdbd8..c8b4d06e8 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -18,18 +18,31 @@ server {
root <tmpl_var name='web_document_root_www'>;
<tmpl_if name='seo_redirect_enabled'>
- if ($http_host = "<tmpl_var name='seo_redirect_origin_domain'>") {
+ if ($http_host <tmpl_var name='seo_redirect_operator'> "<tmpl_var name='seo_redirect_origin_domain'>") {
rewrite ^ $scheme://<tmpl_var name='seo_redirect_target_domain'>$request_uri? permanent;
}
</tmpl_if>
-
-<tmpl_loop name="redirects">
- if ($http_host ~* "<tmpl_var name='rewrite_domain'>$") {
- #rewrite ^/(.+)$ <tmpl_var name='rewrite_target'>$1 <tmpl_var name='rewrite_type'>;
- rewrite ^<tmpl_var name='rewrite_exclude'>/(.+)$ <tmpl_var name='rewrite_target'>$2 <tmpl_var name='rewrite_type'>;
+<tmpl_loop name="alias_seo_redirects">
+ if ($http_host <tmpl_var name='alias_seo_redirect_operator'> "<tmpl_var name='alias_seo_redirect_origin_domain'>") {
+ rewrite ^ $scheme://<tmpl_var name='alias_seo_redirect_target_domain'>$request_uri? permanent;
}
</tmpl_loop>
-
+
+<tmpl_loop name="own_redirects">
+<tmpl_if name='use_rewrite'>
+ rewrite ^<tmpl_var name='rewrite_exclude'>(.*)$ <tmpl_var name='rewrite_target'>$2 <tmpl_var name='rewrite_type'>;
+</tmpl_if>
+<tmpl_if name='use_proxy'>
+ location / {
+ proxy_pass <tmpl_var name='rewrite_target'>;
+ rewrite ^/<tmpl_var name='rewrite_subdir'>/(.*) /$1;
+<tmpl_loop name="proxy_directives">
+ <tmpl_var name='proxy_directive'>
+</tmpl_loop>
+ }
+</tmpl_if>
+</tmpl_loop>
+<tmpl_if name='use_proxy' op='!=' value='y'>
index index.html index.htm index.php index.cgi index.pl index.xhtml;
<tmpl_if name='ssi' op='==' value='y'>
@@ -49,27 +62,35 @@ server {
error_page 503 /error/503.html;
recursive_error_pages on;
location = /error/400.html {
+ <tmpl_var name='web_document_root_www_proxy'>
internal;
}
location = /error/401.html {
+ <tmpl_var name='web_document_root_www_proxy'>
internal;
}
location = /error/403.html {
+ <tmpl_var name='web_document_root_www_proxy'>
internal;
}
location = /error/404.html {
+ <tmpl_var name='web_document_root_www_proxy'>
internal;
}
location = /error/405.html {
+ <tmpl_var name='web_document_root_www_proxy'>
internal;
}
location = /error/500.html {
+ <tmpl_var name='web_document_root_www_proxy'>
internal;
}
location = /error/502.html {
+ <tmpl_var name='web_document_root_www_proxy'>
internal;
}
location = /error/503.html {
+ <tmpl_var name='web_document_root_www_proxy'>
internal;
}
</tmpl_if>
@@ -96,6 +117,7 @@ server {
}
location /stats {
+ <tmpl_var name='web_document_root_www_proxy'>
index index.html index.php;
auth_basic "Members Only";
auth_basic_user_file <tmpl_var name='stats_auth_passwd_file'>;
@@ -157,5 +179,44 @@ server {
}
}
</tmpl_loop>
-
-}
\ No newline at end of file
+</tmpl_if>
+}
+
+<tmpl_loop name="redirects">
+server {
+ listen <tmpl_var name='ip_address'>:80;
+<tmpl_if name='ipv6_enabled'>
+ listen [<tmpl_var name='ipv6_address'>]:80;
+</tmpl_if>
+
+<tmpl_if name='ssl_enabled'>
+ listen <tmpl_var name='ip_address'>:443 ssl;
+<tmpl_if name='ipv6_enabled'>
+ listen [<tmpl_var name='ipv6_address'>]:443 ssl;
+</tmpl_if>
+ ssl_certificate <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt;
+ ssl_certificate_key <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key;
+</tmpl_if>
+
+ server_name <tmpl_var name='rewrite_domain'>;
+<tmpl_if name='alias_seo_redirects2'>
+<tmpl_loop name="alias_seo_redirects2">
+ if ($http_host <tmpl_var name='alias_seo_redirect_operator'> "<tmpl_var name='alias_seo_redirect_origin_domain'>") {
+ rewrite ^ $scheme://<tmpl_var name='alias_seo_redirect_target_domain'>$request_uri? permanent;
+ }
+</tmpl_loop>
+</tmpl_if>
+<tmpl_if name='use_rewrite'>
+ rewrite ^ <tmpl_var name='rewrite_target'>$request_uri? <tmpl_var name='rewrite_type'>;
+</tmpl_if>
+<tmpl_if name='use_proxy'>
+ location / {
+ proxy_pass <tmpl_var name='rewrite_target'>;
+ rewrite ^/<tmpl_var name='rewrite_subdir'>/(.*) /$1;
+<tmpl_loop name="proxy_directives">
+ <tmpl_var name='proxy_directive'>
+</tmpl_loop>
+ }
+</tmpl_if>
+}
+</tmpl_loop>
\ No newline at end of file
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index cb0fc9d2b..8e6cb40fc 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -197,12 +197,13 @@
FcgidIdleTimeout 300
FcgidProcessLifeTime 3600
# FcgidMaxProcesses 1000
+ FcgidMaxRequestsPerProcess <tmpl_var name='fastcgi_max_requests'>
FcgidMinProcessesPerClass 0
FcgidMaxProcessesPerClass 100
FcgidConnectTimeout 3
FcgidIOTimeout 360
FcgidBusyTimeout 300
- FcgidMaxRequestLen 1073741824
+ FcgidMaxRequestLen 1073741824
<tmpl_else>
IdleTimeout 300
ProcessLifeTime 3600
@@ -239,12 +240,12 @@
</Directory>
AddHandler php5-fcgi .php
Action php5-fcgi /php5-fcgi
- Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}
+ Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
<tmpl_if name='use_tcp'>
- FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'} -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
+ FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
</tmpl_if>
<tmpl_if name='use_socket'>
- FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'} -socket <tmpl_var name='fpm_socket'> -pass-header Authorization
+ FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -socket <tmpl_var name='fpm_socket'> -pass-header Authorization
</tmpl_if>
</IfModule>
</tmpl_if>
@@ -252,9 +253,13 @@
<tmpl_if name="rewrite_enabled">
RewriteEngine on
<tmpl_if name='seo_redirect_enabled'>
- RewriteCond %{HTTP_HOST} ^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
+ RewriteCond %{HTTP_HOST} <tmpl_var name='seo_redirect_operator'>^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
RewriteRule ^(.*)$ http://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
</tmpl_if>
+<tmpl_loop name="alias_seo_redirects">
+ RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_redirect_operator'>^<tmpl_var name='alias_seo_redirect_origin_domain'>$ [NC]
+ RewriteRule ^(.*)$ http://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,L]
+</tmpl_loop>
<tmpl_loop name="redirects">
RewriteCond %{HTTP_HOST} <tmpl_var name='rewrite_domain'>$ [NC]
<tmpl_if name="rewrite_is_url" op="==" value="n">
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 9420a051d..0e9fffed6 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -46,11 +46,15 @@ $app->uses('ini_parser,file,services,getconf,system');
// store the mailbox statistics in the database
#######################################################################################################
+$parse_mail_log = false;
$sql = "SELECT mailuser_id,maildir FROM mail_user WHERE server_id = ".$conf['server_id'];
$records = $app->db->queryAllRecords($sql);
+if(count($records) > 0) $parse_mail_log = true;
+
foreach($records as $rec) {
if(@is_file($rec['maildir'].'/ispconfig_mailsize')) {
-
+ $parse_mail_log = false;
+
// rename file
rename($rec['maildir'].'/ispconfig_mailsize',$rec['maildir'].'/ispconfig_mailsize_save');
@@ -78,12 +82,167 @@ foreach($records as $rec) {
$sql = "INSERT INTO mail_traffic (month,mailuser_id,traffic) VALUES ('$tstamp',".$rec['mailuser_id'].",$mail_traffic)";
}
$app->dbmaster->query($sql);
- echo $sql;
+ //echo $sql;
}
}
+if($parse_mail_log == true) {
+ $mailbox_traffic = array();
+ $mail_boxes = array();
+ $mail_rewrites = array(); // we need to read all mail aliases and forwards because the address in amavis is not always the mailbox address
+
+ function parse_mail_log_line($line) {
+ //Oct 31 17:35:48 mx01 amavis[32014]: (32014-05) Passed CLEAN, [IPv6:xxxxx] [IPv6:xxxxx] <xxx@yyyy> -> <aaaa@bbbb>, Message-ID: <xxxx@yyyyy>, mail_id: xxxxxx, Hits: -1.89, size: 1591, queued_as: xxxxxxx, 946 ms
+
+ if(preg_match('/^(\w+\s+\d+\s+\d+:\d+:\d+)\s+[^ ]+\s+amavis.* <([^>]+)>\s+->\s+((<[^>]+>,)+) .*Message-ID:\s+<([^>]+)>.* size:\s+(\d+),.*$/', $line, $matches) == false) return false;
+
+ $timestamp = strtotime($matches[1]);
+ if(!$timestamp) return false;
+
+ $to = array();
+ $recipients = explode(',', $matches[3]);
+ foreach($recipients as $recipient) {
+ $recipient = substr($recipient, 1, -1);
+ if(!$recipient || $recipient == $matches[2]) continue;
+ $to[] = $recipient;
+ }
+
+ return array('line' => $line, 'timestamp' => $timestamp, 'size' => $matches[6], 'from' => $matches[2], 'to' => $to, 'message-id' => $matches[5]);
+ }
+
+ function add_mailbox_traffic(&$traffic_array, $address, $traffic) {
+ global $mail_boxes, $mail_rewrites;
+
+ $address = strtolower($address);
+
+ if(in_array($address, $mail_boxes) == true) {
+ if(!isset($traffic_array[$address])) $traffic_array[$address] = 0;
+ $traffic_array[$address] += $traffic;
+ } elseif(array_key_exists($address, $mail_rewrites)) {
+ foreach($mail_rewrites[$address] as $address) {
+ if(!isset($traffic_array[$address])) $traffic_array[$address] = 0;
+ $traffic_array[$address] += $traffic;
+ }
+ } else {
+ // this is not a local address - skip it
+ }
+ }
+
+ $sql = "SELECT email FROM mail_user WHERE server_id = ".$conf['server_id'];
+ $records = $app->db->queryAllRecords($sql);
+ foreach($records as $record) {
+ $mail_boxes[] = $record['email'];
+ }
+ $sql = "SELECT source, destination FROM mail_forwarding WHERE server_id = ".$conf['server_id'];
+ $records = $app->db->queryAllRecords($sql);
+ foreach($records as $record) {
+ $targets = preg_split('/[\n,]+/', $record['destination']);
+ foreach($targets as $target) {
+ if(in_array($target, $mail_boxes)) {
+ if(isset($mail_rewrites[$record['source']])) $mail_rewrites[$record['source']][] = $target;
+ else $mail_rewrites[$record['source']] = array($target);
+ }
+ }
+ }
+
+ $state_file = dirname(__FILE__) . '/mail_log_parser.state';
+ $prev_line = false;
+ $last_line = false;
+ $cur_line = false;
+
+ if(file_exists($state_file)) {
+ $prev_line = parse_mail_log_line(trim(file_get_contents($state_file)));
+ //if($prev_line) echo "continuing from previous run, log position: " . $prev_line['message-id'] . " at " . strftime('%d.%m.%Y %H:%M:%S', $prev_line['timestamp']) . "\n";
+ }
+
+ if(file_exists('/var/log/mail.log')) {
+ $fp = fopen('/var/log/mail.log', 'r');
+ //echo "Parsing mail.log...\n";
+ $l = 0;
+ while($line = fgets($fp, 8192)) {
+ $l++;
+ //if($l % 1000 == 0) echo "\rline $l";
+ $cur_line = parse_mail_log_line($line);
+ if(!$cur_line) continue;
+
+ if($prev_line) {
+ // check if this line has to be processed
+ if($cur_line['timestamp'] < $prev_line['timestamp']) {
+ $parse_mail_log = false; // we do not need to parse the second file!
+ continue; // already processed
+ } elseif($cur_line['timestamp'] == $prev_line['timestamp'] && $cur_line['message-id'] == $prev_line['message-id']) {
+ $parse_mail_log = false; // we do not need to parse the second file!
+ $prev_line = false; // this line has already been processed but the next one has to be!
+ continue;
+ }
+ }
+
+ add_mailbox_traffic($mailbox_traffic, $cur_line['from'], $cur_line['size']);
+ foreach($cur_line['to'] as $to) {
+ add_mailbox_traffic($mailbox_traffic, $to, $cur_line['size']);
+ }
+ $last_line = $line; // store for the state file
+ }
+ fclose($fp);
+ //echo "\n";
+ }
+
+ if($parse_mail_log == true && file_exists('/var/log/mail.log.1')) {
+ $fp = fopen('/var/log/mail.log.1', 'r');
+ //echo "Parsing mail.log.1...\n";
+ $l = 0;
+ while($line = fgets($fp, 8192)) {
+ $l++;
+ //if($l % 1000 == 0) echo "\rline $l";
+ $cur_line = parse_mail_log_line($line);
+ if(!$cur_line) continue;
+
+ if($prev_line) {
+ // check if this line has to be processed
+ if($cur_line['timestamp'] < $prev_line['timestamp']) continue; // already processed
+ if($cur_line['timestamp'] == $prev_line['timestamp'] && $cur_line['message-id'] == $prev_line['message-id']) {
+ $prev_line = false; // this line has already been processed but the next one has to be!
+ continue;
+ }
+ }
+
+ add_mailbox_traffic($mailbox_traffic, $cur_line['from'], $cur_line['size']);
+ foreach($cur_line['to'] as $to) {
+ add_mailbox_traffic($mailbox_traffic, $to, $cur_line['size']);
+ }
+ }
+ fclose($fp);
+ //echo "\n";
+ }
+ unset($mail_rewrites);
+ unset($mail_boxes);
+
+ // Save the traffic stats in the sql database
+ $tstamp = date('Y-m');
+ $sql = "SELECT mailuser_id,email FROM mail_user WHERE server_id = ".$conf['server_id'];
+ $records = $app->db->queryAllRecords($sql);
+ foreach($records as $rec) {
+ if(array_key_exists($rec['email'], $mailbox_traffic)) {
+ $sql = "SELECT * FROM mail_traffic WHERE month = '$tstamp' AND mailuser_id = ".$rec['mailuser_id'];
+ $tr = $app->dbmaster->queryOneRecord($sql);
+
+ $mail_traffic = $tr['traffic'] + $mailbox_traffic[$rec['email']];
+ if($tr['traffic_id'] > 0) {
+ $sql = "UPDATE mail_traffic SET traffic = $mail_traffic WHERE traffic_id = ".$tr['traffic_id'];
+ } else {
+ $sql = "INSERT INTO mail_traffic (month,mailuser_id,traffic) VALUES ('$tstamp',".$rec['mailuser_id'].",$mail_traffic)";
+ }
+ $app->dbmaster->query($sql);
+ //echo $sql;
+ }
+ }
+
+ unset($mailbox_traffic);
+ if($last_line) file_put_contents($state_file, $last_line);
+}
+
#######################################################################################################
// Create webalizer statistics
#######################################################################################################
@@ -113,7 +272,7 @@ function setConfigVar( $filename, $varName, $varValue ) {
}
-$sql = "SELECT domain_id, domain, document_root, web_folder, type FROM web_domain WHERE stats_type = 'webalizer' AND server_id = ".$conf['server_id'];
+$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'];
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
@@ -154,7 +313,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 stats_type = 'awstats' AND server_id = ".$conf['server_id'];
+$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'];
$records = $app->db->queryAllRecords($sql);
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
@@ -269,7 +428,7 @@ 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 server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') AND server_id = ".$conf['server_id'];
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
@@ -478,7 +637,7 @@ if ($app->dbmaster == $app->db) {
//* get the traffic
$tmp = $app->db->queryOneRecord("SELECT SUM(traffic_bytes) As total_traffic_bytes FROM web_traffic WHERE traffic_date like '$current_month%' AND hostname = '$domain'");
- $web_traffic = (int)$tmp['total_traffic_bytes']/1024/1024;
+ $web_traffic = round($tmp['total_traffic_bytes']/1024/1024);
//* Website is over quota, we will disable it
/*if( ($web_traffic_quota > 0 && $web_traffic > $web_traffic_quota) ||
@@ -639,7 +798,7 @@ if($backup_dir != '') {
//$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
$sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";
$app->db->query($sql);
- $app->dbmaster->query($sql);
+ if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
//* Remove old backups
$backup_copies = intval($rec['backup_copies']);
@@ -658,12 +817,13 @@ if($backup_dir != '') {
for ($n = $backup_copies; $n <= 10; $n++) {
if(isset($files[$n]) && is_file($web_backup_dir.'/'.$files[$n])) {
unlink($web_backup_dir.'/'.$files[$n]);
- $sql = "SELECT backup_id FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($files[$n])."'";
- $tmp = $app->dbmaster->queryOneRecord($sql);
+ //$sql = "SELECT backup_id FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($files[$n])."'";
+ //$tmp = $app->dbmaster->queryOneRecord($sql);
//$app->dbmaster->datalogDelete('web_backup', 'backup_id', $tmp['backup_id']);
- $sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']);
+ //$sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']);
+ $sql = "DELETE FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($files[$n])."'";
$app->db->query($sql);
- $app->dbmaster->query($sql);
+ if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
}
}
@@ -736,7 +896,7 @@ if($backup_dir != '') {
//$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
$sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",$web_id,'mysql','sqlgz',".time().",'".$app->db->quote($db_backup_file).".gz')";
$app->db->query($sql);
- $app->dbmaster->query($sql);
+ if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
//* Remove the uncompressed file
unlink($db_backup_dir.'/'.$db_backup_file);
@@ -747,25 +907,28 @@ if($backup_dir != '') {
$dir_handle = dir($db_backup_dir);
$files = array();
while (false !== ($entry = $dir_handle->read())) {
- if($entry != '.' && $entry != '..' && substr($entry,0,2) == 'db' && is_file($db_backup_dir.'/'.$entry)) {
- $files[] = $entry;
+ if($entry != '.' && $entry != '..' && preg_match('/^db_(.*?)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.sql.gz$/', $entry, $matches) && is_file($db_backup_dir.'/'.$entry)) {
+ if(array_key_exists($matches[1], $files) == false) $files[$matches[1]] = array();
+ $files[$matches[1]][] = $entry;
}
}
$dir_handle->close();
-
- rsort($files);
-
- for ($n = $backup_copies; $n <= 10; $n++) {
- if(isset($files[$n]) && is_file($db_backup_dir.'/'.$files[$n])) {
- unlink($db_backup_dir.'/'.$files[$n]);
- $sql = "SELECT backup_id FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($files[$n])."'";
- $tmp = $app->dbmaster->queryOneRecord($sql);
- //$app->dbmaster->datalogDelete('web_backup', 'backup_id', $tmp['backup_id']);
- $sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']);
- $app->db->query($sql);
- $app->dbmaster->query($sql);
- }
- }
+
+ reset($files);
+ foreach($files as $db_name => $filelist) {
+ rsort($filelist);
+ for ($n = $backup_copies; $n <= 10; $n++) {
+ if(isset($filelist[$n]) && is_file($db_backup_dir.'/'.$filelist[$n])) {
+ unlink($db_backup_dir.'/'.$filelist[$n]);
+ //$sql = "SELECT backup_id FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($filelist[$n])."'";
+ //$tmp = $app->dbmaster->queryOneRecord($sql);
+ //$sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']);
+ $sql = "DELETE FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($filelist[$n])."'";
+ $app->db->query($sql);
+ if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
+ }
+ }
+ }
unset($files);
unset($dir_handle);
diff --git a/server/cron_daily.sh b/server/cron_daily.sh
index ea87447c0..19189076f 100644
--- a/server/cron_daily.sh
+++ b/server/cron_daily.sh
@@ -14,3 +14,6 @@ fi
if [ -f /usr/local/ispconfig/interface/web/billing/cron/create_recurring_invoices_cron.php ]; then
/usr/bin/php -q /usr/local/ispconfig/interface/web/billing/cron/create_recurring_invoices_cron.php
fi
+if [ -f /usr/local/ispconfig/interface/web/billing/cron/recurring_items_reminders.php ]; then
+ /usr/bin/php -q /usr/local/ispconfig/interface/web/billing/cron/recurring_items_reminders.php
+fi
diff --git a/server/lib/classes/aps_base.inc.php b/server/lib/classes/aps_base.inc.php
index 9822caeaa..b8f6ad923 100644
--- a/server/lib/classes/aps_base.inc.php
+++ b/server/lib/classes/aps_base.inc.php
@@ -43,9 +43,6 @@ define('PACKAGE_ERROR_NOMETA', 4);
class ApsBase
{
- protected $app = null;
- protected $db = null;
-
protected $log_prefix = '';
protected $fetch_url = '';
protected $aps_version = '';
@@ -63,9 +60,6 @@ class ApsBase
*/
public function __construct($app, $log_prefix = 'APS: ', $interface_mode = false)
{
- $this->db = $app->db;
- $this->app = $app;
-
$this->log_prefix = $log_prefix;
$this->interface_mode = $interface_mode;
$this->fetch_url = 'apscatalog.com';
diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php
index 9c091b156..f5b661c80 100644
--- a/server/lib/classes/aps_installer.inc.php
+++ b/server/lib/classes/aps_installer.inc.php
@@ -63,6 +63,7 @@ class ApsInstaller extends ApsBase
*/
private function checkRequirements()
{
+ global $app;
try
{
// Check if exec() is not disabled
@@ -76,7 +77,7 @@ class ApsInstaller extends ApsBase
}
catch(Exception $e)
{
- $this->app->log('Aborting execution because '.$e->getMessage());
+ $app->log('Aborting execution because '.$e->getMessage(), 1);
return false;
}
}
@@ -242,27 +243,30 @@ class ApsInstaller extends ApsBase
*/
private function prepareLocation($task)
{
+ global $app;
+
// Get the domain name to use for the installation
// Would be possible in one query too, but we use 2 for easier debugging
- $main_domain = $this->app->db->queryOneRecord("SELECT value FROM aps_instances_settings
- WHERE name = 'main_domain' AND instance_id = '".$this->db->quote($task['instance_id'])."';");
+ $main_domain = $app->db->queryOneRecord("SELECT value FROM aps_instances_settings
+ WHERE name = 'main_domain' AND instance_id = '".$app->db->quote($task['instance_id'])."';");
$this->domain = $main_domain['value'];
// Get the document root
- $domain_res = $this->app->db->queryOneRecord("SELECT document_root FROM web_domain
- WHERE domain = '".$this->db->quote($this->domain)."';");
+ $domain_res = $app->db->queryOneRecord("SELECT document_root, web_folder, type FROM web_domain
+ WHERE domain = '".$app->db->quote($this->domain)."';");
$this->document_root = $domain_res['document_root'];
// Get the sub location
- $location_res = $this->app->dbmaster->queryOneRecord("SELECT value FROM aps_instances_settings
- WHERE name = 'main_location' AND instance_id = '".$this->db->quote($task['instance_id'])."';");
+ $location_res = $app->db->queryOneRecord("SELECT value FROM aps_instances_settings
+ WHERE name = 'main_location' AND instance_id = '".$app->db->quote($task['instance_id'])."';");
$this->sublocation = $location_res['value'];
// Make sure the document_root ends with /
if(substr($this->document_root, -1) != '/') $this->document_root .= '/';
// Attention: ISPConfig Special: web files are in subfolder 'web' -> append it:
- $this->document_root .= 'web/';
+ if($domain_res['type'] == 'vhostsubdomain') $this->document_root .= $domain_res['web_folder'] . '/';
+ else $this->document_root .= 'web/';
// If a subfolder is given, make sure it's path doesn't begin with / i.e. /phpbb
if(substr($this->sublocation, 0, 1) == '/') $this->sublocation = substr($this->sublocation, 1);
@@ -285,6 +289,8 @@ class ApsInstaller extends ApsBase
*/
private function prepareDatabase($task, $sxe)
{
+ global $app;
+
$db_id = parent::getXPathValue($sxe, '//db:id');
if(empty($db_id)) return; // No database needed
@@ -292,14 +298,14 @@ class ApsInstaller extends ApsBase
// Set the database owner to the domain owner
// ISPConfig identifies the owner by the sys_groupid (not sys_userid!)
// so sys_userid can be set to any value
- $perm = $this->app->db->queryOneRecord("SELECT sys_groupid, server_id FROM web_domain
+ $perm = $app->db->queryOneRecord("SELECT sys_groupid, server_id FROM web_domain
WHERE domain = '".$this->domain."';");
$task['sys_groupid'] = $perm['sys_groupid'];
$serverid = $perm['server_id'];
// Get the database prefix and db user prefix
- $this->app->uses('getconf');
- $global_config = $this->app->getconf->get_global_config('sites');
+ $app->uses('getconf');
+ $global_config = $app->getconf->get_global_config('sites');
$dbname_prefix = str_replace('[CLIENTID]', '', $global_config['dbname_prefix']);
$dbuser_prefix = str_replace('[CLIENTID]', '', $global_config['dbuser_prefix']);
$this->dbhost = DB_HOST; // Taken from config.inc.php
@@ -307,47 +313,47 @@ class ApsInstaller extends ApsBase
$this->newdb_name = $dbname_prefix.$task['CustomerID'].'aps'.$task['InstanceID'];
$this->newdb_user = $dbuser_prefix.$task['CustomerID'].'aps'.$task['InstanceID'];
- $dbpw_res = $this->app->dbmaster->queryOneRecord("SELECT Value FROM aps_instances_settings
- WHERE Name = 'main_database_password' AND InstanceID = '".$this->db->quote($task['InstanceID'])."';");
+ $dbpw_res = $app->db->queryOneRecord("SELECT Value FROM aps_instances_settings
+ WHERE Name = 'main_database_password' AND InstanceID = '".$app->db->quote($task['InstanceID'])."';");
$newdb_pw = $dbpw_res['Value'];
// In any case delete an existing database (install and removal procedure)
- $this->db->query('DROP DATABASE IF EXISTS `'.$this->db->quote($this->newdb_name).'`;');
+ $app->db->query('DROP DATABASE IF EXISTS `'.$app->db->quote($this->newdb_name).'`;');
// Delete an already existing database with this name
- $this->app->dbmaster->query("DELETE FROM web_database WHERE database_name = '".$this->db->quote($this->newdb_name)."';");
+ $app->db->query("DELETE FROM web_database WHERE database_name = '".$app->db->quote($this->newdb_name)."';");
// Create the new database and assign it to a user
if($this->handle_type == 'install')
{
- $this->db->query('CREATE DATABASE IF NOT EXISTS `'.$this->db->quote($this->newdb_name).'`;');
- $this->db->query('GRANT ALL PRIVILEGES ON '.$this->db->quote($this->newdb_name).'.* TO '.$this->db->quote($this->newdb_user).'@'.$this->db->quote($this->dbhost).' IDENTIFIED BY \'password\';');
- $this->db->query('SET PASSWORD FOR '.$this->db->quote($this->newdb_user).'@'.$this->db->quote($this->dbhost).' = PASSWORD(\''.$newdb_pw.'\');');
- $this->db->query('FLUSH PRIVILEGES;');
+ $app->db->query('CREATE DATABASE IF NOT EXISTS `'.$app->db->quote($this->newdb_name).'`;');
+ $app->db->query('GRANT ALL PRIVILEGES ON '.$app->db->quote($this->newdb_name).'.* TO '.$app->db->quote($this->newdb_user).'@'.$app->db->quote($this->dbhost).' IDENTIFIED BY \'password\';');
+ $app->db->query('SET PASSWORD FOR '.$app->db->quote($this->newdb_user).'@'.$app->db->quote($this->dbhost).' = PASSWORD(\''.$newdb_pw.'\');');
+ $app->db->query('FLUSH PRIVILEGES;');
// Add the new database to the customer databases
// Assumes: charset = utf8
- $this->app->dbmaster->query('INSERT INTO web_database (sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id,
+ $app->db->query('INSERT INTO web_database (sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id,
type, database_name, database_user, database_password, database_charset, remote_access, remote_ips, active)
VALUES ('.$task['sys_userid'].', '.$task['sys_groupid'].', "'.$task['sys_perm_user'].'", "'.$task['sys_perm_group'].'",
- "'.$task['sys_perm_other'].'", '.$this->db->quote($serverid).', "mysql", "'.$this->db->quote($this->newdb_name).'",
- "'.$this->db->quote($this->newdb_user).'", "'.$this->db->quote($newdb_pw).'", "utf8", "n", "", "y");');
+ "'.$task['sys_perm_other'].'", '.$app->db->quote($serverid).', "mysql", "'.$app->db->quote($this->newdb_name).'",
+ "'.$app->db->quote($this->newdb_user).'", "'.$app->db->quote($newdb_pw).'", "utf8", "n", "", "y");');
}
*/
- $mysqlver_res = $this->app->db->queryOneRecord('SELECT VERSION() as ver;');
+ $mysqlver_res = $app->db->queryOneRecord('SELECT VERSION() as ver;');
$mysqlver = $mysqlver_res['ver'];
- $tmp = $this->app->dbmaster->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_password' AND instance_id = '".$this->db->quote($task['instance_id'])."';");
+ $tmp = $app->db->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_password' AND instance_id = '".$app->db->quote($task['instance_id'])."';");
$newdb_pw = $tmp['value'];
- $tmp = $this->app->dbmaster->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_host' AND instance_id = '".$this->db->quote($task['instance_id'])."';");
+ $tmp = $app->db->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_host' AND instance_id = '".$app->db->quote($task['instance_id'])."';");
$newdb_host = $tmp['value'];
- $tmp = $this->app->dbmaster->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_name' AND instance_id = '".$this->db->quote($task['instance_id'])."';");
+ $tmp = $app->db->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_name' AND instance_id = '".$app->db->quote($task['instance_id'])."';");
$newdb_name = $tmp['value'];
- $tmp = $this->app->dbmaster->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_login' AND instance_id = '".$this->db->quote($task['instance_id'])."';");
+ $tmp = $app->db->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_login' AND instance_id = '".$app->db->quote($task['instance_id'])."';");
$newdb_login = $tmp['value'];
$this->putenv[] = 'DB_'.$db_id.'_TYPE=mysql';
@@ -368,6 +374,8 @@ class ApsInstaller extends ApsBase
*/
private function prepareFiles($task, $sxe)
{
+ global $app;
+
// Basically set the mapping for APS version 1.0, if not available -> newer way
$mapping = $sxe->mapping;
$mapping_path = $sxe->mapping['path'];
@@ -409,10 +417,10 @@ class ApsInstaller extends ApsBase
$this->processMappings($mapping, $mapping_url, $this->local_installpath);
// Set the appropriate file owner
- $main_domain = $this->app->db->queryOneRecord("SELECT value FROM aps_instances_settings
- WHERE name = 'main_domain' AND instance_id = '".$this->db->quote($task['instance_id'])."';");
- $owner_res = $this->db->queryOneRecord("SELECT system_user, system_group FROM web_domain
- WHERE domain = '".$this->db->quote($main_domain['value'])."';");
+ $main_domain = $app->db->queryOneRecord("SELECT value FROM aps_instances_settings
+ WHERE name = 'main_domain' AND instance_id = '".$app->db->quote($task['instance_id'])."';");
+ $owner_res = $app->db->queryOneRecord("SELECT system_user, system_group FROM web_domain
+ WHERE domain = '".$app->db->quote($main_domain['value'])."';");
$this->file_owner_user = $owner_res['system_user'];
$this->file_owner_group = $owner_res['system_group'];
exec('chown -R '.$this->file_owner_user.':'.$this->file_owner_group.' '.escapeshellarg($this->local_installpath));
@@ -420,9 +428,9 @@ class ApsInstaller extends ApsBase
}
catch(Exception $e)
{
- $this->app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_ERROR.'"
- WHERE id = "'.$this->db->quote($task['instance_id']).'";');
- $this->app->log($e->getMessage());
+ $app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_ERROR.'"
+ WHERE id = "'.$app->db->quote($task['instance_id']).'";');
+ $app->log($e->getMessage(), 1);
return false;
}
@@ -436,8 +444,10 @@ class ApsInstaller extends ApsBase
*/
private function prepareUserInputData($task)
{
- $userdata = $this->app->dbmaster->queryAllRecords("SELECT name, value FROM aps_instances_settings
- WHERE instance_id = '".$this->db->quote($task['instance_id'])."';");
+ global $app;
+
+ $userdata = $app->db->queryAllRecords("SELECT name, value FROM aps_instances_settings
+ WHERE instance_id = '".$app->db->quote($task['instance_id'])."';");
if(empty($userdata)) return false;
foreach($userdata as $data)
@@ -510,6 +520,8 @@ class ApsInstaller extends ApsBase
*/
private function doInstallation($task, $sxe)
{
+ global $app;
+
try
{
// Check if the install directory exists
@@ -546,15 +558,15 @@ class ApsInstaller extends ApsBase
// The install succeeded, chown newly created files too
exec('chown -R '.$this->file_owner_user.':'.$this->file_owner_group.' '.escapeshellarg($this->local_installpath));
- $this->app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_SUCCESS.'"
- WHERE id = "'.$this->db->quote($task['instance_id']).'";');
+ $app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_SUCCESS.'"
+ WHERE id = "'.$app->db->quote($task['instance_id']).'";');
}
}
catch(Exception $e)
{
- $this->app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_ERROR.'"
- WHERE id = "'.$this->db->quote($task['instance_id']).'";');
- $this->app->log($e->getMessage());
+ $app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_ERROR.'"
+ WHERE id = "'.$app->db->quote($task['instance_id']).'";');
+ $app->log($e->getMessage(), 1);
return false;
}
@@ -581,18 +593,20 @@ class ApsInstaller extends ApsBase
*/
public function installHandler($instanceid, $type)
{
+ global $app;
+
// Set the given handle type, currently supported: install, delete
if($type == 'install' || $type == 'delete') $this->handle_type = $type;
else return false;
// Get all instance metadata
/*
- $task = $this->app->db->queryOneRecord("SELECT * FROM aps_instances AS i
+ $task = $app->db->queryOneRecord("SELECT * FROM aps_instances AS i
INNER JOIN aps_packages AS p ON i.package_id = p.id
INNER JOIN client AS c ON i.customer_id = c.client_id
WHERE i.id = ".$instanceid.";");
*/
- $task = $this->app->db->queryOneRecord("SELECT * FROM aps_instances AS i
+ $task = $app->db->queryOneRecord("SELECT * FROM aps_instances AS i
INNER JOIN aps_packages AS p ON i.package_id = p.id
WHERE i.id = ".$instanceid.";");
if(!$task) return false; // formerly: throw new Exception('The InstanceID doesn\'t exist.');
@@ -609,7 +623,7 @@ class ApsInstaller extends ApsBase
curl_setopt($ch, CURLOPT_TIMEOUT, 0);
curl_setopt($ch, CURLOPT_FAILONERROR, 1);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
- if(curl_exec($ch) === false) $this->app->log(curl_error ($ch),LOGLEVEL_DEBUG);
+ if(curl_exec($ch) === false) $app->log(curl_error ($ch),1);
fclose($fh);
curl_close($ch);
}
@@ -631,9 +645,9 @@ class ApsInstaller extends ApsBase
// Check if the meta file is existing
if(!$metafile)
{
- $this->app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_ERROR.'"
- WHERE id = "'.$this->db->quote($task['instance_id']).'";');
- $this->app->log('Unable to find the meta data file of package '.$task['path']);
+ $app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_ERROR.'"
+ WHERE id = "'.$app->db->quote($task['instance_id']).'";');
+ $app->log('Unable to find the meta data file of package '.$task['path'], 1);
return false;
}
@@ -665,8 +679,8 @@ class ApsInstaller extends ApsBase
// Finally delete the instance entry + settings
if($this->handle_type == 'delete')
{
- $this->app->dbmaster->query('DELETE FROM aps_instances WHERE id = "'.$this->db->quote($task['instance_id']).'";');
- $this->app->dbmaster->query('DELETE FROM aps_instances_settings WHERE instance_id = "'.$this->db->quote($task['instance_id']).'";');
+ $app->db->query('DELETE FROM aps_instances WHERE id = "'.$app->db->quote($task['instance_id']).'";');
+ $app->db->query('DELETE FROM aps_instances_settings WHERE instance_id = "'.$app->db->quote($task['instance_id']).'";');
}
unset($sxe);
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index d2b4dd6ba..4c75e62bc 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -103,7 +103,8 @@ class db extends mysqli
}
public function query($queryString) {
- $this->queryId = parent::query($queryString);
+ parent::ping();
+ $this->queryId = parent::query($queryString);
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
if(!$this->queryId) {
return false;
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index b460875fd..c10e6ff22 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -1527,6 +1527,16 @@ class system{
unset($shadow_file_array);
}
}
+
+ function intval($string, $force_numeric = false) {
+ if(intval($string) == 2147483647) {
+ if($force_numeric == true) return floatval($string);
+ elseif(preg_match('/^([-]?)[0]*([1-9][0-9]*)([^0-9].*)*$/', $string, $match)) return $match[1].$match[2];
+ else return 0;
+ } else {
+ return intval($string);
+ }
+ }
}
?>
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 099b89a8a..63a813c40 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -138,7 +138,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -163,7 +163,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -188,7 +188,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -213,7 +213,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -238,7 +238,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -263,7 +263,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -287,7 +287,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -311,7 +311,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -336,7 +336,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -361,7 +361,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -386,7 +386,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -424,7 +424,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -449,7 +449,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -474,7 +474,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -509,7 +509,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -534,7 +534,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -560,7 +560,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -585,7 +585,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -610,7 +610,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -635,7 +635,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -660,7 +660,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -685,7 +685,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -708,12 +708,12 @@ class monitor_core_module {
$res = $this->_tools->monitorISPCCronLog();
//* Ensure that output is encoded so that it does not break the serialize
- $res['data'] = htmlentities($res['data']);
+ if(is_array($res) && isset($res['data'])) $res['data'] = htmlentities($res['data']);
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -738,7 +738,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -763,7 +763,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
@@ -788,7 +788,7 @@ class monitor_core_module {
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 182a73868..ca8a88c97 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -849,15 +849,15 @@ class apache2_plugin {
//$vhost_data['document_root'] = $data['new']['document_root'].'/' . $web_folder;
// Set SEO Redirect
- if($data['new']['seo_redirect'] != '' && ($data['new']['subdomain'] == 'www' || $data['new']['subdomain'] == '*')){
+ if($data['new']['seo_redirect'] != ''){
$vhost_data['seo_redirect_enabled'] = 1;
- if($data['new']['seo_redirect'] == 'non_www_to_www'){
- $vhost_data['seo_redirect_origin_domain'] = $data['new']['domain'];
- $vhost_data['seo_redirect_target_domain'] = 'www.'.$data['new']['domain'];
- }
- if($data['new']['seo_redirect'] == 'www_to_non_www'){
- $vhost_data['seo_redirect_origin_domain'] = 'www.'.$data['new']['domain'];
- $vhost_data['seo_redirect_target_domain'] = $data['new']['domain'];
+ $tmp_seo_redirects = $this->get_seo_redirects($data['new']);
+ if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
+ foreach($tmp_seo_redirects as $key => $val){
+ $vhost_data[$key] = $val;
+ }
+ } else {
+ $vhost_data['seo_redirect_enabled'] = 0;
}
} else {
$vhost_data['seo_redirect_enabled'] = 0;
@@ -868,7 +868,7 @@ class apache2_plugin {
// Rewrite rules
$rewrite_rules = array();
if($data['new']['redirect_type'] != '' && $data['new']['redirect_path'] != '') {
- if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
+ if(substr($data['new']['redirect_path'],-1) != '/' && !preg_match('/^(https?|\[scheme\]):\/\//', $data['new']['redirect_path'])) $data['new']['redirect_path'] .= '/';
if(substr($data['new']['redirect_path'],0,8) == '[scheme]'){
$rewrite_target = 'http'.substr($data['new']['redirect_path'],8);
$rewrite_target_ssl = 'https'.substr($data['new']['redirect_path'],8);
@@ -929,6 +929,7 @@ class apache2_plugin {
// get alias domains (co-domains and subdomains)
$aliases = $app->db->queryAllRecords('SELECT * FROM web_domain WHERE parent_domain_id = '.$data['new']['domain_id']." AND active = 'y' AND type != 'vhostsubdomain'");
+ $alias_seo_redirects = array();
switch($data['new']['subdomain']) {
case 'www':
$server_alias[] .= 'www.'.$data['new']['domain'].' ';
@@ -951,9 +952,18 @@ class apache2_plugin {
break;
}
$app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
+
+ // Add SEO redirects for alias domains
+ if($alias['seo_redirect'] != '' && $data['new']['seo_redirect'] != '*_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_to_domain_tld' && ($alias['type'] == 'alias' || ($alias['type'] == 'subdomain' && $data['new']['seo_redirect'] != '*_domain_tld_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_domain_tld_to_domain_tld'))){
+ $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
+ if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
+ $alias_seo_redirects[] = $tmp_seo_redirects;
+ }
+ }
+
// Rewriting
if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
- if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
+ if(substr($alias['redirect_path'],-1) != '/' && !preg_match('/^(https?|\[scheme\]):\/\//', $data['new']['redirect_path'])) $alias['redirect_path'] .= '/';
if(substr($alias['redirect_path'],0,8) == '[scheme]'){
$rewrite_target = 'http'.substr($alias['redirect_path'],8);
$rewrite_target_ssl = 'https'.substr($alias['redirect_path'],8);
@@ -1017,11 +1027,15 @@ class apache2_plugin {
$tpl->setVar('alias','');
}
- if(count($rewrite_rules) > 0 || $vhost_data['seo_redirect_enabled'] > 0) {
+ if(count($rewrite_rules) > 0 || $vhost_data['seo_redirect_enabled'] > 0 || count($alias_seo_redirects) > 0) {
$tpl->setVar('rewrite_enabled',1);
} else {
$tpl->setVar('rewrite_enabled',0);
}
+
+ if(count($alias_seo_redirects) > 0) {
+ $tpl->setLoop('alias_seo_redirects',$alias_seo_redirects);
+ }
//$tpl->setLoop('redirects',$rewrite_rules);
@@ -1098,6 +1112,7 @@ class apache2_plugin {
$tpl->setVar('fastcgi_starter_path',$fastcgi_starter_path);
$tpl->setVar('fastcgi_starter_script',$fastcgi_config['fastcgi_starter_script'].($data['new']['type'] == 'vhostsubdomain' ? '_web' . $data['new']['domain_id'] : ''));
$tpl->setVar('fastcgi_config_syntax',$fastcgi_config['fastcgi_config_syntax']);
+ $tpl->setVar('fastcgi_max_requests',$fastcgi_config['fastcgi_max_requests']);
} else {
//remove the php fastgi starter script if available
@@ -1342,19 +1357,19 @@ class apache2_plugin {
//* Create .htaccess and .htpasswd file for website statistics
if(!is_file($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess') or $data['old']['document_root'] != $data['new']['document_root']) {
if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdir($data['new']['document_root'].'/' . $web_folder . '/stats');
- $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/.htpasswd_stats\nrequire valid-user";
+ $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user";
$app->system->file_put_contents($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',$ht_file);
$app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',0755);
unset($ht_file);
}
- if(!is_file($data['new']['document_root'].'/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
+ if(!is_file($data['new']['document_root'].'/web/stats/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
if(trim($data['new']['stats_password']) != '') {
$htp_file = 'admin:'.trim($data['new']['stats_password']);
$app->system->web_folder_protection($data['new']['document_root'],false);
- $app->system->file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file);
+ $app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htpasswd_stats',$htp_file);
$app->system->web_folder_protection($data['new']['document_root'],true);
- $app->system->chmod($data['new']['document_root'].'/.htpasswd_stats',0750);
+ $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0750);
unset($htp_file);
}
}
@@ -1374,10 +1389,14 @@ class apache2_plugin {
$app->services->restartService('httpd','restart');
// wait a few seconds, before we test the apache status again
+ $apache_online_status_after_restart = false;
sleep(2);
-
+ for($i = 0; $i < 5; $i++) {
+ $apache_online_status_after_restart = $this->_checkTcp('localhost',80);
+ if($apache_online_status_after_restart) break;
+ sleep(1);
+ }
//* Check if apache restarted successfully if it was online before
- $apache_online_status_after_restart = $this->_checkTcp('localhost',80);
$app->log('Apache online status after restart is: '.$apache_online_status_after_restart,LOGLEVEL_DEBUG);
if($apache_online_status_before_restart && !$apache_online_status_after_restart) {
$app->log('Apache did not restart after the configuration change for website '.$data['new']['domain'].' Reverting the configuration. Saved non-working config as '.$vhost_file.'.err',LOGLEVEL_WARN);
@@ -1526,8 +1545,63 @@ class apache2_plugin {
if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain') {
$docroot = escapeshellcmd($data['old']['document_root']);
if($docroot != '' && !stristr($docroot,'..')) {
- if($data['old']['type'] == 'vhost') exec('rm -rf '.$docroot);
- elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder);
+ if($data['old']['type'] == 'vhost') {
+ // this is a vhost - we delete everything in here.
+ exec('rm -rf '.$docroot);
+ } elseif(!stristr($data['old']['web_folder'], '..')) {
+ // this is a vhost subdomain
+ // IMPORTANT: do some folder checks before we delete this!
+ $do_delete = true;
+ $delete_folder = preg_replace('/[\/]{2,}/', '/', $web_folder); // replace / occuring multiple times
+ if(substr($delete_folder, 0, 1) === '/') $delete_folder = substr($delete_folder, 1);
+ if(substr($delete_folder, -1) === '/') $delete_folder = substr($delete_folder, 0, -1);
+
+ $path_elements = explode('/', $delete_folder);
+
+ if($path_elements[0] == 'web' || $path_elements[0] === '') {
+ // paths beginning with /web should NEVER EVER be deleted, empty paths should NEVER occur - but for safety reasons we check it here!
+ // we use strict check as otherwise directories named '0' may not be deleted
+ $do_delete = false;
+ } else {
+ // read all vhost subdomains with same parent domain
+ $used_paths = array();
+ $tmp = $app->db->queryAllRecords("SELECT `web_folder` FROM web_domain WHERE type = 'vhostsubdomain' AND parent_domain_id = ".intval($data['old']['parent_domain_id'])." AND domain_id != ".intval($data['old']['domain_id']));
+ foreach($tmp as $tmprec) {
+ // we normalize the folder entries because we need to compare them
+ $tmp_folder = preg_replace('/[\/]{2,}/', '/', $tmprec['web_folder']); // replace / occuring multiple times
+ if(substr($tmp_folder, 0, 1) === '/') $tmp_folder = substr($tmp_folder, 1);
+ if(substr($tmp_folder, -1) === '/') $tmp_folder = substr($tmp_folder, 0, -1);
+
+ // add this path and it's parent paths to used_paths array
+ while(strpos($tmp_folder, '/') !== false) {
+ if(in_array($tmp_folder, $used_paths) == false) $used_paths[] = $tmp_folder;
+ $tmp_folder = substr($tmp_folder, 0, strrpos($tmp_folder, '/'));
+ }
+ if(in_array($tmp_folder, $used_paths) == false) $used_paths[] = $tmp_folder;
+ }
+ unset($tmp);
+
+ // loop and check if the path is still used and stop at first used one
+ // set do_delete to false so nothing gets deleted if the web_folder itself is still used
+ $do_delete = false;
+ while(count($path_elements) > 0) {
+ $tmp_folder = implode('/', $path_elements);
+ if(in_array($tmp_folder, $used_paths) == true) break;
+
+ // this path is not used - set it as path to delete, strip the last element from the array and set do_delete to true
+ $delete_folder = $tmp_folder;
+ $do_delete = true;
+ array_pop($path_elements);
+ }
+ unset($tmp_folder);
+ unset($used_paths);
+ }
+
+ if($do_delete === true && $delete_folder !== '') exec('rm -rf '.$docroot.'/'.$delete_folder);
+
+ unset($delete_folder);
+ unset($path_elements);
+ }
}
//remove the php fastgi starter script if available
@@ -1581,7 +1655,7 @@ class apache2_plugin {
$tmp_symlink = str_replace('[website_domain]',$data['old']['domain'],$tmp_symlink);
// Remove trailing slash
if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
- // create the symlinks, if not exist
+ // delete the symlink
if(is_link($tmp_symlink)) {
$app->system->unlink($tmp_symlink);
$app->log('Removing symlink: '.$tmp_symlink,LOGLEVEL_DEBUG);
@@ -2198,7 +2272,7 @@ class apache2_plugin {
$files = @scandir($webdavRoot);
if(is_array($files)) {
foreach($files as $file) {
- if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest' && preg_match("[a-zA-Z0-9\-_\.]",$file)) {
+ if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest' && preg_match("/^[a-zA-Z0-9\-_\.]*$/",$file)) {
/*
* found a htdigest - file, so add it to webdav
*/
@@ -2556,6 +2630,8 @@ class apache2_plugin {
}
public function create_relative_link($f, $t) {
+ global $app;
+
// $from already exists
$from = realpath($f);
@@ -2588,6 +2664,49 @@ class apache2_plugin {
private function _is_url($string) {
return preg_match('/^(f|ht)tp(s)?:\/\//i', $string);
}
+
+ private function get_seo_redirects($web, $prefix = ''){
+ $seo_redirects = array();
+
+ if(substr($web['domain'], 0, 2) === '*.') $web['subdomain'] = '*';
+
+ if($web['subdomain'] == 'www' || $web['subdomain'] == '*'){
+ if($web['seo_redirect'] == 'non_www_to_www'){
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = str_replace('.', '\.', $web['domain']);
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '';
+ }
+ if($web['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
+ // ^(example\.com|(?!\bwww\b)\.example\.com)$
+ // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = '('.str_replace('.', '\.', $web['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $web['domain']).'))';
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '';
+ }
+ if($web['seo_redirect'] == '*_to_www_domain_tld'){
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www\.'.str_replace('.', '\.', $web['domain']);
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '!';
+ }
+ }
+ if($web['seo_redirect'] == 'www_to_non_www'){
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www\.'.str_replace('.', '\.', $web['domain']);
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '';
+ }
+ if($web['seo_redirect'] == '*_domain_tld_to_domain_tld'){
+ // ^(.+)\.example\.com$
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = '(.+)\.'.str_replace('.', '\.', $web['domain']);
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '';
+ }
+ if($web['seo_redirect'] == '*_to_domain_tld'){
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = str_replace('.', '\.', $web['domain']);
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '!';
+ }
+ return $seo_redirects;
+ }
} // end class
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 9df9fd6de..5dbc65ebd 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -158,16 +158,40 @@ class maildeliver_plugin {
//* Set alias addresses for autoresponder
$sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = '".$app->db->quote($data["new"]["email"])."'";
$records = $app->db->queryAllRecords($sql);
- $addresses = '';
+
+ $addresses = array();
+ $addresses[] = $data["new"]["email"];
+ if(is_array($records) && count($records) > 0) {
+ foreach($records as $rec) {
+ $addresses[] = $rec['source'];
+ }
+ }
+
+ $email_parts = explode('@',$data["new"]["email"]);
+ $sql = "SELECT * FROM mail_forwarding WHERE type = 'aliasdomain' AND destination = '@".$app->db->quote($email_parts[1])."'";
+ $records = $app->db->queryAllRecords($sql);
if(is_array($records) && count($records) > 0) {
- $addresses .= ':addresses ["'.$data["new"]["email"].'",';
foreach($records as $rec) {
- $addresses .= '"'.$rec['source'].'",';
+ $aliasdomain = substr($rec['source'],1);
+ foreach($addresses as $email) {
+ $email_parts = explode('@',$email);
+ $addresses[] = $email_parts[0].'@'.$aliasdomain;
+ }
+ }
+ }
+
+ $address_str = '';
+ if(is_array($addresses) && count($addresses) > 0) {
+ $address_str .= ':addresses [';
+ foreach($addresses as $rec) {
+ $address_str .= '"'.$rec.'",';
}
- $addresses = substr($addresses,0,-1);
- $addresses .= ']';
+ $address_str = substr($address_str,0,-1);
+ $address_str .= ']';
}
- $tpl->setVar('addresses',$addresses);
+
+
+ $tpl->setVar('addresses',$address_str);
file_put_contents($sieve_file,$tpl->grab());
diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
index df840eef5..101b2ccb8 100644
--- a/server/plugins-available/mysql_clientdb_plugin.inc.php
+++ b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -364,7 +364,7 @@ class mysql_clientdb_plugin {
}
- if($data['old']['database_user'] == $data['new']['database_user'] && $data['old']['database_password'] == $data['new']['database_password']) {
+ if($data['old']['database_user'] == $data['new']['database_user'] && ($data['old']['database_password'] == $data['new']['database_password'] || $data['new']['database_password'] == '')) {
return;
}
@@ -390,7 +390,7 @@ class mysql_clientdb_plugin {
$app->log('Renaming MySQL user: '.$data['old']['database_user'].' to '.$data['new']['database_user'],LOGLEVEL_DEBUG);
}
- if($data['new']['database_password'] != $data['old']['database_password']) {
+ if($data['new']['database_password'] != $data['old']['database_password'] && $data['new']['database_password'] != '') {
$link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = PASSWORD('".$link->escape_string($data['new']['database_password'])."');"); // is contained in clear text so PASSWORD() func is needed
$app->log('Changing MySQL user password for: '.$data['new']['database_user'].'@'.$db_host,LOGLEVEL_DEBUG);
}
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index a0e8314cb..fddfd54e4 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -920,123 +920,196 @@ class nginx_plugin {
}
// Set SEO Redirect
- if($data['new']['seo_redirect'] != '' && ($data['new']['subdomain'] == 'www' || $data['new']['subdomain'] == '*')){
+ if($data['new']['seo_redirect'] != ''){
$vhost_data['seo_redirect_enabled'] = 1;
- if($data['new']['seo_redirect'] == 'non_www_to_www'){
- $vhost_data['seo_redirect_origin_domain'] = $data['new']['domain'];
- $vhost_data['seo_redirect_target_domain'] = 'www.'.$data['new']['domain'];
- }
- if($data['new']['seo_redirect'] == 'www_to_non_www'){
- $vhost_data['seo_redirect_origin_domain'] = 'www.'.$data['new']['domain'];
- $vhost_data['seo_redirect_target_domain'] = $data['new']['domain'];
+ $tmp_seo_redirects = $this->get_seo_redirects($data['new']);
+ if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
+ foreach($tmp_seo_redirects as $key => $val){
+ $vhost_data[$key] = $val;
+ }
+ } else {
+ $vhost_data['seo_redirect_enabled'] = 0;
}
} else {
$vhost_data['seo_redirect_enabled'] = 0;
}
- $tpl->setVar($vhost_data);
+
// Rewrite rules
+ $own_rewrite_rules = array();
$rewrite_rules = array();
if($data['new']['redirect_type'] != '' && $data['new']['redirect_path'] != '') {
if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
- if(substr($data['new']['redirect_path'],0,8) == '[scheme]') $data['new']['redirect_path'] = '$scheme'.substr($data['new']['redirect_path'],8);
+ if(substr($data['new']['redirect_path'],0,8) == '[scheme]'){
+ if($data['new']['redirect_type'] != 'proxy'){
+ $data['new']['redirect_path'] = '$scheme'.substr($data['new']['redirect_path'],8);
+ } else {
+ $data['new']['redirect_path'] = 'http'.substr($data['new']['redirect_path'],8);
+ }
+ }
- /* Disabled path extension
- if($data['new']['redirect_type'] == 'no' && substr($data['new']['redirect_path'],0,4) != 'http') {
- $data['new']['redirect_path'] = $data['new']['document_root'].'/web'.realpath($data['new']['redirect_path']).'/';
+ // Custom proxy directives
+ if($data['new']['redirect_type'] == 'proxy' && trim($data['new']['proxy_directives'] != '')){
+ $final_proxy_directives = array();
+ $proxy_directives = $data['new']['proxy_directives'];
+ // Make sure we only have Unix linebreaks
+ $proxy_directives = str_replace("\r\n", "\n", $proxy_directives);
+ $proxy_directives = str_replace("\r", "\n", $proxy_directives);
+ $proxy_directive_lines = explode("\n", $proxy_directives);
+ if(is_array($proxy_directive_lines) && !empty($proxy_directive_lines)){
+ foreach($proxy_directive_lines as $proxy_directive_line){
+ $final_proxy_directives[] = array('proxy_directive' => $proxy_directive_line);
+ }
+ }
+ } else {
+ $final_proxy_directives = false;
}
- */
switch($data['new']['subdomain']) {
case 'www':
if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
- $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
- } else { // URL - check if URL is local
- $tmp_redirect_path = $data['new']['redirect_path'];
- if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
- $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- if($tmp_redirect_path_parts['host'] == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
- if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
- if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
- $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
- } else {
- $rewrite_exclude = '(.?)';
+ if($data['new']['redirect_type'] == 'proxy'){
+ $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
+ $vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
+ break;
}
- unset($tmp_redirect_path);
- unset($tmp_redirect_path_parts);
- }
- $rewrite_rules[] = array( 'rewrite_domain' => '^'.$this->_rewrite_quote($data['new']['domain']),
- 'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
- 'rewrite_target' => $data['new']['redirect_path'],
- 'rewrite_exclude' => $rewrite_exclude);
-
- if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
- $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
+ $rewrite_exclude = '(?!/\b('.substr($data['new']['redirect_path'],1,-1).(substr($data['new']['redirect_path'],1,-1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
} else { // URL - check if URL is local
$tmp_redirect_path = $data['new']['redirect_path'];
if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- if($tmp_redirect_path_parts['host'] == 'www.'.$data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ if(($tmp_redirect_path_parts['host'] == $data['new']['domain'] || $tmp_redirect_path_parts['host'] == 'www.'.$data['new']['domain']) && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ // URL is local
if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
- $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ //$rewrite_exclude = '((?!'.$tmp_redirect_path_parts['path'].'))';
+ if($data['new']['redirect_type'] == 'proxy'){
+ $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
+ $vhost_data['web_document_root_www'] .= $tmp_redirect_path_parts['path'];
+ break;
+ } else {
+ $rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+ }
} else {
- $rewrite_exclude = '(.?)';
+ // external URL
+ $rewrite_exclude = '(.?)/';
+ if($data['new']['redirect_type'] == 'proxy'){
+ $vhost_data['use_proxy'] = 'y';
+ $rewrite_subdir = $tmp_redirect_path_parts['path'];
+ if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ }
}
unset($tmp_redirect_path);
unset($tmp_redirect_path_parts);
}
- $rewrite_rules[] = array( 'rewrite_domain' => '^' . $this->_rewrite_quote('www.'.$data['new']['domain']),
- 'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
- 'rewrite_target' => $data['new']['redirect_path'],
- 'rewrite_exclude' => $rewrite_exclude);
+ $own_rewrite_rules[] = array( 'rewrite_domain' => '^'.$this->_rewrite_quote($data['new']['domain']),
+ 'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
+ 'rewrite_target' => $data['new']['redirect_path'],
+ 'rewrite_exclude' => $rewrite_exclude,
+ 'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
+ 'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
+ 'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
break;
case '*':
if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
- $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
+ if($data['new']['redirect_type'] == 'proxy'){
+ $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
+ $vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
+ break;
+ }
+ $rewrite_exclude = '(?!/\b('.substr($data['new']['redirect_path'],1,-1).(substr($data['new']['redirect_path'],1,-1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
} else { // URL - check if URL is local
$tmp_redirect_path = $data['new']['redirect_path'];
if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- if(substr($tmp_redirect_path_parts['host'],-strlen($data['new']['domain'])) == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+
+ //if($is_serveralias && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ if($this->url_is_local($tmp_redirect_path_parts['host'], $data['new']['domain_id']) && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ // URL is local
if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
- $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ //$rewrite_exclude = '((?!'.$tmp_redirect_path_parts['path'].'))';
+ if($data['new']['redirect_type'] == 'proxy'){
+ $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
+ $vhost_data['web_document_root_www'] .= $tmp_redirect_path_parts['path'];
+ break;
+ } else {
+ $rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+ }
} else {
- $rewrite_exclude = '(.?)';
+ // external URL
+ $rewrite_exclude = '(.?)/';
+ if($data['new']['redirect_type'] == 'proxy'){
+ $vhost_data['use_proxy'] = 'y';
+ $rewrite_subdir = $tmp_redirect_path_parts['path'];
+ if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ }
}
unset($tmp_redirect_path);
unset($tmp_redirect_path_parts);
}
- $rewrite_rules[] = array( 'rewrite_domain' => '(^|\.)'.$this->_rewrite_quote($data['new']['domain']),
+ $own_rewrite_rules[] = array( 'rewrite_domain' => '(^|\.)'.$this->_rewrite_quote($data['new']['domain']),
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
'rewrite_target' => $data['new']['redirect_path'],
- 'rewrite_exclude' => $rewrite_exclude);
+ 'rewrite_exclude' => $rewrite_exclude,
+ 'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
+ 'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
+ 'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
break;
default:
if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
- $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
+ if($data['new']['redirect_type'] == 'proxy'){
+ $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
+ $vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
+ break;
+ }
+ $rewrite_exclude = '(?!/\b('.substr($data['new']['redirect_path'],1,-1).(substr($data['new']['redirect_path'],1,-1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
} else { // URL - check if URL is local
$tmp_redirect_path = $data['new']['redirect_path'];
if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
if($tmp_redirect_path_parts['host'] == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ // URL is local
if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
- $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ //$rewrite_exclude = '((?!'.$tmp_redirect_path_parts['path'].'))';
+ if($data['new']['redirect_type'] == 'proxy'){
+ $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
+ $vhost_data['web_document_root_www'] .= $tmp_redirect_path_parts['path'];
+ break;
+ } else {
+ $rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+ }
} else {
- $rewrite_exclude = '(.?)';
+ // external URL
+ $rewrite_exclude = '(.?)/';
+ if($data['new']['redirect_type'] == 'proxy'){
+ $vhost_data['use_proxy'] = 'y';
+ $rewrite_subdir = $tmp_redirect_path_parts['path'];
+ if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ }
}
unset($tmp_redirect_path);
unset($tmp_redirect_path_parts);
}
- $rewrite_rules[] = array( 'rewrite_domain' => '^'.$this->_rewrite_quote($data['new']['domain']),
- 'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
- 'rewrite_target' => $data['new']['redirect_path'],
- 'rewrite_exclude' => $rewrite_exclude);
+ $own_rewrite_rules[] = array( 'rewrite_domain' => '^'.$this->_rewrite_quote($data['new']['domain']),
+ 'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
+ 'rewrite_target' => $data['new']['redirect_path'],
+ 'rewrite_exclude' => $rewrite_exclude,
+ 'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
+ 'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
+ 'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
}
}
+
+ $tpl->setVar($vhost_data);
$server_alias = array();
@@ -1054,8 +1127,6 @@ class nginx_plugin {
$server_alias[] .= $auto_alias.' ';
}
- // get alias domains (co-domains and subdomains)
- $aliases = $app->db->queryAllRecords('SELECT * FROM web_domain WHERE parent_domain_id = '.$data['new']['domain_id']." AND active = 'y' AND type != 'vhostsubdomain'");
switch($data['new']['subdomain']) {
case 'www':
$server_alias[] = 'www.'.$data['new']['domain'].' ';
@@ -1064,120 +1135,214 @@ class nginx_plugin {
$server_alias[] = '*.'.$data['new']['domain'].' ';
break;
}
+
+ // get alias domains (co-domains and subdomains)
+ $aliases = $app->db->queryAllRecords('SELECT * FROM web_domain WHERE parent_domain_id = '.$data['new']['domain_id']." AND active = 'y' AND type != 'vhostsubdomain'");
+ $alias_seo_redirects = array();
if(is_array($aliases)) {
foreach($aliases as $alias) {
- switch($alias['subdomain']) {
- case 'www':
- $server_alias[] = 'www.'.$alias['domain'].' '.$alias['domain'].' ';
- break;
- case '*':
- $server_alias[] = '*.'.$alias['domain'].' '.$alias['domain'].' ';
- break;
- default:
- $server_alias[] = $alias['domain'].' ';
- break;
+
+ // Custom proxy directives
+ if($alias['redirect_type'] == 'proxy' && trim($alias['proxy_directives'] != '')){
+ $final_proxy_directives = array();
+ $proxy_directives = $alias['proxy_directives'];
+ // Make sure we only have Unix linebreaks
+ $proxy_directives = str_replace("\r\n", "\n", $proxy_directives);
+ $proxy_directives = str_replace("\r", "\n", $proxy_directives);
+ $proxy_directive_lines = explode("\n", $proxy_directives);
+ if(is_array($proxy_directive_lines) && !empty($proxy_directive_lines)){
+ foreach($proxy_directive_lines as $proxy_directive_line){
+ $final_proxy_directives[] = array('proxy_directive' => $proxy_directive_line);
+ }
+ }
+ } else {
+ $final_proxy_directives = false;
+ }
+
+ if($alias['redirect_type'] == '' || $alias['redirect_path'] == '') {
+ switch($alias['subdomain']) {
+ case 'www':
+ $server_alias[] = 'www.'.$alias['domain'].' '.$alias['domain'].' ';
+ break;
+ case '*':
+ $server_alias[] = '*.'.$alias['domain'].' '.$alias['domain'].' ';
+ break;
+ default:
+ $server_alias[] = $alias['domain'].' ';
+ break;
+ }
+ $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
+
+ // Add SEO redirects for alias domains
+ if($alias['seo_redirect'] != '' && $data['new']['seo_redirect'] != '*_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_to_domain_tld' && ($alias['type'] == 'alias' || ($alias['type'] == 'subdomain' && $data['new']['seo_redirect'] != '*_domain_tld_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_domain_tld_to_domain_tld'))){
+ $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
+ if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
+ $alias_seo_redirects[] = $tmp_seo_redirects;
+ }
+ }
}
- $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
+
// Rewriting
if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
- if(substr($alias['redirect_path'],0,8) == '[scheme]') $alias['redirect_path'] = '$scheme'.substr($alias['redirect_path'],8);
-
- /* Disabled the path extension
- if($data['new']['redirect_type'] == 'no' && substr($data['new']['redirect_path'],0,4) != 'http') {
- $data['new']['redirect_path'] = $data['new']['document_root'].'/web'.realpath($data['new']['redirect_path']).'/';
+ if(substr($alias['redirect_path'],0,8) == '[scheme]'){
+ if($alias['redirect_type'] != 'proxy'){
+ $alias['redirect_path'] = '$scheme'.substr($alias['redirect_path'],8);
+ } else {
+ $alias['redirect_path'] = 'http'.substr($alias['redirect_path'],8);
+ }
}
- */
switch($alias['subdomain']) {
case 'www':
if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
- $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
- } else { // URL - check if URL is local
- $tmp_redirect_path = $alias['redirect_path'];
- if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
- $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- if($tmp_redirect_path_parts['host'] == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
- if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
- if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
- $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
- } else {
- $rewrite_exclude = '(.?)';
+ if($alias['redirect_type'] == 'proxy'){
+ $rewrite_subdir = substr($alias['redirect_path'],1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ }
+ $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
+ } else {
+ if($alias['redirect_type'] == 'proxy'){
+ $tmp_redirect_path = $alias['redirect_path'];
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ $rewrite_subdir = $tmp_redirect_path_parts['path'];
+ if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
}
- unset($tmp_redirect_path);
- unset($tmp_redirect_path_parts);
}
- $rewrite_rules[] = array( 'rewrite_domain' => '^'.$this->_rewrite_quote($alias['domain']),
+ if($alias['redirect_type'] != 'proxy'){
+ if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
+ }
+ // Add SEO redirects for alias domains
+ $alias_seo_redirects2 = array();
+ if($alias['seo_redirect'] != ''){
+ $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_', 'none');
+ if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
+ $alias_seo_redirects2[] = $tmp_seo_redirects;
+ }
+ }
+ $rewrite_rules[] = array( 'rewrite_domain' => $alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
'rewrite_target' => $alias['redirect_path'],
- 'rewrite_exclude' => $rewrite_exclude);
+ 'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
+ 'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
+ 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
+ 'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
+
if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
- $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
- } else { // URL - check if URL is local
- $tmp_redirect_path = $alias['redirect_path'];
- if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
- $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- if($tmp_redirect_path_parts['host'] == 'www.'.$alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
- if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
- if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
- $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
- } else {
- $rewrite_exclude = '(.?)';
+ if($alias['redirect_type'] == 'proxy'){
+ $rewrite_subdir = substr($alias['redirect_path'],1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ }
+ $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
+ } else {
+ if($alias['redirect_type'] == 'proxy'){
+ $tmp_redirect_path = $alias['redirect_path'];
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ $rewrite_subdir = $tmp_redirect_path_parts['path'];
+ if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
}
- unset($tmp_redirect_path);
- unset($tmp_redirect_path_parts);
}
- $rewrite_rules[] = array( 'rewrite_domain' => '^' . $this->_rewrite_quote('www.'.$alias['domain']),
- 'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
- 'rewrite_target' => $alias['redirect_path'],
- 'rewrite_exclude' => $rewrite_exclude);
+ if($alias['redirect_type'] != 'proxy'){
+ if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
+ }
+ // Add SEO redirects for alias domains
+ $alias_seo_redirects2 = array();
+ if($alias['seo_redirect'] != ''){
+ $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_', 'www');
+ if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
+ $alias_seo_redirects2[] = $tmp_seo_redirects;
+ }
+ }
+ $rewrite_rules[] = array( 'rewrite_domain' => 'www.'.$alias['domain'],
+ 'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
+ 'rewrite_target' => $alias['redirect_path'],
+ 'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
+ 'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
+ 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
+ 'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
break;
case '*':
if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
- $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
- } else { // URL - check if URL is local
- $tmp_redirect_path = $alias['redirect_path'];
- if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
- $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- if(substr($tmp_redirect_path_parts['host'],-strlen($alias['domain'])) == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
- if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
- if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
- $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
- } else {
- $rewrite_exclude = '(.?)';
+ if($alias['redirect_type'] == 'proxy'){
+ $rewrite_subdir = substr($alias['redirect_path'],1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ }
+ $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
+ } else {
+ if($alias['redirect_type'] == 'proxy'){
+ $tmp_redirect_path = $alias['redirect_path'];
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ $rewrite_subdir = $tmp_redirect_path_parts['path'];
+ if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ }
+ }
+ if($alias['redirect_type'] != 'proxy'){
+ if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
+ }
+ // Add SEO redirects for alias domains
+ $alias_seo_redirects2 = array();
+ if($alias['seo_redirect'] != ''){
+ $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
+ if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
+ $alias_seo_redirects2[] = $tmp_seo_redirects;
}
- unset($tmp_redirect_path);
- unset($tmp_redirect_path_parts);
}
- $rewrite_rules[] = array( 'rewrite_domain' => '(^|\.)' . $this->_rewrite_quote($alias['domain']),
+ $rewrite_rules[] = array( 'rewrite_domain' => $alias['domain'].' *.'.$alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
'rewrite_target' => $alias['redirect_path'],
- 'rewrite_exclude' => $rewrite_exclude);
+ 'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
+ 'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
+ 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
+ 'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
break;
default:
if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
- $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
- } else { // URL - check if URL is local
- $tmp_redirect_path = $alias['redirect_path'];
- if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
- $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- if($tmp_redirect_path_parts['host'] == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
- if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
- if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
- $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ if($alias['redirect_type'] == 'proxy'){
+ $rewrite_subdir = substr($alias['redirect_path'],1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ }
+ $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
+ } else {
+ if($alias['redirect_type'] == 'proxy'){
+ $tmp_redirect_path = $alias['redirect_path'];
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ $rewrite_subdir = $tmp_redirect_path_parts['path'];
+ if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+ if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ }
+ }
+ if($alias['redirect_type'] != 'proxy'){
+ if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
+ }
+ if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '*.'.substr($alias['domain'], 2);
+ else $domain_rule = $alias['domain'];
+ // Add SEO redirects for alias domains
+ $alias_seo_redirects2 = array();
+ if($alias['seo_redirect'] != ''){
+ if(substr($alias['domain'], 0, 2) === '*.'){
+ $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
} else {
- $rewrite_exclude = '(.?)';
+ $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_', 'none');
+ }
+ if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
+ $alias_seo_redirects2[] = $tmp_seo_redirects;
}
- unset($tmp_redirect_path);
- unset($tmp_redirect_path_parts);
}
- if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '(^|\.)'.$this->_rewrite_quote(substr($alias['domain'], 2));
- else $domain_rule = '^'.$this->_rewrite_quote($alias['domain']);
$rewrite_rules[] = array( 'rewrite_domain' => $domain_rule,
- 'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
- 'rewrite_target' => $alias['redirect_path'],
- 'rewrite_exclude' => $rewrite_exclude);
+ 'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
+ 'rewrite_target' => $alias['redirect_path'],
+ 'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
+ 'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
+ 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
+ 'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
}
}
}
@@ -1201,9 +1366,15 @@ class nginx_plugin {
if(count($rewrite_rules) > 0) {
$tpl->setLoop('redirects',$rewrite_rules);
}
+ if(count($own_rewrite_rules) > 0) {
+ $tpl->setLoop('own_redirects',$own_rewrite_rules);
+ }
+ if(count($alias_seo_redirects) > 0) {
+ $tpl->setLoop('alias_seo_redirects',$alias_seo_redirects);
+ }
//* Create basic http auth for website statistics
- $tpl->setVar('stats_auth_passwd_file', $data['new']['document_root']."/.htpasswd_stats");
+ $tpl->setVar('stats_auth_passwd_file', $data['new']['document_root']."/web/stats/.htpasswd_stats");
// Create basic http auth for other directories
$basic_auth_locations = $this->_create_web_folder_auth_configuration($data['new']);
@@ -1271,11 +1442,11 @@ class nginx_plugin {
}
// create password file for stats directory
- if(!is_file($data['new']['document_root'].'/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
+ if(!is_file($data['new']['document_root'].'/web/stats/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
if(trim($data['new']['stats_password']) != '') {
$htp_file = 'admin:'.trim($data['new']['stats_password']);
- $app->system->file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file);
- $app->system->chmod($data['new']['document_root'].'/.htpasswd_stats',0755);
+ $app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htpasswd_stats',$htp_file);
+ $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0755);
unset($htp_file);
}
}
@@ -2043,9 +2214,12 @@ class nginx_plugin {
$locations = array();
$islocation = false;
$linecount = sizeof($lines);
+ $server_count = 0;
for($i=0;$i<$linecount;$i++){
$l = trim($lines[$i]);
+ if(substr($l, 0, 8) == 'server {') $server_count += 1;
+ if($server_count > 1) break;
if(substr($l, 0, 8) == 'location' && !$islocation){
$islocation = true;
@@ -2149,6 +2323,7 @@ class nginx_plugin {
}
public function create_relative_link($f, $t) {
+ global $app;
// $from already exists
$from = realpath($f);
@@ -2177,6 +2352,114 @@ class nginx_plugin {
private function _rewrite_quote($string) {
return str_replace(array('.', '*', '?', '+'), array('\\.', '\\*', '\\?', '\\+'), $string);
}
+
+ private function url_is_local($hostname, $domain_id){
+ global $app;
+
+ // ORDER BY clause makes sure wildcard subdomains (*) are listed last in the result array so that we can find direct matches first
+ $webs = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' ORDER BY subdomain ASC");
+ if(is_array($webs) && !empty($webs)){
+ foreach($webs as $web){
+ // web domain doesn't match hostname
+ if(substr($hostname,-strlen($web['domain'])) != $web['domain']) continue;
+ // own vhost and therefore server {} container of its own
+ //if($web['type'] == 'vhostsubdomain') continue;
+ // alias domains/subdomains using rewrites and therefore a server {} container of their own
+ //if(($web['type'] == 'alias' || $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') continue;
+
+ if($web['subdomain'] == '*'){
+ $pattern = '/\.?'.str_replace('.', '\.', $web['domain']).'$/i';
+ }
+ if($web['subdomain'] == 'none'){
+ if($web['domain'] == $hostname){
+ if($web['domain_id'] == $domain_id || $web['parent_domain_id'] == $domain_id){
+ // own vhost and therefore server {} container of its own
+ if($web['type'] == 'vhostsubdomain') return false;
+ // alias domains/subdomains using rewrites and therefore a server {} container of their own
+ if(($web['type'] == 'alias' || $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') return false;
+ return true;
+ } else {
+ return false;
+ }
+ }
+ $pattern = '/^'.str_replace('.', '\.', $web['domain']).'$/i';
+ }
+ if($web['subdomain'] == 'www'){
+ if($web['domain'] == $hostname || $web['subdomain'].'.'.$web['domain'] == $hostname){
+ if($web['domain_id'] == $domain_id || $web['parent_domain_id'] == $domain_id){
+ // own vhost and therefore server {} container of its own
+ if($web['type'] == 'vhostsubdomain') return false;
+ // alias domains/subdomains using rewrites and therefore a server {} container of their own
+ if(($web['type'] == 'alias' || $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') return false;
+ return true;
+ } else {
+ return false;
+ }
+ }
+ $pattern = '/^(www\.)?'.str_replace('.', '\.', $web['domain']).'$/i';
+ }
+ if(preg_match($pattern, $hostname)){
+ if($web['domain_id'] == $domain_id || $web['parent_domain_id'] == $domain_id){
+ // own vhost and therefore server {} container of its own
+ if($web['type'] == 'vhostsubdomain') return false;
+ // alias domains/subdomains using rewrites and therefore a server {} container of their own
+ if(($web['type'] == 'alias' || $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') return false;
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
+ private function get_seo_redirects($web, $prefix = '', $force_subdomain = false){
+ // $force_subdomain = 'none|www'
+ $seo_redirects = array();
+
+ if(substr($web['domain'], 0, 2) === '*.') $web['subdomain'] = '*';
+
+ if(($web['subdomain'] == 'www' || $web['subdomain'] == '*') && $force_subdomain != 'www'){
+ if($web['seo_redirect'] == 'non_www_to_www'){
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = $web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '=';
+ }
+ if($web['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
+ // ^(example\.com|(?!\bwww\b)\.example\.com)$
+ // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = '^('.str_replace('.', '\.', $web['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $web['domain']).'))$';
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '~*';
+ }
+ if($web['seo_redirect'] == '*_to_www_domain_tld'){
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www.'.$web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '!=';
+ }
+ }
+ if($force_subdomain != 'none'){
+ if($web['seo_redirect'] == 'www_to_non_www'){
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www.'.$web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '=';
+ }
+ if($web['seo_redirect'] == '*_domain_tld_to_domain_tld'){
+ // ^(.+)\.example\.com$
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = '^(.+)\.'.str_replace('.', '\.', $web['domain']).'$';
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '~*';
+ }
+ if($web['seo_redirect'] == '*_to_domain_tld'){
+ $seo_redirects[$prefix.'seo_redirect_origin_domain'] = $web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
+ $seo_redirects[$prefix.'seo_redirect_operator'] = '!=';
+ }
+ }
+ return $seo_redirects;
+ }
} // end class
--
GitLab