From 8cf78b31b28b9183579c7939b947e1f7e9f5c2fa Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 12 Jan 2012 09:54:19 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20revisions=202812-2883=20from=20stab?= =?UTF-8?q?=C3=B6e=20branch.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/dist/lib/fedora.lib.php | 4 +- install/dist/lib/gentoo.lib.php | 3 +- install/dist/lib/opensuse.lib.php | 4 +- install/install.php | 9 +- install/lib/installer_base.lib.php | 4 +- install/lib/update.lib.php | 15 +- install/sql/ispconfig3.sql | 2 +- install/tpl/bastille-firewall.cfg.master | 2 +- install/tpl/config.inc.php.master | 5 +- install/tpl/debian6_dovecot.conf.master | 3 + install/tpl/debian_dovecot.conf.master | 3 + install/tpl/fedora_dovecot.conf.master | 5 +- install/tpl/mm_cfg.py.master | 2 +- install/tpl/opensuse_dovecot.conf.master | 3 + install/tpl/server.ini.master | 6 +- install/update.php | 29 +- interface/lib/app.inc.php | 15 +- interface/lib/classes/plugin.inc.php | 2 +- interface/lib/classes/remoting.inc.php | 5 + interface/lib/classes/remoting_lib.inc.php | 8 +- interface/lib/classes/tform.inc.php | 11 +- interface/lib/config.inc.php | 1 + interface/lib/lang/ar.lng | 1 + interface/lib/lang/bg.lng | 1 + interface/lib/lang/br.lng | 1 + interface/lib/lang/cz.lng | 1 + interface/lib/lang/de.lng | 1 + interface/lib/lang/el.lng | 1 + interface/lib/lang/en.lng | 1 + interface/lib/lang/es.lng | 1 + interface/lib/lang/fi.lng | 1 + interface/lib/lang/fr.lng | 2 +- interface/lib/lang/hr.lng | 59 ++-- interface/lib/lang/hu.lng | 1 + interface/lib/lang/id.lng | 1 + interface/lib/lang/it.lng | 1 + interface/lib/lang/ja.lng | 1 + interface/lib/lang/nl.lng | 1 + interface/lib/lang/pl.lng | 2 +- interface/lib/lang/pt.lng | 1 + interface/lib/lang/ro.lng | 1 + interface/lib/lang/ru.lng | 140 ++++----- interface/lib/lang/se.lng | 1 + interface/lib/lang/sk.lng | 1 + interface/lib/lang/tr.lng | 1 + .../plugins/mail_user_filter_plugin.inc.php | 26 +- .../web/admin/form/server_config.tform.php | 29 ++ interface/web/admin/form/server_ip.tform.php | 4 +- interface/web/admin/language_complete.php | 4 +- .../web/admin/lib/lang/ar_remote_action.lng | 2 + .../web/admin/lib/lang/ar_server_config.lng | 4 + .../web/admin/lib/lang/bg_remote_action.lng | 2 + .../web/admin/lib/lang/bg_server_config.lng | 4 + .../web/admin/lib/lang/br_remote_action.lng | 2 + .../web/admin/lib/lang/br_server_config.lng | 4 + .../web/admin/lib/lang/cz_remote_action.lng | 2 + .../web/admin/lib/lang/cz_server_config.lng | 4 + .../web/admin/lib/lang/de_remote_action.lng | 2 + .../web/admin/lib/lang/de_server_config.lng | 4 + interface/web/admin/lib/lang/el.lng | 3 +- interface/web/admin/lib/lang/el_firewall.lng | 1 + .../web/admin/lib/lang/el_firewall_list.lng | 1 + interface/web/admin/lib/lang/el_groups.lng | 1 + .../web/admin/lib/lang/el_groups_list.lng | 1 + interface/web/admin/lib/lang/el_iptables.lng | 1 + .../web/admin/lib/lang/el_iptables_list.lng | 1 + .../web/admin/lib/lang/el_language_add.lng | 1 + .../admin/lib/lang/el_language_complete.lng | 1 + .../web/admin/lib/lang/el_language_edit.lng | 1 + .../web/admin/lib/lang/el_language_export.lng | 1 + .../web/admin/lib/lang/el_language_import.lng | 1 + .../web/admin/lib/lang/el_language_list.lng | 1 + .../web/admin/lib/lang/el_package_install.lng | 1 + .../web/admin/lib/lang/el_remote_action.lng | 1 + .../web/admin/lib/lang/el_remote_user.lng | 1 + .../admin/lib/lang/el_remote_user_list.lng | 1 + interface/web/admin/lib/lang/el_server.lng | 1 + .../web/admin/lib/lang/el_server_config.lng | 17 +- .../admin/lib/lang/el_server_config_list.lng | 1 + interface/web/admin/lib/lang/el_server_ip.lng | 7 +- .../web/admin/lib/lang/el_server_ip_list.lng | 1 + .../web/admin/lib/lang/el_server_list.lng | 1 + .../lib/lang/el_software_package_install.lng | 1 + .../lib/lang/el_software_package_list.lng | 1 + .../web/admin/lib/lang/el_software_repo.lng | 1 + .../admin/lib/lang/el_software_repo_list.lng | 1 + .../lib/lang/el_software_update_list.lng | 1 + .../web/admin/lib/lang/el_system_config.lng | 7 +- interface/web/admin/lib/lang/el_users.lng | 1 + .../web/admin/lib/lang/el_users_list.lng | 1 + .../web/admin/lib/lang/en_remote_action.lng | 2 + .../web/admin/lib/lang/en_server_config.lng | 5 + .../web/admin/lib/lang/es_remote_action.lng | 2 + .../web/admin/lib/lang/es_server_config.lng | 5 +- .../web/admin/lib/lang/fi_remote_action.lng | 2 + .../web/admin/lib/lang/fi_server_config.lng | 4 + interface/web/admin/lib/lang/fr.lng | 2 - interface/web/admin/lib/lang/fr_firewall.lng | 2 - .../web/admin/lib/lang/fr_firewall_list.lng | 2 - interface/web/admin/lib/lang/fr_groups.lng | 2 - .../web/admin/lib/lang/fr_groups_list.lng | 2 - interface/web/admin/lib/lang/fr_iptables.lng | 2 - .../web/admin/lib/lang/fr_iptables_list.lng | 2 - .../web/admin/lib/lang/fr_language_add.lng | 2 - .../admin/lib/lang/fr_language_complete.lng | 2 - .../web/admin/lib/lang/fr_language_edit.lng | 2 - .../web/admin/lib/lang/fr_language_export.lng | 2 - .../web/admin/lib/lang/fr_language_import.lng | 2 - .../web/admin/lib/lang/fr_language_list.lng | 2 - .../web/admin/lib/lang/fr_package_install.lng | 2 - .../web/admin/lib/lang/fr_remote_action.lng | 4 +- .../web/admin/lib/lang/fr_remote_user.lng | 2 - .../admin/lib/lang/fr_remote_user_list.lng | 2 - interface/web/admin/lib/lang/fr_server.lng | 2 - .../web/admin/lib/lang/fr_server_config.lng | 6 +- .../admin/lib/lang/fr_server_config_list.lng | 2 - interface/web/admin/lib/lang/fr_server_ip.lng | 2 - .../web/admin/lib/lang/fr_server_ip_list.lng | 2 - .../web/admin/lib/lang/fr_server_list.lng | 2 - .../lib/lang/fr_software_package_install.lng | 2 - .../lib/lang/fr_software_package_list.lng | 2 - .../web/admin/lib/lang/fr_software_repo.lng | 2 - .../admin/lib/lang/fr_software_repo_list.lng | 2 - .../lib/lang/fr_software_update_list.lng | 2 - .../web/admin/lib/lang/fr_system_config.lng | 2 - interface/web/admin/lib/lang/fr_users.lng | 2 - .../web/admin/lib/lang/fr_users_list.lng | 2 - interface/web/admin/lib/lang/hr.lng | 4 +- interface/web/admin/lib/lang/hr_firewall.lng | 16 +- .../web/admin/lib/lang/hr_firewall_list.lng | 8 +- interface/web/admin/lib/lang/hr_groups.lng | 6 +- .../web/admin/lib/lang/hr_groups_list.lng | 10 +- interface/web/admin/lib/lang/hr_iptables.lng | 20 +- .../web/admin/lib/lang/hr_iptables_list.lng | 22 +- .../web/admin/lib/lang/hr_language_add.lng | 12 +- .../admin/lib/lang/hr_language_complete.lng | 10 +- .../web/admin/lib/lang/hr_language_edit.lng | 12 +- .../web/admin/lib/lang/hr_language_export.lng | 8 +- .../web/admin/lib/lang/hr_language_import.lng | 12 +- .../web/admin/lib/lang/hr_language_list.lng | 10 +- .../web/admin/lib/lang/hr_package_install.lng | 8 +- .../web/admin/lib/lang/hr_remote_action.lng | 18 +- .../web/admin/lib/lang/hr_remote_user.lng | 82 ++--- .../admin/lib/lang/hr_remote_user_list.lng | 8 +- interface/web/admin/lib/lang/hr_server.lng | 16 +- .../web/admin/lib/lang/hr_server_config.lng | 86 ++--- .../admin/lib/lang/hr_server_config_list.lng | 2 +- interface/web/admin/lib/lang/hr_server_ip.lng | 16 +- .../web/admin/lib/lang/hr_server_ip_list.lng | 12 +- .../web/admin/lib/lang/hr_server_list.lng | 6 +- .../lib/lang/hr_software_package_install.lng | 8 +- .../lib/lang/hr_software_package_list.lng | 14 +- .../web/admin/lib/lang/hr_software_repo.lng | 8 +- .../admin/lib/lang/hr_software_repo_list.lng | 6 +- .../lib/lang/hr_software_update_list.lng | 12 +- .../web/admin/lib/lang/hr_system_config.lng | 50 +-- interface/web/admin/lib/lang/hr_users.lng | 50 +-- .../web/admin/lib/lang/hr_users_list.lng | 14 +- .../web/admin/lib/lang/hu_remote_action.lng | 2 + .../web/admin/lib/lang/hu_server_config.lng | 4 + .../web/admin/lib/lang/id_remote_action.lng | 2 + .../web/admin/lib/lang/id_server_config.lng | 4 + .../web/admin/lib/lang/it_remote_action.lng | 2 + .../web/admin/lib/lang/it_server_config.lng | 4 + .../web/admin/lib/lang/ja_remote_action.lng | 2 + .../web/admin/lib/lang/ja_server_config.lng | 4 + .../web/admin/lib/lang/nl_remote_action.lng | 2 + .../web/admin/lib/lang/nl_server_config.lng | 4 + interface/web/admin/lib/lang/pl.lng | 1 - interface/web/admin/lib/lang/pl_firewall.lng | 1 - .../web/admin/lib/lang/pl_firewall_list.lng | 1 - interface/web/admin/lib/lang/pl_groups.lng | 1 - .../web/admin/lib/lang/pl_groups_list.lng | 1 - interface/web/admin/lib/lang/pl_iptables.lng | 1 - .../web/admin/lib/lang/pl_iptables_list.lng | 1 - .../web/admin/lib/lang/pl_language_add.lng | 1 - .../admin/lib/lang/pl_language_complete.lng | 1 - .../web/admin/lib/lang/pl_language_edit.lng | 1 - .../web/admin/lib/lang/pl_language_export.lng | 1 - .../web/admin/lib/lang/pl_language_import.lng | 1 - .../web/admin/lib/lang/pl_language_list.lng | 1 - .../web/admin/lib/lang/pl_package_install.lng | 1 - .../web/admin/lib/lang/pl_remote_action.lng | 3 +- .../web/admin/lib/lang/pl_remote_user.lng | 1 - .../admin/lib/lang/pl_remote_user_list.lng | 1 - interface/web/admin/lib/lang/pl_server.lng | 1 - .../web/admin/lib/lang/pl_server_config.lng | 5 +- .../admin/lib/lang/pl_server_config_list.lng | 1 - interface/web/admin/lib/lang/pl_server_ip.lng | 1 - .../web/admin/lib/lang/pl_server_ip_list.lng | 1 - .../web/admin/lib/lang/pl_server_list.lng | 1 - .../lib/lang/pl_software_package_install.lng | 1 - .../lib/lang/pl_software_package_list.lng | 1 - .../web/admin/lib/lang/pl_software_repo.lng | 1 - .../admin/lib/lang/pl_software_repo_list.lng | 1 - .../lib/lang/pl_software_update_list.lng | 1 - .../web/admin/lib/lang/pl_system_config.lng | 1 - interface/web/admin/lib/lang/pl_users.lng | 1 - .../web/admin/lib/lang/pl_users_list.lng | 1 - .../web/admin/lib/lang/pt_remote_action.lng | 2 + .../web/admin/lib/lang/pt_server_config.lng | 4 + .../web/admin/lib/lang/ro_remote_action.lng | 2 + .../web/admin/lib/lang/ro_server_config.lng | 4 + .../web/admin/lib/lang/ru_remote_action.lng | 2 + .../web/admin/lib/lang/ru_server_config.lng | 4 + .../web/admin/lib/lang/se_remote_action.lng | 2 + .../web/admin/lib/lang/se_server_config.lng | 4 + .../web/admin/lib/lang/sk_remote_action.lng | 2 + .../web/admin/lib/lang/sk_server_config.lng | 4 + .../web/admin/lib/lang/tr_remote_action.lng | 2 + .../web/admin/lib/lang/tr_server_config.lng | 4 + interface/web/admin/lib/module.conf.php | 4 +- .../web/admin/remote_action_ispcupdate.php | 7 +- .../templates/remote_action_ispcupdate.htm | 8 + .../templates/server_config_web_edit.htm | 22 ++ interface/web/client/client_edit.php | 14 +- interface/web/client/form/client.tform.php | 6 + interface/web/client/form/reseller.tform.php | 6 + interface/web/client/lib/lang/ar.lng | 2 + interface/web/client/lib/lang/ar_client.lng | 2 + interface/web/client/lib/lang/ar_reseller.lng | 2 + interface/web/client/lib/lang/bg.lng | 2 + interface/web/client/lib/lang/bg_client.lng | 2 + interface/web/client/lib/lang/bg_reseller.lng | 2 + interface/web/client/lib/lang/br.lng | 2 + interface/web/client/lib/lang/br_client.lng | 2 + interface/web/client/lib/lang/br_reseller.lng | 2 + interface/web/client/lib/lang/cz.lng | 2 + interface/web/client/lib/lang/cz_client.lng | 2 + interface/web/client/lib/lang/cz_reseller.lng | 2 + interface/web/client/lib/lang/de.lng | 2 + interface/web/client/lib/lang/de_client.lng | 2 + interface/web/client/lib/lang/de_reseller.lng | 2 + interface/web/client/lib/lang/el.lng | 1 + interface/web/client/lib/lang/el_client.lng | 1 + .../web/client/lib/lang/el_client_del.lng | 1 + .../client/lib/lang/el_client_template.lng | 1 + .../lib/lang/el_client_template_list.lng | 1 + .../web/client/lib/lang/el_clients_list.lng | 1 + interface/web/client/lib/lang/el_reseller.lng | 1 + .../web/client/lib/lang/el_resellers_list.lng | 1 + interface/web/client/lib/lang/en.lng | 3 +- interface/web/client/lib/lang/en_client.lng | 2 + interface/web/client/lib/lang/en_reseller.lng | 2 + interface/web/client/lib/lang/es.lng | 2 + interface/web/client/lib/lang/es_client.lng | 2 + interface/web/client/lib/lang/es_reseller.lng | 2 + interface/web/client/lib/lang/fi.lng | 2 + interface/web/client/lib/lang/fi_client.lng | 2 + interface/web/client/lib/lang/fi_reseller.lng | 2 + interface/web/client/lib/lang/fr.lng | 4 +- interface/web/client/lib/lang/fr_client.lng | 4 +- .../web/client/lib/lang/fr_client_del.lng | 2 - .../client/lib/lang/fr_client_template.lng | 2 - .../lib/lang/fr_client_template_list.lng | 2 - .../web/client/lib/lang/fr_clients_list.lng | 2 - interface/web/client/lib/lang/fr_reseller.lng | 4 +- .../web/client/lib/lang/fr_resellers_list.lng | 2 - interface/web/client/lib/lang/hr.lng | 24 +- interface/web/client/lib/lang/hr_client.lng | 204 ++++++------ .../web/client/lib/lang/hr_client_del.lng | 8 +- .../client/lib/lang/hr_client_template.lng | 140 ++++----- .../lib/lang/hr_client_template_list.lng | 6 +- .../web/client/lib/lang/hr_clients_list.lng | 14 +- interface/web/client/lib/lang/hr_reseller.lng | 206 ++++++------ .../web/client/lib/lang/hr_resellers_list.lng | 12 +- interface/web/client/lib/lang/hu.lng | 2 + interface/web/client/lib/lang/hu_client.lng | 2 + interface/web/client/lib/lang/hu_reseller.lng | 2 + interface/web/client/lib/lang/id.lng | 2 + interface/web/client/lib/lang/id_client.lng | 2 + interface/web/client/lib/lang/id_reseller.lng | 2 + interface/web/client/lib/lang/it.lng | 2 + interface/web/client/lib/lang/it_client.lng | 2 + interface/web/client/lib/lang/it_reseller.lng | 2 + interface/web/client/lib/lang/ja.lng | 2 + interface/web/client/lib/lang/ja_client.lng | 2 + interface/web/client/lib/lang/ja_reseller.lng | 2 + interface/web/client/lib/lang/nl.lng | 2 + interface/web/client/lib/lang/nl_client.lng | 2 + interface/web/client/lib/lang/nl_reseller.lng | 2 + interface/web/client/lib/lang/pl.lng | 3 +- interface/web/client/lib/lang/pl_client.lng | 3 +- .../web/client/lib/lang/pl_client_del.lng | 1 - .../client/lib/lang/pl_client_template.lng | 1 - .../lib/lang/pl_client_template_list.lng | 1 - .../web/client/lib/lang/pl_clients_list.lng | 1 - interface/web/client/lib/lang/pl_reseller.lng | 3 +- .../web/client/lib/lang/pl_resellers_list.lng | 1 - interface/web/client/lib/lang/pt.lng | 2 + interface/web/client/lib/lang/pt_client.lng | 2 + interface/web/client/lib/lang/pt_reseller.lng | 2 + interface/web/client/lib/lang/ro.lng | 2 + interface/web/client/lib/lang/ro_client.lng | 2 + interface/web/client/lib/lang/ro_reseller.lng | 2 + interface/web/client/lib/lang/ru.lng | 2 + interface/web/client/lib/lang/ru_client.lng | 2 + interface/web/client/lib/lang/ru_reseller.lng | 2 + interface/web/client/lib/lang/se.lng | 2 + interface/web/client/lib/lang/se_client.lng | 2 + interface/web/client/lib/lang/se_reseller.lng | 2 + interface/web/client/lib/lang/sk.lng | 2 + interface/web/client/lib/lang/sk_client.lng | 2 + interface/web/client/lib/lang/sk_reseller.lng | 2 + interface/web/client/lib/lang/tr.lng | 2 + interface/web/client/lib/lang/tr_client.lng | 2 + interface/web/client/lib/lang/tr_reseller.lng | 2 + interface/web/client/reseller_edit.php | 13 + .../client/templates/client_edit_limits.htm | 4 +- interface/web/dashboard/dashboard.php | 4 +- interface/web/dashboard/dashlets/modules.php | 6 +- .../web/dashboard/lib/custom_menu.inc.php | 2 + interface/web/dashboard/lib/lang/el.lng | 1 + .../dashboard/lib/lang/el_dashlet_limits.lng | 1 + .../dashboard/lib/lang/el_dashlet_modules.lng | 1 + interface/web/dashboard/lib/lang/fr.lng | 2 - .../dashboard/lib/lang/fr_dashlet_limits.lng | 45 ++- .../dashboard/lib/lang/fr_dashlet_modules.lng | 2 - .../dashboard/lib/lang/hr_dashlet_limits.lng | 8 +- interface/web/dashboard/lib/lang/pl.lng | 1 - .../dashboard/lib/lang/pl_dashlet_limits.lng | 1 - .../dashboard/lib/lang/pl_dashlet_modules.lng | 1 - interface/web/designer/lib/lang/el.lng | 1 + .../web/designer/lib/lang/el_form_edit.lng | 1 + .../web/designer/lib/lang/el_form_list.lng | 1 + .../web/designer/lib/lang/el_form_show.lng | 1 + .../web/designer/lib/lang/el_module_edit.lng | 1 + .../web/designer/lib/lang/el_module_list.lng | 1 + .../designer/lib/lang/el_module_nav_edit.lng | 1 + .../lib/lang/el_module_nav_item_edit.lng | 1 + .../web/designer/lib/lang/el_module_show.lng | 1 + interface/web/designer/lib/lang/fr.lng | 2 - .../web/designer/lib/lang/fr_form_edit.lng | 2 - .../web/designer/lib/lang/fr_form_list.lng | 2 - .../web/designer/lib/lang/fr_form_show.lng | 2 - .../web/designer/lib/lang/fr_module_edit.lng | 2 - .../web/designer/lib/lang/fr_module_list.lng | 2 - .../designer/lib/lang/fr_module_nav_edit.lng | 2 - .../lib/lang/fr_module_nav_item_edit.lng | 2 - .../web/designer/lib/lang/fr_module_show.lng | 2 - interface/web/designer/lib/lang/pl.lng | 1 - .../web/designer/lib/lang/pl_form_edit.lng | 1 - .../web/designer/lib/lang/pl_form_list.lng | 1 - .../web/designer/lib/lang/pl_form_show.lng | 1 - .../web/designer/lib/lang/pl_module_edit.lng | 1 - .../web/designer/lib/lang/pl_module_list.lng | 1 - .../designer/lib/lang/pl_module_nav_edit.lng | 1 - .../lib/lang/pl_module_nav_item_edit.lng | 1 - .../web/designer/lib/lang/pl_module_show.lng | 1 - interface/web/dns/lib/lang/ar.lng | 2 + interface/web/dns/lib/lang/bg.lng | 2 + interface/web/dns/lib/lang/br.lng | 2 + interface/web/dns/lib/lang/cz.lng | 2 + interface/web/dns/lib/lang/de.lng | 2 + interface/web/dns/lib/lang/el.lng | 1 + interface/web/dns/lib/lang/el_dns_a.lng | 1 + interface/web/dns/lib/lang/el_dns_a_list.lng | 1 + interface/web/dns/lib/lang/el_dns_aaaa.lng | 1 + interface/web/dns/lib/lang/el_dns_alias.lng | 1 + interface/web/dns/lib/lang/el_dns_cname.lng | 1 + interface/web/dns/lib/lang/el_dns_hinfo.lng | 1 + interface/web/dns/lib/lang/el_dns_mx.lng | 1 + interface/web/dns/lib/lang/el_dns_ns.lng | 1 + interface/web/dns/lib/lang/el_dns_ptr.lng | 1 + interface/web/dns/lib/lang/el_dns_rp.lng | 1 + interface/web/dns/lib/lang/el_dns_slave.lng | 1 + .../web/dns/lib/lang/el_dns_slave_list.lng | 1 + interface/web/dns/lib/lang/el_dns_soa.lng | 9 +- .../web/dns/lib/lang/el_dns_soa_list.lng | 1 + interface/web/dns/lib/lang/el_dns_srv.lng | 1 + .../web/dns/lib/lang/el_dns_template.lng | 1 + .../web/dns/lib/lang/el_dns_template_list.lng | 1 + interface/web/dns/lib/lang/el_dns_txt.lng | 1 + interface/web/dns/lib/lang/el_dns_wizard.lng | 1 + interface/web/dns/lib/lang/en.lng | 2 + interface/web/dns/lib/lang/es.lng | 2 + interface/web/dns/lib/lang/fi.lng | 2 + interface/web/dns/lib/lang/fr.lng | 4 +- interface/web/dns/lib/lang/fr_dns_a.lng | 1 - interface/web/dns/lib/lang/fr_dns_a_list.lng | 1 - interface/web/dns/lib/lang/fr_dns_aaaa.lng | 1 - interface/web/dns/lib/lang/fr_dns_alias.lng | 2 - interface/web/dns/lib/lang/fr_dns_cname.lng | 2 - interface/web/dns/lib/lang/fr_dns_hinfo.lng | 1 - interface/web/dns/lib/lang/fr_dns_mx.lng | 1 - interface/web/dns/lib/lang/fr_dns_ns.lng | 1 - interface/web/dns/lib/lang/fr_dns_ptr.lng | 1 - interface/web/dns/lib/lang/fr_dns_rp.lng | 1 - interface/web/dns/lib/lang/fr_dns_slave.lng | 1 - .../web/dns/lib/lang/fr_dns_slave_list.lng | 1 - interface/web/dns/lib/lang/fr_dns_soa.lng | 1 - .../web/dns/lib/lang/fr_dns_soa_list.lng | 1 - interface/web/dns/lib/lang/fr_dns_srv.lng | 1 - .../web/dns/lib/lang/fr_dns_template.lng | 1 - .../web/dns/lib/lang/fr_dns_template_list.lng | 1 - interface/web/dns/lib/lang/fr_dns_txt.lng | 1 - interface/web/dns/lib/lang/fr_dns_wizard.lng | 2 - interface/web/dns/lib/lang/hr.lng | 10 +- interface/web/dns/lib/lang/hr_dns_a.lng | 22 +- interface/web/dns/lib/lang/hr_dns_a_list.lng | 22 +- interface/web/dns/lib/lang/hr_dns_aaaa.lng | 4 +- interface/web/dns/lib/lang/hr_dns_alias.lng | 4 +- interface/web/dns/lib/lang/hr_dns_cname.lng | 4 +- interface/web/dns/lib/lang/hr_dns_mx.lng | 22 +- interface/web/dns/lib/lang/hr_dns_ns.lng | 4 +- interface/web/dns/lib/lang/hr_dns_ptr.lng | 4 +- interface/web/dns/lib/lang/hr_dns_slave.lng | 2 +- .../web/dns/lib/lang/hr_dns_slave_list.lng | 2 +- interface/web/dns/lib/lang/hr_dns_soa.lng | 2 +- .../web/dns/lib/lang/hr_dns_soa_list.lng | 2 +- interface/web/dns/lib/lang/hr_dns_srv.lng | 4 +- .../web/dns/lib/lang/hr_dns_template.lng | 2 +- interface/web/dns/lib/lang/hu.lng | 2 + interface/web/dns/lib/lang/id.lng | 2 + interface/web/dns/lib/lang/it.lng | 2 + interface/web/dns/lib/lang/ja.lng | 2 + interface/web/dns/lib/lang/nl.lng | 2 + interface/web/dns/lib/lang/pl.lng | 3 +- interface/web/dns/lib/lang/pl_dns_a.lng | 1 - interface/web/dns/lib/lang/pl_dns_a_list.lng | 1 - interface/web/dns/lib/lang/pl_dns_aaaa.lng | 1 - interface/web/dns/lib/lang/pl_dns_alias.lng | 1 - interface/web/dns/lib/lang/pl_dns_cname.lng | 1 - interface/web/dns/lib/lang/pl_dns_hinfo.lng | 1 - interface/web/dns/lib/lang/pl_dns_mx.lng | 1 - interface/web/dns/lib/lang/pl_dns_ns.lng | 1 - interface/web/dns/lib/lang/pl_dns_ptr.lng | 1 - interface/web/dns/lib/lang/pl_dns_rp.lng | 1 - interface/web/dns/lib/lang/pl_dns_slave.lng | 1 - .../web/dns/lib/lang/pl_dns_slave_list.lng | 1 - interface/web/dns/lib/lang/pl_dns_soa.lng | 1 - .../web/dns/lib/lang/pl_dns_soa_list.lng | 1 - interface/web/dns/lib/lang/pl_dns_srv.lng | 1 - .../web/dns/lib/lang/pl_dns_template.lng | 1 - .../web/dns/lib/lang/pl_dns_template_list.lng | 1 - interface/web/dns/lib/lang/pl_dns_txt.lng | 1 - interface/web/dns/lib/lang/pl_dns_wizard.lng | 1 - interface/web/dns/lib/lang/pt.lng | 2 + interface/web/dns/lib/lang/ro.lng | 2 + interface/web/dns/lib/lang/ru.lng | 2 + interface/web/dns/lib/lang/se.lng | 2 + interface/web/dns/lib/lang/sk.lng | 2 + interface/web/dns/lib/lang/tr.lng | 2 + interface/web/domain/lib/lang/el.lng | 1 + interface/web/domain/lib/lang/el_domain.lng | 1 + .../web/domain/lib/lang/el_domain_list.lng | 1 + interface/web/domain/lib/lang/fr.lng | 2 - interface/web/domain/lib/lang/fr_domain.lng | 2 - .../web/domain/lib/lang/fr_domain_list.lng | 2 - interface/web/domain/lib/lang/pl.lng | 1 - interface/web/domain/lib/lang/pl_domain.lng | 1 - .../web/domain/lib/lang/pl_domain_list.lng | 1 - interface/web/help/lib/lang/el.lng | 1 + interface/web/help/lib/lang/el_faq_form.lng | 1 + .../lib/lang/el_faq_manage_questions_list.lng | 1 + .../help/lib/lang/el_faq_sections_form.lng | 1 + .../web/help/lib/lang/el_help_faq_list.lng | 1 + .../lib/lang/el_help_faq_sections_list.lng | 1 + .../web/help/lib/lang/el_support_message.lng | 1 + .../help/lib/lang/el_support_message_list.lng | 1 + interface/web/help/lib/lang/fr.lng | 2 - interface/web/help/lib/lang/fr_faq_form.lng | 2 - .../lib/lang/fr_faq_manage_questions_list.lng | 2 - .../help/lib/lang/fr_faq_sections_form.lng | 2 - .../web/help/lib/lang/fr_help_faq_list.lng | 1 - .../lib/lang/fr_help_faq_sections_list.lng | 2 - .../web/help/lib/lang/fr_support_message.lng | 2 - .../help/lib/lang/fr_support_message_list.lng | 2 - interface/web/help/lib/lang/pl.lng | 1 - interface/web/help/lib/lang/pl_faq_form.lng | 1 - .../lib/lang/pl_faq_manage_questions_list.lng | 1 - .../help/lib/lang/pl_faq_sections_form.lng | 1 - .../web/help/lib/lang/pl_help_faq_list.lng | 1 - .../lib/lang/pl_help_faq_sections_list.lng | 1 - .../web/help/lib/lang/pl_support_message.lng | 1 - .../help/lib/lang/pl_support_message_list.lng | 1 - interface/web/login/lib/lang/el.lng | 1 + interface/web/login/lib/lang/fr.lng | 2 - interface/web/login/lib/lang/pl.lng | 1 - interface/web/mail/lib/lang/el.lng | 3 +- interface/web/mail/lib/lang/el_mail_alias.lng | 1 + .../web/mail/lib/lang/el_mail_alias_list.lng | 1 + .../web/mail/lib/lang/el_mail_aliasdomain.lng | 1 + .../lib/lang/el_mail_aliasdomain_list.lng | 1 + .../web/mail/lib/lang/el_mail_blacklist.lng | 1 + .../mail/lib/lang/el_mail_blacklist_list.lng | 1 + .../mail/lib/lang/el_mail_content_filter.lng | 1 + .../lib/lang/el_mail_content_filter_list.lng | 1 + .../web/mail/lib/lang/el_mail_domain.lng | 1 + .../lib/lang/el_mail_domain_admin_list.lng | 1 + .../mail/lib/lang/el_mail_domain_catchall.lng | 1 + .../lib/lang/el_mail_domain_catchall_list.lng | 1 + .../web/mail/lib/lang/el_mail_domain_list.lng | 1 + .../web/mail/lib/lang/el_mail_forward.lng | 1 + .../mail/lib/lang/el_mail_forward_list.lng | 1 + interface/web/mail/lib/lang/el_mail_get.lng | 1 + .../web/mail/lib/lang/el_mail_get_list.lng | 1 + .../web/mail/lib/lang/el_mail_mailinglist.lng | 1 + .../lib/lang/el_mail_mailinglist_list.lng | 1 + .../mail/lib/lang/el_mail_relay_recipient.lng | 1 + .../lib/lang/el_mail_relay_recipient_list.lng | 1 + .../web/mail/lib/lang/el_mail_spamfilter.lng | 1 + .../mail/lib/lang/el_mail_spamfilter_list.lng | 1 + .../web/mail/lib/lang/el_mail_transport.lng | 1 + .../mail/lib/lang/el_mail_transport_list.lng | 1 + interface/web/mail/lib/lang/el_mail_user.lng | 1 + .../web/mail/lib/lang/el_mail_user_filter.lng | 1 + .../lib/lang/el_mail_user_filter_list.lng | 1 + .../web/mail/lib/lang/el_mail_user_list.lng | 1 + .../mail/lib/lang/el_mail_user_stats_list.lng | 1 + .../web/mail/lib/lang/el_mail_whitelist.lng | 1 + .../mail/lib/lang/el_mail_whitelist_list.lng | 1 + .../mail/lib/lang/el_spamfilter_blacklist.lng | 1 + .../lib/lang/el_spamfilter_blacklist_list.lng | 1 + .../mail/lib/lang/el_spamfilter_config.lng | 1 + .../lib/lang/el_spamfilter_config_list.lng | 1 + .../mail/lib/lang/el_spamfilter_policy.lng | 1 + .../lib/lang/el_spamfilter_policy_list.lng | 1 + .../web/mail/lib/lang/el_spamfilter_users.lng | 1 + .../lib/lang/el_spamfilter_users_list.lng | 1 + .../mail/lib/lang/el_spamfilter_whitelist.lng | 1 + .../lib/lang/el_spamfilter_whitelist_list.lng | 1 + .../lib/lang/el_user_quota_stats_list.lng | 11 +- interface/web/mail/lib/lang/fr.lng | 2 - interface/web/mail/lib/lang/fr_mail_alias.lng | 2 - .../web/mail/lib/lang/fr_mail_alias_list.lng | 2 - .../web/mail/lib/lang/fr_mail_aliasdomain.lng | 2 - .../lib/lang/fr_mail_aliasdomain_list.lng | 2 - .../web/mail/lib/lang/fr_mail_blacklist.lng | 2 - .../mail/lib/lang/fr_mail_blacklist_list.lng | 2 - .../mail/lib/lang/fr_mail_content_filter.lng | 2 - .../lib/lang/fr_mail_content_filter_list.lng | 2 - .../web/mail/lib/lang/fr_mail_domain.lng | 2 - .../lib/lang/fr_mail_domain_admin_list.lng | 2 - .../mail/lib/lang/fr_mail_domain_catchall.lng | 2 - .../lib/lang/fr_mail_domain_catchall_list.lng | 2 - .../web/mail/lib/lang/fr_mail_domain_list.lng | 2 - .../web/mail/lib/lang/fr_mail_forward.lng | 2 - .../mail/lib/lang/fr_mail_forward_list.lng | 2 - interface/web/mail/lib/lang/fr_mail_get.lng | 2 - .../web/mail/lib/lang/fr_mail_get_list.lng | 2 - .../web/mail/lib/lang/fr_mail_mailinglist.lng | 2 - .../lib/lang/fr_mail_mailinglist_list.lng | 2 - .../mail/lib/lang/fr_mail_relay_recipient.lng | 2 - .../lib/lang/fr_mail_relay_recipient_list.lng | 2 - .../web/mail/lib/lang/fr_mail_spamfilter.lng | 2 - .../mail/lib/lang/fr_mail_spamfilter_list.lng | 2 - .../web/mail/lib/lang/fr_mail_transport.lng | 2 - .../mail/lib/lang/fr_mail_transport_list.lng | 2 - .../web/mail/lib/lang/fr_mail_user_filter.lng | 2 - .../lib/lang/fr_mail_user_filter_list.lng | 2 - .../web/mail/lib/lang/fr_mail_user_list.lng | 2 - .../mail/lib/lang/fr_mail_user_stats_list.lng | 2 - .../web/mail/lib/lang/fr_mail_whitelist.lng | 2 - .../mail/lib/lang/fr_mail_whitelist_list.lng | 2 - .../mail/lib/lang/fr_spamfilter_blacklist.lng | 2 - .../lib/lang/fr_spamfilter_blacklist_list.lng | 2 - .../mail/lib/lang/fr_spamfilter_config.lng | 2 - .../lib/lang/fr_spamfilter_config_list.lng | 2 - .../mail/lib/lang/fr_spamfilter_policy.lng | 2 - .../lib/lang/fr_spamfilter_policy_list.lng | 2 - .../web/mail/lib/lang/fr_spamfilter_users.lng | 2 - .../lib/lang/fr_spamfilter_users_list.lng | 2 - .../mail/lib/lang/fr_spamfilter_whitelist.lng | 2 - .../lib/lang/fr_spamfilter_whitelist_list.lng | 2 - .../lib/lang/fr_user_quota_stats_list.lng | 2 - interface/web/mail/lib/lang/hr.lng | 2 +- interface/web/mail/lib/lang/hr_mail_alias.lng | 4 +- .../web/mail/lib/lang/hr_mail_alias_list.lng | 2 +- .../web/mail/lib/lang/hr_mail_aliasdomain.lng | 2 +- .../lib/lang/hr_mail_aliasdomain_list.lng | 2 +- .../web/mail/lib/lang/hr_mail_blacklist.lng | 4 +- .../mail/lib/lang/hr_mail_blacklist_list.lng | 4 +- .../mail/lib/lang/hr_mail_content_filter.lng | 2 +- .../lib/lang/hr_mail_content_filter_list.lng | 2 +- .../web/mail/lib/lang/hr_mail_domain.lng | 6 +- .../lib/lang/hr_mail_domain_admin_list.lng | 4 +- .../mail/lib/lang/hr_mail_domain_catchall.lng | 4 +- .../lib/lang/hr_mail_domain_catchall_list.lng | 4 +- .../web/mail/lib/lang/hr_mail_domain_list.lng | 4 +- .../web/mail/lib/lang/hr_mail_forward.lng | 4 +- .../mail/lib/lang/hr_mail_forward_list.lng | 2 +- interface/web/mail/lib/lang/hr_mail_get.lng | 8 +- .../web/mail/lib/lang/hr_mail_get_list.lng | 4 +- .../web/mail/lib/lang/hr_mail_mailinglist.lng | 4 +- .../lib/lang/hr_mail_mailinglist_list.lng | 2 +- .../mail/lib/lang/hr_mail_relay_recipient.lng | 4 +- .../lib/lang/hr_mail_relay_recipient_list.lng | 2 +- .../web/mail/lib/lang/hr_mail_spamfilter.lng | 2 +- .../mail/lib/lang/hr_mail_spamfilter_list.lng | 2 +- .../web/mail/lib/lang/hr_mail_transport.lng | 6 +- .../mail/lib/lang/hr_mail_transport_list.lng | 4 +- interface/web/mail/lib/lang/hr_mail_user.lng | 10 +- .../web/mail/lib/lang/hr_mail_user_filter.lng | 2 +- .../web/mail/lib/lang/hr_mail_whitelist.lng | 4 +- .../mail/lib/lang/hr_mail_whitelist_list.lng | 4 +- .../mail/lib/lang/hr_spamfilter_blacklist.lng | 2 +- .../lib/lang/hr_spamfilter_blacklist_list.lng | 2 +- .../mail/lib/lang/hr_spamfilter_whitelist.lng | 2 +- .../lib/lang/hr_spamfilter_whitelist_list.lng | 2 +- interface/web/mail/lib/lang/pl.lng | 1 - interface/web/mail/lib/lang/pl_mail_alias.lng | 1 - .../web/mail/lib/lang/pl_mail_alias_list.lng | 1 - .../web/mail/lib/lang/pl_mail_aliasdomain.lng | 1 - .../lib/lang/pl_mail_aliasdomain_list.lng | 1 - .../web/mail/lib/lang/pl_mail_blacklist.lng | 1 - .../mail/lib/lang/pl_mail_blacklist_list.lng | 1 - .../mail/lib/lang/pl_mail_content_filter.lng | 1 - .../lib/lang/pl_mail_content_filter_list.lng | 1 - .../web/mail/lib/lang/pl_mail_domain.lng | 1 - .../lib/lang/pl_mail_domain_admin_list.lng | 1 - .../mail/lib/lang/pl_mail_domain_catchall.lng | 1 - .../lib/lang/pl_mail_domain_catchall_list.lng | 1 - .../web/mail/lib/lang/pl_mail_domain_list.lng | 1 - .../web/mail/lib/lang/pl_mail_forward.lng | 1 - .../mail/lib/lang/pl_mail_forward_list.lng | 1 - interface/web/mail/lib/lang/pl_mail_get.lng | 1 - .../web/mail/lib/lang/pl_mail_get_list.lng | 1 - .../web/mail/lib/lang/pl_mail_mailinglist.lng | 1 - .../lib/lang/pl_mail_mailinglist_list.lng | 1 - .../mail/lib/lang/pl_mail_relay_recipient.lng | 1 - .../lib/lang/pl_mail_relay_recipient_list.lng | 1 - .../web/mail/lib/lang/pl_mail_spamfilter.lng | 1 - .../mail/lib/lang/pl_mail_spamfilter_list.lng | 1 - .../web/mail/lib/lang/pl_mail_transport.lng | 1 - .../mail/lib/lang/pl_mail_transport_list.lng | 1 - interface/web/mail/lib/lang/pl_mail_user.lng | 1 - .../web/mail/lib/lang/pl_mail_user_filter.lng | 1 - .../lib/lang/pl_mail_user_filter_list.lng | 1 - .../web/mail/lib/lang/pl_mail_user_list.lng | 1 - .../mail/lib/lang/pl_mail_user_stats_list.lng | 1 - .../web/mail/lib/lang/pl_mail_whitelist.lng | 1 - .../mail/lib/lang/pl_mail_whitelist_list.lng | 1 - .../mail/lib/lang/pl_spamfilter_blacklist.lng | 1 - .../lib/lang/pl_spamfilter_blacklist_list.lng | 1 - .../mail/lib/lang/pl_spamfilter_config.lng | 1 - .../lib/lang/pl_spamfilter_config_list.lng | 1 - .../mail/lib/lang/pl_spamfilter_policy.lng | 1 - .../lib/lang/pl_spamfilter_policy_list.lng | 1 - .../web/mail/lib/lang/pl_spamfilter_users.lng | 1 - .../lib/lang/pl_spamfilter_users_list.lng | 1 - .../mail/lib/lang/pl_spamfilter_whitelist.lng | 1 - .../lib/lang/pl_spamfilter_whitelist_list.lng | 1 - .../lib/lang/pl_user_quota_stats_list.lng | 1 - interface/web/mail/mail_user_edit.php | 3 +- interface/web/mail/mail_user_filter_del.php | 3 + interface/web/monitor/lib/lang/el.lng | 3 +- .../web/monitor/lib/lang/el_syslog_list.lng | 1 + interface/web/monitor/lib/lang/fr.lng | 296 +++++++++--------- .../web/monitor/lib/lang/fr_datalog_list.lng | 2 - .../web/monitor/lib/lang/fr_syslog_list.lng | 2 - interface/web/monitor/lib/lang/hr.lng | 44 +-- interface/web/monitor/lib/lang/pl.lng | 1 - .../web/monitor/lib/lang/pl_datalog_list.lng | 1 - .../web/monitor/lib/lang/pl_syslog_list.lng | 1 - interface/web/monitor/show_sys_state.php | 2 +- interface/web/sites/database_phpmyadmin.php | 12 +- interface/web/sites/form/database.tform.php | 3 +- .../web/sites/form/web_aliasdomain.tform.php | 4 +- interface/web/sites/form/web_domain.tform.php | 2 +- .../web/sites/form/web_subdomain.tform.php | 2 +- interface/web/sites/lib/lang/el.lng | 1 + interface/web/sites/lib/lang/el_cron.lng | 1 + interface/web/sites/lib/lang/el_cron_list.lng | 1 + interface/web/sites/lib/lang/el_database.lng | 1 + .../sites/lib/lang/el_database_admin_list.lng | 1 + .../web/sites/lib/lang/el_database_list.lng | 1 + interface/web/sites/lib/lang/el_ftp_user.lng | 1 + .../web/sites/lib/lang/el_ftp_user_list.lng | 1 + .../web/sites/lib/lang/el_shell_user.lng | 1 + .../web/sites/lib/lang/el_shell_user_list.lng | 1 + .../lib/lang/el_user_quota_stats_list.lng | 1 + .../lib/lang/el_web_aliasdomain_list.lng | 1 + .../web/sites/lib/lang/el_web_domain.lng | 7 +- .../lib/lang/el_web_domain_admin_list.lng | 1 + .../web/sites/lib/lang/el_web_domain_list.lng | 1 + .../web/sites/lib/lang/el_web_folder.lng | 1 + .../web/sites/lib/lang/el_web_folder_list.lng | 1 + .../web/sites/lib/lang/el_web_folder_user.lng | 1 + .../lib/lang/el_web_folder_user_list.lng | 1 + .../lib/lang/el_web_sites_stats_list.lng | 1 + .../web/sites/lib/lang/el_web_subdomain.lng | 1 + .../sites/lib/lang/el_web_subdomain_list.lng | 1 + .../web/sites/lib/lang/el_webdav_user.lng | 1 + .../sites/lib/lang/el_webdav_user_list.lng | 1 + interface/web/sites/lib/lang/fr.lng | 14 +- interface/web/sites/lib/lang/fr_cron.lng | 2 - interface/web/sites/lib/lang/fr_cron_list.lng | 2 - interface/web/sites/lib/lang/fr_database.lng | 48 ++- .../sites/lib/lang/fr_database_admin_list.lng | 2 - .../web/sites/lib/lang/fr_database_list.lng | 2 - interface/web/sites/lib/lang/fr_ftp_user.lng | 2 - .../web/sites/lib/lang/fr_ftp_user_list.lng | 2 - .../web/sites/lib/lang/fr_shell_user.lng | 2 - .../web/sites/lib/lang/fr_shell_user_list.lng | 2 - .../lib/lang/fr_user_quota_stats_list.lng | 2 - .../lib/lang/fr_web_aliasdomain_list.lng | 2 - .../web/sites/lib/lang/fr_web_domain.lng | 2 - .../lib/lang/fr_web_domain_admin_list.lng | 2 - .../web/sites/lib/lang/fr_web_domain_list.lng | 2 - .../web/sites/lib/lang/fr_web_folder.lng | 2 - .../web/sites/lib/lang/fr_web_folder_list.lng | 2 - .../web/sites/lib/lang/fr_web_folder_user.lng | 2 - .../lib/lang/fr_web_folder_user_list.lng | 2 - .../lib/lang/fr_web_sites_stats_list.lng | 2 - .../web/sites/lib/lang/fr_web_subdomain.lng | 2 - .../sites/lib/lang/fr_web_subdomain_list.lng | 2 - .../web/sites/lib/lang/fr_webdav_user.lng | 2 - .../sites/lib/lang/fr_webdav_user_list.lng | 2 - interface/web/sites/lib/lang/hr_cron.lng | 2 +- interface/web/sites/lib/lang/hr_cron_list.lng | 4 +- interface/web/sites/lib/lang/hr_database.lng | 4 +- .../web/sites/lib/lang/hr_database_list.lng | 2 +- interface/web/sites/lib/lang/hr_ftp_user.lng | 8 +- .../web/sites/lib/lang/hr_ftp_user_list.lng | 10 +- .../web/sites/lib/lang/hr_shell_user.lng | 6 +- .../web/sites/lib/lang/hr_shell_user_list.lng | 4 +- .../lib/lang/hr_web_aliasdomain_list.lng | 8 +- .../web/sites/lib/lang/hr_web_domain.lng | 6 +- .../lib/lang/hr_web_domain_admin_list.lng | 4 +- .../web/sites/lib/lang/hr_web_domain_list.lng | 8 +- .../web/sites/lib/lang/hr_web_folder.lng | 4 +- .../web/sites/lib/lang/hr_web_folder_list.lng | 4 +- .../web/sites/lib/lang/hr_web_folder_user.lng | 10 +- .../lib/lang/hr_web_folder_user_list.lng | 4 +- .../lib/lang/hr_web_sites_stats_list.lng | 12 +- .../web/sites/lib/lang/hr_web_subdomain.lng | 6 +- .../sites/lib/lang/hr_web_subdomain_list.lng | 10 +- .../web/sites/lib/lang/hr_webdav_user.lng | 8 +- .../sites/lib/lang/hr_webdav_user_list.lng | 6 +- interface/web/sites/lib/lang/pl.lng | 1 - interface/web/sites/lib/lang/pl_cron.lng | 1 - interface/web/sites/lib/lang/pl_cron_list.lng | 1 - interface/web/sites/lib/lang/pl_database.lng | 1 - .../sites/lib/lang/pl_database_admin_list.lng | 1 - .../web/sites/lib/lang/pl_database_list.lng | 1 - interface/web/sites/lib/lang/pl_ftp_user.lng | 1 - .../web/sites/lib/lang/pl_ftp_user_list.lng | 1 - .../web/sites/lib/lang/pl_shell_user.lng | 1 - .../web/sites/lib/lang/pl_shell_user_list.lng | 1 - .../lib/lang/pl_user_quota_stats_list.lng | 1 - .../lib/lang/pl_web_aliasdomain_list.lng | 1 - .../web/sites/lib/lang/pl_web_domain.lng | 1 - .../lib/lang/pl_web_domain_admin_list.lng | 1 - .../web/sites/lib/lang/pl_web_domain_list.lng | 1 - .../web/sites/lib/lang/pl_web_folder.lng | 1 - .../web/sites/lib/lang/pl_web_folder_list.lng | 1 - .../web/sites/lib/lang/pl_web_folder_user.lng | 1 - .../lib/lang/pl_web_folder_user_list.lng | 1 - .../lib/lang/pl_web_sites_stats_list.lng | 1 - .../web/sites/lib/lang/pl_web_subdomain.lng | 1 - .../sites/lib/lang/pl_web_subdomain_list.lng | 1 - .../web/sites/lib/lang/pl_webdav_user.lng | 1 - .../sites/lib/lang/pl_webdav_user_list.lng | 1 - interface/web/sites/web_aliasdomain_edit.php | 27 +- .../lib/lang/el_strengthmeter.lng | 1 + .../lib/lang/pl_strengthmeter.lng | 1 - .../default/css/screen/content_ispc.css | 3 + .../web/themes/default/templates/main.tpl.htm | 2 +- interface/web/tools/lib/lang/ar.lng | 2 + interface/web/tools/lib/lang/bg.lng | 2 + interface/web/tools/lib/lang/br.lng | 2 + interface/web/tools/lib/lang/cz.lng | 2 + interface/web/tools/lib/lang/de.lng | 2 + interface/web/tools/lib/lang/el.lng | 1 + .../web/tools/lib/lang/el_usersettings.lng | 1 + interface/web/tools/lib/lang/en.lng | 2 + interface/web/tools/lib/lang/es.lng | 2 + interface/web/tools/lib/lang/fi.lng | 2 + interface/web/tools/lib/lang/fr.lng | 4 +- .../web/tools/lib/lang/fr_usersettings.lng | 2 - interface/web/tools/lib/lang/hr.lng | 4 +- interface/web/tools/lib/lang/hu.lng | 2 + interface/web/tools/lib/lang/id.lng | 2 + interface/web/tools/lib/lang/it.lng | 2 + interface/web/tools/lib/lang/ja.lng | 2 + interface/web/tools/lib/lang/nl.lng | 2 + interface/web/tools/lib/lang/pl.lng | 3 +- .../web/tools/lib/lang/pl_usersettings.lng | 1 - interface/web/tools/lib/lang/pt.lng | 2 + interface/web/tools/lib/lang/ro.lng | 2 + interface/web/tools/lib/lang/ru.lng | 2 + interface/web/tools/lib/lang/se.lng | 2 + interface/web/tools/lib/lang/sk.lng | 2 + interface/web/tools/lib/lang/tr.lng | 2 + interface/web/vm/lib/lang/el.lng | 1 + .../web/vm/lib/lang/el_openvz_action.lng | 1 + interface/web/vm/lib/lang/el_openvz_ip.lng | 1 + .../web/vm/lib/lang/el_openvz_ip_list.lng | 1 + .../web/vm/lib/lang/el_openvz_ostemplate.lng | 1 + .../vm/lib/lang/el_openvz_ostemplate_list.lng | 1 + .../web/vm/lib/lang/el_openvz_template.lng | 1 + .../vm/lib/lang/el_openvz_template_list.lng | 1 + interface/web/vm/lib/lang/el_openvz_vm.lng | 1 + .../web/vm/lib/lang/el_openvz_vm_list.lng | 1 + interface/web/vm/lib/lang/fr.lng | 2 - .../web/vm/lib/lang/fr_openvz_action.lng | 2 - interface/web/vm/lib/lang/fr_openvz_ip.lng | 2 - .../web/vm/lib/lang/fr_openvz_ip_list.lng | 2 - .../web/vm/lib/lang/fr_openvz_ostemplate.lng | 2 - .../vm/lib/lang/fr_openvz_ostemplate_list.lng | 2 - .../web/vm/lib/lang/fr_openvz_template.lng | 2 - .../vm/lib/lang/fr_openvz_template_list.lng | 2 - interface/web/vm/lib/lang/fr_openvz_vm.lng | 2 - .../web/vm/lib/lang/fr_openvz_vm_list.lng | 2 - interface/web/vm/lib/lang/hr.lng | 8 +- .../web/vm/lib/lang/hr_openvz_action.lng | 12 +- interface/web/vm/lib/lang/hr_openvz_ip.lng | 14 +- .../web/vm/lib/lang/hr_openvz_ip_list.lng | 6 +- .../web/vm/lib/lang/hr_openvz_ostemplate.lng | 2 +- .../vm/lib/lang/hr_openvz_ostemplate_list.lng | 8 +- .../web/vm/lib/lang/hr_openvz_template.lng | 2 +- .../vm/lib/lang/hr_openvz_template_list.lng | 6 +- interface/web/vm/lib/lang/hr_openvz_vm.lng | 2 +- .../web/vm/lib/lang/hr_openvz_vm_list.lng | 14 +- interface/web/vm/lib/lang/pl.lng | 1 - .../web/vm/lib/lang/pl_openvz_action.lng | 1 - interface/web/vm/lib/lang/pl_openvz_ip.lng | 1 - .../web/vm/lib/lang/pl_openvz_ip_list.lng | 1 - .../vm/lib/lang/pl_openvz_ostemplate_list.lng | 1 - .../web/vm/lib/lang/pl_openvz_template.lng | 1 - .../vm/lib/lang/pl_openvz_template_list.lng | 1 - interface/web/vm/lib/lang/pl_openvz_vm.lng | 1 - .../web/vm/lib/lang/pl_openvz_vm_list.lng | 1 - .../examples/sites_web_domain_add.php | 4 +- server/conf/awstats_index.php.master | 53 ++-- server/conf/bastille-firewall.cfg.master | 2 +- server/conf/nginx_vhost.conf.master | 4 + server/cron_daily.php | 13 +- server/lib/app.inc.php | 3 + server/lib/classes/db_mysql.inc.php | 20 +- server/lib/classes/monitor_tools.inc.php | 10 +- .../plugins-available/apache2_plugin.inc.php | 102 ++++-- server/plugins-available/bind_plugin.inc.php | 24 +- .../mysql_clientdb_plugin.inc.php | 13 +- server/plugins-available/nginx_plugin.inc.php | 214 ++++++++----- .../shelluser_base_plugin.inc.php | 54 ++-- .../shelluser_jailkit_plugin.inc.php | 137 ++++---- .../scripts/create_daily_nginx_access_logs.sh | 2 +- 839 files changed, 2410 insertions(+), 1935 deletions(-) diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 51f2dff82..a3da18abf 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -718,6 +718,7 @@ class installer_dist extends installer_base { $content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{language}', $conf['language'], $content); + $content = str_replace('{timezone}', $conf['timezone'], $content); wf("$install_dir/interface/lib/$configfile", $content); @@ -740,6 +741,7 @@ class installer_dist extends installer_base { $content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{language}', $conf['language'], $content); + $content = str_replace('{timezone}', $conf['timezone'], $content); wf("$install_dir/server/lib/$configfile", $content); @@ -1029,7 +1031,7 @@ class installer_dist extends installer_base { // Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail replaceLine('/etc/sudoers','Defaults requiretty','#Defaults requiretty',0,0); - if(is_file($install_dir.'/interface/invoices')) { + if(is_dir($install_dir.'/interface/invoices')) { chmod($install_dir.'/interface/invoices', 0770); chown($install_dir.'/interface/invoices', 'ispconfig'); chgrp($install_dir.'/interface/invoices', 'ispconfig'); diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index c5fdad0e7..5b9d5bf08 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -733,6 +733,7 @@ class installer extends installer_base $content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{language}', $conf['language'], $content); + $content = str_replace('{timezone}', $conf['timezone'], $content); $this->write_config_file("$install_dir/interface/lib/$configfile", $content); @@ -866,7 +867,7 @@ class installer extends installer_base chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root'); } - if(is_file($install_dir.'/interface/invoices')) { + if(is_dir($install_dir.'/interface/invoices')) { chmod($install_dir.'/interface/invoices', 0770); chown($install_dir.'/interface/invoices', 'ispconfig'); chgrp($install_dir.'/interface/invoices', 'ispconfig'); diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index eed222634..7b51cac33 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -756,6 +756,7 @@ class installer_dist extends installer_base { $content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{language}', $conf['language'], $content); + $content = str_replace('{timezone}', $conf['timezone'], $content); wf("$install_dir/interface/lib/$configfile", $content); @@ -778,6 +779,7 @@ class installer_dist extends installer_base { $content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{language}', $conf['language'], $content); + $content = str_replace('{timezone}', $conf['timezone'], $content); wf("$install_dir/server/lib/$configfile", $content); @@ -1060,7 +1062,7 @@ class installer_dist extends installer_base { exec('chmod 744 /usr/local/bin/run-getmail.sh'); } - if(is_file($install_dir.'/interface/invoices')) { + if(is_dir($install_dir.'/interface/invoices')) { chmod($install_dir.'/interface/invoices', 0770); chown($install_dir.'/interface/invoices', 'ispconfig'); chgrp($install_dir.'/interface/invoices', 'ispconfig'); diff --git a/install/install.php b/install/install.php index a31efbce0..0255c12aa 100644 --- a/install/install.php +++ b/install/install.php @@ -102,8 +102,9 @@ if(is_dir('/usr/local/ispconfig')) { //** Detect the installed applications $inst->find_installed_apps(); -//** Select the language +//** Select the language and set default timezone $conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en'); +$conf['timezone'] = 'UTC'; //** Select installation mode $install_mode = $inst->simple_query('Installation mode', array('standard','expert'), 'standard'); @@ -127,6 +128,12 @@ do { $tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']); $tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']); + if($install_mode == 'expert') { + swriteln("The next two questions are about the internal ISPConfig database user and password.\nIt is recommended to accept the defaults which are 'ispconfig' as username and a random password.\nIf you use a different password, use only numbers and chars for the password.\n"); + $conf['mysql']['ispconfig_user'] = $inst->free_query('ISPConfig mysql database username', $conf['mysql']['ispconfig_user']); + $conf['mysql']['ispconfig_password'] = $inst->free_query('ISPConfig mysql database password', $conf['mysql']['ispconfig_password']); + } + //* Initialize the MySQL server connection if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) { $conf['mysql']['host'] = $tmp_mysql_server_host; diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index c47d7e303..7508ad4c3 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1608,6 +1608,7 @@ class installer_base { $content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{language}', $conf['language'], $content); + $content = str_replace('{timezone}', $conf['timezone'], $content); wf($install_dir.'/interface/lib/'.$configfile, $content); @@ -1630,6 +1631,7 @@ class installer_base { $content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{language}', $conf['language'], $content); + $content = str_replace('{timezone}', $conf['timezone'], $content); wf($install_dir.'/server/lib/'.$configfile, $content); @@ -1763,7 +1765,7 @@ class installer_base { chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root'); } - if(is_file($install_dir.'/interface/invoices')) { + if(is_dir($install_dir.'/interface/invoices')) { chmod($install_dir.'/interface/invoices', 0770); chown($install_dir.'/interface/invoices', 'ispconfig'); chgrp($install_dir.'/interface/invoices', 'ispconfig'); diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php index 729ee04d8..5a3c9bbaf 100644 --- a/install/lib/update.lib.php +++ b/install/lib/update.lib.php @@ -56,7 +56,11 @@ function prepareDBDump() { //if(filesize('existing_db.sql') < 30000) die('Possible problem with dumping the database. We will stop here. Please check the file existing_db.sql'); // create a backup copy of the ispconfig database in the root folder - $backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_h-i').'.sql'; + if(isset($conf['backup_path'])) { + $backup_db_name = $conf['backup_path'].'/ispconfig_db_backup.sql'; + } else { + $backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_H-i').'.sql'; + } copy('existing_db.sql',$backup_db_name); chmod($backup_db_name, 0700); chown($backup_db_name, 'root'); @@ -164,6 +168,7 @@ function updateDbAndIni() { //* update the database version in server table $inst->db->query("UPDATE ".$conf["mysql"]["database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']); + if($inst->db->dbHost != $inst->dbmaster->dbHost) $inst->dbmaster->query("UPDATE ".$conf["mysql"]["master_database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']); //* If ISPConfig Version < 3.0.3, we will do a full db update @@ -207,6 +212,7 @@ function updateDbAndIni() { //* update the database version in server table $inst->db->query("UPDATE ".$conf["mysql"]["database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']); + if($inst->db->dbHost != $inst->dbmaster->dbHost) $inst->dbmaster->query("UPDATE ".$conf["mysql"]["master_database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']); if ($conf['powerdns']['installed']) { @@ -276,7 +282,7 @@ function updateDbAndIni() { $tpl_ini_array['global']['webserver'] = 'nginx'; } - // update the new template with the old values + //* update the new template with the old values if(is_array($old_ini_array)) { foreach($old_ini_array as $tmp_section_name => $tmp_section_content) { foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) { @@ -288,6 +294,11 @@ function updateDbAndIni() { $new_ini = array_to_ini($tpl_ini_array); $sql = "UPDATE ".$conf["mysql"]["database"].".server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']; $inst->db->query($sql); + + if($inst->db->dbHost != $inst->dbmaster->dbHost) { + $sql = "UPDATE ".$conf["mysql"]["master_database"].".server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']; + $inst->dbmaster->query($sql); + } unset($old_ini_array); unset($tpl_ini_array); unset($new_ini); diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 11d1b6c65..9c2d5cfaa 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1919,6 +1919,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, -- Dumping data for table `sys_config` -- -INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.1'); +INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.2'); SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/install/tpl/bastille-firewall.cfg.master b/install/tpl/bastille-firewall.cfg.master index e43d0df1d..728a731dc 100644 --- a/install/tpl/bastille-firewall.cfg.master +++ b/install/tpl/bastille-firewall.cfg.master @@ -75,7 +75,7 @@ DNS_SERVERS="{DNS_SERVERS}" # use the "\" continuation character (so Bastille can change the # values if it is run more than once) TRUSTED_IFACES="lo" # MINIMAL/SAFEST -PUBLIC_IFACES="eth+ ppp+ slip+ venet+" # SAFEST +PUBLIC_IFACES="eth+ ppp+ slip+ venet+ bond+" # SAFEST INTERNAL_IFACES="" # SAFEST diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index a6abb12a6..75fa92e2b 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision); //** Application define('ISPC_APP_TITLE', 'ISPConfig'); -define('ISPC_APP_VERSION', '3.0.4.1'); +define('ISPC_APP_VERSION', '3.0.4.2'); define('DEVSYSTEM', 0); @@ -148,9 +148,10 @@ $conf['theme'] = 'default'; $conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ... $conf['logo'] = 'themes/default/images/ispc_logo.png'; -//** Default Language +//** Default Language and Timezone $conf['language'] = '{language}'; $conf['debug_language'] = false; +$conf['timezone'] = '{timezone}'; //** Misc. diff --git a/install/tpl/debian6_dovecot.conf.master b/install/tpl/debian6_dovecot.conf.master index d9088d86a..2b82ba70b 100644 --- a/install/tpl/debian6_dovecot.conf.master +++ b/install/tpl/debian6_dovecot.conf.master @@ -12,6 +12,9 @@ log_timestamp = "%Y-%m-%d %H:%M:%S " # ssl_cert_file = /etc/ssl/_.my-domain.tld/_.my-domain.tld.crt # ssl_key_file = /etc/ssl/_.my-domain.tld/_.my-domain.tld.key +ssl_cert_file = /etc/postfix/smtpd.cert +ssl_key_file = /etc/postfix/smtpd.key + mail_privileged_group = mail login_greeting = ISPConfig3 IMAP server ready... diff --git a/install/tpl/debian_dovecot.conf.master b/install/tpl/debian_dovecot.conf.master index d32537b8a..9eca0e174 100644 --- a/install/tpl/debian_dovecot.conf.master +++ b/install/tpl/debian_dovecot.conf.master @@ -99,6 +99,9 @@ log_timestamp = "%Y-%m-%d %H:%M:%S " #ssl_cert_file = /etc/ssl/certs/dovecot.pem #ssl_key_file = /etc/ssl/private/dovecot.pem +ssl_cert_file = /etc/postfix/smtpd.cert +ssl_key_file = /etc/postfix/smtpd.key + # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. #ssl_key_password = diff --git a/install/tpl/fedora_dovecot.conf.master b/install/tpl/fedora_dovecot.conf.master index 7dfcc3ee2..a49244d7f 100644 --- a/install/tpl/fedora_dovecot.conf.master +++ b/install/tpl/fedora_dovecot.conf.master @@ -87,7 +87,7 @@ log_timestamp = "%Y-%m-%d %H:%M:%S " #ssl_listen = # SSL/TLS support: yes, no, required. -#ssl = yes +ssl = yes # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before # dropping root privileges, so keep the key file unreadable by anyone but @@ -96,6 +96,9 @@ log_timestamp = "%Y-%m-%d %H:%M:%S " #ssl_cert_file = /etc/pki/dovecot/certs/dovecot.pem #ssl_key_file = /etc/pki/dovecot/private/dovecot.pem +ssl_cert_file = /etc/postfix/smtpd.cert +ssl_key_file = /etc/postfix/smtpd.key + # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. Since this file is often # world-readable, you may want to place this setting instead to a different diff --git a/install/tpl/mm_cfg.py.master b/install/tpl/mm_cfg.py.master index 9ec47a727..9501c61b9 100644 --- a/install/tpl/mm_cfg.py.master +++ b/install/tpl/mm_cfg.py.master @@ -57,7 +57,7 @@ MAILMAN_SITE_LIST = 'mailman' #------------------------------------------------------------- # If you change these, you have to configure your http server # accordingly (Alias and ScriptAlias directives in most httpds) -DEFAULT_URL_PATTERN = 'http://%s/cgi-bin/mailman/' +DEFAULT_URL_PATTERN = 'https://%s/cgi-bin/mailman/' PRIVATE_ARCHIVE_URL = '/cgi-bin/mailman/private' IMAGE_LOGOS = '/images/mailman/' diff --git a/install/tpl/opensuse_dovecot.conf.master b/install/tpl/opensuse_dovecot.conf.master index 1ee8934a3..287e96a4d 100644 --- a/install/tpl/opensuse_dovecot.conf.master +++ b/install/tpl/opensuse_dovecot.conf.master @@ -103,6 +103,9 @@ ssl = no #ssl_cert_file = /etc/ssl/certs/dovecot.pem #ssl_key_file = /etc/ssl/private/dovecot.pem +ssl_cert_file = /etc/postfix/smtpd.cert +ssl_key_file = /etc/postfix/smtpd.key + # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. Since this file is often # world-readable, you may want to place this setting instead to a different diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index 8817e0003..71e61e6cb 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -45,7 +45,7 @@ vhost_conf_dir=/etc/apache2/sites-available vhost_conf_enabled_dir=/etc/apache2/sites-enabled nginx_vhost_conf_dir=/etc/nginx/sites-available nginx_vhost_conf_enabled_dir=/etc/nginx/sites-enabled -security_level=10 +security_level=20 user=www-data group=www-data nginx_user=www-data @@ -69,6 +69,10 @@ php_fpm_ini_path=/etc/php5/fpm/php.ini php_fpm_pool_dir=/etc/php5/fpm/pool.d php_fpm_start_port=9010 php_fpm_socket_dir=/var/lib/php5-fpm +set_folder_permissions_on_update=y +add_web_users_to_sshusers_group=y +connect_userid_to_webid=n +connect_userid_to_webid_start=10000 [dns] bind_user=root diff --git a/install/update.php b/install/update.php index 769cdce59..87866582f 100644 --- a/install/update.php +++ b/install/update.php @@ -96,6 +96,8 @@ $conf["mysql"]["ispconfig_user"] = $conf_old["db_user"]; $conf["mysql"]["ispconfig_password"] = $conf_old["db_password"]; $conf['language'] = $conf_old['language']; if($conf['language'] == '{language}') $conf['language'] = 'en'; +$conf['timezone'] = $conf_old['timezone']; +if($conf['timezone'] == '{timezone}' or trim($conf['timezone']) == '') $conf['timezone'] = 'UTC'; if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"]; if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"]; @@ -119,7 +121,32 @@ $inst->is_update = true; //** Detect the installed applications $inst->find_installed_apps(); -echo "This application will update ISPConfig 3 on your server.\n"; +echo "This application will update ISPConfig 3 on your server.\n\n"; + +//* Make a backup before we start the update +$do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in /var/backup/ now?', array('yes','no'),'yes'); +if($do_backup == 'yes') { + + //* Create the backup directory + $backup_path = '/var/backup/ispconfig_'.date('Y-m-d_H-i'); + $conf['backup_path'] = $backup_path; + exec("mkdir -p $backup_path"); + exec("chown root:root $backup_path"); + exec("chmod 700 $backup_path"); + + //* Do the backup + swriteln('Creating backup of "/usr/local/ispconfig" directory...'); + exec("tar pcfz $backup_path/ispconfig_software.tar.gz /usr/local/ispconfig 2> /dev/null",$out,$returnvar); + if($returnvar != 0) die("Backup failed. We stop here...\n"); + + swriteln('Creating backup of "/etc" directory...'); + exec("tar pcfz $backup_path/etc.tar.gz /etc 2> /dev/null",$out,$returnvar); + if($returnvar != 0) die("Backup failed. We stop here...\n"); + + exec("chown root:root $backup_path/*.tar.gz"); + exec("chmod 700 $backup_path/*.tar.gz"); +} + //** Initialize the MySQL server connection include_once('lib/mysql.lib.php'); diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php index 7e0d10a25..7fa8c034e 100755 --- a/interface/lib/app.inc.php +++ b/interface/lib/app.inc.php @@ -28,12 +28,20 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +//* Enable gzip compression for the interface +ob_start('ob_gzhandler'); + +//* Set timezone +if(isset($conf['timezone']) && $conf['timezone'] != '') date_default_timezone_set($conf['timezone']); + +//* Set error reporting level when we are not on a developer system +if(DEVSYSTEM == 0) { + @ini_set('error_reporting', E_ALL & ~E_NOTICE & ~E_DEPRECATED); +} + /* Application Class */ - -ob_start('ob_gzhandler'); - class app { private $_language_inc = 0; @@ -233,6 +241,7 @@ class app { /* Show username */ if(isset($_SESSION['s']['user'])) { $this->tpl->setVar('cpuser', $_SESSION['s']['user']['username']); + $this->tpl->setVar('logout_txt', $this->lng('logout_txt')); } } diff --git a/interface/lib/classes/plugin.inc.php b/interface/lib/classes/plugin.inc.php index 910cc5705..1cc9a06c3 100644 --- a/interface/lib/classes/plugin.inc.php +++ b/interface/lib/classes/plugin.inc.php @@ -136,7 +136,7 @@ class plugin { global $app; //* execute the functions for the events - if(is_array($_SESSION['s']['plugin_cache'][$event_name])) { + if(@is_array($_SESSION['s']['plugin_cache'][$event_name])) { foreach($_SESSION['s']['plugin_cache'][$event_name] as $rec) { $plugin_name = $rec['plugin']; $function_name = $rec['function']; diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php index 318b26870..26199c243 100644 --- a/interface/lib/classes/remoting.inc.php +++ b/interface/lib/classes/remoting.inc.php @@ -2158,6 +2158,11 @@ class remoting { $sql = $app->remoting_lib->getSQL($params,'INSERT',0); $app->db->query($sql); + //* Check if no system user with that username exists + $username = $app->db->quote($params["username"]); + $tmp = $app->db->queryOneRecord("SELECT count(userid) as number FROm sys_user WHERE username = '$username'"); + if($tmp['number'] > 0) $app->remoting_lib->errorMessage .= "Duplicate username
"; + if($app->remoting_lib->errorMessage != '') { $this->server->fault('data_processing_error', $app->remoting_lib->errorMessage); return false; diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php index a9dd87016..06d5dfd7b 100644 --- a/interface/lib/classes/remoting_lib.inc.php +++ b/interface/lib/classes/remoting_lib.inc.php @@ -208,7 +208,13 @@ class remoting_lib { break; case 'INTEGER': - $new_record[$key] = intval($record[$key]); + //* We use + 0 to force the string to be a number as + //* intval return value is too limited on 32bit systems + if(intval($record[$key]) == 2147483647) { + $new_record[$key] = $record[$key] + 0; + } else { + $new_record[$key] = intval($record[$key]); + } break; case 'DOUBLE': diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index 324d5b87e..561016259 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -364,7 +364,12 @@ class tform { $record = $this->decode($record,$tab); if(is_array($record)) { foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) { - $val = $record[$key]; + + if(isset($record[$key])) { + $val = $record[$key]; + } else { + $val = ''; + } // If Datasource is set, get the data from there if(isset($field['datasource']) && is_array($field['datasource'])) { @@ -478,7 +483,11 @@ class tform { break; default: + if(isset($record[$key])) { $new_record[$key] = htmlspecialchars($record[$key]); + } else { + $new_record[$key] = ''; + } } } } diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php index fc94da8ff..40de43259 100644 --- a/interface/lib/config.inc.php +++ b/interface/lib/config.inc.php @@ -45,6 +45,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision); //** Application define('ISPC_APP_TITLE', 'ISPConfig'); define('ISPC_APP_VERSION', '3.0.2'); +define('DEVSYSTEM', 0); //** Database diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng index 20b68a8b6..07ebf5383 100644 --- a/interface/lib/lang/ar.lng +++ b/interface/lib/lang/ar.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_sep'] = 'Sep'; $wb['monthnamesshort_oct'] = 'Oct'; $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng index 734f134f9..3e99a70fc 100644 --- a/interface/lib/lang/bg.lng +++ b/interface/lib/lang/bg.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_sep'] = 'Sep'; $wb['monthnamesshort_oct'] = 'Oct'; $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng index 89e7a51b0..98ed94a84 100644 --- a/interface/lib/lang/br.lng +++ b/interface/lib/lang/br.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng index 72379d57e..4963dbaae 100644 --- a/interface/lib/lang/cz.lng +++ b/interface/lib/lang/cz.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng index f2f208d47..fbb5207ea 100644 --- a/interface/lib/lang/de.lng +++ b/interface/lib/lang/de.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dez'; $wb['datepicker_nextText'] = 'Vor'; $wb['datepicker_prevText'] = 'Zurück'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng index add04e6a4..77b75bb5b 100644 --- a/interface/lib/lang/el.lng +++ b/interface/lib/lang/el.lng @@ -69,3 +69,4 @@ $wb['monthnamesshort_nov'] = "Νοε"; $wb['monthnamesshort_dec'] = "Δεκ"; ?> + diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index 00d54e79d..302b3e890 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -39,6 +39,7 @@ $wb['top_menu_dashboard'] = 'Home'; $wb['top_menu_vm'] = 'VServer'; $wb['toolsarea_head_txt'] = 'Tools'; $wb['latest_news_txt'] = 'Latest news'; +$wb['logout_txt'] = "LOGOUT"; $wb['daynamesmin_su'] = "Su"; $wb['daynamesmin_mo'] = "Mo"; $wb['daynamesmin_tu'] = "Tu"; diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng index 137711fcb..5c4627a1c 100644 --- a/interface/lib/lang/es.lng +++ b/interface/lib/lang/es.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng index 8e96384a5..45615bc06 100755 --- a/interface/lib/lang/fi.lng +++ b/interface/lib/lang/fi.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng index f0c885af5..c75f32b86 100644 --- a/interface/lib/lang/fr.lng +++ b/interface/lib/lang/fr.lng @@ -67,5 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Suivant'; $wb['datepicker_prevText'] = 'Précédent'; +$wb['logout_txt'] = 'LOGOUT'; ?> - diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng index 937d88a3e..5ff48ac16 100644 --- a/interface/lib/lang/hr.lng +++ b/interface/lib/lang/hr.lng @@ -17,7 +17,7 @@ $wb['page_next_txt'] = 'Naprijed'; $wb['page_back_txt'] = 'Natrag'; $wb['delete_txt'] = 'Obriši'; $wb['filter_txt'] = 'Filter'; -$wb['add_new_record_txt'] = 'Dodaj novi zapis'; +$wb['add_new_record_txt'] = 'Dodaj'; $wb['btn_save_txt'] = 'Spremi'; $wb['btn_cancel_txt'] = 'Natrag'; $wb['top_menu_system'] = 'Sistem'; @@ -39,32 +39,33 @@ $wb['error_1001'] = 'Korisničko ime i šifra ne mogu biti prazni!'; $wb['error_1002'] = 'Korisničko ime i/ili šifra nisu ispravni!'; $wb['error_1003'] = 'Korisničko ime je deaktivirano!'; $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['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['daynamesmin_su'] = 'Ned'; +$wb['daynamesmin_mo'] = 'Pon'; +$wb['daynamesmin_tu'] = 'Uto'; +$wb['daynamesmin_we'] = 'Sri'; +$wb['daynamesmin_th'] = 'Čet'; +$wb['daynamesmin_fr'] = 'Pet'; +$wb['daynamesmin_sa'] = 'Sub'; +$wb['daynames_sunday'] = 'Nedjelja'; +$wb['daynames_monday'] = 'Ponedjeljak'; +$wb['daynames_tuesday'] = 'Utorak'; +$wb['daynames_wednesday'] = 'Srijeda'; +$wb['daynames_thursday'] = 'Četvrtak'; +$wb['daynames_friday'] = 'Petak'; +$wb['daynames_saturday'] = 'Subota'; +$wb['monthnamesshort_jan'] = 'Sij'; +$wb['monthnamesshort_feb'] = 'Velj'; +$wb['monthnamesshort_mar'] = 'Ožu'; +$wb['monthnamesshort_apr'] = 'Tra'; +$wb['monthnamesshort_may'] = 'Svi'; +$wb['monthnamesshort_jun'] = 'Lip'; +$wb['monthnamesshort_jul'] = 'Srp'; +$wb['monthnamesshort_aug'] = 'Kol'; +$wb['monthnamesshort_sep'] = 'Ruj'; +$wb['monthnamesshort_oct'] = 'Lis'; +$wb['monthnamesshort_nov'] = 'Stu'; +$wb['monthnamesshort_dec'] = 'Pro'; +$wb['datepicker_nextText'] = 'Naprijed'; +$wb['datepicker_prevText'] = 'Natrag'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng index 0b7ee93f4..de6cf262d 100644 --- a/interface/lib/lang/hu.lng +++ b/interface/lib/lang/hu.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng index 91a7d9d2b..9a9cf11c2 100644 --- a/interface/lib/lang/id.lng +++ b/interface/lib/lang/id.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng index 772267ac0..92e7ebf3f 100644 --- a/interface/lib/lang/it.lng +++ b/interface/lib/lang/it.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng index 8dfcc29a7..cd23480e9 100644 --- a/interface/lib/lang/ja.lng +++ b/interface/lib/lang/ja.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_sep'] = 'Sep'; $wb['monthnamesshort_oct'] = 'Oct'; $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng index 73d07207d..badb322b5 100644 --- a/interface/lib/lang/nl.lng +++ b/interface/lib/lang/nl.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng index 5741bccbe..d2319c77c 100644 --- a/interface/lib/lang/pl.lng +++ b/interface/lib/lang/pl.lng @@ -67,5 +67,5 @@ $wb['monthnamesshort_nov'] = 'Lis'; $wb['monthnamesshort_dec'] = 'Gru'; $wb['datepicker_nextText'] = 'Nast'; $wb['datepicker_prevText'] = 'Poprz'; +$wb['logout_txt'] = 'LOGOUT'; ?> - diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng index 0b5cdb17d..846979d61 100644 --- a/interface/lib/lang/pt.lng +++ b/interface/lib/lang/pt.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng index e85d2d1cb..12ff91e4d 100644 --- a/interface/lib/lang/ro.lng +++ b/interface/lib/lang/ro.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng index 54ee29144..0568b5e04 100644 --- a/interface/lib/lang/ru.lng +++ b/interface/lib/lang/ru.lng @@ -1,70 +1,70 @@ - + \ No newline at end of file diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng index 104ba9c6e..3664fa2c3 100644 --- a/interface/lib/lang/se.lng +++ b/interface/lib/lang/se.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng index d9a40a99a..4e9f0b0bf 100644 --- a/interface/lib/lang/sk.lng +++ b/interface/lib/lang/sk.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng index ffbb86161..fdfca9c42 100644 --- a/interface/lib/lang/tr.lng +++ b/interface/lib/lang/tr.lng @@ -67,4 +67,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; +$wb['logout_txt'] = 'LOGOUT'; ?> diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php index 3b6252412..7b22da89d 100644 --- a/interface/lib/plugins/mail_user_filter_plugin.inc.php +++ b/interface/lib/plugins/mail_user_filter_plugin.inc.php @@ -46,7 +46,7 @@ class mail_user_filter_plugin { $app->plugin->registerEvent('mail:mail_user_filter:on_after_insert','mail_user_filter_plugin','mail_user_filter_edit'); $app->plugin->registerEvent('mail:mail_user_filter:on_after_update','mail_user_filter_plugin','mail_user_filter_edit'); - + $app->plugin->registerEvent('mail:mail_user_filter:on_after_delete','mail_user_filter_plugin','mail_user_filter_del'); } @@ -89,6 +89,30 @@ class mail_user_filter_plugin { } + function mail_user_filter_del($event_name,$page_form) { + global $app, $conf; + + $mailuser = $app->db->queryOneRecord("SELECT custom_mailfilter FROM mail_user WHERE mailuser_id = ".$page_form->dataRecord["mailuser_id"]); + $skip = false; + $lines = explode("\n",$mailuser['custom_mailfilter']); + $out = ''; + + foreach($lines as $line) { + $line = trim($line); + if($line == '### BEGIN FILTER_ID:'.$page_form->id) { + $skip = true; + } + if($skip == false && $line != '') $out .= $line ."\n"; + if($line == '### END FILTER_ID:'.$page_form->id) { + $skip = false; + } + } + + $out = mysql_real_escape_string($out); + $app->db->datalogUpdate('mail_user', "custom_mailfilter = '$out'", 'mailuser_id', $page_form->dataRecord["mailuser_id"]); + } + + /* private function to create the mail filter rules in maildrop or sieve format. */ diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index f9ec365db..027328def 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -440,6 +440,18 @@ $form["tabs"]['web'] = array( 'default' => '20', 'value' => array('10' => 'Medium', '20' => 'High') ), + 'set_folder_permissions_on_update' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n', 1 => 'y') + ), + 'add_web_users_to_sshusers_group' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n', 1 => 'y') + ), 'check_apache_config' => array( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', @@ -474,6 +486,23 @@ $form["tabs"]['web'] = array( 'width' => '40', 'maxlength' => '255' ), + 'connect_userid_to_webid' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n', 1 => 'y') + ), + 'connect_userid_to_webid_start' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '10000', + 'validators' => array(0 => array('type' => 'ISINT', + 'errmsg' => 'connect_userid_to_webid_startid_isint'), + ), + 'value' => '', + 'width' => '40', + 'maxlength' => '255' + ), 'nginx_user' => array( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', diff --git a/interface/web/admin/form/server_ip.tform.php b/interface/web/admin/form/server_ip.tform.php index a6d9bcf57..1bc21d515 100644 --- a/interface/web/admin/form/server_ip.tform.php +++ b/interface/web/admin/form/server_ip.tform.php @@ -100,9 +100,9 @@ $form["tabs"]['server_ip'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT client_id,contact_name FROM client WHERE {AUTHSQL} ORDER BY contact_name', + 'querystring' => "SELECT client_id,CONCAT(contact_name,' :: ',username) as name FROM client WHERE {AUTHSQL} ORDER BY contact_name", 'keyfield'=> 'client_id', - 'valuefield'=> 'contact_name' + 'valuefield'=> 'name' ), 'value' => array(0 => ' ') ), diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php index 1ac69887d..5c071a380 100644 --- a/interface/web/admin/language_complete.php +++ b/interface/web/admin/language_complete.php @@ -137,8 +137,8 @@ function merge_langfile($langfile,$masterfile) { $file_content = " $val) { - $val = str_replace("'",'',$val); - $val = str_replace('"','',$val); + $val = str_replace("'","\\'",$val); + $val = str_replace('"','\\"',$val); $file_content .= '$wb['."'$key'".'] = '."'$val';\n"; } $file_content .= "?>\n"; diff --git a/interface/web/admin/lib/lang/ar_remote_action.lng b/interface/web/admin/lib/lang/ar_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/ar_remote_action.lng +++ b/interface/web/admin/lib/lang/ar_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index 44f4f74f4..0cc0b92b8 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/bg_remote_action.lng b/interface/web/admin/lib/lang/bg_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/bg_remote_action.lng +++ b/interface/web/admin/lib/lang/bg_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 1d570d4c9..7d15039d3 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/br_remote_action.lng b/interface/web/admin/lib/lang/br_remote_action.lng index a455c10d9..d6578c9d6 100644 --- a/interface/web/admin/lib/lang/br_remote_action.lng +++ b/interface/web/admin/lib/lang/br_remote_action.lng @@ -7,4 +7,6 @@ $wb['do_ispcupdate_caption'] = 'Faça uma atualização do ISPConfig 3 no servid $wb['do_ispcupdate_desc'] = 'Esta ação fará uma atualização do ISPConfig3 no servidor selecionado.

UTILIZE POR SUA CONTA E RISCO!'; $wb['action_scheduled'] = 'Esta ação está agendada para execução'; $wb['select_all_server'] = 'Todos os servidores'; +$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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index 64f7056ef..d57c4e063 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/cz_remote_action.lng +++ b/interface/web/admin/lib/lang/cz_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index 2518aba18..0d23e13e6 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/de_remote_action.lng b/interface/web/admin/lib/lang/de_remote_action.lng index fee0b06d5..0c7a704ff 100644 --- a/interface/web/admin/lib/lang/de_remote_action.lng +++ b/interface/web/admin/lib/lang/de_remote_action.lng @@ -7,4 +7,6 @@ $wb['do_ispcupdate_caption'] = 'ISPConfig 3 - Update auf entferntem Server ausf $wb['do_ispcupdate_desc'] = 'Diese Aktion wird ein Update des ISPConfig3-Systems auf Ihrem ausgewählten Server ausführen.

DIES GESCHIEHT AUF IHRE EIGENE VERANTWORTUNG!'; $wb['action_scheduled'] = 'Die Aktion wurde zur Ausführung vorgemerkt'; $wb['select_all_server'] = 'Alle 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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 71bc79fb1..fd78f1bce 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mysql_txt'] = 'Deaktiviere MySQL Monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere Email Monitoring'; $wb['rescue_description_txt'] = 'Information: Falls Sie MySQL stoppen möchten, wählen Sie die "Deaktiviere MySQL Monitoring" Checkbox und warten Sie 2-3 Minuten.
Falls Sie nicht 2-3 Minuten warten, wird Rescue versuchen, MySQL neu zu starten!'; $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'; ?> diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng index 732f71645..6941af26e 100644 --- a/interface/web/admin/lib/lang/el.lng +++ b/interface/web/admin/lib/lang/el.lng @@ -5,7 +5,7 @@ $wb['groups_description'] = 'Φόρμα επεξεργασίας ομάδων χ $wb['Server'] = 'Server'; $wb['Services'] = 'Υπηρεσίες'; $wb['Config'] = 'Ρυθμίσεις'; -$wb['Server Config'] = 'Ρύθμιση Server'; +$wb['Server Config'] = 'Ρυθμίσεις Server'; $wb['Mail'] = 'Mail'; $wb['Getmail'] = 'Getmail'; $wb['Web'] = 'Web'; @@ -42,3 +42,4 @@ $wb['1001'] = 'Το όνομα χρήστη ή το συνθηματικό εί $wb['1002'] = 'Το όνομα χρήστη ή το συνθηματικό είναι λάθος.'; ?> + diff --git a/interface/web/admin/lib/lang/el_firewall.lng b/interface/web/admin/lib/lang/el_firewall.lng index 83260ed3a..c19e09ea5 100644 --- a/interface/web/admin/lib/lang/el_firewall.lng +++ b/interface/web/admin/lib/lang/el_firewall.lng @@ -10,3 +10,4 @@ $wb['tcp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπ $wb['udp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών udp. Επιτρέπονται μόνο αριθμοί, : και ,.'; ?> + diff --git a/interface/web/admin/lib/lang/el_firewall_list.lng b/interface/web/admin/lib/lang/el_firewall_list.lng index 91cab725f..67be85a08 100644 --- a/interface/web/admin/lib/lang/el_firewall_list.lng +++ b/interface/web/admin/lib/lang/el_firewall_list.lng @@ -7,3 +7,4 @@ $wb['udp_port_txt'] = 'Ανοιχτές θύρες UDP'; $wb['add_new_record_txt'] = 'Νέα εγγραφή Firewall'; ?> + diff --git a/interface/web/admin/lib/lang/el_groups.lng b/interface/web/admin/lib/lang/el_groups.lng index b50df7981..3a81b5130 100644 --- a/interface/web/admin/lib/lang/el_groups.lng +++ b/interface/web/admin/lib/lang/el_groups.lng @@ -4,3 +4,4 @@ $wb['name_txt'] = 'Ομάδα'; $wb['name_err'] = 'Η ομάδα πρέπει να έχει από 1 μέχρι 30 χαρακτήρες.'; ?> + diff --git a/interface/web/admin/lib/lang/el_groups_list.lng b/interface/web/admin/lib/lang/el_groups_list.lng index 10ce5ebce..602293589 100644 --- a/interface/web/admin/lib/lang/el_groups_list.lng +++ b/interface/web/admin/lib/lang/el_groups_list.lng @@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Νέα ομάδα'; $wb['warning_txt'] = 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ:Μην επεξεργάζεστε οποιαδήποτε ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!'; ?> + diff --git a/interface/web/admin/lib/lang/el_iptables.lng b/interface/web/admin/lib/lang/el_iptables.lng index 9236d4778..aea9270ad 100644 --- a/interface/web/admin/lib/lang/el_iptables.lng +++ b/interface/web/admin/lib/lang/el_iptables.lng @@ -12,3 +12,4 @@ $wb['active_txt'] = 'Ενεργή'; $wb['iptables_error_unique'] = 'Υπάρχει ήδη μια εγγραφή του firewall για αυτόν τον server.'; ?> + diff --git a/interface/web/admin/lib/lang/el_iptables_list.lng b/interface/web/admin/lib/lang/el_iptables_list.lng index a2da45d82..ebe13105f 100644 --- a/interface/web/admin/lib/lang/el_iptables_list.lng +++ b/interface/web/admin/lib/lang/el_iptables_list.lng @@ -14,3 +14,4 @@ $wb['active_txt'] = 'Ενεργός'; $wb['iptables_error_unique'] = 'Υπάρχει ήδη μια εγγραφή firewall για αυτόν τον server.'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_add.lng b/interface/web/admin/lib/lang/el_language_add.lng index f783f913c..f088dc7b9 100644 --- a/interface/web/admin/lib/lang/el_language_add.lng +++ b/interface/web/admin/lib/lang/el_language_add.lng @@ -7,3 +7,4 @@ $wb['btn_save_txt'] = 'Νέα ομάδα αρχείων γλώσσας'; $wb['btn_cancel_txt'] = 'Επιστροφή'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_complete.lng b/interface/web/admin/lib/lang/el_language_complete.lng index cf10cabc3..3da2a83c5 100644 --- a/interface/web/admin/lib/lang/el_language_complete.lng +++ b/interface/web/admin/lib/lang/el_language_complete.lng @@ -6,3 +6,4 @@ $wb['btn_save_txt'] = 'Συγχώνευση Γλώσσας τώρα'; $wb['btn_cancel_txt'] = 'Επιστροφή'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_edit.lng b/interface/web/admin/lib/lang/el_language_edit.lng index 6faa60e6b..0b92579f7 100644 --- a/interface/web/admin/lib/lang/el_language_edit.lng +++ b/interface/web/admin/lib/lang/el_language_edit.lng @@ -7,3 +7,4 @@ $wb['btn_save_txt'] = 'Αποθήκευση'; $wb['btn_cancel_txt'] = 'Επιστροφή'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_export.lng b/interface/web/admin/lib/lang/el_language_export.lng index 4ff092fc1..34700ed13 100644 --- a/interface/web/admin/lib/lang/el_language_export.lng +++ b/interface/web/admin/lib/lang/el_language_export.lng @@ -5,3 +5,4 @@ $wb['btn_save_txt'] = 'Εξαγωγή της επιλεγμένης λίστας $wb['btn_cancel_txt'] = 'Επιστροφή'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_import.lng b/interface/web/admin/lib/lang/el_language_import.lng index e30eb1ff3..58d31d8c8 100644 --- a/interface/web/admin/lib/lang/el_language_import.lng +++ b/interface/web/admin/lib/lang/el_language_import.lng @@ -7,3 +7,4 @@ $wb['btn_cancel_txt'] = 'Επιστροφή'; $wb['ignore_version_txt'] = 'Παράλειψη ελέγχου έκδοσης ISPConfig'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_list.lng b/interface/web/admin/lib/lang/el_language_list.lng index a9cfee171..c64843763 100644 --- a/interface/web/admin/lib/lang/el_language_list.lng +++ b/interface/web/admin/lib/lang/el_language_list.lng @@ -6,3 +6,4 @@ $wb['lang_file_txt'] = 'Αρχείο Γλώσσας'; $wb['lang_file_date_txt'] = 'Τελευταία τροποποίηση'; ?> + diff --git a/interface/web/admin/lib/lang/el_package_install.lng b/interface/web/admin/lib/lang/el_package_install.lng index 1c9858907..5bc9709d0 100644 --- a/interface/web/admin/lib/lang/el_package_install.lng +++ b/interface/web/admin/lib/lang/el_package_install.lng @@ -6,3 +6,4 @@ $wb['repo_password_txt'] = 'Συνθηματικό (προαιρετικό)'; $wb['active_txt'] = 'Ενεργό'; ?> + diff --git a/interface/web/admin/lib/lang/el_remote_action.lng b/interface/web/admin/lib/lang/el_remote_action.lng index 59b017c4c..d020ab55b 100644 --- a/interface/web/admin/lib/lang/el_remote_action.lng +++ b/interface/web/admin/lib/lang/el_remote_action.lng @@ -9,3 +9,4 @@ $wb['action_scheduled'] = 'Η ενέργεια προγραμματίστηκε $wb['select_all_server'] = 'Σε όλους τους servers'; ?> + diff --git a/interface/web/admin/lib/lang/el_remote_user.lng b/interface/web/admin/lib/lang/el_remote_user.lng index 4033a3425..c97916907 100644 --- a/interface/web/admin/lib/lang/el_remote_user.lng +++ b/interface/web/admin/lib/lang/el_remote_user.lng @@ -42,3 +42,4 @@ $wb['DNS txt functions'] = 'Ενέργειες εγγραφών txt του DNS'; $wb['Mail mailing list functions'] = 'Ενέργειες Mail mailinglist'; ?> + diff --git a/interface/web/admin/lib/lang/el_remote_user_list.lng b/interface/web/admin/lib/lang/el_remote_user_list.lng index 93fc165af..a40f3138e 100644 --- a/interface/web/admin/lib/lang/el_remote_user_list.lng +++ b/interface/web/admin/lib/lang/el_remote_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_remote_userid_txt'] = 'ID'; $wb['username_txt'] = 'Όνομα Χρήστη'; ?> + diff --git a/interface/web/admin/lib/lang/el_server.lng b/interface/web/admin/lib/lang/el_server.lng index 2f961c64c..34d620750 100644 --- a/interface/web/admin/lib/lang/el_server.lng +++ b/interface/web/admin/lib/lang/el_server.lng @@ -14,3 +14,4 @@ $wb['proxy_server_txt'] = 'Proxy-Server'; $wb['firewall_server_txt'] = 'Firewall-Server'; ?> + diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index 1f2a86e89..1fec2809f 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -87,7 +87,7 @@ $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['backup_dir_ftpread_txt'] = 'Backup dir. readable for website FTP users.'; +$wb['backup_dir_ftpread_txt'] = 'Δικαιώματα ανάγνωσης backup για τους χρήστες FTP του website.'; $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'; @@ -132,7 +132,7 @@ $wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applica $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['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'; @@ -143,11 +143,12 @@ $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'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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['try_rescue_txt'] = 'Ενεργοποίηση εποπτείας υπηρεσιών και επανεκκινησης σε περίπτωση αποτυχίας'; +$wb['do_not_try_rescue_mysql_txt'] = 'Απενεργοποίηση εποπτείας MySQL'; +$wb['do_not_try_rescue_mail_txt'] = 'Απενεργοποίηση εποπτείας Email'; +$wb['rescue_description_txt'] = 'Πληροφορία: Αν θέλετε να τερματίσετε την MySQL πρέπει να επιλέξετε την επιλογή Απενεργοποίηση εποπτείας MySQL και μετά να περιμένετε 2-3 λεπτά.
Αν δεν περιμένετε 2-3 λεπτά, η εποπτεία και αποκατάσταση θα προσπαθήσει να επανεκκινήσει την MySQL!'; +$wb['enable_sni_txt'] = 'Ενεργοποίηση SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Απενεργοποίηση εποπτείας HTTPD'; ?> + diff --git a/interface/web/admin/lib/lang/el_server_config_list.lng b/interface/web/admin/lib/lang/el_server_config_list.lng index e75bda011..a9f2d4fa5 100644 --- a/interface/web/admin/lib/lang/el_server_config_list.lng +++ b/interface/web/admin/lib/lang/el_server_config_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Ρυθμίσεις Server'; $wb['server_name_txt'] = 'Server'; ?> + diff --git a/interface/web/admin/lib/lang/el_server_ip.lng b/interface/web/admin/lib/lang/el_server_ip.lng index 00185a1f1..823b9f533 100644 --- a/interface/web/admin/lib/lang/el_server_ip.lng +++ b/interface/web/admin/lib/lang/el_server_ip.lng @@ -4,9 +4,10 @@ $wb['ip_address_txt'] = 'Διεύθυνση IP'; $wb['virtualhost_txt'] = 'HTTP NameVirtualHost'; $wb['ip_error_wrong'] = 'Η Διεύθυνση IP είναι άκυρη'; $wb['ip_error_unique'] = 'Η Διεύθυνση IP πρέπει να είναι μοναδική'; -$wb['client_id_txt'] = 'Client'; -$wb['ip_type_txt'] = 'Type'; -$wb['virtualhost_port_txt'] = 'HTTP Ports'; +$wb['client_id_txt'] = 'Πελάτης'; +$wb['ip_type_txt'] = 'Τύπος'; +$wb['virtualhost_port_txt'] = 'Θύρες HTTP'; $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/el_server_ip_list.lng b/interface/web/admin/lib/lang/el_server_ip_list.lng index f19dc824b..34221840b 100644 --- a/interface/web/admin/lib/lang/el_server_ip_list.lng +++ b/interface/web/admin/lib/lang/el_server_ip_list.lng @@ -9,3 +9,4 @@ $wb['virtualhost_port_txt'] = 'Θύρες HTTP'; $wb['ip_type_txt'] = 'Τύπος'; ?> + diff --git a/interface/web/admin/lib/lang/el_server_list.lng b/interface/web/admin/lib/lang/el_server_list.lng index 2f7b5695f..549e4cc99 100644 --- a/interface/web/admin/lib/lang/el_server_list.lng +++ b/interface/web/admin/lib/lang/el_server_list.lng @@ -12,3 +12,4 @@ $wb['proxy_server_txt'] = 'Proxy'; $wb['firewall_server_txt'] = 'Firewall'; ?> + diff --git a/interface/web/admin/lib/lang/el_software_package_install.lng b/interface/web/admin/lib/lang/el_software_package_install.lng index 5e1f63023..3a271dabd 100644 --- a/interface/web/admin/lib/lang/el_software_package_install.lng +++ b/interface/web/admin/lib/lang/el_software_package_install.lng @@ -5,3 +5,4 @@ $wb['btn_save_txt'] = 'Εκκίνηση εγκατάστασης'; $wb['btn_cancel_txt'] = 'Ακύρωση'; ?> + diff --git a/interface/web/admin/lib/lang/el_software_package_list.lng b/interface/web/admin/lib/lang/el_software_package_list.lng index f3e22fbf1..148c2331e 100644 --- a/interface/web/admin/lib/lang/el_software_package_list.lng +++ b/interface/web/admin/lib/lang/el_software_package_list.lng @@ -9,3 +9,4 @@ $wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακκέτων'; $wb['package_id_txt'] = 'τοπικό App-ID'; ?> + diff --git a/interface/web/admin/lib/lang/el_software_repo.lng b/interface/web/admin/lib/lang/el_software_repo.lng index d52666dec..9126fecb7 100644 --- a/interface/web/admin/lib/lang/el_software_repo.lng +++ b/interface/web/admin/lib/lang/el_software_repo.lng @@ -6,3 +6,4 @@ $wb['repo_password_txt'] = 'Συνθηματικό (Προαιρετικό)'; $wb['active_txt'] = 'Ενεργό'; ?> + diff --git a/interface/web/admin/lib/lang/el_software_repo_list.lng b/interface/web/admin/lib/lang/el_software_repo_list.lng index cb3f2c45d..a43fdbb3a 100644 --- a/interface/web/admin/lib/lang/el_software_repo_list.lng +++ b/interface/web/admin/lib/lang/el_software_repo_list.lng @@ -5,3 +5,4 @@ $wb['repo_name_txt'] = 'Αποθετήριο'; $wb['repo_url_txt'] = 'URL'; ?> + diff --git a/interface/web/admin/lib/lang/el_software_update_list.lng b/interface/web/admin/lib/lang/el_software_update_list.lng index 50a4b47e1..e5ebe6dd8 100644 --- a/interface/web/admin/lib/lang/el_software_update_list.lng +++ b/interface/web/admin/lib/lang/el_software_update_list.lng @@ -7,3 +7,4 @@ $wb['version_txt'] = 'Έκδοση'; $wb['action_txt'] = 'Ενέργεια'; ?> + diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng index 6c5b8b53a..da1cb30f3 100644 --- a/interface/web/admin/lib/lang/el_system_config.lng +++ b/interface/web/admin/lib/lang/el_system_config.lng @@ -21,11 +21,12 @@ $wb['use_domain_module_txt'] = 'Χρήση του αρθρώματος-domain γ $wb['use_domain_module_hint'] = 'Αν χρησιμοποιήσετε αυτό το άρθρωμα, οι πελάτες σας μπορούν μόνο να διαλέξουν ένα από τα domains που δημιούργησε για αυτούς ο διαχειριστής. Δεν μπορούν να επεξεργαστούν ελεύθερα τα πεδία του domain.Πρέπει να επανασυνδεθείτε αν αλλάξετε αυτή την τιμή, για να γίνουν οι αλλαγές σας, ορατές.'; $wb['new_domain_txt'] = 'HTML για την δημιουργία domain'; $wb['webftp_url_txt'] = 'URL του WebFTP'; -$wb['enable_custom_login_txt'] = 'Allow custom login name'; +$wb['enable_custom_login_txt'] = 'Αποδοχή προσαρμοσμένου ονόματος login'; $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; -$wb['mailmailinglist_url_txt'] = 'Mailing list URL'; +$wb['mailmailinglist_url_txt'] = 'URL της Mailing list '; $wb['admin_mail_txt'] = 'e-mail Διαχειριστών'; $wb['monitor_key_txt'] = 'Monitor keyword'; -$wb['admin_name_txt'] = 'Administrators name'; +$wb['admin_name_txt'] = 'Όνομα Administrator'; ?> + diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng index eacd3853f..e97db542a 100644 --- a/interface/web/admin/lib/lang/el_users.lng +++ b/interface/web/admin/lib/lang/el_users.lng @@ -27,3 +27,4 @@ $wb['default_group_txt'] = 'Προκαθορισμένη Ομάδα'; $wb['startmodule_err'] = 'Το άρθρωμα εκκίνησης δεν υπάρχει στα διαθέσιμα αρθρώματα.'; ?> + diff --git a/interface/web/admin/lib/lang/el_users_list.lng b/interface/web/admin/lib/lang/el_users_list.lng index 69b640db7..09218d251 100644 --- a/interface/web/admin/lib/lang/el_users_list.lng +++ b/interface/web/admin/lib/lang/el_users_list.lng @@ -8,3 +8,4 @@ $wb['add_new_record_txt'] = 'Νέος Χρήστης'; $wb['warning_txt'] = 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ:Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!'; ?> + diff --git a/interface/web/admin/lib/lang/en_remote_action.lng b/interface/web/admin/lib/lang/en_remote_action.lng index 4d6a06282..ad96e1fb2 100644 --- a/interface/web/admin/lib/lang/en_remote_action.lng +++ b/interface/web/admin/lib/lang/en_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!"; $wb['action_scheduled'] = "The action is scheduled for execution"; $wb['select_all_server'] = "All servers"; +$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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins"; ?> diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index b3e9f60a0..ec2e05341 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -149,6 +149,11 @@ $wb["do_not_try_rescue_mysql_txt"] = 'Disable MySQL monitoring'; $wb["do_not_try_rescue_mail_txt"] = 'Disable Email monitoring'; $wb["rescue_description_txt"] = 'Information: If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.
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["realtime_blackhole_list_txt"] = 'Real-time Blackhole List'; $wb["realtime_blackhole_list_note_txt"] = '(Separate RBL\'s with commas)'; ?> \ No newline at end of file diff --git a/interface/web/admin/lib/lang/es_remote_action.lng b/interface/web/admin/lib/lang/es_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/es_remote_action.lng +++ b/interface/web/admin/lib/lang/es_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index db7f0ca91..99dc89e02 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -149,5 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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["realtime_blackhole_list_txt"] = 'Real-time Blackhole List'; +$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'; ?> diff --git a/interface/web/admin/lib/lang/fi_remote_action.lng b/interface/web/admin/lib/lang/fi_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/fi_remote_action.lng +++ b/interface/web/admin/lib/lang/fi_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index d04966ba2..89498269e 100755 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/fr.lng b/interface/web/admin/lib/lang/fr.lng index 96a8c744d..d7ab95dac 100644 --- a/interface/web/admin/lib/lang/fr.lng +++ b/interface/web/admin/lib/lang/fr.lng @@ -41,5 +41,3 @@ $wb['Remote Actions'] = 'Actions distantes'; $wb['Do OS-Update'] = 'Mise à jour de l\'OS'; $wb['Do ISPConfig-Update'] = 'Mise à jour ISPConfig'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_firewall.lng b/interface/web/admin/lib/lang/fr_firewall.lng index 83b287067..53b762c08 100644 --- a/interface/web/admin/lib/lang/fr_firewall.lng +++ b/interface/web/admin/lib/lang/fr_firewall.lng @@ -9,5 +9,3 @@ $wb['firewall_error_unique'] = 'Il y a déjà un enregistrement dans le pare-feu $wb['tcp_ports_error_regex'] = 'Caractère non autorisé dans la définition du port TCP. Les caractères autorisés sont les nombres, : et ,.'; $wb['udp_ports_error_regex'] = 'Caractère non autorisé dans la définition du port UDP. Les caractères autorisés sont les nombres, : et ,.'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_firewall_list.lng b/interface/web/admin/lib/lang/fr_firewall_list.lng index dbb27ef57..965eb0109 100644 --- a/interface/web/admin/lib/lang/fr_firewall_list.lng +++ b/interface/web/admin/lib/lang/fr_firewall_list.lng @@ -6,5 +6,3 @@ $wb['tcp_port_txt'] = 'Ouvrir des ports TCP'; $wb['udp_port_txt'] = 'Ouvrir des ports UDP'; $wb['add_new_record_txt'] = 'Ajouter un enregistrement au pare-feu'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_groups.lng b/interface/web/admin/lib/lang/fr_groups.lng index 97e85c9b6..e0a92d734 100644 --- a/interface/web/admin/lib/lang/fr_groups.lng +++ b/interface/web/admin/lib/lang/fr_groups.lng @@ -3,5 +3,3 @@ $wb['description_txt'] = 'Description'; $wb['name_txt'] = 'Groupe'; $wb['name_err'] = 'Le groupe doit avoir entre 1 et 30 caractères.'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_groups_list.lng b/interface/web/admin/lib/lang/fr_groups_list.lng index 531d400aa..e51afd1cf 100644 --- a/interface/web/admin/lib/lang/fr_groups_list.lng +++ b/interface/web/admin/lib/lang/fr_groups_list.lng @@ -5,5 +5,3 @@ $wb['name_txt'] = 'Groupe'; $wb['add_new_record_txt'] = 'Ajouter un nouveau groupe'; $wb['warning_txt'] = 'ATTENTION: Ne pas éditer ou modifier de paramètre utilisateur ici. Utilisez les paramètres Client et Revendeur dans le module Client à la place. Modifier ou changer les informations ici peut conduire à la perte de données'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_iptables.lng b/interface/web/admin/lib/lang/fr_iptables.lng index b1aee3480..40760b949 100644 --- a/interface/web/admin/lib/lang/fr_iptables.lng +++ b/interface/web/admin/lib/lang/fr_iptables.lng @@ -11,5 +11,3 @@ $wb['source_ip_txt'] = 'Source Address'; $wb['active_txt'] = 'Active'; $wb['iptables_error_unique'] = 'There is already a firewall record for this server.'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_iptables_list.lng b/interface/web/admin/lib/lang/fr_iptables_list.lng index 6d732da4e..15c8baddc 100644 --- a/interface/web/admin/lib/lang/fr_iptables_list.lng +++ b/interface/web/admin/lib/lang/fr_iptables_list.lng @@ -13,5 +13,3 @@ $wb['source_ip_txt'] = 'Source Address'; $wb['active_txt'] = 'Active'; $wb['iptables_error_unique'] = 'There is already a firewall record for this server.'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_language_add.lng b/interface/web/admin/lib/lang/fr_language_add.lng index 65b508e10..f60bdacc3 100644 --- a/interface/web/admin/lib/lang/fr_language_add.lng +++ b/interface/web/admin/lib/lang/fr_language_add.lng @@ -6,5 +6,3 @@ $wb['btn_save_txt'] = 'Créer un nouveau fichier de langue'; $wb['btn_cancel_txt'] = 'Précédent'; $wb['language_new_hint_txt'] = 'Code langage à 2 caractères ISO 639-1 (Voir http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_language_complete.lng b/interface/web/admin/lib/lang/fr_language_complete.lng index 552ccb7fd..30dea02aa 100644 --- a/interface/web/admin/lib/lang/fr_language_complete.lng +++ b/interface/web/admin/lib/lang/fr_language_complete.lng @@ -5,5 +5,3 @@ $wb['btn_save_txt'] = 'Fusionner les fichiers'; $wb['btn_cancel_txt'] = 'Précédent'; $wb['list_desc_txt'] = 'Fusionne le langage sélectionné avec le langage principal anglais.
Ceci ajoute les élements manquants en anglais au fichier sélectionné.'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_language_edit.lng b/interface/web/admin/lib/lang/fr_language_edit.lng index 3fe535411..744f44d42 100644 --- a/interface/web/admin/lib/lang/fr_language_edit.lng +++ b/interface/web/admin/lib/lang/fr_language_edit.lng @@ -6,5 +6,3 @@ $wb['lang_file_txt'] = 'Fichier de langue'; $wb['btn_save_txt'] = 'Enregistrer'; $wb['btn_cancel_txt'] = 'Précédent'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_language_export.lng b/interface/web/admin/lib/lang/fr_language_export.lng index b08d4a2fd..dbe3fbf04 100644 --- a/interface/web/admin/lib/lang/fr_language_export.lng +++ b/interface/web/admin/lib/lang/fr_language_export.lng @@ -4,5 +4,3 @@ $wb['language_select_txt'] = 'Sélectionnez la langue'; $wb['btn_save_txt'] = 'Exporte la langue sélectionnée dans un fichier'; $wb['btn_cancel_txt'] = 'Précédent'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_language_import.lng b/interface/web/admin/lib/lang/fr_language_import.lng index 94fbda2fc..710847cc5 100644 --- a/interface/web/admin/lib/lang/fr_language_import.lng +++ b/interface/web/admin/lib/lang/fr_language_import.lng @@ -6,5 +6,3 @@ $wb['language_overwrite_txt'] = 'Ecraser le fichier sil existe déja.'; $wb['btn_cancel_txt'] = 'Précédent'; $wb['ignore_version_txt'] = 'Ignorer le test de version ISPConfig'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_language_list.lng b/interface/web/admin/lib/lang/fr_language_list.lng index b85a0f79b..8e9f26a7b 100644 --- a/interface/web/admin/lib/lang/fr_language_list.lng +++ b/interface/web/admin/lib/lang/fr_language_list.lng @@ -5,5 +5,3 @@ $wb['module_txt'] = 'Module'; $wb['lang_file_txt'] = 'Fichier de langue'; $wb['lang_file_date_txt'] = 'Dernière modification'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_package_install.lng b/interface/web/admin/lib/lang/fr_package_install.lng index f13ffdbf8..e32084b2f 100644 --- a/interface/web/admin/lib/lang/fr_package_install.lng +++ b/interface/web/admin/lib/lang/fr_package_install.lng @@ -5,5 +5,3 @@ $wb['repo_username_txt'] = 'Utilisateur (optionnel)'; $wb['repo_password_txt'] = 'Mot de passe (optionnel)'; $wb['active_txt'] = 'Actif'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_remote_action.lng b/interface/web/admin/lib/lang/fr_remote_action.lng index b822eac05..3df14f355 100644 --- a/interface/web/admin/lib/lang/fr_remote_action.lng +++ b/interface/web/admin/lib/lang/fr_remote_action.lng @@ -7,6 +7,6 @@ $wb['do_ispcupdate_caption'] = 'Mettre à jour ISPConfig 3 sur le serveur distan $wb['do_ispcupdate_desc'] = 'Cette action met à jour ISPConfig3 sur le serveur sélectionné.

UTILISEZ A VOS RISQUES ET PERILS !'; $wb['action_scheduled'] = 'Laction est marquée pour exécution'; $wb['select_all_server'] = 'Tout serveur'; +$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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_remote_user.lng b/interface/web/admin/lib/lang/fr_remote_user.lng index 83be16150..5f740a467 100644 --- a/interface/web/admin/lib/lang/fr_remote_user.lng +++ b/interface/web/admin/lib/lang/fr_remote_user.lng @@ -41,5 +41,3 @@ $wb['DNS srv functions'] = 'Fonctions SRV DNS'; $wb['DNS txt functions'] = 'Fonctions TXT DNS'; $wb['Mail mailing list functions'] = 'Fonctions Mailinglist Mail'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_remote_user_list.lng b/interface/web/admin/lib/lang/fr_remote_user_list.lng index bbde2db78..e78707e08 100644 --- a/interface/web/admin/lib/lang/fr_remote_user_list.lng +++ b/interface/web/admin/lib/lang/fr_remote_user_list.lng @@ -5,5 +5,3 @@ $wb['add_new_record_txt'] = 'Ajouter un utilisateur'; $wb['parent_remote_userid_txt'] = 'ID'; $wb['username_txt'] = 'Identifiant'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_server.lng b/interface/web/admin/lib/lang/fr_server.lng index 14890c64f..7224e1dab 100644 --- a/interface/web/admin/lib/lang/fr_server.lng +++ b/interface/web/admin/lib/lang/fr_server.lng @@ -13,5 +13,3 @@ $wb['- None -'] = '- Aucun -'; $wb['proxy_server_txt'] = 'Proxy-Server'; $wb['firewall_server_txt'] = 'Firewall-Server'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index e8ea1564b..f73e4bffd 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -149,6 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_server_config_list.lng b/interface/web/admin/lib/lang/fr_server_config_list.lng index c3c7be411..850cdd120 100644 --- a/interface/web/admin/lib/lang/fr_server_config_list.lng +++ b/interface/web/admin/lib/lang/fr_server_config_list.lng @@ -2,5 +2,3 @@ $wb['list_head_txt'] = 'Configuration du serveur'; $wb['server_name_txt'] = 'Serveur'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_server_ip.lng b/interface/web/admin/lib/lang/fr_server_ip.lng index 2b93c78ed..5c2f23eee 100644 --- a/interface/web/admin/lib/lang/fr_server_ip.lng +++ b/interface/web/admin/lib/lang/fr_server_ip.lng @@ -9,5 +9,3 @@ $wb['ip_type_txt'] = 'Type'; $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/fr_server_ip_list.lng b/interface/web/admin/lib/lang/fr_server_ip_list.lng index 5e333409a..e911e528c 100644 --- a/interface/web/admin/lib/lang/fr_server_ip_list.lng +++ b/interface/web/admin/lib/lang/fr_server_ip_list.lng @@ -8,5 +8,3 @@ $wb['virtualhost_txt'] = 'HTTP Vhost'; $wb['virtualhost_port_txt'] = 'HTTP Ports'; $wb['ip_type_txt'] = 'Type'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_server_list.lng b/interface/web/admin/lib/lang/fr_server_list.lng index c2bc1ecab..054195f3e 100644 --- a/interface/web/admin/lib/lang/fr_server_list.lng +++ b/interface/web/admin/lib/lang/fr_server_list.lng @@ -11,5 +11,3 @@ $wb['add_new_record_txt'] = 'Ajouter nouveau serveur'; $wb['proxy_server_txt'] = 'Proxy'; $wb['firewall_server_txt'] = 'Firewall'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_software_package_install.lng b/interface/web/admin/lib/lang/fr_software_package_install.lng index 2ea530a06..39f643d3e 100644 --- a/interface/web/admin/lib/lang/fr_software_package_install.lng +++ b/interface/web/admin/lib/lang/fr_software_package_install.lng @@ -4,5 +4,3 @@ $wb['install_key_txt'] = 'Entrez la clef dinstallation'; $wb['btn_save_txt'] = 'Démarrer linstallation'; $wb['btn_cancel_txt'] = 'Annuler'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_software_package_list.lng b/interface/web/admin/lib/lang/fr_software_package_list.lng index 363645867..cb8f3f363 100644 --- a/interface/web/admin/lib/lang/fr_software_package_list.lng +++ b/interface/web/admin/lib/lang/fr_software_package_list.lng @@ -8,5 +8,3 @@ $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Mettre à jour la liste des paquets'; $wb['package_id_txt'] = 'App-ID locale'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_software_repo.lng b/interface/web/admin/lib/lang/fr_software_repo.lng index c12f700fb..7b3ec481a 100644 --- a/interface/web/admin/lib/lang/fr_software_repo.lng +++ b/interface/web/admin/lib/lang/fr_software_repo.lng @@ -5,5 +5,3 @@ $wb['repo_username_txt'] = 'Utilisateur (optionnel)'; $wb['repo_password_txt'] = 'Mot de passe (optionnel)'; $wb['active_txt'] = 'Actif'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_software_repo_list.lng b/interface/web/admin/lib/lang/fr_software_repo_list.lng index 34b5bf0c1..56749896b 100644 --- a/interface/web/admin/lib/lang/fr_software_repo_list.lng +++ b/interface/web/admin/lib/lang/fr_software_repo_list.lng @@ -4,5 +4,3 @@ $wb['active_txt'] = 'Actif'; $wb['repo_name_txt'] = 'Référence'; $wb['repo_url_txt'] = 'URL'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_software_update_list.lng b/interface/web/admin/lib/lang/fr_software_update_list.lng index 9ab12f5ce..3c66539aa 100644 --- a/interface/web/admin/lib/lang/fr_software_update_list.lng +++ b/interface/web/admin/lib/lang/fr_software_update_list.lng @@ -6,5 +6,3 @@ $wb['version_txt'] = 'Version'; $wb['action_txt'] = 'Action'; $wb['server_select_txt'] = 'Sélectionnez le serveur'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng index 4f23095a1..14d194f3d 100644 --- a/interface/web/admin/lib/lang/fr_system_config.lng +++ b/interface/web/admin/lib/lang/fr_system_config.lng @@ -28,5 +28,3 @@ $wb['admin_mail_txt'] = 'E-mail de l\'administrateur'; $wb['monitor_key_txt'] = 'Mot-clé du moniteur'; $wb['admin_name_txt'] = 'Nom des administrateurs'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_users.lng b/interface/web/admin/lib/lang/fr_users.lng index a1af1ada3..43500b697 100644 --- a/interface/web/admin/lib/lang/fr_users.lng +++ b/interface/web/admin/lib/lang/fr_users.lng @@ -26,5 +26,3 @@ $wb['username_unique'] = 'Le nom d\'utilisateur entré existe déja.'; $wb['password_strength_txt'] = 'Force du mot de passe'; $wb['startmodule_err'] = 'Le module de départ nexiste pas.'; ?> - - diff --git a/interface/web/admin/lib/lang/fr_users_list.lng b/interface/web/admin/lib/lang/fr_users_list.lng index 9d607dff2..af8cebc51 100644 --- a/interface/web/admin/lib/lang/fr_users_list.lng +++ b/interface/web/admin/lib/lang/fr_users_list.lng @@ -7,5 +7,3 @@ $wb['ort_txt'] = 'Ville'; $wb['add_new_record_txt'] = 'Ajouter un nouvel utilisateur'; $wb['warning_txt'] = 'ATTENTION: Ne pas éditer ou modifier de paramètre utilisateur ici. Utilisez les paramètres Client et Revendeur dans le module Client à la place. Modifier ou changer les informations ici peut conduire à la perte de données'; ?> - - diff --git a/interface/web/admin/lib/lang/hr.lng b/interface/web/admin/lib/lang/hr.lng index 0f6e4717f..b7f72f8f1 100644 --- a/interface/web/admin/lib/lang/hr.lng +++ b/interface/web/admin/lib/lang/hr.lng @@ -16,7 +16,7 @@ $wb['Jailkit'] = 'Jailkit'; $wb['System'] = 'Sistem'; $wb['Add user'] = 'Dodaj korisnika'; $wb['Edit user'] = 'Editiraj korisnika'; -$wb['CP Users'] = 'CP korisnici'; +$wb['CP Users'] = 'Control panel korisnici'; $wb['Add group'] = 'Dodaj grupu'; $wb['Edit group'] = 'Editiraj grupu'; $wb['Edit server'] = 'Editiraj server'; @@ -30,7 +30,7 @@ $wb['Export'] = 'Eksportiraj'; $wb['Import'] = 'Importiraj'; $wb['Language Editor'] = 'Jezični editor'; $wb['Software'] = 'Aplikacije i dodaci'; -$wb['Repositories'] = 'Repositoriji'; +$wb['Repositories'] = 'Repozitoriji'; $wb['Server Services'] = 'Serverski servisi'; $wb['Interface Config'] = 'Konfiguracija sistema'; $wb['Packages'] = 'Paketi'; diff --git a/interface/web/admin/lib/lang/hr_firewall.lng b/interface/web/admin/lib/lang/hr_firewall.lng index e626345d3..7b5b63d86 100644 --- a/interface/web/admin/lib/lang/hr_firewall.lng +++ b/interface/web/admin/lib/lang/hr_firewall.lng @@ -1,11 +1,11 @@ diff --git a/interface/web/admin/lib/lang/hr_firewall_list.lng b/interface/web/admin/lib/lang/hr_firewall_list.lng index 24a34be1c..568d915a7 100644 --- a/interface/web/admin/lib/lang/hr_firewall_list.lng +++ b/interface/web/admin/lib/lang/hr_firewall_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/admin/lib/lang/hr_groups.lng b/interface/web/admin/lib/lang/hr_groups.lng index 61c3dc538..33c1e70df 100644 --- a/interface/web/admin/lib/lang/hr_groups.lng +++ b/interface/web/admin/lib/lang/hr_groups.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/admin/lib/lang/hr_groups_list.lng b/interface/web/admin/lib/lang/hr_groups_list.lng index f1d8e2c1a..e88fae2e7 100644 --- a/interface/web/admin/lib/lang/hr_groups_list.lng +++ b/interface/web/admin/lib/lang/hr_groups_list.lng @@ -1,7 +1,7 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; +$wb['list_head_txt'] = 'Grupe sistemskih korisnika'; +$wb['description_txt'] = 'Opis'; +$wb['name_txt'] = 'Grupa'; +$wb['add_new_record_txt'] = 'Dodaj grupu'; +$wb['warning_txt'] = 'UPOZORENJE: Ne mijenjajte postavke klijenta ovdje. Koristite '; ?> diff --git a/interface/web/admin/lib/lang/hr_iptables.lng b/interface/web/admin/lib/lang/hr_iptables.lng index 40760b949..5a6cef9e9 100644 --- a/interface/web/admin/lib/lang/hr_iptables.lng +++ b/interface/web/admin/lib/lang/hr_iptables.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/admin/lib/lang/hr_iptables_list.lng b/interface/web/admin/lib/lang/hr_iptables_list.lng index 15c8baddc..869bd1776 100644 --- a/interface/web/admin/lib/lang/hr_iptables_list.lng +++ b/interface/web/admin/lib/lang/hr_iptables_list.lng @@ -1,15 +1,15 @@ diff --git a/interface/web/admin/lib/lang/hr_language_add.lng b/interface/web/admin/lib/lang/hr_language_add.lng index dc6b2d1b7..d4a3e1bd8 100644 --- a/interface/web/admin/lib/lang/hr_language_add.lng +++ b/interface/web/admin/lib/lang/hr_language_add.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/admin/lib/lang/hr_language_complete.lng b/interface/web/admin/lib/lang/hr_language_complete.lng index db7c05bb2..8562ced8a 100644 --- a/interface/web/admin/lib/lang/hr_language_complete.lng +++ b/interface/web/admin/lib/lang/hr_language_complete.lng @@ -1,7 +1,7 @@ This adds missing strings from the english master language files to the selected language.'; -$wb['language_select_txt'] = 'Select language'; -$wb['btn_save_txt'] = 'Merge files now'; -$wb['btn_cancel_txt'] = 'Back'; +$wb['list_head_txt'] = 'Spoji jezike'; +$wb['list_desc_txt'] = 'Spoji izabrani jezik sa glavnim datotekom engleskog jezika.
Ovime ćete dodati podatke iz datoteke engleskog jezika koji nedostaju u izabrani jezik.'; +$wb['language_select_txt'] = 'Izaberi jezik'; +$wb['btn_save_txt'] = 'Spoji jezike sada'; +$wb['btn_cancel_txt'] = 'Natrag'; ?> diff --git a/interface/web/admin/lib/lang/hr_language_edit.lng b/interface/web/admin/lib/lang/hr_language_edit.lng index 4c50e883e..b223069ba 100644 --- a/interface/web/admin/lib/lang/hr_language_edit.lng +++ b/interface/web/admin/lib/lang/hr_language_edit.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/admin/lib/lang/hr_language_export.lng b/interface/web/admin/lib/lang/hr_language_export.lng index f45d47b17..4799ddf85 100644 --- a/interface/web/admin/lib/lang/hr_language_export.lng +++ b/interface/web/admin/lib/lang/hr_language_export.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/admin/lib/lang/hr_language_import.lng b/interface/web/admin/lib/lang/hr_language_import.lng index 4c31ec3de..6a31f395a 100644 --- a/interface/web/admin/lib/lang/hr_language_import.lng +++ b/interface/web/admin/lib/lang/hr_language_import.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/admin/lib/lang/hr_language_list.lng b/interface/web/admin/lib/lang/hr_language_list.lng index 1c784edf6..68f9cca26 100644 --- a/interface/web/admin/lib/lang/hr_language_list.lng +++ b/interface/web/admin/lib/lang/hr_language_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/hr_package_install.lng b/interface/web/admin/lib/lang/hr_package_install.lng index 574dd1162..181c797ab 100644 --- a/interface/web/admin/lib/lang/hr_package_install.lng +++ b/interface/web/admin/lib/lang/hr_package_install.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/hr_remote_action.lng b/interface/web/admin/lib/lang/hr_remote_action.lng index 2bb2a1247..0ebb53dae 100644 --- a/interface/web/admin/lib/lang/hr_remote_action.lng +++ b/interface/web/admin/lib/lang/hr_remote_action.lng @@ -1,10 +1,12 @@
USE THIS AT YOUR OWN RISK!'; -$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.

USE THIS AT YOUR OWN RISK!'; -$wb['action_scheduled'] = 'The action is scheduled for execution'; -$wb['select_all_server'] = 'All servers'; +$wb['select_server_txt'] = 'Izaberi server'; +$wb['btn_do_txt'] = 'Pokreni'; +$wb['do_osupdate_caption'] = 'Nadogradi operativni sistem na udaljenom serveru'; +$wb['do_osupdate_desc'] = 'Ovime pokrećete aptitude -y upgrade na izabranom serveru.

KORISTITE NA VLASTITU ODGOVORNOST!'; +$wb['do_ispcupdate_caption'] = 'Nadogradi ISPConfig 3 na udaljenom serveru'; +$wb['do_ispcupdate_desc'] = 'Ovime pokrećete nadogradnju ISPConfig3-a na izabranom serveru.

KORISTITE NA VLASTITU ODGOVORNOST!'; +$wb['action_scheduled'] = 'Nadogradnja je dodana u planer poslova'; +$wb['select_all_server'] = 'Svi serveri'; +$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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/hr_remote_user.lng b/interface/web/admin/lib/lang/hr_remote_user.lng index 879385aac..ae35c9200 100644 --- a/interface/web/admin/lib/lang/hr_remote_user.lng +++ b/interface/web/admin/lib/lang/hr_remote_user.lng @@ -1,43 +1,43 @@ diff --git a/interface/web/admin/lib/lang/hr_remote_user_list.lng b/interface/web/admin/lib/lang/hr_remote_user_list.lng index 152a75fba..2da20fc61 100644 --- a/interface/web/admin/lib/lang/hr_remote_user_list.lng +++ b/interface/web/admin/lib/lang/hr_remote_user_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/hr_server.lng b/interface/web/admin/lib/lang/hr_server.lng index 0ece5aa61..39b7f361c 100644 --- a/interface/web/admin/lib/lang/hr_server.lng +++ b/interface/web/admin/lib/lang/hr_server.lng @@ -1,15 +1,15 @@ diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 3110f4f48..b0c445e73 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -1,45 +1,45 @@ Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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['enable_sni_txt'] = 'Omogući SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Isključi HTTPD monitoriranje'; +$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'; ?> diff --git a/interface/web/admin/lib/lang/hr_server_config_list.lng b/interface/web/admin/lib/lang/hr_server_config_list.lng index 636c2e050..4b814eb1d 100644 --- a/interface/web/admin/lib/lang/hr_server_config_list.lng +++ b/interface/web/admin/lib/lang/hr_server_config_list.lng @@ -1,4 +1,4 @@ diff --git a/interface/web/admin/lib/lang/hr_server_ip.lng b/interface/web/admin/lib/lang/hr_server_ip.lng index 88d8a2f60..0ddf8be14 100644 --- a/interface/web/admin/lib/lang/hr_server_ip.lng +++ b/interface/web/admin/lib/lang/hr_server_ip.lng @@ -1,11 +1,11 @@ diff --git a/interface/web/admin/lib/lang/hr_server_ip_list.lng b/interface/web/admin/lib/lang/hr_server_ip_list.lng index ea40668b6..d4210d3a8 100644 --- a/interface/web/admin/lib/lang/hr_server_ip_list.lng +++ b/interface/web/admin/lib/lang/hr_server_ip_list.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/admin/lib/lang/hr_server_list.lng b/interface/web/admin/lib/lang/hr_server_list.lng index 40cc28e5b..320b45f77 100644 --- a/interface/web/admin/lib/lang/hr_server_list.lng +++ b/interface/web/admin/lib/lang/hr_server_list.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/admin/lib/lang/hr_software_package_install.lng b/interface/web/admin/lib/lang/hr_software_package_install.lng index 5c8b75643..22d7e0ce7 100644 --- a/interface/web/admin/lib/lang/hr_software_package_install.lng +++ b/interface/web/admin/lib/lang/hr_software_package_install.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/admin/lib/lang/hr_software_package_list.lng b/interface/web/admin/lib/lang/hr_software_package_list.lng index 29ad55587..0240c2d23 100644 --- a/interface/web/admin/lib/lang/hr_software_package_list.lng +++ b/interface/web/admin/lib/lang/hr_software_package_list.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/admin/lib/lang/hr_software_repo.lng b/interface/web/admin/lib/lang/hr_software_repo.lng index 574dd1162..181c797ab 100644 --- a/interface/web/admin/lib/lang/hr_software_repo.lng +++ b/interface/web/admin/lib/lang/hr_software_repo.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/hr_software_repo_list.lng b/interface/web/admin/lib/lang/hr_software_repo_list.lng index b7a219ffa..b79045bd7 100644 --- a/interface/web/admin/lib/lang/hr_software_repo_list.lng +++ b/interface/web/admin/lib/lang/hr_software_repo_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/admin/lib/lang/hr_software_update_list.lng b/interface/web/admin/lib/lang/hr_software_update_list.lng index ec4af23a4..59f910b69 100644 --- a/interface/web/admin/lib/lang/hr_software_update_list.lng +++ b/interface/web/admin/lib/lang/hr_software_update_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng index 8a4e8722a..665d56480 100644 --- a/interface/web/admin/lib/lang/hr_system_config.lng +++ b/interface/web/admin/lib/lang/hr_system_config.lng @@ -1,30 +1,30 @@ diff --git a/interface/web/admin/lib/lang/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng index 8e70364aa..cae026494 100644 --- a/interface/web/admin/lib/lang/hr_users.lng +++ b/interface/web/admin/lib/lang/hr_users.lng @@ -1,28 +1,28 @@ diff --git a/interface/web/admin/lib/lang/hr_users_list.lng b/interface/web/admin/lib/lang/hr_users_list.lng index 0de8cdc3e..b960e1475 100644 --- a/interface/web/admin/lib/lang/hr_users_list.lng +++ b/interface/web/admin/lib/lang/hr_users_list.lng @@ -1,9 +1,9 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; +$wb['list_head_txt'] = 'Klijenti'; +$wb['username_txt'] = 'Korisničko ime'; +$wb['name_txt'] = 'Ime'; +$wb['vorname_txt'] = 'Prezime'; +$wb['ort_txt'] = 'grad'; +$wb['add_new_record_txt'] = 'Dodaj klijenta'; +$wb['warning_txt'] = 'UPOZORENJE: Ovdje nemojte mijenjati podatke klijenta. Koristite Klijent i Preprodavač postavke u Klijent modulu. Mijenjanjem postavki klijenata ili grupa može doći do gubitka podataka!'; ?> diff --git a/interface/web/admin/lib/lang/hu_remote_action.lng b/interface/web/admin/lib/lang/hu_remote_action.lng index 0589540fb..8fe6314d3 100644 --- a/interface/web/admin/lib/lang/hu_remote_action.lng +++ b/interface/web/admin/lib/lang/hu_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'Összes szerver'; +$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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index 6a1c67e35..33785e883 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/id_remote_action.lng b/interface/web/admin/lib/lang/id_remote_action.lng index e004d0620..3a1b8518e 100644 --- a/interface/web/admin/lib/lang/id_remote_action.lng +++ b/interface/web/admin/lib/lang/id_remote_action.lng @@ -7,4 +7,6 @@ $wb['do_ispcupdate_caption'] = 'Lakukan pemutakhiran ISPConfig 3 - di server rem $wb['do_ispcupdate_desc'] = 'Tindakan ini melakukan pemutakhiran ISPConfig3 di server yang Anda pilih.

PENGGUNAANNYA MENJADI TANGGUNG JAWAB ANDA SENDIRI!'; $wb['action_scheduled'] = 'Tindakan dijadwalkan untuk dijalankan'; $wb['select_all_server'] = 'Semua 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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index cab99a14f..15aa4d215 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/it_remote_action.lng b/interface/web/admin/lib/lang/it_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/it_remote_action.lng +++ b/interface/web/admin/lib/lang/it_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index b9ba257a8..ca56ef829 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/ja_remote_action.lng b/interface/web/admin/lib/lang/ja_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/ja_remote_action.lng +++ b/interface/web/admin/lib/lang/ja_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 778009ec6..c06e10f02 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/nl_remote_action.lng b/interface/web/admin/lib/lang/nl_remote_action.lng index e30d4d5fc..c0046ff01 100644 --- a/interface/web/admin/lib/lang/nl_remote_action.lng +++ b/interface/web/admin/lib/lang/nl_remote_action.lng @@ -7,4 +7,6 @@ $wb['do_ispcupdate_caption'] = 'Voer een ISPConfig 3 - update uit op de remote s $wb['do_ispcupdate_desc'] = 'Deze actie voert een ISPConfig3 update uit op de soor u geselecteerde server.

GEBRUIK OP EIGEN RISICO!'; $wb['action_scheduled'] = 'Deze actie is ingepland om uitgevoerd te worden'; $wb['select_all_server'] = 'Alle servers'; +$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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index ac60ba57d..5267610f0 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng index 71419783e..6d5e88756 100644 --- a/interface/web/admin/lib/lang/pl.lng +++ b/interface/web/admin/lib/lang/pl.lng @@ -41,4 +41,3 @@ $wb['Do ISPConfig-Update'] = 'Wykonaj aktualizację ISPConfig'; $wb['1001'] = 'Nazwa użytkownika lub hasło jest puste.'; $wb['1002'] = 'Nazwa użytkownika lub hasło jest błędne.'; ?> - diff --git a/interface/web/admin/lib/lang/pl_firewall.lng b/interface/web/admin/lib/lang/pl_firewall.lng index 8098fcc61..568178950 100644 --- a/interface/web/admin/lib/lang/pl_firewall.lng +++ b/interface/web/admin/lib/lang/pl_firewall.lng @@ -9,4 +9,3 @@ $wb['firewall_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.'; $wb['tcp_ports_error_regex'] = 'Znak nie jest dozwolony w formacie portu TCP. Dozwolone znaki to liczby, : oraz ,.'; $wb['udp_ports_error_regex'] = 'Znak nie jest dozwolony w formacie portu UDP. Dozwolone znaki to liczby, : oraz ,.'; ?> - diff --git a/interface/web/admin/lib/lang/pl_firewall_list.lng b/interface/web/admin/lib/lang/pl_firewall_list.lng index fe80e430c..6a4b8388f 100644 --- a/interface/web/admin/lib/lang/pl_firewall_list.lng +++ b/interface/web/admin/lib/lang/pl_firewall_list.lng @@ -6,4 +6,3 @@ $wb['tcp_port_txt'] = 'Otwarte porty TCP'; $wb['udp_port_txt'] = 'Otwarte porty UDP'; $wb['add_new_record_txt'] = 'Dodaj wpis Firewalla'; ?> - diff --git a/interface/web/admin/lib/lang/pl_groups.lng b/interface/web/admin/lib/lang/pl_groups.lng index a97ac3f30..b3c8b9ca7 100644 --- a/interface/web/admin/lib/lang/pl_groups.lng +++ b/interface/web/admin/lib/lang/pl_groups.lng @@ -3,4 +3,3 @@ $wb['description_txt'] = 'Opis'; $wb['name_txt'] = 'Grupa'; $wb['name_err'] = 'Nazwa grupy musi mieć od 1 do 30 znaków.'; ?> - diff --git a/interface/web/admin/lib/lang/pl_groups_list.lng b/interface/web/admin/lib/lang/pl_groups_list.lng index 9409d32c9..75756bca7 100644 --- a/interface/web/admin/lib/lang/pl_groups_list.lng +++ b/interface/web/admin/lib/lang/pl_groups_list.lng @@ -5,4 +5,3 @@ $wb['name_txt'] = 'Grupa'; $wb['add_new_record_txt'] = 'Dodaj nową grupę'; $wb['warning_txt'] = 'OSTRZEŻENIE: Nie modyfikuj żadnych ustawień użytkownika w tym miejscu. Użyj ustawień Klienta lub Resellera w module Klient. Modyfikacja ustawień użytkownika lub grupy tutaj grozi utratą danych!'; ?> - diff --git a/interface/web/admin/lib/lang/pl_iptables.lng b/interface/web/admin/lib/lang/pl_iptables.lng index 8073e5d00..f6be566c4 100644 --- a/interface/web/admin/lib/lang/pl_iptables.lng +++ b/interface/web/admin/lib/lang/pl_iptables.lng @@ -11,4 +11,3 @@ $wb['source_ip_txt'] = 'Adres źródłowy'; $wb['active_txt'] = 'Aktywny'; $wb['iptables_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.'; ?> - diff --git a/interface/web/admin/lib/lang/pl_iptables_list.lng b/interface/web/admin/lib/lang/pl_iptables_list.lng index 255a82925..2f74b180c 100644 --- a/interface/web/admin/lib/lang/pl_iptables_list.lng +++ b/interface/web/admin/lib/lang/pl_iptables_list.lng @@ -13,4 +13,3 @@ $wb['source_ip_txt'] = 'Adres źródłowy'; $wb['active_txt'] = 'Aktywny'; $wb['iptables_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.'; ?> - diff --git a/interface/web/admin/lib/lang/pl_language_add.lng b/interface/web/admin/lib/lang/pl_language_add.lng index df1a5f31f..82e42ef72 100644 --- a/interface/web/admin/lib/lang/pl_language_add.lng +++ b/interface/web/admin/lib/lang/pl_language_add.lng @@ -6,4 +6,3 @@ $wb['language_new_hint_txt'] = '2 znakowe kodowanie języka ISO 639-1 (Zobacz ht $wb['btn_save_txt'] = 'Utwórz nowy zbiór plików z językami'; $wb['btn_cancel_txt'] = 'Wróć'; ?> - diff --git a/interface/web/admin/lib/lang/pl_language_complete.lng b/interface/web/admin/lib/lang/pl_language_complete.lng index 6d6d8ec36..0096c69ef 100644 --- a/interface/web/admin/lib/lang/pl_language_complete.lng +++ b/interface/web/admin/lib/lang/pl_language_complete.lng @@ -5,4 +5,3 @@ $wb['language_select_txt'] = 'Wybierz język'; $wb['btn_save_txt'] = 'Połącz pliki teraz'; $wb['btn_cancel_txt'] = 'Wróć'; ?> - diff --git a/interface/web/admin/lib/lang/pl_language_edit.lng b/interface/web/admin/lib/lang/pl_language_edit.lng index b4ec35d9b..3a5e70693 100644 --- a/interface/web/admin/lib/lang/pl_language_edit.lng +++ b/interface/web/admin/lib/lang/pl_language_edit.lng @@ -6,4 +6,3 @@ $wb['lang_file_txt'] = 'Plik języka'; $wb['btn_save_txt'] = 'Zapisz'; $wb['btn_cancel_txt'] = 'Wróć'; ?> - diff --git a/interface/web/admin/lib/lang/pl_language_export.lng b/interface/web/admin/lib/lang/pl_language_export.lng index 0b38a4870..e58dbf072 100644 --- a/interface/web/admin/lib/lang/pl_language_export.lng +++ b/interface/web/admin/lib/lang/pl_language_export.lng @@ -4,4 +4,3 @@ $wb['language_select_txt'] = 'Wybierz język'; $wb['btn_save_txt'] = 'Eksportuj pliki wybranego języka'; $wb['btn_cancel_txt'] = 'Wróć'; ?> - diff --git a/interface/web/admin/lib/lang/pl_language_import.lng b/interface/web/admin/lib/lang/pl_language_import.lng index e78238ada..077d0c00e 100644 --- a/interface/web/admin/lib/lang/pl_language_import.lng +++ b/interface/web/admin/lib/lang/pl_language_import.lng @@ -6,4 +6,3 @@ $wb['language_overwrite_txt'] = 'Nadpisz plik jeśli istnieje.'; $wb['btn_cancel_txt'] = 'Wróć'; $wb['ignore_version_txt'] = 'Pomiń sprawdzanie wersji ISPConfig'; ?> - diff --git a/interface/web/admin/lib/lang/pl_language_list.lng b/interface/web/admin/lib/lang/pl_language_list.lng index 14b7cdb50..05fd6e39a 100644 --- a/interface/web/admin/lib/lang/pl_language_list.lng +++ b/interface/web/admin/lib/lang/pl_language_list.lng @@ -5,4 +5,3 @@ $wb['module_txt'] = 'Moduł'; $wb['lang_file_txt'] = 'Plik języka'; $wb['lang_file_date_txt'] = 'Ostatnia modyfikacja'; ?> - diff --git a/interface/web/admin/lib/lang/pl_package_install.lng b/interface/web/admin/lib/lang/pl_package_install.lng index ce5c73c81..30439086a 100644 --- a/interface/web/admin/lib/lang/pl_package_install.lng +++ b/interface/web/admin/lib/lang/pl_package_install.lng @@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'Użytkownik (opcjonalnie)'; $wb['repo_password_txt'] = 'Hasło (opcjonalnie)'; $wb['active_txt'] = 'Aktywne'; ?> - diff --git a/interface/web/admin/lib/lang/pl_remote_action.lng b/interface/web/admin/lib/lang/pl_remote_action.lng index 4d07f29c9..7d0308993 100644 --- a/interface/web/admin/lib/lang/pl_remote_action.lng +++ b/interface/web/admin/lib/lang/pl_remote_action.lng @@ -7,5 +7,6 @@ $wb['do_ispcupdate_caption'] = 'Wykonaj zdalną aktualizację ISPConfig 3 na ser $wb['do_ispcupdate_desc'] = 'Ta akcja przeprowadzi aktualizację ISPConfig3 na wybranym serwerze.

UŻYWASZ JEJ NA WŁASNĄ ODPOWIEDZIALNOŚĆ!'; $wb['action_scheduled'] = 'Akcja zaplanowana do wykonania'; $wb['select_all_server'] = 'Wszystkie serwery'; +$wb['ispconfig_update_title'] = 'ISPConfig update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> - diff --git a/interface/web/admin/lib/lang/pl_remote_user.lng b/interface/web/admin/lib/lang/pl_remote_user.lng index 5daa2c743..dd8a3683e 100644 --- a/interface/web/admin/lib/lang/pl_remote_user.lng +++ b/interface/web/admin/lib/lang/pl_remote_user.lng @@ -41,4 +41,3 @@ $wb['DNS srv functions'] = 'Funkcje rekordu SRV DNS'; $wb['DNS txt functions'] = 'Funkcje rekordu TXT DNS'; $wb['Mail mailing list functions'] = 'Funkcje listy mailingowej'; ?> - diff --git a/interface/web/admin/lib/lang/pl_remote_user_list.lng b/interface/web/admin/lib/lang/pl_remote_user_list.lng index 976e3130a..6dd12ae97 100644 --- a/interface/web/admin/lib/lang/pl_remote_user_list.lng +++ b/interface/web/admin/lib/lang/pl_remote_user_list.lng @@ -5,4 +5,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika'; $wb['parent_remote_userid_txt'] = 'ID'; $wb['username_txt'] = 'Nazwa użytkownika'; ?> - diff --git a/interface/web/admin/lib/lang/pl_server.lng b/interface/web/admin/lib/lang/pl_server.lng index 2ebbeb219..5e9c41172 100644 --- a/interface/web/admin/lib/lang/pl_server.lng +++ b/interface/web/admin/lib/lang/pl_server.lng @@ -13,4 +13,3 @@ $wb['- None -'] = '- Żaden -'; $wb['proxy_server_txt'] = 'Proxy-Server'; $wb['firewall_server_txt'] = 'Firewall-Server'; ?> - diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index f0d93a82d..998a75589 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -149,5 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> - diff --git a/interface/web/admin/lib/lang/pl_server_config_list.lng b/interface/web/admin/lib/lang/pl_server_config_list.lng index e700889bf..f9e8dcf1b 100644 --- a/interface/web/admin/lib/lang/pl_server_config_list.lng +++ b/interface/web/admin/lib/lang/pl_server_config_list.lng @@ -2,4 +2,3 @@ $wb['list_head_txt'] = 'Konfiguracja serwera'; $wb['server_name_txt'] = 'Serwer'; ?> - diff --git a/interface/web/admin/lib/lang/pl_server_ip.lng b/interface/web/admin/lib/lang/pl_server_ip.lng index 2c107d05a..cb16e104d 100644 --- a/interface/web/admin/lib/lang/pl_server_ip.lng +++ b/interface/web/admin/lib/lang/pl_server_ip.lng @@ -9,4 +9,3 @@ $wb['ip_type_txt'] = 'Typ'; $wb['virtualhost_port_txt'] = 'Porty HTTP'; $wb['error_port_syntax'] = 'Nieprawidłowe wartości w polu portów, proszę wpisać tylko liczby oddzielone przecinkiem. Przykładowo: 80,443'; ?> - diff --git a/interface/web/admin/lib/lang/pl_server_ip_list.lng b/interface/web/admin/lib/lang/pl_server_ip_list.lng index dcf8951ac..64b004dc7 100644 --- a/interface/web/admin/lib/lang/pl_server_ip_list.lng +++ b/interface/web/admin/lib/lang/pl_server_ip_list.lng @@ -8,4 +8,3 @@ $wb['virtualhost_txt'] = 'HTTP Vhost'; $wb['virtualhost_port_txt'] = 'Porty HTTP'; $wb['ip_type_txt'] = 'Typ'; ?> - diff --git a/interface/web/admin/lib/lang/pl_server_list.lng b/interface/web/admin/lib/lang/pl_server_list.lng index 9ca9eb871..81356acf7 100644 --- a/interface/web/admin/lib/lang/pl_server_list.lng +++ b/interface/web/admin/lib/lang/pl_server_list.lng @@ -11,4 +11,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowy serwer'; $wb['proxy_server_txt'] = 'Proxy'; $wb['firewall_server_txt'] = 'Firewall'; ?> - diff --git a/interface/web/admin/lib/lang/pl_software_package_install.lng b/interface/web/admin/lib/lang/pl_software_package_install.lng index ea9290bd3..fd2f2930d 100644 --- a/interface/web/admin/lib/lang/pl_software_package_install.lng +++ b/interface/web/admin/lib/lang/pl_software_package_install.lng @@ -4,4 +4,3 @@ $wb['install_key_txt'] = 'Podaj klucz instalacyjny'; $wb['btn_save_txt'] = 'Start instalacji'; $wb['btn_cancel_txt'] = 'Przerwij'; ?> - diff --git a/interface/web/admin/lib/lang/pl_software_package_list.lng b/interface/web/admin/lib/lang/pl_software_package_list.lng index 5fbd65219..e50d34f34 100644 --- a/interface/web/admin/lib/lang/pl_software_package_list.lng +++ b/interface/web/admin/lib/lang/pl_software_package_list.lng @@ -8,4 +8,3 @@ $wb['toolsarea_head_txt'] = 'Pakiety'; $wb['repoupdate_txt'] = 'Aktualizuj listę pakietów'; $wb['package_id_txt'] = 'lokalny App-ID'; ?> - diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng index 84d9c9e61..d11a1b3b3 100644 --- a/interface/web/admin/lib/lang/pl_software_repo.lng +++ b/interface/web/admin/lib/lang/pl_software_repo.lng @@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'Użytkownik (Opcjonalnie)'; $wb['repo_password_txt'] = 'Hasło (Opcjonalnie)'; $wb['active_txt'] = 'Aktywny'; ?> - diff --git a/interface/web/admin/lib/lang/pl_software_repo_list.lng b/interface/web/admin/lib/lang/pl_software_repo_list.lng index 85a54b06b..7ca6af9f9 100644 --- a/interface/web/admin/lib/lang/pl_software_repo_list.lng +++ b/interface/web/admin/lib/lang/pl_software_repo_list.lng @@ -4,4 +4,3 @@ $wb['active_txt'] = 'Aktywny'; $wb['repo_name_txt'] = 'Repozytoria'; $wb['repo_url_txt'] = 'URL'; ?> - diff --git a/interface/web/admin/lib/lang/pl_software_update_list.lng b/interface/web/admin/lib/lang/pl_software_update_list.lng index 5cf9ccd98..e38bdf8a3 100644 --- a/interface/web/admin/lib/lang/pl_software_update_list.lng +++ b/interface/web/admin/lib/lang/pl_software_update_list.lng @@ -6,4 +6,3 @@ $wb['update_title_txt'] = 'Aktualizacja'; $wb['version_txt'] = 'Wersja'; $wb['action_txt'] = 'Akcja'; ?> - diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng index 8bf4293e7..3135b1995 100644 --- a/interface/web/admin/lib/lang/pl_system_config.lng +++ b/interface/web/admin/lib/lang/pl_system_config.lng @@ -28,4 +28,3 @@ $wb['admin_mail_txt'] = 'E-Mail administratorów'; $wb['monitor_key_txt'] = 'Klucz monitora'; $wb['admin_name_txt'] = 'Nazwy administratorów'; ?> - diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng index 191185e9a..99e5fd3fc 100644 --- a/interface/web/admin/lib/lang/pl_users.lng +++ b/interface/web/admin/lib/lang/pl_users.lng @@ -26,4 +26,3 @@ $wb['groups_txt'] = 'Grupy'; $wb['default_group_txt'] = 'Domyślna grupa'; $wb['startmodule_err'] = 'Modułu startowego nie ma wśród modułów.'; ?> - diff --git a/interface/web/admin/lib/lang/pl_users_list.lng b/interface/web/admin/lib/lang/pl_users_list.lng index aa2294c5a..17d72250c 100644 --- a/interface/web/admin/lib/lang/pl_users_list.lng +++ b/interface/web/admin/lib/lang/pl_users_list.lng @@ -7,4 +7,3 @@ $wb['ort_txt'] = 'Miasto'; $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika'; $wb['warning_txt'] = 'OSTRZEŻENIE: Nie edytuj żadnych ustawień tutaj. Użyj do tego celu ustawień Klienta i Resellera w module Klienta. Zmiana użytkowników i grup w tym miejscu może spowodować utratę danych!'; ?> - diff --git a/interface/web/admin/lib/lang/pt_remote_action.lng b/interface/web/admin/lib/lang/pt_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/pt_remote_action.lng +++ b/interface/web/admin/lib/lang/pt_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index 642d0c921..a0042d0fc 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/ro_remote_action.lng b/interface/web/admin/lib/lang/ro_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/ro_remote_action.lng +++ b/interface/web/admin/lib/lang/ro_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index dd7a521ac..c497a0ba9 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/ru_remote_action.lng b/interface/web/admin/lib/lang/ru_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/ru_remote_action.lng +++ b/interface/web/admin/lib/lang/ru_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index 87e40efbd..ddbb8c807 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/se_remote_action.lng b/interface/web/admin/lib/lang/se_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/se_remote_action.lng +++ b/interface/web/admin/lib/lang/se_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index 1d570d4c9..7d15039d3 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/sk_remote_action.lng b/interface/web/admin/lib/lang/sk_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/sk_remote_action.lng +++ b/interface/web/admin/lib/lang/sk_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index 69308b986..836165362 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/lang/tr_remote_action.lng b/interface/web/admin/lib/lang/tr_remote_action.lng index 949f7eb14..f26852708 100644 --- a/interface/web/admin/lib/lang/tr_remote_action.lng +++ b/interface/web/admin/lib/lang/tr_remote_action.lng @@ -7,4 +7,6 @@ $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.

USE THIS AT YOUR OWN RISK!'; $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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index fd0f14717..56a64655c 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -149,4 +149,8 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
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'; ?> diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php index 20fb32265..84959d6c5 100644 --- a/interface/web/admin/lib/module.conf.php +++ b/interface/web/admin/lib/module.conf.php @@ -193,13 +193,13 @@ $items[] = array( 'title' => 'Do OS-Update', 'target' => 'content', 'link' => 'admin/remote_action_osupdate.php', 'html_id'=> 'osupdate'); -/* + // ISPConfig interface update has been removed. Please use ispconfig_update.sh on the shell instead. $items[] = array( 'title' => 'Do ISPConfig-Update', 'target' => 'content', 'link' => 'admin/remote_action_ispcupdate.php', 'html_id'=> 'ispcupdate'); -*/ + $module['nav'][] = array( 'title' => 'Remote Actions', 'open' => 1, diff --git a/interface/web/admin/remote_action_ispcupdate.php b/interface/web/admin/remote_action_ispcupdate.php index 5bde7e1de..a72f9426f 100644 --- a/interface/web/admin/remote_action_ispcupdate.php +++ b/interface/web/admin/remote_action_ispcupdate.php @@ -27,7 +27,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -die('Function has been removed.'); +//die('Function has been removed.'); require_once('../../lib/config.inc.php'); require_once('../../lib/app.inc.php'); @@ -50,6 +50,7 @@ include($lng_file); /* * We need a list of all Servers */ + $sysServers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name"); $dropDown = ""; foreach ($sysServers as $server) { @@ -62,7 +63,9 @@ $msg = ''; /* * If the user wants to do the action, write this to our db */ -if (isset($_POST['server_select'])) { + +//* Note: Disabled post action +if (1 == 0 && isset($_POST['server_select'])) { $server = $_POST['server_select']; $servers = array(); if ($server == '*') { diff --git a/interface/web/admin/templates/remote_action_ispcupdate.htm b/interface/web/admin/templates/remote_action_ispcupdate.htm index 156949a21..7baca7a78 100644 --- a/interface/web/admin/templates/remote_action_ispcupdate.htm +++ b/interface/web/admin/templates/remote_action_ispcupdate.htm @@ -1,9 +1,15 @@ + + +

+

+
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index a2b5f49c3..da93a2ead 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -75,6 +75,28 @@ {tmpl_var name='enable_sni'} +
+

{tmpl_var name='set_folder_permissions_on_update_txt'}

+
+ {tmpl_var name='set_folder_permissions_on_update'} +
+
+
+

{tmpl_var name='add_web_users_to_sshusers_group_txt'}

+
+ {tmpl_var name='add_web_users_to_sshusers_group'} +
+
+
+

{tmpl_var name='connect_userid_to_webid_txt'}

+
+ {tmpl_var name='connect_userid_to_webid'} +
+
+
+ + +
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php index 589636114..f0c972784 100644 --- a/interface/web/client/client_edit.php +++ b/interface/web/client/client_edit.php @@ -97,7 +97,6 @@ class page_action extends tform_actions { parent::onSubmit(); } - function onShowEnd() { global $app; @@ -169,8 +168,19 @@ class page_action extends tform_actions { $app->db->query("UPDATE client SET parent_client_id = ".intval($_SESSION['s']['user']['client_id'])." WHERE client_id = ".$this->id); } + //* Set the default servers + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE mail_server = 1 LIMIT 0,1'); + $default_mailserver = intval($tmp['server_id']); + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE web_server = 1 LIMIT 0,1'); + $default_webserver = intval($tmp['server_id']); + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE dns_server = 1 LIMIT 0,1'); + $default_dnsserver = intval($tmp['server_id']); + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE db_server = 1 LIMIT 0,1'); + $default_dbserver = intval($tmp['server_id']); + + $sql = "UPDATE client SET default_mailserver = $default_mailserver, default_webserver = $default_webserver, default_dnsserver = $default_dnsserver, default_dbserver = $default_dbserver WHERE client_id = ".$this->id; + $app->db->query($sql); - /* If there is a client-template, process it */ applyClientTemplates($this->id); diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index 7b64147b7..6e7699250 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -604,6 +604,9 @@ $form["tabs"]['limits'] = array ( 'web_php_options' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOXARRAY', + 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', + 'errmsg'=> 'web_php_options_notempty'), + ), 'default' => '', 'separator' => ',', 'valuelimit' => 'client:web_php_options', @@ -668,6 +671,9 @@ $form["tabs"]['limits'] = array ( 'ssh_chroot' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOXARRAY', + 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', + 'errmsg'=> 'ssh_chroot_notempty'), + ), 'default' => '', 'separator' => ',', 'valuelimit' => 'client:ssh_chroot', diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php index a402bc7cf..5447070f6 100644 --- a/interface/web/client/form/reseller.tform.php +++ b/interface/web/client/form/reseller.tform.php @@ -593,6 +593,9 @@ $form["tabs"]['limits'] = array ( 'web_php_options' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOXARRAY', + 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', + 'errmsg'=> 'web_php_options_notempty'), + ), 'default' => '', 'separator' => ',', 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP') @@ -656,6 +659,9 @@ $form["tabs"]['limits'] = array ( 'ssh_chroot' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOXARRAY', + 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', + 'errmsg'=> 'ssh_chroot_notempty'), + ), 'default' => '', 'separator' => ',', 'value' => array('no' => 'None', 'jailkit' => 'Jailkit') diff --git a/interface/web/client/lib/lang/ar.lng b/interface/web/client/lib/lang/ar.lng index 38bbbb501..9d70b064a 100644 --- a/interface/web/client/lib/lang/ar.lng +++ b/interface/web/client/lib/lang/ar.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Add Reseller'; $wb['Edit Reseller'] = 'Edit Reseller'; $wb['Resellers'] = 'Resellers'; $wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index da332aeb8..f688fd5f7 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng index cc83780ad..ea62daf72 100644 --- a/interface/web/client/lib/lang/ar_reseller.lng +++ b/interface/web/client/lib/lang/ar_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/bg.lng b/interface/web/client/lib/lang/bg.lng index f835dfd5f..5f1f246ff 100644 --- a/interface/web/client/lib/lang/bg.lng +++ b/interface/web/client/lib/lang/bg.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Add Reseller'; $wb['Edit Reseller'] = 'Edit Reseller'; $wb['Resellers'] = 'Resellers'; $wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index aad7d8267..830109f18 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng index cc83780ad..ea62daf72 100644 --- a/interface/web/client/lib/lang/bg_reseller.lng +++ b/interface/web/client/lib/lang/bg_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/br.lng b/interface/web/client/lib/lang/br.lng index 3dcb5e343..c47aa91e6 100644 --- a/interface/web/client/lib/lang/br.lng +++ b/interface/web/client/lib/lang/br.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Adcionar Revendedor'; $wb['Edit Reseller'] = 'Editar Revendedor'; $wb['Resellers'] = 'Revendedores'; $wb['error_has_clients'] = 'Este revendedor possui clientes. Você deve remover os clientes primeiro.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index ad0b957e4..f900d5b83 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Empresa ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng index 257ea5094..670d6756b 100644 --- a/interface/web/client/lib/lang/br_reseller.lng +++ b/interface/web/client/lib/lang/br_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng index 026b6f5bf..eeef0fcf6 100644 --- a/interface/web/client/lib/lang/cz.lng +++ b/interface/web/client/lib/lang/cz.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Přidat distributora'; $wb['Edit Reseller'] = 'Upravit distributora'; $wb['Resellers'] = 'Distributoři'; $wb['error_has_clients'] = 'Distributor má klienty. Nejdříve smažte tyto klienty.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index 9ed5ceded..b6a4d22e2 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index 45ce44ca8..75d4cf469 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/de.lng b/interface/web/client/lib/lang/de.lng index 2ab45de2f..89617e20a 100644 --- a/interface/web/client/lib/lang/de.lng +++ b/interface/web/client/lib/lang/de.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Reseller hinzufügen'; $wb['Edit Reseller'] = 'Reseller bearbeiten'; $wb['Resellers'] = 'Reseller'; $wb['error_has_clients'] = 'Dieser Reseller besitzt Kunden. Bitte zuerst die Kunden löschen.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 6f42cf046..2dca1c7d6 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng index 0b4430f26..55dbfe0cb 100644 --- a/interface/web/client/lib/lang/de_reseller.lng +++ b/interface/web/client/lib/lang/de_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng index e2bb0ab1f..4359ba783 100644 --- a/interface/web/client/lib/lang/el.lng +++ b/interface/web/client/lib/lang/el.lng @@ -12,3 +12,4 @@ $wb['Resellers'] = 'Μεταπωλητές'; $wb['error_has_clients'] = 'Ο Μεταπωλητής έχει πελάτες. Διαγράψτε πρώτα τους πελάτες.'; ?> + diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index 44e2bf1f9..3361cced3 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -106,3 +106,4 @@ $wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπ $wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.'; ?> + diff --git a/interface/web/client/lib/lang/el_client_del.lng b/interface/web/client/lib/lang/el_client_del.lng index 7bd428457..e9056cd62 100644 --- a/interface/web/client/lib/lang/el_client_del.lng +++ b/interface/web/client/lib/lang/el_client_del.lng @@ -5,3 +5,4 @@ $wb['btn_save_txt'] = 'Διαγραφή πελάτη'; $wb['btn_cancel_txt'] = 'Ακύρωση χωρίς διαγραφή πελάτη'; ?> + diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng index c2e604463..d6ad0ffcf 100644 --- a/interface/web/client/lib/lang/el_client_template.lng +++ b/interface/web/client/lib/lang/el_client_template.lng @@ -71,3 +71,4 @@ $wb['template_type_txt'] = 'Τύπος προτύπου'; $wb['template_name_txt'] = 'Όνομα προτύπου'; ?> + diff --git a/interface/web/client/lib/lang/el_client_template_list.lng b/interface/web/client/lib/lang/el_client_template_list.lng index 30e6969e3..ba8ddd3f4 100644 --- a/interface/web/client/lib/lang/el_client_template_list.lng +++ b/interface/web/client/lib/lang/el_client_template_list.lng @@ -4,3 +4,4 @@ $wb['template_type_txt'] = 'Τύπος'; $wb['template_name_txt'] = 'Όνομα Προτύπου'; ?> + diff --git a/interface/web/client/lib/lang/el_clients_list.lng b/interface/web/client/lib/lang/el_clients_list.lng index dd652bfd6..8a51898f7 100644 --- a/interface/web/client/lib/lang/el_clients_list.lng +++ b/interface/web/client/lib/lang/el_clients_list.lng @@ -9,3 +9,4 @@ $wb['add_new_record_txt'] = 'Νέος Πελάτης'; $wb['username_txt'] = 'Username'; ?> + diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng index f3e2dffd9..7deacd0c0 100644 --- a/interface/web/client/lib/lang/el_reseller.lng +++ b/interface/web/client/lib/lang/el_reseller.lng @@ -106,3 +106,4 @@ $wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπ $wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.'; ?> + diff --git a/interface/web/client/lib/lang/el_resellers_list.lng b/interface/web/client/lib/lang/el_resellers_list.lng index 53eecc98d..dbd228691 100644 --- a/interface/web/client/lib/lang/el_resellers_list.lng +++ b/interface/web/client/lib/lang/el_resellers_list.lng @@ -8,3 +8,4 @@ $wb['country_txt'] = 'Χώρα'; $wb['add_new_record_txt'] = 'Νεός Μεταπωλητής'; ?> + diff --git a/interface/web/client/lib/lang/en.lng b/interface/web/client/lib/lang/en.lng index 2c598f3e2..4b10b2b8e 100644 --- a/interface/web/client/lib/lang/en.lng +++ b/interface/web/client/lib/lang/en.lng @@ -10,5 +10,6 @@ $wb['Add Reseller'] = 'Add Reseller'; $wb['Edit Reseller'] = 'Edit Reseller'; $wb['Resellers'] = 'Resellers'; $wb["error_has_clients"] = 'This reseller has clients. Delete the clients of the reseller first.'; - +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> \ No newline at end of file diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index cc7a28c8f..ce4805ef6 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -107,4 +107,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb["limit_openvz_vm_txt"] = 'Max. number of virtual servers'; $wb["limit_openvz_vm_template_id_txt"] = 'Force virtual server template'; $wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.'; +$wb["web_php_options_notempty"] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb["ssh_chroot_notempty"] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng index a553dd731..b93f54ee8 100644 --- a/interface/web/client/lib/lang/en_reseller.lng +++ b/interface/web/client/lib/lang/en_reseller.lng @@ -106,4 +106,6 @@ $wb["required_fields_txt"] = '* Required fields'; $wb["limit_openvz_vm_txt"] = 'Max. number of virtual servers'; $wb["limit_openvz_vm_template_id_txt"] = 'Force virtual server template'; $wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.'; +$wb["web_php_options_notempty"] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb["ssh_chroot_notempty"] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/es.lng b/interface/web/client/lib/lang/es.lng index f1b1d758e..9f72fe574 100644 --- a/interface/web/client/lib/lang/es.lng +++ b/interface/web/client/lib/lang/es.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Añadir revendedor'; $wb['Edit Reseller'] = 'Editar revendedor'; $wb['Resellers'] = 'Revendedores'; $wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng index 8b278d426..3c461a54a 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng index 0b1bdefba..23ea38e5e 100644 --- a/interface/web/client/lib/lang/es_reseller.lng +++ b/interface/web/client/lib/lang/es_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/fi.lng b/interface/web/client/lib/lang/fi.lng index 184f1554a..538902414 100755 --- a/interface/web/client/lib/lang/fi.lng +++ b/interface/web/client/lib/lang/fi.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Lisää uusi jälleenmyyjä'; $wb['Edit Reseller'] = 'Muokkaa jälleenmyyjää'; $wb['Resellers'] = 'Jälleenmyyjät'; $wb['error_has_clients'] = 'Tällä jälleenmyyjällä on asiakkaita, poista ne ensin.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index a6f723ddd..45fbefa3b 100755 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng index 4d3c5a336..bc4b36865 100644 --- a/interface/web/client/lib/lang/fi_reseller.lng +++ b/interface/web/client/lib/lang/fi_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/fr.lng b/interface/web/client/lib/lang/fr.lng index 6bb06dc60..624247c7f 100644 --- a/interface/web/client/lib/lang/fr.lng +++ b/interface/web/client/lib/lang/fr.lng @@ -10,6 +10,6 @@ $wb['Add Reseller'] = 'Ajouter un Revendeur'; $wb['Edit Reseller'] = 'Editer un Revendeur'; $wb['Resellers'] = 'Revendeurs'; $wb['error_has_clients'] = 'Ce revendeur a des clients. Effacez dabord les clients de ce revendeur.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> - - diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index 354d11468..3254ca0ef 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -104,6 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> - - diff --git a/interface/web/client/lib/lang/fr_client_del.lng b/interface/web/client/lib/lang/fr_client_del.lng index 6112325ec..b4d7d5564 100644 --- a/interface/web/client/lib/lang/fr_client_del.lng +++ b/interface/web/client/lib/lang/fr_client_del.lng @@ -4,5 +4,3 @@ $wb['delete_explanation'] = 'Cette action va supprimer le nombre d\'enregistreme $wb['btn_save_txt'] = 'Effacer le client'; $wb['btn_cancel_txt'] = 'Annuler sans effacer le client'; ?> - - diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng index 02b0da055..0aed25104 100644 --- a/interface/web/client/lib/lang/fr_client_template.lng +++ b/interface/web/client/lib/lang/fr_client_template.lng @@ -70,5 +70,3 @@ $wb['web_php_options_txt'] = 'PHP Options'; $wb['template_type_txt'] = 'Template type'; $wb['template_name_txt'] = 'Template name'; ?> - - diff --git a/interface/web/client/lib/lang/fr_client_template_list.lng b/interface/web/client/lib/lang/fr_client_template_list.lng index 6e8fb6970..3405427d2 100644 --- a/interface/web/client/lib/lang/fr_client_template_list.lng +++ b/interface/web/client/lib/lang/fr_client_template_list.lng @@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Modèles de clients'; $wb['template_type_txt'] = 'Type'; $wb['template_name_txt'] = 'Nom du modèle'; ?> - - diff --git a/interface/web/client/lib/lang/fr_clients_list.lng b/interface/web/client/lib/lang/fr_clients_list.lng index e090ccbb3..05d7cb932 100644 --- a/interface/web/client/lib/lang/fr_clients_list.lng +++ b/interface/web/client/lib/lang/fr_clients_list.lng @@ -8,5 +8,3 @@ $wb['country_txt'] = 'Pays'; $wb['add_new_record_txt'] = 'Ajouter un nouveau client'; $wb['username_txt'] = 'Username'; ?> - - diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng index 3c64a3010..40b3502cc 100644 --- a/interface/web/client/lib/lang/fr_reseller.lng +++ b/interface/web/client/lib/lang/fr_reseller.lng @@ -104,6 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> - - diff --git a/interface/web/client/lib/lang/fr_resellers_list.lng b/interface/web/client/lib/lang/fr_resellers_list.lng index 0023caee4..954bd10ed 100644 --- a/interface/web/client/lib/lang/fr_resellers_list.lng +++ b/interface/web/client/lib/lang/fr_resellers_list.lng @@ -7,5 +7,3 @@ $wb['city_txt'] = 'Ville'; $wb['country_txt'] = 'Pays'; $wb['add_new_record_txt'] = 'Ajouter un nouveau client'; ?> - - diff --git a/interface/web/client/lib/lang/hr.lng b/interface/web/client/lib/lang/hr.lng index 38bbbb501..c314f4692 100644 --- a/interface/web/client/lib/lang/hr.lng +++ b/interface/web/client/lib/lang/hr.lng @@ -1,13 +1,15 @@ diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index 36c7b1ad7..0637b904a 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -1,107 +1,109 @@ diff --git a/interface/web/client/lib/lang/hr_client_del.lng b/interface/web/client/lib/lang/hr_client_del.lng index a826d64e1..240f0c8e3 100644 --- a/interface/web/client/lib/lang/hr_client_del.lng +++ b/interface/web/client/lib/lang/hr_client_del.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng index 3aceddb17..535a19132 100644 --- a/interface/web/client/lib/lang/hr_client_template.lng +++ b/interface/web/client/lib/lang/hr_client_template.lng @@ -1,72 +1,72 @@ diff --git a/interface/web/client/lib/lang/hr_client_template_list.lng b/interface/web/client/lib/lang/hr_client_template_list.lng index b93a5f97b..fa009906e 100644 --- a/interface/web/client/lib/lang/hr_client_template_list.lng +++ b/interface/web/client/lib/lang/hr_client_template_list.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/client/lib/lang/hr_clients_list.lng b/interface/web/client/lib/lang/hr_clients_list.lng index a1c0f8766..6039798e1 100644 --- a/interface/web/client/lib/lang/hr_clients_list.lng +++ b/interface/web/client/lib/lang/hr_clients_list.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng index 59f21f7c7..37c350b82 100644 --- a/interface/web/client/lib/lang/hr_reseller.lng +++ b/interface/web/client/lib/lang/hr_reseller.lng @@ -1,107 +1,109 @@ 0'; -$wb['limit_web_quota_txt'] = 'Web Quota'; -$wb['limit_traffic_quota_txt'] = 'Traffic Quota'; -$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.'; -$wb['customer_no_txt'] = 'Customer No.'; -$wb['vat_id_txt'] = 'VAT ID'; -$wb['required_fields_txt'] = '* Required fields'; -$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; -$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; -$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['notes_txt'] = 'Napomena'; +$wb['company_txt'] = 'Poduzeće'; +$wb['title_txt'] = 'Naziv'; +$wb['firstname_txt'] = 'Ime'; +$wb['surname_txt'] = 'Prezime'; +$wb['limit_domain_txt'] = 'limit_domena'; +$wb['limit_subdomain_txt'] = 'limit_poddomena'; +$wb['limit_webquota_txt'] = 'limit_prostora'; +$wb['limit_database_txt'] = 'Maks. broj baza'; +$wb['limit_cron_txt'] = 'Maks. broj cron-ova (chrooted i sa url-om)'; +$wb['limit_cron_type_txt'] = 'Dozvoljena vrsta cron-a'; +$wb['limit_cron_frequency_txt'] = 'Min. pauza između izvršavanja'; +$wb['ip_address_txt'] = 'ip_adresa'; +$wb['limit_client_error_notint'] = 'Limit broja klijenata mora biti znamenka.'; +$wb['firstname_error_empty'] = 'Upišite ime.'; +$wb['contact_error_empty'] = 'Upišite kontakt osobu.'; +$wb['default_webserver_txt'] = 'Izaberi web server'; +$wb['limit_web_domain_txt'] = 'Maks. broj domena'; +$wb['limit_web_aliasdomain_txt'] = 'Maks. broj alias domena'; +$wb['limit_web_subdomain_txt'] = 'Maks. broj poddomena'; +$wb['limit_ftp_user_txt'] = 'Maks. broj FTP računa'; +$wb['default_dnsserver_txt'] = 'Izaberi DNS server'; +$wb['limit_dns_zone_txt'] = 'Maks. broj DNS zona'; +$wb['limit_dns_slave_zone_txt'] = 'Maks. broj sekundarnih DNS zona'; +$wb['limit_dns_record_txt'] = 'Maks. broj DNS zapisa'; +$wb['limit_shell_user_txt'] = 'Maks. broj Shell računa'; +$wb['limit_webdav_user_txt'] = 'Maks. broj Webdav računa'; +$wb['limit_client_txt'] = 'Maks. broj klijenata'; +$wb['username_error_empty'] = 'Korisničko ime nije upisano.'; +$wb['username_error_unique'] = 'Korisničko ime se već koristi.'; +$wb['limit_maildomain_error_notint'] = 'Limit email domena mora biti znamenka.'; +$wb['limit_mailbox_error_notint'] = 'Limit mailboxeva mora biti znamenka.'; +$wb['limit_mailalias_error_notint'] = 'Maks. broj email aliasa mora biti znamenka.'; +$wb['limit_mailforward_error_notint'] = 'Limit email forwarda mora biti znamenka.'; +$wb['limit_mailcatchall_error_notint'] = 'Limit email catchalla mora biti znamenka.'; +$wb['limit_mailrouting_error_notint'] = 'Limit email ruta mora biti znamenka.'; +$wb['limit_mailfilter_error_notint'] = 'Limit email filtera mora biti znamenka.'; +$wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmaila mora biti znamenka.'; +$wb['limit_mailquota_error_notint'] = 'Veličina mailboxa mora biti znamenka.'; +$wb['limit_spamfilter_wblist_error_notint'] = 'Limit white / blacklist spamfiltera mora biti znamenka.'; +$wb['limit_spamfilter_user_error_notint'] = 'Broj spamfilter računa mora biti znamenka.'; +$wb['limit_spamfilter_policy_error_notint'] = 'Broj spamfilter pravila mora biti znamenka.'; +$wb['limit_web_domain_error_notint'] = 'Limit web stranica mora biti znamenka.'; +$wb['limit_web_aliasdomain_error_notint'] = 'Limit alias domena web stranica mora biti broj.'; +$wb['limit_web_subdomain_error_notint'] = 'Maks. broj poddomena web stranice mora biti znamenka.'; +$wb['limit_ftp_user_error_notint'] = 'Maks. broj FTP računa mora biti znamenka.'; +$wb['limit_webdav_user_error_notint'] = 'Maks. broj Webdav računa mora biti znamenka.'; +$wb['limit_shell_user_error_notint'] = 'Maks. broj Shell računa mora biti znamenka.'; +$wb['limit_dns_zone_error_notint'] = 'Maks. broj DNS zapisa mora biti znamenka.'; +$wb['limit_dns_slave_zone_error_notint'] = 'Maks. broj sekundarnih DNS zona mora biti znamenka.'; +$wb['limit_dns_record_error_notint'] = 'Maks. broj DNS zapisa mora biti znamenka.'; +$wb['default_dbserver_txt'] = 'Izaberi server za bazu'; +$wb['limit_database_error_notint'] = 'Maks. broj baza mora biti znamenka.'; +$wb['limit_cron_error_notint'] = 'Maks. broj cron-a mora biti znamenka.'; +$wb['limit_cron_error_frequency'] = 'Trajanje pauze između izvršavanja mora biti znamenka.'; +$wb['username_error_regex'] = 'Korisničko ime sadrži nedozvoljene znakove.'; +$wb['template_master_txt'] = 'Glavni predložak'; +$wb['template_additional_txt'] = 'Dodatni predložak'; +$wb['ssh_chroot_txt'] = 'SSH-Chroot opcije'; +$wb['web_php_options_txt'] = 'PHP opcije'; +$wb['limit_client_error'] = 'Maksimalan broj klijenata!'; +$wb['limit_client_error_positive'] = 'Broj klijenata mora biti veći od 0.'; +$wb['limit_web_quota_txt'] = 'Diskovni prostor'; +$wb['limit_traffic_quota_txt'] = 'Maksimalni promet'; +$wb['limit_trafficquota_error_notint'] = 'Maksimalni promet mora biti znamenka.'; +$wb['customer_no_txt'] = 'Klijent broj:'; +$wb['vat_id_txt'] = 'Porez'; +$wb['required_fields_txt'] = '* Obavezna polja'; +$wb['limit_mailmailinglist_txt'] = 'Maks. broj mail lista'; +$wb['limit_mailmailinglist_error_notint'] = 'Broj mail lista mora biti znamenka.'; +$wb['limit_openvz_vm_txt'] = 'Maks. broj virtualnih servera'; +$wb['limit_openvz_vm_template_id_txt'] = 'Primjeni predložak virtualnog servera'; +$wb['limit_openvz_vm_error_notint'] = 'Broj virtualnih servera mora biti znamenka.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/hr_resellers_list.lng b/interface/web/client/lib/lang/hr_resellers_list.lng index 34d089669..ebdf7dd43 100644 --- a/interface/web/client/lib/lang/hr_resellers_list.lng +++ b/interface/web/client/lib/lang/hr_resellers_list.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/client/lib/lang/hu.lng b/interface/web/client/lib/lang/hu.lng index 2673a462d..ee5a41d34 100644 --- a/interface/web/client/lib/lang/hu.lng +++ b/interface/web/client/lib/lang/hu.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Új Viszonteladó'; $wb['Edit Reseller'] = 'Viszonteladók szerkesztése'; $wb['Resellers'] = 'Viszonteladók'; $wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index 2b4d83748..6bc3a8b83 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng index 37984d793..b1d8e0135 100644 --- a/interface/web/client/lib/lang/hu_reseller.lng +++ b/interface/web/client/lib/lang/hu_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number. $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/id.lng b/interface/web/client/lib/lang/id.lng index 0536b06b5..09bf4fb48 100644 --- a/interface/web/client/lib/lang/id.lng +++ b/interface/web/client/lib/lang/id.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Tambah Reseller'; $wb['Edit Reseller'] = 'Sunting Reseller'; $wb['Resellers'] = 'Reseller'; $wb['error_has_clients'] = 'Reseller ini memiliki klien. Hapus klien dari reseller terlebih dahulu.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng index fdef2911a..5465034e5 100644 --- a/interface/web/client/lib/lang/id_client.lng +++ b/interface/web/client/lib/lang/id_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng index 7b206073b..4ce86492b 100644 --- a/interface/web/client/lib/lang/id_reseller.lng +++ b/interface/web/client/lib/lang/id_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/it.lng b/interface/web/client/lib/lang/it.lng index 4d6a7a319..44d29f733 100644 --- a/interface/web/client/lib/lang/it.lng +++ b/interface/web/client/lib/lang/it.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Aggiungi rivenditore'; $wb['Edit Reseller'] = 'Modifica rivenditore'; $wb['Resellers'] = 'Rivenditori'; $wb['error_has_clients'] = 'Questo rivenditore ha dei clienti, bisogna cancellarli prima di procedere.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index 6120bef76..a0f5bba7f 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng index cc83780ad..ea62daf72 100644 --- a/interface/web/client/lib/lang/it_reseller.lng +++ b/interface/web/client/lib/lang/it_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/ja.lng b/interface/web/client/lib/lang/ja.lng index a6edbc168..66ed95ed7 100644 --- a/interface/web/client/lib/lang/ja.lng +++ b/interface/web/client/lib/lang/ja.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'リセラーを追加する'; $wb['Edit Reseller'] = 'リセラーを編集する'; $wb['Resellers'] = 'リセラー'; $wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index de1a63f58..edf1a4fac 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng index 7178fd6b0..b3b08a6a9 100644 --- a/interface/web/client/lib/lang/ja_reseller.lng +++ b/interface/web/client/lib/lang/ja_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/nl.lng b/interface/web/client/lib/lang/nl.lng index 9ec9454cd..abfdc9184 100644 --- a/interface/web/client/lib/lang/nl.lng +++ b/interface/web/client/lib/lang/nl.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Toevoegen Reseller'; $wb['Edit Reseller'] = 'Wijzigen Reseller'; $wb['Resellers'] = 'Resellers'; $wb['error_has_clients'] = 'Deze reseller heeft klanten. Verwijder eerst de klanten van de reseller'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index 3746c6859..35234e59b 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index 340a0e6b4..59913a163 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/pl.lng b/interface/web/client/lib/lang/pl.lng index f99feadab..f0200d378 100644 --- a/interface/web/client/lib/lang/pl.lng +++ b/interface/web/client/lib/lang/pl.lng @@ -10,5 +10,6 @@ $wb['Add Reseller'] = 'Dodaj Resellera'; $wb['Edit Reseller'] = 'Edytuj Resellera'; $wb['Resellers'] = 'Resellerzy'; $wb['error_has_clients'] = 'Reseller posiada klientów. Usuń ich zanim usuniesz resellera.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> - diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index d9c2d8098..b822079e4 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -104,5 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> - diff --git a/interface/web/client/lib/lang/pl_client_del.lng b/interface/web/client/lib/lang/pl_client_del.lng index aab69a43b..666e12a24 100644 --- a/interface/web/client/lib/lang/pl_client_del.lng +++ b/interface/web/client/lib/lang/pl_client_del.lng @@ -4,4 +4,3 @@ $wb['delete_explanation'] = 'Ta akcja usunie następującą liczbę rekordów po $wb['btn_save_txt'] = 'Usuń klienta'; $wb['btn_cancel_txt'] = 'Anuluj bez usuwania klienta'; ?> - diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng index f49db5bfd..f5f966cc7 100644 --- a/interface/web/client/lib/lang/pl_client_template.lng +++ b/interface/web/client/lib/lang/pl_client_template.lng @@ -70,4 +70,3 @@ $wb['web_php_options_txt'] = 'Opcje PHP'; $wb['template_type_txt'] = 'Rodzaj szablonu'; $wb['template_name_txt'] = 'Nazwa szablonu'; ?> - diff --git a/interface/web/client/lib/lang/pl_client_template_list.lng b/interface/web/client/lib/lang/pl_client_template_list.lng index 76204419e..06a39761f 100644 --- a/interface/web/client/lib/lang/pl_client_template_list.lng +++ b/interface/web/client/lib/lang/pl_client_template_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Szablon klienta'; $wb['template_type_txt'] = 'Typ'; $wb['template_name_txt'] = 'Nazwa szablonu'; ?> - diff --git a/interface/web/client/lib/lang/pl_clients_list.lng b/interface/web/client/lib/lang/pl_clients_list.lng index 7b5cf1d88..a9fad5859 100644 --- a/interface/web/client/lib/lang/pl_clients_list.lng +++ b/interface/web/client/lib/lang/pl_clients_list.lng @@ -8,4 +8,3 @@ $wb['country_txt'] = 'Kraj'; $wb['add_new_record_txt'] = 'Dodaj nowego klienta'; $wb['username_txt'] = 'Login'; ?> - diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index 2f4539639..e0631f2b9 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -104,5 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Maks. ilość wirtualnych serwerów'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> - diff --git a/interface/web/client/lib/lang/pl_resellers_list.lng b/interface/web/client/lib/lang/pl_resellers_list.lng index 256f3b97f..fecbc20b4 100644 --- a/interface/web/client/lib/lang/pl_resellers_list.lng +++ b/interface/web/client/lib/lang/pl_resellers_list.lng @@ -7,4 +7,3 @@ $wb['city_txt'] = 'Miasto'; $wb['country_txt'] = 'Państwo'; $wb['add_new_record_txt'] = 'Dodaj nowego resellera'; ?> - diff --git a/interface/web/client/lib/lang/pt.lng b/interface/web/client/lib/lang/pt.lng index 564bd6030..8ec6dd1dc 100644 --- a/interface/web/client/lib/lang/pt.lng +++ b/interface/web/client/lib/lang/pt.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Adicionar Revendedor'; $wb['Edit Reseller'] = 'Editar Revendedor'; $wb['Resellers'] = 'Revendedores'; $wb['error_has_clients'] = 'Este revendedor possui clientes. Deve remover os clientes primeiro.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index 4452a681a..bdc3f7eb8 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng index 164cf87cb..83c9fa94f 100644 --- a/interface/web/client/lib/lang/pt_reseller.lng +++ b/interface/web/client/lib/lang/pt_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/ro.lng b/interface/web/client/lib/lang/ro.lng index 38bbbb501..9d70b064a 100644 --- a/interface/web/client/lib/lang/ro.lng +++ b/interface/web/client/lib/lang/ro.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Add Reseller'; $wb['Edit Reseller'] = 'Edit Reseller'; $wb['Resellers'] = 'Resellers'; $wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index 550941169..1380813b1 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng index cc83780ad..ea62daf72 100644 --- a/interface/web/client/lib/lang/ro_reseller.lng +++ b/interface/web/client/lib/lang/ro_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/ru.lng b/interface/web/client/lib/lang/ru.lng index bc900f9ca..ec39c0629 100644 --- a/interface/web/client/lib/lang/ru.lng +++ b/interface/web/client/lib/lang/ru.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Добавить реселлера'; $wb['Edit Reseller'] = 'Изменить реселлера'; $wb['Resellers'] = 'Реселлеры'; $wb['error_has_clients'] = 'У реселлера есть клиенты. Вначале удалите их.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index ef4200868..ab7c44803 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng index 7ef6c8d17..3c36e5bc2 100644 --- a/interface/web/client/lib/lang/ru_reseller.lng +++ b/interface/web/client/lib/lang/ru_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/se.lng b/interface/web/client/lib/lang/se.lng index 38bbbb501..9d70b064a 100644 --- a/interface/web/client/lib/lang/se.lng +++ b/interface/web/client/lib/lang/se.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Add Reseller'; $wb['Edit Reseller'] = 'Edit Reseller'; $wb['Resellers'] = 'Resellers'; $wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng index 3ba3ecf81..bcefaddf2 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng index cc83780ad..ea62daf72 100644 --- a/interface/web/client/lib/lang/se_reseller.lng +++ b/interface/web/client/lib/lang/se_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/sk.lng b/interface/web/client/lib/lang/sk.lng index 5dc2b70c6..a6f182ee2 100644 --- a/interface/web/client/lib/lang/sk.lng +++ b/interface/web/client/lib/lang/sk.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Pridať nového predajcu'; $wb['Edit Reseller'] = 'Upraviť predajcu'; $wb['Resellers'] = 'Predajcovia'; $wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index 165d11813..72cd85323 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng index f41b5854b..2008e6c1c 100644 --- a/interface/web/client/lib/lang/sk_reseller.lng +++ b/interface/web/client/lib/lang/sk_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/tr.lng b/interface/web/client/lib/lang/tr.lng index 5a0a4a887..9caa4cb8c 100644 --- a/interface/web/client/lib/lang/tr.lng +++ b/interface/web/client/lib/lang/tr.lng @@ -10,4 +10,6 @@ $wb['Add Reseller'] = 'Reseller Ekle'; $wb['Edit Reseller'] = 'Reseller Düzenle'; $wb['Resellers'] = 'Resellerlar'; $wb['error_has_clients'] = 'Bu reseller müşterilere sahip. Resellerı silmeden önce müşterilerini silmelisiniz.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Delete additional template'; ?> diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index d6da752e2..117eb4f4b 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -104,4 +104,6 @@ $wb['company_id_txt'] = 'Company/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng index 9170b5e0d..ba24fda9b 100644 --- a/interface/web/client/lib/lang/tr_reseller.lng +++ b/interface/web/client/lib/lang/tr_reseller.lng @@ -104,4 +104,6 @@ $wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number. $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; ?> diff --git a/interface/web/client/reseller_edit.php b/interface/web/client/reseller_edit.php index 9ab636920..8a1a1b9e1 100644 --- a/interface/web/client/reseller_edit.php +++ b/interface/web/client/reseller_edit.php @@ -165,6 +165,19 @@ class page_action extends tform_actions { //* set the number of clients to 1 $app->db->query("UPDATE client SET limit_client = 1 WHERE client_id = ".$this->id); + + //* Set the default servers + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE mail_server = 1 LIMIT 0,1'); + $default_mailserver = intval($tmp['server_id']); + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE web_server = 1 LIMIT 0,1'); + $default_webserver = intval($tmp['server_id']); + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE dns_server = 1 LIMIT 0,1'); + $default_dnsserver = intval($tmp['server_id']); + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE db_server = 1 LIMIT 0,1'); + $default_dbserver = intval($tmp['server_id']); + + $sql = "UPDATE client SET default_mailserver = $default_mailserver, default_webserver = $default_webserver, default_dnsserver = $default_dnsserver, default_dbserver = $default_dbserver WHERE client_id = ".$this->id; + $app->db->query($sql); /* If there is a client-template, process it */ applyClientTemplates($this->id); diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index 74b28ef67..472fb877c 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -7,8 +7,8 @@
{tmpl_var name="toolsarea_head_txt"}
- - + +
diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php index 88d459f33..c0778816a 100644 --- a/interface/web/dashboard/dashboard.php +++ b/interface/web/dashboard/dashboard.php @@ -100,14 +100,14 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') { $this_fullversion = (($this_version[0] < 10) ? '0'.$this_version[0] : $this_version[0]) . ((isset($this_version[1]) && $this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) . ((isset($this_version[2]) && $this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) . - ((isset($this_version[3]) && $this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : $this_version[3]); + ((isset($this_version[3]) && $this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : @$this_version[3]); $new_version = explode(".",$v2); $new_fullversion = (($new_version[0] < 10) ? '0'.$new_version[0] : $new_version[0]) . ((isset($new_version[1]) && $new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) . ((isset($new_version[2]) && $new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) . - ((isset($new_version[3]) && $new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : $new_version[3]); + ((isset($new_version[3]) && $new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : @$new_version[3]); if($new_fullversion > $this_fullversion) { $info[] = array('info_msg' => 'There is a new Version of ISPConfig 3 available!
' . 'This Version: ' . $v1 . '
' . diff --git a/interface/web/dashboard/dashlets/modules.php b/interface/web/dashboard/dashlets/modules.php index cfb2e129d..2f16329f8 100644 --- a/interface/web/dashboard/dashlets/modules.php +++ b/interface/web/dashboard/dashlets/modules.php @@ -29,7 +29,11 @@ class dashlet_modules { /* We don't want to show the dashboard */ if ($mt != 'dashboard') { $module_title = $app->lng($module['title']); - if(strlen($module_title) > 8) $module_title = substr($module_title,0,7).'..'; + if(function_exists('mb_strlen')) { + if(mb_strlen($module_title,"UTF-8") > 8) $module_title = mb_substr($module_title,0,7,"UTF-8").'..'; + } else { + if(strlen($module_title) > 8) $module_title = substr($module_title,0,7).'..'; + } $mod[] = array( 'modules_title' => $module_title, 'modules_startpage' => $module['startpage'], 'modules_name' => $module['name']); diff --git a/interface/web/dashboard/lib/custom_menu.inc.php b/interface/web/dashboard/lib/custom_menu.inc.php index 247f3c101..8796023c6 100644 --- a/interface/web/dashboard/lib/custom_menu.inc.php +++ b/interface/web/dashboard/lib/custom_menu.inc.php @@ -51,6 +51,8 @@ switch($_SESSION['s']['user']['typ']) { $atom_url = ""; } +$rows = array(); + if( $atom_url != '' ) { if(!isset($_SESSION['s']['rss_news'])) { diff --git a/interface/web/dashboard/lib/lang/el.lng b/interface/web/dashboard/lib/lang/el.lng index 39bf4b868..562b361d6 100644 --- a/interface/web/dashboard/lib/lang/el.lng +++ b/interface/web/dashboard/lib/lang/el.lng @@ -3,3 +3,4 @@ $wb['welcome_user_txt'] = 'Καλωσήρθατε %s'; $wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα'; ?> + diff --git a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng index 351e98231..a3553dd51 100644 --- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng @@ -29,3 +29,4 @@ $wb['limit_database_txt'] = 'Πλήθος Databases'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; ?> + diff --git a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng index 17d42ed2e..64678ba2d 100644 --- a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng @@ -2,3 +2,4 @@ $wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα'; ?> + diff --git a/interface/web/dashboard/lib/lang/fr.lng b/interface/web/dashboard/lib/lang/fr.lng index 07dc5b791..a33b5e4ef 100644 --- a/interface/web/dashboard/lib/lang/fr.lng +++ b/interface/web/dashboard/lib/lang/fr.lng @@ -2,5 +2,3 @@ $wb['welcome_user_txt'] = 'Bienvenue %s'; $wb['available_modules_txt'] = 'Modules disponibles'; ?> - - diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng index afcf28b2b..60e3ef211 100644 --- a/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng @@ -5,27 +5,26 @@ $wb['unlimited_txt'] = 'Illimité'; $wb['limit_maildomain_txt'] = 'Nombre de domaines email'; $wb['limit_mailmailinglist_txt'] = 'Nombre de mailing lists'; $wb['limit_mailbox_txt'] = 'Nombre de boites email'; -$wb["limit_mailalias_txt"] = 'Nombre d\'alias email'; -$wb["limit_mailaliasdomain_txt"] = 'Nombre d\'alias de domaine'; -$wb["limit_mailforward_txt"] = 'Nombre de transferts d\'email'; -$wb["limit_mailcatchall_txt"] = 'Nombre de comptes email collecteurs'; -$wb["limit_mailrouting_txt"] = 'Nombre de routes email'; -$wb["limit_mailfilter_txt"] = 'Nombre de filtres email'; -$wb["limit_fetchmail_txt"] = 'Nombre de comptes Fetchmail'; -$wb["limit_spamfilter_wblist_txt"] = 'Nombre de listes blanches / noires de l\'anti-spam'; -$wb["limit_spamfilter_user_txt"] = 'Nombre d\'utilisateurs de l\'anti-spam'; -$wb["limit_spamfilter_policy_txt"] = 'Nombre de stratégies de l\'anti-spam'; -$wb["limit_cron_txt"] = 'Nombre de tâches Cron'; -$wb["limit_web_domain_txt"] = 'Nombre de domaines web'; -$wb["limit_web_aliasdomain_txt"] = 'Nombre d\'alias de domaine web'; -$wb["limit_web_subdomain_txt"] = 'Nombre de sous-domaines web'; -$wb["limit_ftp_user_txt"] = 'Nombre d\'utilisateurs FTP'; -$wb["limit_dns_zone_txt"] = 'Nombre de zones DNS'; -$wb["limit_dns_slave_zone_txt"] = 'Nombre de zones DNS secondaires'; -$wb["limit_dns_record_txt"] = 'Nombre d\'enregistrements DNS'; -$wb["limit_shell_user_txt"] = 'Nombre d\'utilisateurs Shell'; -$wb["limit_webdav_user_txt"] = 'Nombre d\'utilisateurs WebDAV'; -$wb["limit_client_txt"] = 'Nombre de clients'; -$wb["limit_database_txt"] = 'Nombre de bases de données'; +$wb['limit_mailalias_txt'] = 'Nombre d\'alias email'; +$wb['limit_mailaliasdomain_txt'] = 'Nombre d\'alias de domaine'; +$wb['limit_mailforward_txt'] = 'Nombre de transferts d\'email'; +$wb['limit_mailcatchall_txt'] = 'Nombre de comptes email collecteurs'; +$wb['limit_mailrouting_txt'] = 'Nombre de routes email'; +$wb['limit_mailfilter_txt'] = 'Nombre de filtres email'; +$wb['limit_fetchmail_txt'] = 'Nombre de comptes Fetchmail'; +$wb['limit_spamfilter_wblist_txt'] = 'Nombre de listes blanches / noires de l\'anti-spam'; +$wb['limit_spamfilter_user_txt'] = 'Nombre d\'utilisateurs de l\'anti-spam'; +$wb['limit_spamfilter_policy_txt'] = 'Nombre de stratégies de l\'anti-spam'; +$wb['limit_cron_txt'] = 'Nombre de tâches Cron'; +$wb['limit_web_domain_txt'] = 'Nombre de domaines web'; +$wb['limit_web_aliasdomain_txt'] = 'Nombre d\'alias de domaine web'; +$wb['limit_web_subdomain_txt'] = 'Nombre de sous-domaines web'; +$wb['limit_ftp_user_txt'] = 'Nombre d\'utilisateurs FTP'; +$wb['limit_dns_zone_txt'] = 'Nombre de zones DNS'; +$wb['limit_dns_slave_zone_txt'] = 'Nombre de zones DNS secondaires'; +$wb['limit_dns_record_txt'] = 'Nombre d\'enregistrements DNS'; +$wb['limit_shell_user_txt'] = 'Nombre d\'utilisateurs Shell'; +$wb['limit_webdav_user_txt'] = 'Nombre d\'utilisateurs WebDAV'; +$wb['limit_client_txt'] = 'Nombre de clients'; +$wb['limit_database_txt'] = 'Nombre de bases de données'; ?> - diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng index 910a04f1c..4d6a5d827 100644 --- a/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng @@ -1,5 +1,3 @@ - - diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng index 65e0d4497..cc5b32257 100644 --- a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng @@ -8,7 +8,7 @@ $wb['limit_mailalias_txt'] = 'Mail aliasi'; $wb['limit_mailaliasdomain_txt'] = 'Aliasi domene'; $wb['limit_mailforward_txt'] = 'Mail forwarderi'; $wb['limit_mailcatchall_txt'] = 'Mail catchall računi'; -$wb['limit_mailrouting_txt'] = 'Mail route'; +$wb['limit_mailrouting_txt'] = 'Mail rute'; $wb['limit_mailfilter_txt'] = 'Mail filteri'; $wb['limit_fetchmail_txt'] = 'Fetchmail računi'; $wb['limit_spamfilter_wblist_txt'] = 'Broj white / blacklist spam filtera'; @@ -17,7 +17,7 @@ $wb['limit_spamfilter_policy_txt'] = 'Broj spam filtera'; $wb['limit_cron_txt'] = 'Broj cron-ova'; $wb['limit_web_domain_txt'] = 'Domene'; $wb['limit_web_aliasdomain_txt'] = 'Alias domene'; -$wb['limit_web_subdomain_txt'] = 'Subdomene'; +$wb['limit_web_subdomain_txt'] = 'Poddomene'; $wb['limit_ftp_user_txt'] = 'FTP računi'; $wb['limit_dns_zone_txt'] = 'DNS primarne zone'; $wb['limit_dns_slave_zone_txt'] = 'DNS sekundarne zone'; @@ -25,6 +25,6 @@ $wb['limit_dns_record_txt'] = 'DNS zapisi'; $wb['limit_shell_user_txt'] = 'Shell računi'; $wb['limit_webdav_user_txt'] = 'Webdav računi'; $wb['limit_client_txt'] = 'Klijenti'; -$wb['limit_database_txt'] = 'Baze'; -$wb['limit_mailmailinglist_txt'] = 'Mail liste'; +$wb['limit_database_txt'] = 'Broj baza'; +$wb['limit_mailmailinglist_txt'] = 'Broj mail lista'; ?> diff --git a/interface/web/dashboard/lib/lang/pl.lng b/interface/web/dashboard/lib/lang/pl.lng index 9a8b6694f..5ef320a86 100644 --- a/interface/web/dashboard/lib/lang/pl.lng +++ b/interface/web/dashboard/lib/lang/pl.lng @@ -2,4 +2,3 @@ $wb['welcome_user_txt'] = 'Witaj %s'; $wb['available_modules_txt'] = 'Dostępne moduły'; ?> - diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng index b0c28ec7e..d69a551bd 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng @@ -28,4 +28,3 @@ $wb['limit_client_txt'] = 'Liczba klientów'; $wb['limit_database_txt'] = 'Liczba baz danych'; $wb['limit_mailmailinglist_txt'] = 'Liczba list mailingowych'; ?> - diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng index e329a2517..fafcc6148 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng @@ -1,4 +1,3 @@ - diff --git a/interface/web/designer/lib/lang/el.lng b/interface/web/designer/lib/lang/el.lng index 29f4a51ef..dd815ad75 100644 --- a/interface/web/designer/lib/lang/el.lng +++ b/interface/web/designer/lib/lang/el.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/designer/lib/lang/el_form_edit.lng b/interface/web/designer/lib/lang/el_form_edit.lng index 1e653873f..e4ae9c344 100644 --- a/interface/web/designer/lib/lang/el_form_edit.lng +++ b/interface/web/designer/lib/lang/el_form_edit.lng @@ -23,3 +23,4 @@ $wb['auth_preset_perm_group_txt'] = 'Perm. Group'; $wb['auth_preset_perm_other_txt'] = 'Perm. Other'; ?> + diff --git a/interface/web/designer/lib/lang/el_form_list.lng b/interface/web/designer/lib/lang/el_form_list.lng index f428b6935..68a5f4787 100644 --- a/interface/web/designer/lib/lang/el_form_list.lng +++ b/interface/web/designer/lib/lang/el_form_list.lng @@ -6,3 +6,4 @@ $wb['title_txt'] = 'Τίτλος'; $wb['description_txt'] = 'Περιγραφή'; ?> + diff --git a/interface/web/designer/lib/lang/el_form_show.lng b/interface/web/designer/lib/lang/el_form_show.lng index 1cedf2676..fff12a741 100644 --- a/interface/web/designer/lib/lang/el_form_show.lng +++ b/interface/web/designer/lib/lang/el_form_show.lng @@ -17,3 +17,4 @@ $wb['menu_del_txt'] = 'Διαγραφή μενού και όλων των στο $wb['item_del_txt'] = 'Διαγραφή του στοιχείου μενού'; ?> + diff --git a/interface/web/designer/lib/lang/el_module_edit.lng b/interface/web/designer/lib/lang/el_module_edit.lng index a253cbc0b..7abbb0857 100644 --- a/interface/web/designer/lib/lang/el_module_edit.lng +++ b/interface/web/designer/lib/lang/el_module_edit.lng @@ -11,3 +11,4 @@ $wb['header_txt'] = 'Ιδιότητες αρθρώματος'; $wb['description_txt'] = 'Περιγραφή

Όνομα αρθρώματος: Όνομα του φακέλου του αρθρώματος. Επιτρέπονται μόνο αριθμοί, χαρακτήρες και η κάτω παύλα.
Τίτλος Αρθώματος: Θα εμφανιστεί στο βασικό μενού (επάνω).
Αρχείο προτύπου: Το αρχείο προτύπου του αρθρώματος. Προς το παρών διαθέσιμα: module.tpl.htm και module_tree.tpl.htm. Το προεπιλεγμένο είναι το module.tpl.htm.
NaviFrame: Αν το module_tree.tpl.htm επιλέχθηκε ώα αρχείο προτύπου, εισάγετε εδώ την διαδρομή για το script που αφορά το αριστερό frame.
Προεπιλεγμένη Σελίδα: Αυτή σελίδα θα εμφανίζεται όταν ανοίξει το άρθρωμα.
Πλάτος Καρτέλας:Το πλάτος της καρτέλας στο βασικό μενού. Το πεδίο είναι άδειο εξ ορισμού. Μπορείτε να εισάγετε απόλυτες τιμές σε pixel (π.χ. 20) ή σχετικές (π.χ. 20%).
Βοήθεια: Όλες οι διαδρομές είναι σχετικές ως προς τον φάκελο '; ?> + diff --git a/interface/web/designer/lib/lang/el_module_list.lng b/interface/web/designer/lib/lang/el_module_list.lng index c5c484d16..fb598b127 100644 --- a/interface/web/designer/lib/lang/el_module_list.lng +++ b/interface/web/designer/lib/lang/el_module_list.lng @@ -4,3 +4,4 @@ $wb['module_txt'] = 'Άρθρωμα'; $wb['title_txt'] = 'Τίτλος'; ?> + diff --git a/interface/web/designer/lib/lang/el_module_nav_edit.lng b/interface/web/designer/lib/lang/el_module_nav_edit.lng index b41f138a2..972c48791 100644 --- a/interface/web/designer/lib/lang/el_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/el_module_nav_edit.lng @@ -5,3 +5,4 @@ $wb['save_txt'] = 'Αποθήκευση'; $wb['cancel_txt'] = 'Άκυρο'; ?> + diff --git a/interface/web/designer/lib/lang/el_module_nav_item_edit.lng b/interface/web/designer/lib/lang/el_module_nav_item_edit.lng index af3c434ac..673d95421 100644 --- a/interface/web/designer/lib/lang/el_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/el_module_nav_item_edit.lng @@ -7,3 +7,4 @@ $wb['save_txt'] = 'Αποθήκευση'; $wb['cancel_txt'] = 'Ακύρωση'; ?> + diff --git a/interface/web/designer/lib/lang/el_module_show.lng b/interface/web/designer/lib/lang/el_module_show.lng index be99c925b..450281b44 100644 --- a/interface/web/designer/lib/lang/el_module_show.lng +++ b/interface/web/designer/lib/lang/el_module_show.lng @@ -15,3 +15,4 @@ $wb['menu_del_txt'] = 'Θέλετε να διαγράψετε το μενού κ $wb['item_del_txt'] = 'Θέλετε να διαγράψετε το στοιχείο;'; ?> + diff --git a/interface/web/designer/lib/lang/fr.lng b/interface/web/designer/lib/lang/fr.lng index dd815ad75..acb6c3546 100644 --- a/interface/web/designer/lib/lang/fr.lng +++ b/interface/web/designer/lib/lang/fr.lng @@ -1,4 +1,2 @@ - - diff --git a/interface/web/designer/lib/lang/fr_form_edit.lng b/interface/web/designer/lib/lang/fr_form_edit.lng index 0a4ca94c0..eb3f5a35c 100644 --- a/interface/web/designer/lib/lang/fr_form_edit.lng +++ b/interface/web/designer/lib/lang/fr_form_edit.lng @@ -22,5 +22,3 @@ $wb['auth_preset_perm_user_txt'] = 'Permission Utilisateur'; $wb['auth_preset_perm_group_txt'] = 'Permission Groupe'; $wb['auth_preset_perm_other_txt'] = 'Permission Autre'; ?> - - diff --git a/interface/web/designer/lib/lang/fr_form_list.lng b/interface/web/designer/lib/lang/fr_form_list.lng index bec1e46a8..a61e61af5 100644 --- a/interface/web/designer/lib/lang/fr_form_list.lng +++ b/interface/web/designer/lib/lang/fr_form_list.lng @@ -5,5 +5,3 @@ $wb['module_txt'] = 'Module'; $wb['title_txt'] = 'Titre'; $wb['description_txt'] = 'Description'; ?> - - diff --git a/interface/web/designer/lib/lang/fr_form_show.lng b/interface/web/designer/lib/lang/fr_form_show.lng index 7e0f219a9..3cb420f47 100644 --- a/interface/web/designer/lib/lang/fr_form_show.lng +++ b/interface/web/designer/lib/lang/fr_form_show.lng @@ -16,5 +16,3 @@ $wb['module_del_txt'] = 'Effacer le module et tous ses sous-répertoires'; $wb['menu_del_txt'] = 'Effacer le menu et toutes ses entrées'; $wb['item_del_txt'] = 'Effacer lentrée'; ?> - - diff --git a/interface/web/designer/lib/lang/fr_module_edit.lng b/interface/web/designer/lib/lang/fr_module_edit.lng index 3029358ed..282c73cdc 100644 --- a/interface/web/designer/lib/lang/fr_module_edit.lng +++ b/interface/web/designer/lib/lang/fr_module_edit.lng @@ -10,5 +10,3 @@ $wb['cancel_txt'] = 'Annuler'; $wb['header_txt'] = 'Propriétés du module'; $wb['description_txt'] = ' Description

Nom du Module: Nom du répertoire du module. Seuls les nombres, lettres et underscores sont autorisés.
Titre du module: Sera affiché dans le menu de navigation (supérieur).
Fichier gabarit: Fichier'; ?> - - diff --git a/interface/web/designer/lib/lang/fr_module_list.lng b/interface/web/designer/lib/lang/fr_module_list.lng index 57b4a3da1..927c65eb5 100644 --- a/interface/web/designer/lib/lang/fr_module_list.lng +++ b/interface/web/designer/lib/lang/fr_module_list.lng @@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Module dadministration'; $wb['module_txt'] = 'Module'; $wb['title_txt'] = 'Titre'; ?> - - diff --git a/interface/web/designer/lib/lang/fr_module_nav_edit.lng b/interface/web/designer/lib/lang/fr_module_nav_edit.lng index b22b3c0f8..53c5e4128 100644 --- a/interface/web/designer/lib/lang/fr_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/fr_module_nav_edit.lng @@ -4,5 +4,3 @@ $wb['header_txt'] = 'Propriétés de navigation'; $wb['save_txt'] = 'Sauver'; $wb['cancel_txt'] = 'Annuler'; ?> - - diff --git a/interface/web/designer/lib/lang/fr_module_nav_item_edit.lng b/interface/web/designer/lib/lang/fr_module_nav_item_edit.lng index 64d9131c8..21852e292 100644 --- a/interface/web/designer/lib/lang/fr_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/fr_module_nav_item_edit.lng @@ -6,5 +6,3 @@ $wb['header_txt'] = 'Propriétés de navigation'; $wb['save_txt'] = 'Sauver'; $wb['cancel_txt'] = 'Annuler'; ?> - - diff --git a/interface/web/designer/lib/lang/fr_module_show.lng b/interface/web/designer/lib/lang/fr_module_show.lng index bf1a74ba3..c9c85706f 100644 --- a/interface/web/designer/lib/lang/fr_module_show.lng +++ b/interface/web/designer/lib/lang/fr_module_show.lng @@ -14,5 +14,3 @@ $wb['module_del_txt'] = 'Voulez-vous supprimer le module et tous les fichiers et $wb['menu_del_txt'] = 'Voulez-vous supprimer le menu avec tous ses sous-menus '; $wb['item_del_txt'] = 'Voulez-vous supprimer lentrée de menu '; ?> - - diff --git a/interface/web/designer/lib/lang/pl.lng b/interface/web/designer/lib/lang/pl.lng index 29f4a51ef..acb6c3546 100644 --- a/interface/web/designer/lib/lang/pl.lng +++ b/interface/web/designer/lib/lang/pl.lng @@ -1,3 +1,2 @@ - diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng index cff6b51b2..ee4f4c410 100644 --- a/interface/web/designer/lib/lang/pl_form_edit.lng +++ b/interface/web/designer/lib/lang/pl_form_edit.lng @@ -22,4 +22,3 @@ $wb['auth_preset_perm_user_txt'] = 'Stały użytkownik'; $wb['auth_preset_perm_group_txt'] = 'Stała grupa'; $wb['auth_preset_perm_other_txt'] = 'Stała inna'; ?> - diff --git a/interface/web/designer/lib/lang/pl_form_list.lng b/interface/web/designer/lib/lang/pl_form_list.lng index a0aacc35b..ac8572277 100644 --- a/interface/web/designer/lib/lang/pl_form_list.lng +++ b/interface/web/designer/lib/lang/pl_form_list.lng @@ -5,4 +5,3 @@ $wb['module_txt'] = 'Moduł'; $wb['title_txt'] = 'Tytuł'; $wb['description_txt'] = 'Opis'; ?> - diff --git a/interface/web/designer/lib/lang/pl_form_show.lng b/interface/web/designer/lib/lang/pl_form_show.lng index fbb82a426..db62af16b 100644 --- a/interface/web/designer/lib/lang/pl_form_show.lng +++ b/interface/web/designer/lib/lang/pl_form_show.lng @@ -16,4 +16,3 @@ $wb['module_del_txt'] = 'Usunąć moduł i wszystkie podkatalogi?'; $wb['menu_del_txt'] = 'Usunąć menu i wszystkie jego elementy?'; $wb['item_del_txt'] = 'Usunąc element menu?'; ?> - diff --git a/interface/web/designer/lib/lang/pl_module_edit.lng b/interface/web/designer/lib/lang/pl_module_edit.lng index d05cb9fad..b87d04b18 100644 --- a/interface/web/designer/lib/lang/pl_module_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_edit.lng @@ -20,4 +20,3 @@ $wb['description_txt'] = ' Podpowiedź: Wszystkie ścieżki są względne według strony www.. '; ?> - diff --git a/interface/web/designer/lib/lang/pl_module_list.lng b/interface/web/designer/lib/lang/pl_module_list.lng index 2751633fa..308d1c688 100644 --- a/interface/web/designer/lib/lang/pl_module_list.lng +++ b/interface/web/designer/lib/lang/pl_module_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Nazwa modułu'; $wb['module_txt'] = 'Moduł'; $wb['title_txt'] = 'Tytuł'; ?> - diff --git a/interface/web/designer/lib/lang/pl_module_nav_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_edit.lng index 54095f906..fe8edabf6 100644 --- a/interface/web/designer/lib/lang/pl_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_nav_edit.lng @@ -4,4 +4,3 @@ $wb['header_txt'] = 'Parametry nawigacyjne'; $wb['save_txt'] = 'Zapisz'; $wb['cancel_txt'] = 'Usuń'; ?> - diff --git a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng index 1e2fde46f..779b3b4b3 100644 --- a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng @@ -6,4 +6,3 @@ $wb['header_txt'] = 'Parametry nawigacyjne'; $wb['save_txt'] = 'Zapisz'; $wb['cancel_txt'] = 'Usuń'; ?> - diff --git a/interface/web/designer/lib/lang/pl_module_show.lng b/interface/web/designer/lib/lang/pl_module_show.lng index 6daf82e39..9b98c4948 100644 --- a/interface/web/designer/lib/lang/pl_module_show.lng +++ b/interface/web/designer/lib/lang/pl_module_show.lng @@ -14,4 +14,3 @@ $wb['module_del_txt'] = 'Czy na pewno chcesz usunąć moduł wraz z wszystkimi p $wb['menu_del_txt'] = 'Czy na pewno chcesz usunąć menu z wszystkimi wpisami?'; $wb['item_del_txt'] = 'Czy na pewno chcesz usunąć wpis w menu?'; ?> - diff --git a/interface/web/dns/lib/lang/ar.lng b/interface/web/dns/lib/lang/ar.lng index c08339fe9..8b25f7356 100644 --- a/interface/web/dns/lib/lang/ar.lng +++ b/interface/web/dns/lib/lang/ar.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/bg.lng b/interface/web/dns/lib/lang/bg.lng index c08339fe9..8b25f7356 100644 --- a/interface/web/dns/lib/lang/bg.lng +++ b/interface/web/dns/lib/lang/bg.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/br.lng b/interface/web/dns/lib/lang/br.lng index b7a7a7cc0..fd2eb370c 100644 --- a/interface/web/dns/lib/lang/br.lng +++ b/interface/web/dns/lib/lang/br.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Gabaritos'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng index 432c8fede..6a938278c 100644 --- a/interface/web/dns/lib/lang/cz.lng +++ b/interface/web/dns/lib/lang/cz.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Šablony'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng index 7242257fc..8200e568e 100644 --- a/interface/web/dns/lib/lang/de.lng +++ b/interface/web/dns/lib/lang/de.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Vorlagen'; $wb['zone_file_successfully_imported_txt'] = 'Die Zone-Datei ist erfolgreich importiert worden!'; $wb['error_no_valid_zone_file_txt'] = 'Es scheint, als ob dies keine gültige Zone-Datei ist!'; $wb['zonefile_to_import_txt'] = 'Zone-Datei'; +$wb['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/el.lng b/interface/web/dns/lib/lang/el.lng index 45144226e..9f513f27f 100644 --- a/interface/web/dns/lib/lang/el.lng +++ b/interface/web/dns/lib/lang/el.lng @@ -22,3 +22,4 @@ $wb['error_no_valid_zone_file_txt'] = 'Το αρχείο ζώνης φαίνετ $wb['zonefile_to_import_txt'] = 'Αρχείο Ζώνης'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_a.lng b/interface/web/dns/lib/lang/el_dns_a.lng index 7772b5ff0..6ccc36888 100644 --- a/interface/web/dns/lib/lang/el_dns_a.lng +++ b/interface/web/dns/lib/lang/el_dns_a.lng @@ -15,3 +15,4 @@ $wb['data_error_regex'] = 'Διεύθυνση IP με μη έγκυρη μορφ $wb['data_error_duplicate'] = 'Διπλή εγγραφή A-Record ή CNAME-Record'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_a_list.lng b/interface/web/dns/lib/lang/el_dns_a_list.lng index 05ed36039..06cd76ae6 100644 --- a/interface/web/dns/lib/lang/el_dns_a_list.lng +++ b/interface/web/dns/lib/lang/el_dns_a_list.lng @@ -13,3 +13,4 @@ $wb['page_of_txt'] = 'από'; $wb['delete_confirmation'] = 'Θέλετε οπωσδήποτε να διαγράψετε αυτή την εγγραφή;'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_aaaa.lng b/interface/web/dns/lib/lang/el_dns_aaaa.lng index 76a46877c..a29de3d93 100644 --- a/interface/web/dns/lib/lang/el_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/el_dns_aaaa.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Διεύθυνση IP κενή'; $wb['data_error_regex'] = 'Διεύθυνση IP με μη έγκυρη μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_alias.lng b/interface/web/dns/lib/lang/el_dns_alias.lng index 46bcfe284..ff6f54a45 100644 --- a/interface/web/dns/lib/lang/el_dns_alias.lng +++ b/interface/web/dns/lib/lang/el_dns_alias.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Το hostname Προορισμός δεν έχει ο $wb['data_error_regex'] = 'Το hostname Προορισμός έχει λάθος μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_cname.lng b/interface/web/dns/lib/lang/el_dns_cname.lng index 4a8cc63ab..b972d7d94 100644 --- a/interface/web/dns/lib/lang/el_dns_cname.lng +++ b/interface/web/dns/lib/lang/el_dns_cname.lng @@ -15,3 +15,4 @@ $wb['data_error_regex'] = 'Hostname Προορισμός με μη έγκυρη $wb['data_error_duplicate'] = 'Διπλοεγγραφή A-Record ή CNAME-Record'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_hinfo.lng b/interface/web/dns/lib/lang/el_dns_hinfo.lng index 8c869537a..af2c1bbaf 100644 --- a/interface/web/dns/lib/lang/el_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/el_dns_hinfo.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Οι πληροφορίες του Host είναι κ $wb['data_error_regex'] = 'Οι πληροφορίες Host έχουν μη έγκυρη μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng index 85718b7ca..761b5cc6a 100644 --- a/interface/web/dns/lib/lang/el_dns_mx.lng +++ b/interface/web/dns/lib/lang/el_dns_mx.lng @@ -15,3 +15,4 @@ $wb['data_error_empty'] = 'Το hostname Mailserver δεν έχει οριστε $wb['data_error_regex'] = 'Mailserver hostname με μη έγκυρη μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_ns.lng b/interface/web/dns/lib/lang/el_dns_ns.lng index 06ad7cf87..b47c01f07 100644 --- a/interface/web/dns/lib/lang/el_dns_ns.lng +++ b/interface/web/dns/lib/lang/el_dns_ns.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Ο Nameserver δεν έχει οριστεί'; $wb['data_error_regex'] = 'Η μορφοποίηση του Nameserver δεν είναι σωστή'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_ptr.lng b/interface/web/dns/lib/lang/el_dns_ptr.lng index ceb8b1389..8d3544bb3 100644 --- a/interface/web/dns/lib/lang/el_dns_ptr.lng +++ b/interface/web/dns/lib/lang/el_dns_ptr.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Το Κανονικοποιημένο hostname δεν $wb['data_error_regex'] = 'Κανονικοποιημένο hostname με μη έγκυρη μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_rp.lng b/interface/web/dns/lib/lang/el_dns_rp.lng index b63597c85..7d8e522fb 100644 --- a/interface/web/dns/lib/lang/el_dns_rp.lng +++ b/interface/web/dns/lib/lang/el_dns_rp.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Το πρόσωπο επικοινωνίας δεν $wb['data_error_regex'] = 'Η μορφοποίηση του υπεύθυνου δεν είναι έγκυρη'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_slave.lng b/interface/web/dns/lib/lang/el_dns_slave.lng index ae3f5d004..749ef597e 100644 --- a/interface/web/dns/lib/lang/el_dns_slave.lng +++ b/interface/web/dns/lib/lang/el_dns_slave.lng @@ -15,3 +15,4 @@ $wb['eg_domain_tld'] = 'π.χ. domain.tld.'; $wb['ipv4_form_txt'] = 'μορφή IPv4 - π.χ. 1.2.3.4'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_slave_list.lng b/interface/web/dns/lib/lang/el_dns_slave_list.lng index aa50cae6f..1aa01b25a 100644 --- a/interface/web/dns/lib/lang/el_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/el_dns_slave_list.lng @@ -8,3 +8,4 @@ $wb['add_new_record_txt'] = 'Νέα Δευτερεύουσα ζώνη DNS'; $wb['eg_domain_tld'] = 'π.χ. domain.tld.'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng index a05a49e2c..59e3f9872 100644 --- a/interface/web/dns/lib/lang/el_dns_soa.lng +++ b/interface/web/dns/lib/lang/el_dns_soa.lng @@ -4,10 +4,10 @@ $wb['origin_txt'] = 'Ζώνη (SOA)'; $wb['ns_txt'] = 'NS'; $wb['mbox_txt'] = 'Email'; $wb['serial_txt'] = 'Serial'; -$wb['refresh_txt'] = 'Refresh'; -$wb['retry_txt'] = 'Retry'; -$wb['expire_txt'] = 'Expire'; -$wb['minimum_txt'] = 'Minimum'; +$wb['refresh_txt'] = 'Ανανέωση'; +$wb['retry_txt'] = 'Επαναπροσπάθεια'; +$wb['expire_txt'] = 'Λήξη'; +$wb['minimum_txt'] = 'Ελάχιστο'; $wb['ttl_txt'] = 'TTL'; $wb['xfer_txt'] = 'Άδεια μεταφοράς ζώνης από
αυτές τς IP (λίστα χωρισμένη με κόμα)'; $wb['active_txt'] = 'Ενεργή'; @@ -30,3 +30,4 @@ $wb['eg_ns1_domain_tld'] = 'π.χ. ns1.domain.tld'; $wb['eg_webmaster_domain_tld'] = 'π.χ. webmaster@domain.tld'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_soa_list.lng b/interface/web/dns/lib/lang/el_dns_soa_list.lng index 17446da45..68a18291c 100644 --- a/interface/web/dns/lib/lang/el_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/el_dns_soa_list.lng @@ -9,3 +9,4 @@ $wb['add_new_record_wizard_txt'] = 'Νέα ζώνη DNS με Οδηγό'; $wb['add_new_record_txt'] = 'Νέα ζώνη DNS (χειροκίνητα)'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_srv.lng b/interface/web/dns/lib/lang/el_dns_srv.lng index 1dc24f902..3ba3ae629 100644 --- a/interface/web/dns/lib/lang/el_dns_srv.lng +++ b/interface/web/dns/lib/lang/el_dns_srv.lng @@ -16,3 +16,4 @@ $wb['data_error_regex'] = 'Εγγραφή Server με μη έγκυρη μορ $wb['srv_error_regex'] = 'Εγγραφή Server με μη έγκυρη μορφοποίηση. Η εγγραφή Server πρέπει να περιέχει 3 λέξεις χωρισμένες με κενά.'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_template.lng b/interface/web/dns/lib/lang/el_dns_template.lng index 2ba9b4dab..39305728f 100644 --- a/interface/web/dns/lib/lang/el_dns_template.lng +++ b/interface/web/dns/lib/lang/el_dns_template.lng @@ -5,3 +5,4 @@ $wb['template_txt'] = 'Πρότυπο'; $wb['visible_txt'] = 'Ενεργό'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_template_list.lng b/interface/web/dns/lib/lang/el_dns_template_list.lng index 64da2e810..ba73fc845 100644 --- a/interface/web/dns/lib/lang/el_dns_template_list.lng +++ b/interface/web/dns/lib/lang/el_dns_template_list.lng @@ -5,3 +5,4 @@ $wb['name_txt'] = 'Όνομα'; $wb['add_new_record_txt'] = 'Νέα εγγραφή'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_txt.lng b/interface/web/dns/lib/lang/el_dns_txt.lng index c98ceca5d..e08978e48 100644 --- a/interface/web/dns/lib/lang/el_dns_txt.lng +++ b/interface/web/dns/lib/lang/el_dns_txt.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Το κείμενο δεν έχει οριστεί'; $wb['data_error_regex'] = 'Κείμενο με μη έγκυρη μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng index 6ed6d91a3..fa060aae9 100644 --- a/interface/web/dns/lib/lang/el_dns_wizard.lng +++ b/interface/web/dns/lib/lang/el_dns_wizard.lng @@ -28,3 +28,4 @@ $wb['error_ns2_regex'] = 'Ο NS2 περιέχει μη επιτρεπόμενο $wb['error_email_regex'] = 'Το Email δεν περιέχει μια έγκυρη διεύθυνση.'; ?> + diff --git a/interface/web/dns/lib/lang/en.lng b/interface/web/dns/lib/lang/en.lng index f2311c029..565d92aac 100644 --- a/interface/web/dns/lib/lang/en.lng +++ b/interface/web/dns/lib/lang/en.lng @@ -21,4 +21,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> \ No newline at end of file diff --git a/interface/web/dns/lib/lang/es.lng b/interface/web/dns/lib/lang/es.lng index f71ae16a3..80cbbfda2 100644 --- a/interface/web/dns/lib/lang/es.lng +++ b/interface/web/dns/lib/lang/es.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Plantillas'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/fi.lng b/interface/web/dns/lib/lang/fi.lng index 8814a771f..1c628f8b5 100755 --- a/interface/web/dns/lib/lang/fi.lng +++ b/interface/web/dns/lib/lang/fi.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Mallit'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/fr.lng b/interface/web/dns/lib/lang/fr.lng index 33710fe01..d7e7901d1 100644 --- a/interface/web/dns/lib/lang/fr.lng +++ b/interface/web/dns/lib/lang/fr.lng @@ -1,5 +1,4 @@ - diff --git a/interface/web/dns/lib/lang/fr_dns_a.lng b/interface/web/dns/lib/lang/fr_dns_a.lng index e77166d5b..d3e7a7c77 100644 --- a/interface/web/dns/lib/lang/fr_dns_a.lng +++ b/interface/web/dns/lib/lang/fr_dns_a.lng @@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'L\'adresse IP est vide.'; $wb['data_error_regex'] = 'Le format de l\'adresse IP est invalide.'; $wb['data_error_duplicate'] = 'Enregistrement A ou CNAME en double'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_a_list.lng b/interface/web/dns/lib/lang/fr_dns_a_list.lng index 8aec347f1..a12c9b550 100644 --- a/interface/web/dns/lib/lang/fr_dns_a_list.lng +++ b/interface/web/dns/lib/lang/fr_dns_a_list.lng @@ -12,4 +12,3 @@ $wb['page_txt'] = 'Page'; $wb['page_of_txt'] = 'de'; $wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_aaaa.lng b/interface/web/dns/lib/lang/fr_dns_aaaa.lng index 0719417a0..efe3a693d 100644 --- a/interface/web/dns/lib/lang/fr_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/fr_dns_aaaa.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.'; $wb['data_error_empty'] = 'L\'adresse IP est vide.'; $wb['data_error_regex'] = 'Le format de l\'adresse IP est invalide.'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_alias.lng b/interface/web/dns/lib/lang/fr_dns_alias.lng index 315a589a6..58fbe2561 100644 --- a/interface/web/dns/lib/lang/fr_dns_alias.lng +++ b/interface/web/dns/lib/lang/fr_dns_alias.lng @@ -13,5 +13,3 @@ $wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.'; $wb['data_error_empty'] = 'Le nom d\'hôte cible est vide.'; $wb['data_error_regex'] = 'Le format du nom d\'hôte est invalide.'; ?> - - diff --git a/interface/web/dns/lib/lang/fr_dns_cname.lng b/interface/web/dns/lib/lang/fr_dns_cname.lng index 77e94ae96..09751030c 100644 --- a/interface/web/dns/lib/lang/fr_dns_cname.lng +++ b/interface/web/dns/lib/lang/fr_dns_cname.lng @@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Le nom d\'hôte cible est vide.'; $wb['data_error_regex'] = 'Le format du nom d\'hôte cible invalide.'; $wb['data_error_duplicate'] = 'Enregistrement A ou CNAME en double'; ?> - - diff --git a/interface/web/dns/lib/lang/fr_dns_hinfo.lng b/interface/web/dns/lib/lang/fr_dns_hinfo.lng index 1949ace8e..4845f64ce 100644 --- a/interface/web/dns/lib/lang/fr_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/fr_dns_hinfo.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.'; $wb['data_error_empty'] = 'L\'information de l\'hôte est vide'; $wb['data_error_regex'] = 'Le format de l\'information de l\'hôte est invalide'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_mx.lng b/interface/web/dns/lib/lang/fr_dns_mx.lng index 12b0b3714..b625c124c 100644 --- a/interface/web/dns/lib/lang/fr_dns_mx.lng +++ b/interface/web/dns/lib/lang/fr_dns_mx.lng @@ -14,4 +14,3 @@ $wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.'; $wb['data_error_empty'] = 'Le nom d\'hôte du serveur mail est vide'; $wb['data_error_regex'] = 'Le format du nom d\'hôte du serveur mail est invalide'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_ns.lng b/interface/web/dns/lib/lang/fr_dns_ns.lng index a5348f71f..09dc9cb4b 100644 --- a/interface/web/dns/lib/lang/fr_dns_ns.lng +++ b/interface/web/dns/lib/lang/fr_dns_ns.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Le format de la zone est invalide.'; $wb['data_error_empty'] = 'Le serveur de nom est vide.'; $wb['data_error_regex'] = 'Le format du serveur de nom est invalide.'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_ptr.lng b/interface/web/dns/lib/lang/fr_dns_ptr.lng index 7db02656f..f417771ce 100644 --- a/interface/web/dns/lib/lang/fr_dns_ptr.lng +++ b/interface/web/dns/lib/lang/fr_dns_ptr.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Le format du nom est invalide.'; $wb['data_error_empty'] = 'Le nom d\'hôte canonique est vide'; $wb['data_error_regex'] = 'Le format du nom d\'hôte canonique est invalide'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_rp.lng b/interface/web/dns/lib/lang/fr_dns_rp.lng index be78caf1c..e9493dc8a 100644 --- a/interface/web/dns/lib/lang/fr_dns_rp.lng +++ b/interface/web/dns/lib/lang/fr_dns_rp.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.'; $wb['data_error_empty'] = 'Le champ de la personne responsable est vide.'; $wb['data_error_regex'] = 'Le format du champ de la personne responsable est invalide.'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_slave.lng b/interface/web/dns/lib/lang/fr_dns_slave.lng index 3c22ded27..625657122 100644 --- a/interface/web/dns/lib/lang/fr_dns_slave.lng +++ b/interface/web/dns/lib/lang/fr_dns_slave.lng @@ -14,4 +14,3 @@ $wb['ns_error_regex'] = 'Le format de l\'enregistrement NS est invalide.'; $wb['eg_domain_tld'] = 'ex. domain.tld.'; $wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_slave_list.lng b/interface/web/dns/lib/lang/fr_dns_slave_list.lng index f2fc488af..c85acf202 100644 --- a/interface/web/dns/lib/lang/fr_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/fr_dns_slave_list.lng @@ -7,4 +7,3 @@ $wb['ns_txt'] = 'NS'; $wb['add_new_record_txt'] = 'Ajouter une nouvelle zone DNS secondaire'; $wb['eg_domain_tld'] = 'ex. domain.tld.'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_soa.lng b/interface/web/dns/lib/lang/fr_dns_soa.lng index 7defd1c88..4b949d91a 100644 --- a/interface/web/dns/lib/lang/fr_dns_soa.lng +++ b/interface/web/dns/lib/lang/fr_dns_soa.lng @@ -29,4 +29,3 @@ $wb['eg_domain_tld'] = 'ex. domain.tld'; $wb['eg_ns1_domain_tld'] = 'ex. ns1.domain.tld'; $wb['eg_webmaster_domain_tld'] = 'ex. webmaster@domain.tld'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_soa_list.lng b/interface/web/dns/lib/lang/fr_dns_soa_list.lng index ed2ef50da..0abb4c042 100644 --- a/interface/web/dns/lib/lang/fr_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/fr_dns_soa_list.lng @@ -8,4 +8,3 @@ $wb['mbox_txt'] = 'Email'; $wb['add_new_record_wizard_txt'] = 'Ajouter une nouvelle zone DNS en utilisant l\'assistant'; $wb['add_new_record_txt'] = 'Ajouter manuellement une nouvelle zone DNS'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_srv.lng b/interface/web/dns/lib/lang/fr_dns_srv.lng index bfb63f0a7..597e99263 100644 --- a/interface/web/dns/lib/lang/fr_dns_srv.lng +++ b/interface/web/dns/lib/lang/fr_dns_srv.lng @@ -15,4 +15,3 @@ $wb['data_error_empty'] = 'L\'enregistrement serveur est vide'; $wb['data_error_regex'] = 'Le format de l\'enregistrement serveur est invalide'; $wb['srv_error_regex'] = 'Le format d\'enregistrement serveur invalide. L\'enregistrement serveur doit contenir 3 chaînes de caractères séparées par des espaces.'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_template.lng b/interface/web/dns/lib/lang/fr_dns_template.lng index dffdae27f..1202cfd76 100644 --- a/interface/web/dns/lib/lang/fr_dns_template.lng +++ b/interface/web/dns/lib/lang/fr_dns_template.lng @@ -4,4 +4,3 @@ $wb['fields_txt'] = 'Champs'; $wb['template_txt'] = 'Modèle'; $wb['visible_txt'] = 'Visible'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_template_list.lng b/interface/web/dns/lib/lang/fr_dns_template_list.lng index 2a1dcdf66..7f28cad4a 100644 --- a/interface/web/dns/lib/lang/fr_dns_template_list.lng +++ b/interface/web/dns/lib/lang/fr_dns_template_list.lng @@ -4,4 +4,3 @@ $wb['visible_txt'] = 'Visible'; $wb['name_txt'] = 'Nom'; $wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_txt.lng b/interface/web/dns/lib/lang/fr_dns_txt.lng index d91e4f6d6..8264ba9de 100644 --- a/interface/web/dns/lib/lang/fr_dns_txt.lng +++ b/interface/web/dns/lib/lang/fr_dns_txt.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.'; $wb['data_error_empty'] = 'Le texte est vide'; $wb['data_error_regex'] = 'Le format du texte est invalide'; ?> - diff --git a/interface/web/dns/lib/lang/fr_dns_wizard.lng b/interface/web/dns/lib/lang/fr_dns_wizard.lng index 79e220e2c..feefbaedb 100644 --- a/interface/web/dns/lib/lang/fr_dns_wizard.lng +++ b/interface/web/dns/lib/lang/fr_dns_wizard.lng @@ -1,5 +1,4 @@ - diff --git a/interface/web/dns/lib/lang/hr.lng b/interface/web/dns/lib/lang/hr.lng index 6b4df5167..39d393f2f 100644 --- a/interface/web/dns/lib/lang/hr.lng +++ b/interface/web/dns/lib/lang/hr.lng @@ -15,9 +15,11 @@ $wb['DNS SRV'] = 'DNS SRV'; $wb['DNS TXT Record'] = 'DNS TXT zapis'; $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS čarobnjak'; -$wb['Add DNS Zone'] = 'Dodaj DNS zonu'; +$wb['Add DNS Zone'] = 'Dodaj'; $wb['Templates'] = 'Predlošci'; -$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['zone_file_successfully_imported_txt'] = 'Zonska datoteka je uspješno učitana!'; +$wb['error_no_valid_zone_file_txt'] = 'Ovo nije ispravna zonska datoteka!'; +$wb['zonefile_to_import_txt'] = 'Datoteka'; +$wb['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/hr_dns_a.lng b/interface/web/dns/lib/lang/hr_dns_a.lng index 045af15fc..19ff54a57 100644 --- a/interface/web/dns/lib/lang/hr_dns_a.lng +++ b/interface/web/dns/lib/lang/hr_dns_a.lng @@ -1,16 +1,16 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_a_list.lng b/interface/web/dns/lib/lang/hr_dns_a_list.lng index 87c9cd818..808e4a815 100644 --- a/interface/web/dns/lib/lang/hr_dns_a_list.lng +++ b/interface/web/dns/lib/lang/hr_dns_a_list.lng @@ -1,14 +1,14 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_aaaa.lng b/interface/web/dns/lib/lang/hr_dns_aaaa.lng index 31ef0da15..705c72323 100644 --- a/interface/web/dns/lib/lang/hr_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/hr_dns_aaaa.lng @@ -2,10 +2,10 @@ $wb['server_id_txt'] = 'Server'; $wb['zone_txt'] = 'Zone'; $wb['name_txt'] = 'Hostname'; -$wb['type_txt'] = 'type'; +$wb['type_txt'] = 'Vrsta'; $wb['data_txt'] = 'IPv6-Address'; $wb['ttl_txt'] = 'TTL'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.'; $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.'; $wb['name_error_empty'] = 'The hostname is empty.'; diff --git a/interface/web/dns/lib/lang/hr_dns_alias.lng b/interface/web/dns/lib/lang/hr_dns_alias.lng index 827e5a89e..5842cd176 100644 --- a/interface/web/dns/lib/lang/hr_dns_alias.lng +++ b/interface/web/dns/lib/lang/hr_dns_alias.lng @@ -2,10 +2,10 @@ $wb['server_id_txt'] = 'Server'; $wb['zone_txt'] = 'Zone'; $wb['name_txt'] = 'Hostname'; -$wb['type_txt'] = 'type'; +$wb['type_txt'] = 'Vrsta'; $wb['data_txt'] = 'Target Hostname'; $wb['ttl_txt'] = 'TTL'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.'; $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.'; $wb['name_error_empty'] = 'The hostname is empty.'; diff --git a/interface/web/dns/lib/lang/hr_dns_cname.lng b/interface/web/dns/lib/lang/hr_dns_cname.lng index 184f776e9..9474a15eb 100644 --- a/interface/web/dns/lib/lang/hr_dns_cname.lng +++ b/interface/web/dns/lib/lang/hr_dns_cname.lng @@ -2,10 +2,10 @@ $wb['server_id_txt'] = 'Server'; $wb['zone_txt'] = 'Zone'; $wb['name_txt'] = 'Hostname'; -$wb['type_txt'] = 'type'; +$wb['type_txt'] = 'Vrsta'; $wb['data_txt'] = 'Target Hostname'; $wb['ttl_txt'] = 'TTL'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.'; $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.'; $wb['name_error_empty'] = 'The hostname is empty.'; diff --git a/interface/web/dns/lib/lang/hr_dns_mx.lng b/interface/web/dns/lib/lang/hr_dns_mx.lng index 648827f04..97e801acb 100644 --- a/interface/web/dns/lib/lang/hr_dns_mx.lng +++ b/interface/web/dns/lib/lang/hr_dns_mx.lng @@ -1,16 +1,16 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_ns.lng b/interface/web/dns/lib/lang/hr_dns_ns.lng index 713ec2858..6a7ad8a82 100644 --- a/interface/web/dns/lib/lang/hr_dns_ns.lng +++ b/interface/web/dns/lib/lang/hr_dns_ns.lng @@ -2,10 +2,10 @@ $wb['server_id_txt'] = 'Server'; $wb['zone_txt'] = 'Zone'; $wb['name_txt'] = 'Zone'; -$wb['type_txt'] = 'type'; +$wb['type_txt'] = 'Vrsta'; $wb['data_txt'] = 'Nameserver Hostname'; $wb['ttl_txt'] = 'TTL'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.'; $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.'; $wb['name_error_empty'] = 'The zone is empty.'; diff --git a/interface/web/dns/lib/lang/hr_dns_ptr.lng b/interface/web/dns/lib/lang/hr_dns_ptr.lng index c02638406..08d6b3498 100644 --- a/interface/web/dns/lib/lang/hr_dns_ptr.lng +++ b/interface/web/dns/lib/lang/hr_dns_ptr.lng @@ -2,10 +2,10 @@ $wb['server_id_txt'] = 'Server'; $wb['zone_txt'] = 'Zone'; $wb['name_txt'] = 'Name'; -$wb['type_txt'] = 'type'; +$wb['type_txt'] = 'Vrsta'; $wb['data_txt'] = 'Canonical Hostname'; $wb['ttl_txt'] = 'TTL'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.'; $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.'; $wb['name_error_empty'] = 'The name is empty.'; diff --git a/interface/web/dns/lib/lang/hr_dns_slave.lng b/interface/web/dns/lib/lang/hr_dns_slave.lng index 51d4ab228..b77fda588 100644 --- a/interface/web/dns/lib/lang/hr_dns_slave.lng +++ b/interface/web/dns/lib/lang/hr_dns_slave.lng @@ -2,7 +2,7 @@ $wb['server_id_txt'] = 'Server'; $wb['origin_txt'] = 'DNS Zone'; $wb['ns_txt'] = 'NS'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $wb['limit_dns_slave_zone_txt'] = 'The max. number of Secondary DNS zones for your account is reached.'; $wb['client_txt'] = 'Client'; $wb['xfer_txt'] = 'Allow zone transfers to
these IPs (comma separated list)'; diff --git a/interface/web/dns/lib/lang/hr_dns_slave_list.lng b/interface/web/dns/lib/lang/hr_dns_slave_list.lng index 4ced2ddb5..3d3b9bcef 100644 --- a/interface/web/dns/lib/lang/hr_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/hr_dns_slave_list.lng @@ -1,6 +1,6 @@ these IPs (comma separated list)'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $wb['limit_dns_zone_txt'] = 'The max. number of DNS zones for your account is reached.'; $wb['client_txt'] = 'Client'; $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.'; diff --git a/interface/web/dns/lib/lang/hr_dns_soa_list.lng b/interface/web/dns/lib/lang/hr_dns_soa_list.lng index d37d319f7..2007397f2 100644 --- a/interface/web/dns/lib/lang/hr_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/hr_dns_soa_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/dns/lib/lang/hu.lng b/interface/web/dns/lib/lang/hu.lng index bab141916..5882a281a 100644 --- a/interface/web/dns/lib/lang/hu.lng +++ b/interface/web/dns/lib/lang/hu.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/id.lng b/interface/web/dns/lib/lang/id.lng index 74b5f80bd..b47b55c5d 100644 --- a/interface/web/dns/lib/lang/id.lng +++ b/interface/web/dns/lib/lang/id.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Template'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/it.lng b/interface/web/dns/lib/lang/it.lng index c08339fe9..8b25f7356 100644 --- a/interface/web/dns/lib/lang/it.lng +++ b/interface/web/dns/lib/lang/it.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/ja.lng b/interface/web/dns/lib/lang/ja.lng index 549cd2d11..06608e6f8 100644 --- a/interface/web/dns/lib/lang/ja.lng +++ b/interface/web/dns/lib/lang/ja.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/nl.lng b/interface/web/dns/lib/lang/nl.lng index c08339fe9..8b25f7356 100644 --- a/interface/web/dns/lib/lang/nl.lng +++ b/interface/web/dns/lib/lang/nl.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng index 8ea63ff55..2c8e1523f 100644 --- a/interface/web/dns/lib/lang/pl.lng +++ b/interface/web/dns/lib/lang/pl.lng @@ -20,5 +20,6 @@ $wb['Templates'] = 'Szablony'; $wb['zone_file_successfully_imported_txt'] = 'Plik strefy został zaimportowany poprawnie!'; $wb['error_no_valid_zone_file_txt'] = 'Przepraszamy ale nie jest to poprawny plik strefy!'; $wb['zonefile_to_import_txt'] = 'Plik strefy'; +$wb['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_a.lng b/interface/web/dns/lib/lang/pl_dns_a.lng index 3aa2d6855..f9b099773 100644 --- a/interface/web/dns/lib/lang/pl_dns_a.lng +++ b/interface/web/dns/lib/lang/pl_dns_a.lng @@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'Adres IP jest pusty.'; $wb['data_error_regex'] = 'Adres IP ma niepoprawny format.'; $wb['data_error_duplicate'] = 'Duplikat wpisu A.'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_a_list.lng b/interface/web/dns/lib/lang/pl_dns_a_list.lng index 9141abe16..41b5dbbaa 100644 --- a/interface/web/dns/lib/lang/pl_dns_a_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_a_list.lng @@ -12,4 +12,3 @@ $wb['page_txt'] = 'Strona'; $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Czy jesteś pewny, że chcesz usunąć ten wpis?'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_aaaa.lng b/interface/web/dns/lib/lang/pl_dns_aaaa.lng index 8c90e3fe5..f8e44e58f 100644 --- a/interface/web/dns/lib/lang/pl_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/pl_dns_aaaa.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.'; $wb['data_error_empty'] = 'Adres IP jest pusty.'; $wb['data_error_regex'] = 'Adres IP ma niepoprawny format.'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_alias.lng b/interface/web/dns/lib/lang/pl_dns_alias.lng index 44c377e38..a950805e3 100644 --- a/interface/web/dns/lib/lang/pl_dns_alias.lng +++ b/interface/web/dns/lib/lang/pl_dns_alias.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.'; $wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta.'; $wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format.'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_cname.lng b/interface/web/dns/lib/lang/pl_dns_cname.lng index 5fbe69356..c007ea6f4 100644 --- a/interface/web/dns/lib/lang/pl_dns_cname.lng +++ b/interface/web/dns/lib/lang/pl_dns_cname.lng @@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta.'; $wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format.'; $wb['data_error_duplicate'] = 'Zdublowany rekord A lub CNAME.'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_hinfo.lng b/interface/web/dns/lib/lang/pl_dns_hinfo.lng index 18f3b9f4f..d408e1432 100644 --- a/interface/web/dns/lib/lang/pl_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/pl_dns_hinfo.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.'; $wb['data_error_empty'] = 'Informacje o serwerze są puste.'; $wb['data_error_regex'] = 'Informacje o serwerze mają niepoprawny format.'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_mx.lng b/interface/web/dns/lib/lang/pl_dns_mx.lng index d244013de..4a3936a1b 100644 --- a/interface/web/dns/lib/lang/pl_dns_mx.lng +++ b/interface/web/dns/lib/lang/pl_dns_mx.lng @@ -14,4 +14,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.'; $wb['data_error_empty'] = 'Nazwa serwera poczty e-mail jest pusta.'; $wb['data_error_regex'] = 'Nazwa serwera poczty e-mail ma niepoprawny format.'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_ns.lng b/interface/web/dns/lib/lang/pl_dns_ns.lng index d82dc4887..18d7efd6c 100644 --- a/interface/web/dns/lib/lang/pl_dns_ns.lng +++ b/interface/web/dns/lib/lang/pl_dns_ns.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Strefa ma zły format.'; $wb['data_error_empty'] = 'Nazwa serwera jest pusta.'; $wb['data_error_regex'] = 'Nazwa serwera ma zły format.'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_ptr.lng b/interface/web/dns/lib/lang/pl_dns_ptr.lng index eeb03d652..eae39817a 100644 --- a/interface/web/dns/lib/lang/pl_dns_ptr.lng +++ b/interface/web/dns/lib/lang/pl_dns_ptr.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa ma zły format.'; $wb['data_error_empty'] = 'Standardowa nazwa serwera jest pusta'; $wb['data_error_regex'] = 'Standardowa nazwa serwera ma zły format'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_rp.lng b/interface/web/dns/lib/lang/pl_dns_rp.lng index 587c7353a..43cbc5122 100644 --- a/interface/web/dns/lib/lang/pl_dns_rp.lng +++ b/interface/web/dns/lib/lang/pl_dns_rp.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.'; $wb['data_error_empty'] = 'Musisz podać osobę odpowiedzialna.'; $wb['data_error_regex'] = 'Nazwa osoby odpowiedzialnej ma niepoprawny format.'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_slave.lng b/interface/web/dns/lib/lang/pl_dns_slave.lng index 71a292210..ce7902e46 100644 --- a/interface/web/dns/lib/lang/pl_dns_slave.lng +++ b/interface/web/dns/lib/lang/pl_dns_slave.lng @@ -14,4 +14,3 @@ $wb['ns_error_regex'] = 'NS ma niepoprawny format.'; $wb['eg_domain_tld'] = 'e.g. domain.tld.'; $wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_slave_list.lng b/interface/web/dns/lib/lang/pl_dns_slave_list.lng index 010d78f36..bbdb368f1 100644 --- a/interface/web/dns/lib/lang/pl_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_slave_list.lng @@ -7,4 +7,3 @@ $wb['ns_txt'] = 'NS'; $wb['add_new_record_txt'] = 'Dodaj nową zapasową strefę DNS'; $wb['eg_domain_tld'] = 'np. domena.pl.'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng index ea69f2c32..8c17246b2 100644 --- a/interface/web/dns/lib/lang/pl_dns_soa.lng +++ b/interface/web/dns/lib/lang/pl_dns_soa.lng @@ -29,4 +29,3 @@ $wb['eg_domain_tld'] = 'np. domena.pl'; $wb['eg_ns1_domain_tld'] = 'np. ns1.domena.pl'; $wb['eg_webmaster_domain_tld'] = 'np. webmaster@domena.pl'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_soa_list.lng b/interface/web/dns/lib/lang/pl_dns_soa_list.lng index 0b17c903f..d440e0546 100644 --- a/interface/web/dns/lib/lang/pl_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng @@ -8,4 +8,3 @@ $wb['mbox_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Dodaj nową strefę DNS (SOA)'; $wb['add_new_record_wizard_txt'] = 'Dodaj nową strefę DNS za pomocą Kreatora'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_srv.lng b/interface/web/dns/lib/lang/pl_dns_srv.lng index a0f13dda0..3e93bc299 100644 --- a/interface/web/dns/lib/lang/pl_dns_srv.lng +++ b/interface/web/dns/lib/lang/pl_dns_srv.lng @@ -15,4 +15,3 @@ $wb['data_error_regex'] = 'Wpis serwera ma niepoprawny format'; $wb['srv_error_regex'] = 'Niepoprawny format rekordu serwera. Rekord serwera musi zawierać 3 łańcuchy znakowe oddzielone spacjami.'; $wb['aux_txt'] = 'Priorytet'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_template.lng b/interface/web/dns/lib/lang/pl_dns_template.lng index fc7a0d6f9..f3e756357 100644 --- a/interface/web/dns/lib/lang/pl_dns_template.lng +++ b/interface/web/dns/lib/lang/pl_dns_template.lng @@ -4,4 +4,3 @@ $wb['fields_txt'] = 'Pola'; $wb['template_txt'] = 'Szablon'; $wb['visible_txt'] = 'Widoczność'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_template_list.lng b/interface/web/dns/lib/lang/pl_dns_template_list.lng index a74e0c52f..7deac3b2f 100644 --- a/interface/web/dns/lib/lang/pl_dns_template_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_template_list.lng @@ -4,4 +4,3 @@ $wb['visible_txt'] = 'Widoczność'; $wb['name_txt'] = 'Nazwa'; $wb['add_new_record_txt'] = 'Dodaj nowy wpis'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_txt.lng b/interface/web/dns/lib/lang/pl_dns_txt.lng index 324bf06aa..f84620ed3 100644 --- a/interface/web/dns/lib/lang/pl_dns_txt.lng +++ b/interface/web/dns/lib/lang/pl_dns_txt.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.'; $wb['data_error_empty'] = 'Tekst jest pusty.'; $wb['data_error_regex'] = 'Tekst ma zły format.'; ?> - diff --git a/interface/web/dns/lib/lang/pl_dns_wizard.lng b/interface/web/dns/lib/lang/pl_dns_wizard.lng index cacbf3af8..f90030972 100644 --- a/interface/web/dns/lib/lang/pl_dns_wizard.lng +++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng @@ -27,4 +27,3 @@ $wb['error_ns1_regex'] = 'NS1 zawiera niepoprawne znaki.'; $wb['error_ns2_regex'] = 'NS2 zawiera niepoprawne znaki.'; $wb['error_email_regex'] = 'Pole E-mail nie zawiera poprawnego adresu e-mail.'; ?> - diff --git a/interface/web/dns/lib/lang/pt.lng b/interface/web/dns/lib/lang/pt.lng index 316981afe..6619a86c5 100644 --- a/interface/web/dns/lib/lang/pt.lng +++ b/interface/web/dns/lib/lang/pt.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/ro.lng b/interface/web/dns/lib/lang/ro.lng index f545b0781..5707dfca3 100644 --- a/interface/web/dns/lib/lang/ro.lng +++ b/interface/web/dns/lib/lang/ro.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/ru.lng b/interface/web/dns/lib/lang/ru.lng index e52b2d607..edc717efd 100644 --- a/interface/web/dns/lib/lang/ru.lng +++ b/interface/web/dns/lib/lang/ru.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Шаблоны'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/se.lng b/interface/web/dns/lib/lang/se.lng index c08339fe9..8b25f7356 100644 --- a/interface/web/dns/lib/lang/se.lng +++ b/interface/web/dns/lib/lang/se.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/sk.lng b/interface/web/dns/lib/lang/sk.lng index e6f62f814..70b57d6e4 100644 --- a/interface/web/dns/lib/lang/sk.lng +++ b/interface/web/dns/lib/lang/sk.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Templates'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/dns/lib/lang/tr.lng b/interface/web/dns/lib/lang/tr.lng index e519b9a39..37fb8b162 100644 --- a/interface/web/dns/lib/lang/tr.lng +++ b/interface/web/dns/lib/lang/tr.lng @@ -20,4 +20,6 @@ $wb['Templates'] = 'Şablonlar'; $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['Secondary Zones'] = 'Secondary Zones'; +$wb['Import Zone File'] = 'Import Zone File'; ?> diff --git a/interface/web/domain/lib/lang/el.lng b/interface/web/domain/lib/lang/el.lng index aab3355e1..af485ae9b 100644 --- a/interface/web/domain/lib/lang/el.lng +++ b/interface/web/domain/lib/lang/el.lng @@ -8,3 +8,4 @@ $wb['error_client_can_not_add_domain'] = 'Δεν μπορείτε να προσ $wb['error_client_group_id_empty'] = 'Πρέπει να επιλέξετε πελάτη
'; ?> + diff --git a/interface/web/domain/lib/lang/el_domain.lng b/interface/web/domain/lib/lang/el_domain.lng index 79bf5a86d..62f76371f 100644 --- a/interface/web/domain/lib/lang/el_domain.lng +++ b/interface/web/domain/lib/lang/el_domain.lng @@ -5,3 +5,4 @@ $wb['domain_error_regex'] = 'Το όνομα domain δεν επιτρέπετα $wb['Domain'] = 'Domain'; ?> + diff --git a/interface/web/domain/lib/lang/el_domain_list.lng b/interface/web/domain/lib/lang/el_domain_list.lng index 7d3a53bdd..1af982619 100644 --- a/interface/web/domain/lib/lang/el_domain_list.lng +++ b/interface/web/domain/lib/lang/el_domain_list.lng @@ -4,3 +4,4 @@ $wb['add_new_record_txt'] = 'Νέο Domain'; $wb['domain_txt'] = 'Domain'; ?> + diff --git a/interface/web/domain/lib/lang/fr.lng b/interface/web/domain/lib/lang/fr.lng index 2ee424c86..827483d59 100644 --- a/interface/web/domain/lib/lang/fr.lng +++ b/interface/web/domain/lib/lang/fr.lng @@ -7,5 +7,3 @@ $wb['error_domain_in webuse'] = 'Ce domaine ne peut pas être supprimé, parce q $wb['error_client_can_not_add_domain'] = 'Vous ne pouvez créer un nouveau domaine'; $wb['error_client_group_id_empty'] = 'Vous devez choisir un client
'; ?> - - diff --git a/interface/web/domain/lib/lang/fr_domain.lng b/interface/web/domain/lib/lang/fr_domain.lng index 47b53e103..4465c83e8 100644 --- a/interface/web/domain/lib/lang/fr_domain.lng +++ b/interface/web/domain/lib/lang/fr_domain.lng @@ -4,5 +4,3 @@ $wb['domain_error_unique'] = 'Ce nom de domaine existe déjà'; $wb['domain_error_regex'] = 'Ce nom de domaine nest pas autorisé'; $wb['Domain'] = 'Domaine'; ?> - - diff --git a/interface/web/domain/lib/lang/fr_domain_list.lng b/interface/web/domain/lib/lang/fr_domain_list.lng index e1fa112c5..cc6eb115a 100644 --- a/interface/web/domain/lib/lang/fr_domain_list.lng +++ b/interface/web/domain/lib/lang/fr_domain_list.lng @@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Domaines'; $wb['add_new_record_txt'] = 'Ajouter nouveau Domaine'; $wb['domain_txt'] = 'Domaine'; ?> - - diff --git a/interface/web/domain/lib/lang/pl.lng b/interface/web/domain/lib/lang/pl.lng index 2503e95dc..3ee1d5d35 100644 --- a/interface/web/domain/lib/lang/pl.lng +++ b/interface/web/domain/lib/lang/pl.lng @@ -7,4 +7,3 @@ $wb['error_domain_in webuse'] = 'Domena nie może zostać skasowana, ponieważ w $wb['error_client_can_not_add_domain'] = 'Nie możesz dodać nowej domeny'; $wb['error_client_group_id_empty'] = 'Musisz wybrać klienta
'; ?> - diff --git a/interface/web/domain/lib/lang/pl_domain.lng b/interface/web/domain/lib/lang/pl_domain.lng index 9854e8904..9f3e80ff6 100644 --- a/interface/web/domain/lib/lang/pl_domain.lng +++ b/interface/web/domain/lib/lang/pl_domain.lng @@ -4,4 +4,3 @@ $wb['domain_error_unique'] = 'Domena o podanej nazwie już istnieje'; $wb['domain_error_regex'] = 'Nazwa domeny jest niedopuszczalna'; $wb['Domain'] = 'Domena'; ?> - diff --git a/interface/web/domain/lib/lang/pl_domain_list.lng b/interface/web/domain/lib/lang/pl_domain_list.lng index 1ff9016f9..a34140391 100644 --- a/interface/web/domain/lib/lang/pl_domain_list.lng +++ b/interface/web/domain/lib/lang/pl_domain_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Domeny'; $wb['add_new_record_txt'] = 'Dodaj nową domenę'; $wb['domain_txt'] = 'Domena'; ?> - diff --git a/interface/web/help/lib/lang/el.lng b/interface/web/help/lib/lang/el.lng index 1a690af19..5274bafbd 100644 --- a/interface/web/help/lib/lang/el.lng +++ b/interface/web/help/lib/lang/el.lng @@ -13,3 +13,4 @@ $wb['Add a Question & Answer Pair'] = 'Προσθήκη ζεύγους Ερώτ $wb['Manage Questions'] = 'Διαχείριση Ερωτήσεων'; ?> + diff --git a/interface/web/help/lib/lang/el_faq_form.lng b/interface/web/help/lib/lang/el_faq_form.lng index 9f84708f2..fecacecdc 100644 --- a/interface/web/help/lib/lang/el_faq_form.lng +++ b/interface/web/help/lib/lang/el_faq_form.lng @@ -5,3 +5,4 @@ $wb['faq_answer_txt'] = "Απάντηση"; $wb['faq_section_txt'] = "Ενότητα"; ?> + diff --git a/interface/web/help/lib/lang/el_faq_manage_questions_list.lng b/interface/web/help/lib/lang/el_faq_manage_questions_list.lng index a05a0a824..3432e0c14 100644 --- a/interface/web/help/lib/lang/el_faq_manage_questions_list.lng +++ b/interface/web/help/lib/lang/el_faq_manage_questions_list.lng @@ -8,3 +8,4 @@ $wb['faq_faq_questions_txt'] = 'Συχνές Ερωτήσεις'; $wb['faq_new_question_txt'] = 'Προσθήκη ζεύγους Ερώτησης - Απάντησης'; ?> + diff --git a/interface/web/help/lib/lang/el_faq_sections_form.lng b/interface/web/help/lib/lang/el_faq_sections_form.lng index e8fdc0a2c..1fb687d86 100644 --- a/interface/web/help/lib/lang/el_faq_sections_form.lng +++ b/interface/web/help/lib/lang/el_faq_sections_form.lng @@ -2,3 +2,4 @@ $wb['faq_section_name_txt'] = 'Όνομα Ενότητας'; ?> + diff --git a/interface/web/help/lib/lang/el_help_faq_list.lng b/interface/web/help/lib/lang/el_help_faq_list.lng index b6c7b460b..db8976195 100644 --- a/interface/web/help/lib/lang/el_help_faq_list.lng +++ b/interface/web/help/lib/lang/el_help_faq_list.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/help/lib/lang/el_help_faq_sections_list.lng b/interface/web/help/lib/lang/el_help_faq_sections_list.lng index 081162991..7e5f71b44 100644 --- a/interface/web/help/lib/lang/el_help_faq_sections_list.lng +++ b/interface/web/help/lib/lang/el_help_faq_sections_list.lng @@ -7,3 +7,4 @@ $wb['faq_faq_sections_txt'] = 'Ενότητες Ερωτήσεων'; $wb['faq_new_section_txt'] = 'Προσθήκη Ενότητας'; ?> + diff --git a/interface/web/help/lib/lang/el_support_message.lng b/interface/web/help/lib/lang/el_support_message.lng index 1613a71e5..a46bf8c43 100644 --- a/interface/web/help/lib/lang/el_support_message.lng +++ b/interface/web/help/lib/lang/el_support_message.lng @@ -7,3 +7,4 @@ $wb['tstamp_txt'] = 'Ημερομηνία/Ώρα'; $wb['reply_txt'] = 'Απάντηση'; ?> + diff --git a/interface/web/help/lib/lang/el_support_message_list.lng b/interface/web/help/lib/lang/el_support_message_list.lng index 97381d836..58cc6a237 100644 --- a/interface/web/help/lib/lang/el_support_message_list.lng +++ b/interface/web/help/lib/lang/el_support_message_list.lng @@ -5,3 +5,4 @@ $wb['subject_txt'] = 'Θέμα'; $wb['add_new_record_txt'] = 'Νέο μήνυμα υποστήριξης'; ?> + diff --git a/interface/web/help/lib/lang/fr.lng b/interface/web/help/lib/lang/fr.lng index 0db28d096..5c09ff83b 100644 --- a/interface/web/help/lib/lang/fr.lng +++ b/interface/web/help/lib/lang/fr.lng @@ -12,5 +12,3 @@ $wb['Manage Sections'] = 'Gérer les Sections'; $wb['Add a Question & Answer Pair'] = 'Ajouter un couple Question & Réponse'; $wb['Manage Questions'] = 'Gérer les Questions'; ?> - - diff --git a/interface/web/help/lib/lang/fr_faq_form.lng b/interface/web/help/lib/lang/fr_faq_form.lng index 06cb6e86e..c251b42c4 100644 --- a/interface/web/help/lib/lang/fr_faq_form.lng +++ b/interface/web/help/lib/lang/fr_faq_form.lng @@ -4,5 +4,3 @@ $wb['faq_question_txt'] = 'Question'; $wb['faq_answer_txt'] = 'Réponse'; $wb['faq_section_txt'] = 'Section'; ?> - - diff --git a/interface/web/help/lib/lang/fr_faq_manage_questions_list.lng b/interface/web/help/lib/lang/fr_faq_manage_questions_list.lng index bd1b7b36c..6a9754b2a 100644 --- a/interface/web/help/lib/lang/fr_faq_manage_questions_list.lng +++ b/interface/web/help/lib/lang/fr_faq_manage_questions_list.lng @@ -7,5 +7,3 @@ $wb['faq_sections_txt'] = 'Section'; $wb['faq_faq_questions_txt'] = 'Foire Aux Questions'; $wb['faq_new_question_txt'] = 'Ajouter un nouveau couple Question & Réponse'; ?> - - diff --git a/interface/web/help/lib/lang/fr_faq_sections_form.lng b/interface/web/help/lib/lang/fr_faq_sections_form.lng index 96c67b07b..ee014e094 100644 --- a/interface/web/help/lib/lang/fr_faq_sections_form.lng +++ b/interface/web/help/lib/lang/fr_faq_sections_form.lng @@ -1,5 +1,3 @@ - - diff --git a/interface/web/help/lib/lang/fr_help_faq_list.lng b/interface/web/help/lib/lang/fr_help_faq_list.lng index db8976195..b6c7b460b 100644 --- a/interface/web/help/lib/lang/fr_help_faq_list.lng +++ b/interface/web/help/lib/lang/fr_help_faq_list.lng @@ -1,4 +1,3 @@ - diff --git a/interface/web/help/lib/lang/fr_help_faq_sections_list.lng b/interface/web/help/lib/lang/fr_help_faq_sections_list.lng index bc7295ca3..a99ab07d6 100644 --- a/interface/web/help/lib/lang/fr_help_faq_sections_list.lng +++ b/interface/web/help/lib/lang/fr_help_faq_sections_list.lng @@ -6,5 +6,3 @@ $wb['faq_sections_txt'] = 'Sections'; $wb['faq_faq_sections_txt'] = 'Sections FAQ'; $wb['faq_new_section_txt'] = 'Ajouter une nouvelle section'; ?> - - diff --git a/interface/web/help/lib/lang/fr_support_message.lng b/interface/web/help/lib/lang/fr_support_message.lng index 366eb1448..6d6434483 100644 --- a/interface/web/help/lib/lang/fr_support_message.lng +++ b/interface/web/help/lib/lang/fr_support_message.lng @@ -6,5 +6,3 @@ $wb['message_txt'] = 'Message'; $wb['tstamp_txt'] = 'Timestamp'; $wb['reply_txt'] = 'Répondre'; ?> - - diff --git a/interface/web/help/lib/lang/fr_support_message_list.lng b/interface/web/help/lib/lang/fr_support_message_list.lng index ee8a65460..ac63d3f6e 100644 --- a/interface/web/help/lib/lang/fr_support_message_list.lng +++ b/interface/web/help/lib/lang/fr_support_message_list.lng @@ -4,5 +4,3 @@ $wb['sender_id_txt'] = 'Expéditeur'; $wb['subject_txt'] = 'Sujet'; $wb['add_new_record_txt'] = 'Créer un nouveau message de support'; ?> - - diff --git a/interface/web/help/lib/lang/pl.lng b/interface/web/help/lib/lang/pl.lng index 3357604e5..6d9412c7a 100644 --- a/interface/web/help/lib/lang/pl.lng +++ b/interface/web/help/lib/lang/pl.lng @@ -12,4 +12,3 @@ $wb['Manage Sections'] = 'Zarządzaj sekcjami'; $wb['Add a Question & Answer Pair'] = 'Dodaj nowe pytanie i odpowiedź'; $wb['Manage Questions'] = 'Zarządzaj pytaniami'; ?> - diff --git a/interface/web/help/lib/lang/pl_faq_form.lng b/interface/web/help/lib/lang/pl_faq_form.lng index 6495e6352..a39383e99 100644 --- a/interface/web/help/lib/lang/pl_faq_form.lng +++ b/interface/web/help/lib/lang/pl_faq_form.lng @@ -4,4 +4,3 @@ $wb['faq_question_txt'] = 'Pytanie'; $wb['faq_answer_txt'] = 'Odpowiedź'; $wb['faq_section_txt'] = 'Sekcja'; ?> - diff --git a/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng b/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng index c50ff019a..4c07503ee 100644 --- a/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng +++ b/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng @@ -7,4 +7,3 @@ $wb['faq_sections_txt'] = 'Sekcja'; $wb['faq_faq_questions_txt'] = 'Pomoc Techniczna'; $wb['faq_new_question_txt'] = 'Dodaj nowe pytanie i odpowiedź'; ?> - diff --git a/interface/web/help/lib/lang/pl_faq_sections_form.lng b/interface/web/help/lib/lang/pl_faq_sections_form.lng index 21615bd07..d4bb7ef94 100644 --- a/interface/web/help/lib/lang/pl_faq_sections_form.lng +++ b/interface/web/help/lib/lang/pl_faq_sections_form.lng @@ -1,4 +1,3 @@ - diff --git a/interface/web/help/lib/lang/pl_help_faq_list.lng b/interface/web/help/lib/lang/pl_help_faq_list.lng index 10a98c50c..072e3edbd 100644 --- a/interface/web/help/lib/lang/pl_help_faq_list.lng +++ b/interface/web/help/lib/lang/pl_help_faq_list.lng @@ -1,4 +1,3 @@ - diff --git a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng index 53a56a928..e21792dfd 100644 --- a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng +++ b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng @@ -6,4 +6,3 @@ $wb['faq_sections_txt'] = 'Sekcje'; $wb['faq_faq_sections_txt'] = 'Sekcje FAQ'; $wb['faq_new_section_txt'] = 'Dodaj nową sekcję'; ?> - diff --git a/interface/web/help/lib/lang/pl_support_message.lng b/interface/web/help/lib/lang/pl_support_message.lng index 82ef3deb9..5758dadec 100644 --- a/interface/web/help/lib/lang/pl_support_message.lng +++ b/interface/web/help/lib/lang/pl_support_message.lng @@ -6,4 +6,3 @@ $wb['message_txt'] = 'Wiadomość'; $wb['tstamp_txt'] = 'Kalendarz'; $wb['reply_txt'] = 'Reply'; ?> - diff --git a/interface/web/help/lib/lang/pl_support_message_list.lng b/interface/web/help/lib/lang/pl_support_message_list.lng index 13c678e3b..bc3285694 100644 --- a/interface/web/help/lib/lang/pl_support_message_list.lng +++ b/interface/web/help/lib/lang/pl_support_message_list.lng @@ -4,4 +4,3 @@ $wb['sender_id_txt'] = 'Nadawca'; $wb['subject_txt'] = 'Temat'; $wb['add_new_record_txt'] = 'Wyślij wiadomość'; ?> - diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng index 849537b27..189799bd8 100644 --- a/interface/web/login/lib/lang/el.lng +++ b/interface/web/login/lib/lang/el.lng @@ -16,3 +16,4 @@ $wb['password_txt'] = 'Συνθηματικό'; $wb['login_button_txt'] = 'Είσοδος'; ?> + diff --git a/interface/web/login/lib/lang/fr.lng b/interface/web/login/lib/lang/fr.lng index 43f8fe1ba..a6d082f2d 100644 --- a/interface/web/login/lib/lang/fr.lng +++ b/interface/web/login/lib/lang/fr.lng @@ -15,5 +15,3 @@ $wb['username_txt'] = 'Nom d\'utilisateur'; $wb['password_txt'] = 'Mot de passe'; $wb['login_button_txt'] = 'Connexion'; ?> - - diff --git a/interface/web/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng index 1d02b39d5..78d355816 100644 --- a/interface/web/login/lib/lang/pl.lng +++ b/interface/web/login/lib/lang/pl.lng @@ -15,4 +15,3 @@ $wb['username_txt'] = 'Nazwa użytkownika'; $wb['password_txt'] = 'Hasło'; $wb['login_button_txt'] = 'Zaloguj'; ?> - diff --git a/interface/web/mail/lib/lang/el.lng b/interface/web/mail/lib/lang/el.lng index 5180b8d9e..1ddf7837b 100644 --- a/interface/web/mail/lib/lang/el.lng +++ b/interface/web/mail/lib/lang/el.lng @@ -10,7 +10,7 @@ $wb['Email Catchall'] = 'Email Catchall'; $wb['Email Forward'] = 'Email Προώθησης'; $wb['Get Email'] = 'Λήψη Email'; $wb['Spamfilter'] = 'Φίλτρο Spam'; -$wb['Email Routing'] = 'Δρομολογήση Email'; +$wb['Email Routing'] = 'Δρομολόγηση Email'; $wb['Email transport'] = 'Μεταφορά Email'; $wb['Mailbox'] = 'Θυρίδα'; $wb['Autoresponder'] = 'Αυτόματη απάντηση'; @@ -46,3 +46,4 @@ $wb['Domain Alias'] = 'Ψευδώνυμο Domain'; $wb['Relay Recipients'] = 'Παραλήπτες Relay'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_alias.lng b/interface/web/mail/lib/lang/el_mail_alias.lng index 8b8a3ae3f..b1b2b5978 100644 --- a/interface/web/mail/lib/lang/el_mail_alias.lng +++ b/interface/web/mail/lib/lang/el_mail_alias.lng @@ -11,3 +11,4 @@ $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με $wb['domain_txt'] = 'Domain'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_alias_list.lng b/interface/web/mail/lib/lang/el_mail_alias_list.lng index b3e1f7ef4..9579667cb 100644 --- a/interface/web/mail/lib/lang/el_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/el_mail_alias_list.lng @@ -7,3 +7,4 @@ $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Νέο Ψευδώνυμο Email'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_aliasdomain.lng b/interface/web/mail/lib/lang/el_mail_aliasdomain.lng index 52f26a057..ab3ae6ebb 100644 --- a/interface/web/mail/lib/lang/el_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/el_mail_aliasdomain.lng @@ -10,3 +10,4 @@ $wb['source_error_unique'] = 'Το Domain Πηγή πρέπει να είναι $wb['source_error_regex'] = 'Μή έγκυρο όνομα για το Domain Εκκίνησης'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng index dbbe30060..2a65ce375 100644 --- a/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Προορισμός'; $wb['add_new_record_txt'] = 'Νέο ψευδωνύμο Domain'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_blacklist.lng b/interface/web/mail/lib/lang/el_mail_blacklist.lng index 75485e4f1..cc252a56b 100644 --- a/interface/web/mail/lib/lang/el_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/el_mail_blacklist.lng @@ -8,3 +8,4 @@ $wb['type_txt'] = 'Τύπος'; $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_blacklist_list.lng b/interface/web/mail/lib/lang/el_mail_blacklist_list.lng index 3f3a4d288..66c42c27c 100644 --- a/interface/web/mail/lib/lang/el_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/el_mail_blacklist_list.lng @@ -9,3 +9,4 @@ $wb['add_new_record_txt'] = 'Νέα εγγραφή Blacklist'; $wb['access_txt'] = 'πρόσβαση'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_content_filter.lng b/interface/web/mail/lib/lang/el_mail_content_filter.lng index c974878b0..94c3afe04 100644 --- a/interface/web/mail/lib/lang/el_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/el_mail_content_filter.lng @@ -8,3 +8,4 @@ $wb['active_txt'] = 'Ενεργό'; $wb['pattern_error_empty'] = 'Το μοτίβο δεν έχει οριστεί.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_content_filter_list.lng b/interface/web/mail/lib/lang/el_mail_content_filter_list.lng index 200058fcf..7b52950ed 100644 --- a/interface/web/mail/lib/lang/el_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/el_mail_content_filter_list.lng @@ -7,3 +7,4 @@ $wb['action_txt'] = 'Ενέργεια'; $wb['add_new_record_txt'] = 'Νέο φίλτρο περιεχομένου'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng index 9c29f4755..da0c0bc85 100644 --- a/interface/web/mail/lib/lang/el_mail_domain.lng +++ b/interface/web/mail/lib/lang/el_mail_domain.lng @@ -12,3 +12,4 @@ $wb['policy_txt'] = 'Spamfilter'; $wb['no_policy'] = '- ανενεργό -'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng index 4a1a84ed8..5bb1c51ab 100644 --- a/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng @@ -7,3 +7,4 @@ $wb['active_txt'] = 'Ενεργό'; $wb['sys_groupid_txt'] = 'Πελάτης'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng index fdf5e4082..5047b0d46 100644 --- a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng @@ -8,3 +8,4 @@ $wb['domain_error_regex'] = 'Μη έγκρυρο όνομα domain ή το όν $wb['limit_mailcatchall_txt'] = 'Το μέγιστο πλήθος των email catchall για τον λογαριασμό σας, έχει εξαντληθεί.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng index 55d0e08bd..5c427da2f 100644 --- a/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng @@ -8,3 +8,4 @@ $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Νέο Catchall'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_domain_list.lng b/interface/web/mail/lib/lang/el_mail_domain_list.lng index 393171c43..d3ddcbd1f 100644 --- a/interface/web/mail/lib/lang/el_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/el_mail_domain_list.lng @@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Νέο Domain'; $wb['active_txt'] = 'Ενεργό'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_forward.lng b/interface/web/mail/lib/lang/el_mail_forward.lng index 024507096..bfe431b86 100644 --- a/interface/web/mail/lib/lang/el_mail_forward.lng +++ b/interface/web/mail/lib/lang/el_mail_forward.lng @@ -7,3 +7,4 @@ $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με $wb['domain_txt'] = 'Domain'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_forward_list.lng b/interface/web/mail/lib/lang/el_mail_forward_list.lng index 11e5650dc..0e56a2fac 100644 --- a/interface/web/mail/lib/lang/el_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/el_mail_forward_list.lng @@ -7,3 +7,4 @@ $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Νέα προώθηση Email'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_get.lng b/interface/web/mail/lib/lang/el_mail_get.lng index 4cba32614..c3854294e 100644 --- a/interface/web/mail/lib/lang/el_mail_get.lng +++ b/interface/web/mail/lib/lang/el_mail_get.lng @@ -16,3 +16,4 @@ $wb['source_server_error_regex'] = 'Το όνομα του Pop3/Imap Server δε $wb['source_read_all_txt'] = 'Ανάκτηση όλων των emails (συμπερ. αναγνωσμένων mails)'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_get_list.lng b/interface/web/mail/lib/lang/el_mail_get_list.lng index 658e6b27e..45e2f3492 100644 --- a/interface/web/mail/lib/lang/el_mail_get_list.lng +++ b/interface/web/mail/lib/lang/el_mail_get_list.lng @@ -8,3 +8,4 @@ $wb['destination_txt'] = 'Προορισμός'; $wb['add_new_record_txt'] = 'Νέος Λογαρισμός'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist.lng b/interface/web/mail/lib/lang/el_mail_mailinglist.lng index 485d7a1b7..7d74373ed 100644 --- a/interface/web/mail/lib/lang/el_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/el_mail_mailinglist.lng @@ -14,3 +14,4 @@ $wb['email_txt'] = "Email"; $wb['password_txt'] = "Συνθηματικό"; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng index 4701821ca..c39d88fa8 100644 --- a/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng @@ -4,3 +4,4 @@ $wb['domain_txt'] = 'Domain'; $wb['listname_txt'] = 'Όνομα Λίστας'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_relay_recipient.lng b/interface/web/mail/lib/lang/el_mail_relay_recipient.lng index 769e30661..1a33bc37f 100644 --- a/interface/web/mail/lib/lang/el_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/el_mail_relay_recipient.lng @@ -8,3 +8,4 @@ $wb['type_txt'] = 'Τύπος'; $wb['limit_mailfilter_txt'] = 'Το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας, εξαντλήθηκε.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng index 1028112c9..2ce9b2d64 100644 --- a/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng @@ -8,3 +8,4 @@ $wb['add_new_record_txt'] = 'Νέος παραλήπτης relay'; $wb['access_txt'] = 'πρόσβαση'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter.lng b/interface/web/mail/lib/lang/el_mail_spamfilter.lng index b6cd7197a..4e53c7cf6 100644 --- a/interface/web/mail/lib/lang/el_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/el_mail_spamfilter.lng @@ -16,3 +16,4 @@ $wb['spam_redirect_maildir_purge_txt'] = 'Εκκαθάριση φακέλου ma $wb['days_txt'] = 'Ημέρες.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng index 4b2f141cc..e24251b00 100644 --- a/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng @@ -7,3 +7,4 @@ $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Νέα εγγραφή φίλτρου Spam'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_transport.lng b/interface/web/mail/lib/lang/el_mail_transport.lng index 34c779dbf..72d812e24 100644 --- a/interface/web/mail/lib/lang/el_mail_transport.lng +++ b/interface/web/mail/lib/lang/el_mail_transport.lng @@ -9,3 +9,4 @@ $wb['active_txt'] = 'Ενεργό'; $wb['limit_mailrouting_txt'] = 'Το μέγιστο πλήθος των δρομολογήσεων email για τον λογαριασμό σας, εξαντλήθηκε.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_transport_list.lng b/interface/web/mail/lib/lang/el_mail_transport_list.lng index 72ae994ea..425578e83 100644 --- a/interface/web/mail/lib/lang/el_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/el_mail_transport_list.lng @@ -8,3 +8,4 @@ $wb['sort_order_txt'] = 'Ταξινόμηση κατά'; $wb['add_new_record_txt'] = 'Νέα μεταφορά'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng index dd2e6847c..cac5297c1 100644 --- a/interface/web/mail/lib/lang/el_mail_user.lng +++ b/interface/web/mail/lib/lang/el_mail_user.lng @@ -43,3 +43,4 @@ $wb['login_txt'] = "Login (προαιτερικά)"; $wb['error_login_email_txt'] = "Το όνομα δεν επιτρέπεται. Παρακαλούμε εισάγεται ένα διαφορετικό όνομα ή χρησιμοποιείστε την διεύθυνση e-mail."; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_user_filter.lng b/interface/web/mail/lib/lang/el_mail_user_filter.lng index 39ad5eae0..1780f857a 100644 --- a/interface/web/mail/lib/lang/el_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/el_mail_user_filter.lng @@ -19,3 +19,4 @@ $wb['move_to_txt'] = 'Μετακίνηση σε'; $wb['delete_txt'] = 'Διαγραφή'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_user_filter_list.lng b/interface/web/mail/lib/lang/el_mail_user_filter_list.lng index 9f2aa4000..2c9500106 100644 --- a/interface/web/mail/lib/lang/el_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/el_mail_user_filter_list.lng @@ -6,3 +6,4 @@ $wb['page_of_txt'] = 'από'; $wb['delete_confirmation'] = 'Θέλετε οπωσδήποτε να διαγράψετε το φίλτρο mail;'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_user_list.lng b/interface/web/mail/lib/lang/el_mail_user_list.lng index aa82d04b2..4fbc7a83b 100644 --- a/interface/web/mail/lib/lang/el_mail_user_list.lng +++ b/interface/web/mail/lib/lang/el_mail_user_list.lng @@ -7,3 +7,4 @@ $wb['name_txt'] = 'Πραγματικό Όνομα'; $wb['login_txt'] = 'Login'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_user_stats_list.lng b/interface/web/mail/lib/lang/el_mail_user_stats_list.lng index e51cbd3ce..92db1c781 100644 --- a/interface/web/mail/lib/lang/el_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/el_mail_user_stats_list.lng @@ -7,3 +7,4 @@ $wb['this_year_txt'] = 'Αυτό το χρόνο'; $wb['last_year_txt'] = 'Τον τελευταίο χρόνο'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_whitelist.lng b/interface/web/mail/lib/lang/el_mail_whitelist.lng index 80f7c8ff2..1e221e554 100644 --- a/interface/web/mail/lib/lang/el_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/el_mail_whitelist.lng @@ -8,3 +8,4 @@ $wb['type_txt'] = 'Τύπος'; $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_whitelist_list.lng b/interface/web/mail/lib/lang/el_mail_whitelist_list.lng index f744f3515..d80490c51 100644 --- a/interface/web/mail/lib/lang/el_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/el_mail_whitelist_list.lng @@ -9,3 +9,4 @@ $wb['add_new_record_txt'] = 'Νέα εγγραφή στην λίστα των ε $wb['access_txt'] = 'πρόσβαση'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng index a2377487e..9dfc03895 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng @@ -8,3 +8,4 @@ $wb['active_txt'] = 'Ενεργό'; $wb['limit_spamfilter_wblist_txt'] = 'Το μέγιστο πλήθος των Whitelist ή Blacklist εγγραφών για τον λογαριασμό σας, έχει εξαντληθεί.'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng index 169c21a52..bc25acd78 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng @@ -8,3 +8,4 @@ $wb['email_txt'] = 'Blacklisted Email'; $wb['add_new_record_txt'] = 'Νέα εγγραφή Blacklist'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_config.lng b/interface/web/mail/lib/lang/el_spamfilter_config.lng index 4654dd2dd..f6d9ebfa8 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_config.lng @@ -19,3 +19,4 @@ $wb['mailbox_size_limit_txt'] = 'Όριο μεγέθους θυρίδας'; $wb['message_size_limit_txt'] = 'Όριο μεγέθους μηνύματος'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_config_list.lng b/interface/web/mail/lib/lang/el_spamfilter_config_list.lng index 84bd401c8..4f2bc7a72 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_config_list.lng @@ -4,3 +4,4 @@ $wb['server_name_txt'] = 'Server'; $wb['server_id_txt'] = 'server_id'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_policy.lng b/interface/web/mail/lib/lang/el_spamfilter_policy.lng index f928816d3..3d34164f9 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_policy.lng @@ -37,3 +37,4 @@ $wb['message_size_limit_txt'] = 'Όριο μεγέθους μηνύματος'; $wb['banned_rulenames_txt'] = 'Banned rulenames'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng index 4b894093c..162984db5 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng @@ -8,3 +8,4 @@ $wb['bad_header_lover_txt'] = 'Αποδοχή κακών κεφαλίδων'; $wb['add_new_record_txt'] = 'Νέα εγγραφή Πολιτικής'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_users.lng b/interface/web/mail/lib/lang/el_spamfilter_users.lng index e5b6d0428..be5685204 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_users.lng @@ -7,3 +7,4 @@ $wb['fullname_txt'] = 'Όνομα'; $wb['local_txt'] = 'Τοπικός'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_users_list.lng b/interface/web/mail/lib/lang/el_spamfilter_users_list.lng index 1176465b3..3e620cf99 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_users_list.lng @@ -9,3 +9,4 @@ $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Νέος χρήστης Spamfilter'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng index acbe6cca4..d9fdabefa 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng @@ -8,3 +8,4 @@ $wb['active_txt'] = 'Ενεργό'; $wb['limit_spamfilter_wblist_txt'] = 'Το μέγιστο πλήθος των White η Blacklist εγγραφών έχει εξαντληθεί.'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng index 811ebea0c..abbb5162f 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng @@ -8,3 +8,4 @@ $wb['email_txt'] = 'Whitelisted Email'; $wb['add_new_record_txt'] = 'Νέα εγγραφή Whitelist'; ?> + diff --git a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng index dde63a052..3dca89e4c 100755 --- a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng +++ b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/mail/lib/lang/fr.lng b/interface/web/mail/lib/lang/fr.lng index f2405456e..ad2f79cfc 100644 --- a/interface/web/mail/lib/lang/fr.lng +++ b/interface/web/mail/lib/lang/fr.lng @@ -45,5 +45,3 @@ $wb['Mailbox traffic'] = 'Trafic de la boite email'; $wb['Domain Alias'] = 'Alias de domaine'; $wb['Relay Recipients'] = 'Destinataires de relais'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_alias.lng b/interface/web/mail/lib/lang/fr_mail_alias.lng index fd3046730..55450d475 100644 --- a/interface/web/mail/lib/lang/fr_mail_alias.lng +++ b/interface/web/mail/lib/lang/fr_mail_alias.lng @@ -10,5 +10,3 @@ $wb['limit_mailalias_txt'] = 'Le nombre maximal d\'alias d\'email pour votre com $wb['duplicate_mailbox_txt'] = 'Il y a déja une boîte mail avec cette adresse email'; $wb['domain_txt'] = 'Domaine'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_alias_list.lng b/interface/web/mail/lib/lang/fr_mail_alias_list.lng index 29091c449..406d52a33 100644 --- a/interface/web/mail/lib/lang/fr_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_alias_list.lng @@ -6,5 +6,3 @@ $wb['destination_txt'] = 'Destination'; $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Ajouter un nouvel alias d\'email'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_aliasdomain.lng b/interface/web/mail/lib/lang/fr_mail_aliasdomain.lng index 4f00dc0a1..c0493fd23 100644 --- a/interface/web/mail/lib/lang/fr_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/fr_mail_aliasdomain.lng @@ -9,5 +9,3 @@ $wb['source_error_empty'] = 'Le domaine source est vide.'; $wb['source_error_unique'] = 'Domaine source dupliqué.'; $wb['source_error_regex'] = 'Nom de domaine source invalide.'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/fr_mail_aliasdomain_list.lng index 011c9f0de..f37797535 100644 --- a/interface/web/mail/lib/lang/fr_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_aliasdomain_list.lng @@ -5,5 +5,3 @@ $wb['source_txt'] = 'Source'; $wb['destination_txt'] = 'Destination'; $wb['add_new_record_txt'] = 'Ajouter un alias de domaine'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_blacklist.lng b/interface/web/mail/lib/lang/fr_mail_blacklist.lng index b82fb549c..3f5f9709e 100644 --- a/interface/web/mail/lib/lang/fr_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/fr_mail_blacklist.lng @@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'L\'adresse est vide.'; $wb['type_txt'] = 'Type'; $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres d\'email pour votre compte a été atteint.'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_blacklist_list.lng b/interface/web/mail/lib/lang/fr_mail_blacklist_list.lng index b367d45d4..a740f38fe 100644 --- a/interface/web/mail/lib/lang/fr_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_blacklist_list.lng @@ -8,5 +8,3 @@ $wb['recipient_txt'] = 'Destinataire'; $wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement'; $wb['access_txt'] = 'accès'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_content_filter.lng b/interface/web/mail/lib/lang/fr_mail_content_filter.lng index 2dfa25b00..5aa0caac0 100644 --- a/interface/web/mail/lib/lang/fr_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/fr_mail_content_filter.lng @@ -7,5 +7,3 @@ $wb['action_txt'] = 'Action'; $wb['active_txt'] = 'Actif'; $wb['pattern_error_empty'] = 'Le schéma est vide.'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_content_filter_list.lng b/interface/web/mail/lib/lang/fr_mail_content_filter_list.lng index e7539035f..2011396cb 100644 --- a/interface/web/mail/lib/lang/fr_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_content_filter_list.lng @@ -6,5 +6,3 @@ $wb['pattern_txt'] = 'Schéma'; $wb['action_txt'] = 'Action'; $wb['add_new_record_txt'] = 'Ajouter un nouveau filtre de contenu'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_domain.lng b/interface/web/mail/lib/lang/fr_mail_domain.lng index 978b01b5e..55e8c2607 100644 --- a/interface/web/mail/lib/lang/fr_mail_domain.lng +++ b/interface/web/mail/lib/lang/fr_mail_domain.lng @@ -11,5 +11,3 @@ $wb['limit_maildomain_txt'] = 'Le nombre maximal de domaines d\'email pour votre $wb['policy_txt'] = 'Filtre antispam'; $wb['no_policy'] = '- inactif -'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/fr_mail_domain_admin_list.lng index 62c71e269..11a957b88 100644 --- a/interface/web/mail/lib/lang/fr_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_domain_admin_list.lng @@ -6,5 +6,3 @@ $wb['add_new_record_txt'] = 'Ajouter un domaine'; $wb['active_txt'] = 'Actif'; $wb['sys_groupid_txt'] = 'Client'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng b/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng index 11abb62e1..41b7e8324 100644 --- a/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng @@ -7,5 +7,3 @@ $wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.'; $wb['domain_error_regex'] = 'Nom de domaine invalide, ou contient des caractères invalides.'; $wb['limit_mailcatchall_txt'] = 'Le nombre maximal de comptes collecteurs pour votre compte a été atteint.'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/fr_mail_domain_catchall_list.lng index 7ec84ea5e..51f21be82 100644 --- a/interface/web/mail/lib/lang/fr_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_domain_catchall_list.lng @@ -7,5 +7,3 @@ $wb['server_id_txt'] = 'Serveur'; $wb['domain_txt'] = 'Domaine'; $wb['add_new_record_txt'] = 'Ajouter un nouveau collecteur'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_domain_list.lng b/interface/web/mail/lib/lang/fr_mail_domain_list.lng index a25097818..dca99fbc5 100644 --- a/interface/web/mail/lib/lang/fr_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_domain_list.lng @@ -5,5 +5,3 @@ $wb['domain_txt'] = 'Domaine'; $wb['add_new_record_txt'] = 'Ajouter un nouveau domaine'; $wb['active_txt'] = 'Actif'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_forward.lng b/interface/web/mail/lib/lang/fr_mail_forward.lng index fb5ab01f0..7f9b277dd 100644 --- a/interface/web/mail/lib/lang/fr_mail_forward.lng +++ b/interface/web/mail/lib/lang/fr_mail_forward.lng @@ -6,5 +6,3 @@ $wb['limit_mailforward_txt'] = 'Le nombre maximal de transferts d\'email pour vo $wb['duplicate_mailbox_txt'] = 'Il y a déja une boite email avec cette adresse email'; $wb['domain_txt'] = 'Domaine'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_forward_list.lng b/interface/web/mail/lib/lang/fr_mail_forward_list.lng index 7e3827a1a..e901ddeeb 100644 --- a/interface/web/mail/lib/lang/fr_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_forward_list.lng @@ -6,5 +6,3 @@ $wb['destination_txt'] = 'Destination'; $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Ajouter un nouveau transfert d\'email'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_get.lng b/interface/web/mail/lib/lang/fr_mail_get.lng index 144fd47de..81aa6e5b0 100644 --- a/interface/web/mail/lib/lang/fr_mail_get.lng +++ b/interface/web/mail/lib/lang/fr_mail_get.lng @@ -15,5 +15,3 @@ $wb['destination_error_isemail'] = 'Pas de destination sélectionnée.'; $wb['source_server_error_regex'] = 'Le serveur POP3 / IMAP n\'est pas un nom de domaine valide.'; $wb['source_read_all_txt'] = 'Récupérer tous les emails (incl. les emails lus)'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_get_list.lng b/interface/web/mail/lib/lang/fr_mail_get_list.lng index 441535eb4..a93db851d 100644 --- a/interface/web/mail/lib/lang/fr_mail_get_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_get_list.lng @@ -7,5 +7,3 @@ $wb['source_username_txt'] = 'Utilisateur'; $wb['destination_txt'] = 'Destination'; $wb['add_new_record_txt'] = 'Ajouter un nouveau compte'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_mailinglist.lng b/interface/web/mail/lib/lang/fr_mail_mailinglist.lng index a16cbd18b..ca7b5b3d6 100644 --- a/interface/web/mail/lib/lang/fr_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/fr_mail_mailinglist.lng @@ -13,5 +13,3 @@ $wb['client_txt'] = 'Client'; $wb['email_txt'] = 'Email'; $wb['password_txt'] = 'Mot de passe'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/fr_mail_mailinglist_list.lng index ae21364ad..d04d99ae0 100644 --- a/interface/web/mail/lib/lang/fr_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_mailinglist_list.lng @@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Mailing List'; $wb['domain_txt'] = 'Domaine'; $wb['listname_txt'] = 'Nom de la liste'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_relay_recipient.lng b/interface/web/mail/lib/lang/fr_mail_relay_recipient.lng index cdda912e8..4851835ab 100644 --- a/interface/web/mail/lib/lang/fr_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/fr_mail_relay_recipient.lng @@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'L\'adresse est vide'; $wb['type_txt'] = 'Type'; $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres pour votre compte est atteint.'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/fr_mail_relay_recipient_list.lng index 61ba35801..27353debf 100644 --- a/interface/web/mail/lib/lang/fr_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_relay_recipient_list.lng @@ -7,5 +7,3 @@ $wb['recipient_txt'] = 'Destinataire'; $wb['add_new_record_txt'] = 'Ajouter un relai de destinataire'; $wb['access_txt'] = 'accès'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_spamfilter.lng b/interface/web/mail/lib/lang/fr_mail_spamfilter.lng index f9e174c73..a312fadd5 100644 --- a/interface/web/mail/lib/lang/fr_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/fr_mail_spamfilter.lng @@ -15,5 +15,3 @@ $wb['email_error_unique'] = 'Il y a déja un enregistrement de filtre antispam a $wb['spam_redirect_maildir_purge_txt'] = 'Purger le répertoire de mail après'; $wb['days_txt'] = 'Jours.'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/fr_mail_spamfilter_list.lng index d16b47a9e..1be0c0ef0 100644 --- a/interface/web/mail/lib/lang/fr_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_spamfilter_list.lng @@ -6,5 +6,3 @@ $wb['server_name_txt'] = 'Nom du serveur'; $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_transport.lng b/interface/web/mail/lib/lang/fr_mail_transport.lng index 02388c6a6..e99e2a879 100644 --- a/interface/web/mail/lib/lang/fr_mail_transport.lng +++ b/interface/web/mail/lib/lang/fr_mail_transport.lng @@ -8,5 +8,3 @@ $wb['sort_order_txt'] = 'Trier par'; $wb['active_txt'] = 'Actif'; $wb['limit_mailrouting_txt'] = 'Le nombre maximal de routes pour votre compte a été atteint.'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_transport_list.lng b/interface/web/mail/lib/lang/fr_mail_transport_list.lng index 9ffe29c2f..60c51c3a4 100644 --- a/interface/web/mail/lib/lang/fr_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_transport_list.lng @@ -7,5 +7,3 @@ $wb['transport_txt'] = 'Déplacement'; $wb['sort_order_txt'] = 'Trier par'; $wb['add_new_record_txt'] = 'Ajouter un nouveau déplacement'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_user_filter.lng b/interface/web/mail/lib/lang/fr_mail_user_filter.lng index 86650bc34..b847c9077 100644 --- a/interface/web/mail/lib/lang/fr_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/fr_mail_user_filter.lng @@ -18,5 +18,3 @@ $wb['ends_with_txt'] = 'Fini par'; $wb['move_to_txt'] = 'Déplacer vers'; $wb['delete_txt'] = 'Supprimer'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_user_filter_list.lng b/interface/web/mail/lib/lang/fr_mail_user_filter_list.lng index a62536c59..96bde24ea 100644 --- a/interface/web/mail/lib/lang/fr_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_user_filter_list.lng @@ -5,5 +5,3 @@ $wb['page_txt'] = 'Page'; $wb['page_of_txt'] = 'de'; $wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer ce filtre'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_user_list.lng b/interface/web/mail/lib/lang/fr_mail_user_list.lng index dfa23675a..59652ba26 100644 --- a/interface/web/mail/lib/lang/fr_mail_user_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_user_list.lng @@ -6,5 +6,3 @@ $wb['add_new_record_txt'] = 'Ajouter une nouvelle boîte email'; $wb['name_txt'] = 'Nom véritable'; $wb['login_txt'] = 'Nom d\'utilisateur'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng b/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng index 8e8ce5905..9e5b4b979 100644 --- a/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng @@ -6,5 +6,3 @@ $wb['last_month_txt'] = 'Le mois dernier'; $wb['this_year_txt'] = 'L\'année en cours'; $wb['last_year_txt'] = 'Lannée dernière'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_whitelist.lng b/interface/web/mail/lib/lang/fr_mail_whitelist.lng index edb22f843..0d621c95f 100644 --- a/interface/web/mail/lib/lang/fr_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/fr_mail_whitelist.lng @@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'L\'adresse est vide.'; $wb['type_txt'] = 'Type'; $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres à mails pour votre compte a été atteint.'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_mail_whitelist_list.lng b/interface/web/mail/lib/lang/fr_mail_whitelist_list.lng index f7fc6a7f7..244c2b36b 100644 --- a/interface/web/mail/lib/lang/fr_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/fr_mail_whitelist_list.lng @@ -8,5 +8,3 @@ $wb['recipient_txt'] = 'Destinataire'; $wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement'; $wb['access_txt'] = 'accès'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/fr_spamfilter_blacklist.lng index 2e5ffb78e..de9c43a61 100644 --- a/interface/web/mail/lib/lang/fr_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/fr_spamfilter_blacklist.lng @@ -7,5 +7,3 @@ $wb['priority_txt'] = 'Priorité'; $wb['active_txt'] = 'Actif'; $wb['limit_spamfilter_wblist_txt'] = 'Le nombre maximal d\'enregistrements dans votre liste blanche/noire pour votre compte a été atteint.'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/fr_spamfilter_blacklist_list.lng index 9e245cadf..7758b12e9 100644 --- a/interface/web/mail/lib/lang/fr_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/fr_spamfilter_blacklist_list.lng @@ -7,5 +7,3 @@ $wb['rid_txt'] = 'Utilisateur'; $wb['email_txt'] = 'Email en liste blanche'; $wb['add_new_record_txt'] = 'Ajouter un enregistrement'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_spamfilter_config.lng b/interface/web/mail/lib/lang/fr_spamfilter_config.lng index 65a6758be..081594c43 100644 --- a/interface/web/mail/lib/lang/fr_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/fr_spamfilter_config.lng @@ -18,5 +18,3 @@ $wb['relayhost_password_txt'] = 'Mot de passe hôte de relais'; $wb['mailbox_size_limit_txt'] = 'Limite de taille de la boite email'; $wb['message_size_limit_txt'] = 'Limite de taille des messages'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_spamfilter_config_list.lng b/interface/web/mail/lib/lang/fr_spamfilter_config_list.lng index fab905501..d59ed84c2 100644 --- a/interface/web/mail/lib/lang/fr_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/fr_spamfilter_config_list.lng @@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Configuration du serveur'; $wb['server_name_txt'] = 'Serveur'; $wb['server_id_txt'] = 'ID Serveur'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_spamfilter_policy.lng b/interface/web/mail/lib/lang/fr_spamfilter_policy.lng index fd052d686..e23c90127 100644 --- a/interface/web/mail/lib/lang/fr_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/fr_spamfilter_policy.lng @@ -36,5 +36,3 @@ $wb['spam_admin_txt'] = 'Admin SPAM'; $wb['message_size_limit_txt'] = 'Limite de taille de message'; $wb['banned_rulenames_txt'] = 'Noms des règles bannir'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/fr_spamfilter_policy_list.lng index c4845a9c3..3a0e77fba 100644 --- a/interface/web/mail/lib/lang/fr_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/fr_spamfilter_policy_list.lng @@ -7,5 +7,3 @@ $wb['banned_files_lover_txt'] = 'Aime les fichiers bannis'; $wb['bad_header_lover_txt'] = 'Aime les mauvaises entêtes'; $wb['add_new_record_txt'] = 'Ajouter une entrée à la politique'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_spamfilter_users.lng b/interface/web/mail/lib/lang/fr_spamfilter_users.lng index 7257dbff5..e88d33e39 100644 --- a/interface/web/mail/lib/lang/fr_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/fr_spamfilter_users.lng @@ -6,5 +6,3 @@ $wb['email_txt'] = 'Email (Schéma)'; $wb['fullname_txt'] = 'Nom'; $wb['local_txt'] = 'Local'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_spamfilter_users_list.lng b/interface/web/mail/lib/lang/fr_spamfilter_users_list.lng index 2ca2fdd14..f7047b103 100644 --- a/interface/web/mail/lib/lang/fr_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/fr_spamfilter_users_list.lng @@ -8,5 +8,3 @@ $wb['fullname_txt'] = 'Nom'; $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Ajouter un utilisateur de l\'anti-spam'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/fr_spamfilter_whitelist.lng index 1cc257cc6..a4a96491d 100644 --- a/interface/web/mail/lib/lang/fr_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/fr_spamfilter_whitelist.lng @@ -7,5 +7,3 @@ $wb['priority_txt'] = 'Priorité'; $wb['active_txt'] = 'Actif'; $wb['limit_spamfilter_wblist_txt'] = 'Le nombre maximal d\'enregistrements de liste blanche ou noire est atteint pour votre compte.'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/fr_spamfilter_whitelist_list.lng index fa7fc483c..5c0fab1e9 100644 --- a/interface/web/mail/lib/lang/fr_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/fr_spamfilter_whitelist_list.lng @@ -7,5 +7,3 @@ $wb['rid_txt'] = 'Utilisateur'; $wb['email_txt'] = 'Email en liste blanche'; $wb['add_new_record_txt'] = 'Ajouter des enregistrements en liste blanche'; ?> - - diff --git a/interface/web/mail/lib/lang/fr_user_quota_stats_list.lng b/interface/web/mail/lib/lang/fr_user_quota_stats_list.lng index 9cd26f538..258d73f23 100755 --- a/interface/web/mail/lib/lang/fr_user_quota_stats_list.lng +++ b/interface/web/mail/lib/lang/fr_user_quota_stats_list.lng @@ -5,5 +5,3 @@ $wb['name_txt'] = 'Nom'; $wb['email_txt'] = 'Adresse email'; $wb['used_txt'] = 'Espace utilisé'; ?> - - diff --git a/interface/web/mail/lib/lang/hr.lng b/interface/web/mail/lib/lang/hr.lng index e3a31e332..1563955ca 100644 --- a/interface/web/mail/lib/lang/hr.lng +++ b/interface/web/mail/lib/lang/hr.lng @@ -5,7 +5,7 @@ $wb['Blacklist'] = 'Blacklist'; $wb['Mail Content Filter'] = 'Mail Content Filter'; $wb['Filter'] = 'Filter'; $wb['Mail Domain'] = 'Mail Domain'; -$wb['Domain'] = 'Domain'; +$wb['Domain'] = 'Domena'; $wb['Email Catchall'] = 'Email Catchall'; $wb['Email Forward'] = 'Email Forward'; $wb['Get Email'] = 'Get Email'; diff --git a/interface/web/mail/lib/lang/hr_mail_alias.lng b/interface/web/mail/lib/lang/hr_mail_alias.lng index 7f149eb96..f78f29dc8 100644 --- a/interface/web/mail/lib/lang/hr_mail_alias.lng +++ b/interface/web/mail/lib/lang/hr_mail_alias.lng @@ -1,12 +1,12 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_alias_list.lng b/interface/web/mail/lib/lang/hr_mail_alias_list.lng index 0a44ea4f7..de017ff9b 100644 --- a/interface/web/mail/lib/lang/hr_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_alias_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng b/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng index a72052f08..0d1231f27 100644 --- a/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_content_filter_list.lng b/interface/web/mail/lib/lang/hr_mail_content_filter_list.lng index 8c1e5e2e7..d3c273e9d 100644 --- a/interface/web/mail/lib/lang/hr_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_content_filter_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng b/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng index 382e97f0e..e154524ae 100644 --- a/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_domain_list.lng b/interface/web/mail/lib/lang/hr_mail_domain_list.lng index d84478131..8b8090943 100644 --- a/interface/web/mail/lib/lang/hr_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_domain_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_forward.lng b/interface/web/mail/lib/lang/hr_mail_forward.lng index 9ac60a20c..328a685ad 100644 --- a/interface/web/mail/lib/lang/hr_mail_forward.lng +++ b/interface/web/mail/lib/lang/hr_mail_forward.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_forward_list.lng b/interface/web/mail/lib/lang/hr_mail_forward_list.lng index f4529440c..3312f6355 100644 --- a/interface/web/mail/lib/lang/hr_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_forward_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_mailinglist.lng b/interface/web/mail/lib/lang/hr_mail_mailinglist.lng index d9c3059f1..3209ff192 100644 --- a/interface/web/mail/lib/lang/hr_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/hr_mail_mailinglist.lng @@ -7,9 +7,9 @@ $wb['email_in_use_txt'] = 'Email is in use'; $wb['no_domain_perm'] = 'You have no permission for this domain.'; $wb['password_strength_txt'] = 'Password strength'; $wb['server_id_txt'] = 'Server'; -$wb['domain_txt'] = 'Domain'; +$wb['domain_txt'] = 'Domena'; $wb['listname_txt'] = 'Listname'; $wb['client_txt'] = 'Client'; $wb['email_txt'] = 'Email'; -$wb['password_txt'] = 'Password'; +$wb['password_txt'] = 'Šifra'; ?> diff --git a/interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng index dac225ad9..8eebde903 100644 --- a/interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng b/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng index b5c8724da..5d284784d 100644 --- a/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng @@ -2,8 +2,8 @@ $wb['server_id_txt'] = 'Server'; $wb['source_txt'] = 'Relay recipient'; $wb['recipient_txt'] = 'Recipient'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $wb['source_error_notempty'] = 'Address is empty.'; -$wb['type_txt'] = 'Type'; +$wb['type_txt'] = 'Vrsta'; $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.'; ?> diff --git a/interface/web/mail/lib/lang/hr_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/hr_mail_relay_recipient_list.lng index 36045f4e3..3b4586b49 100644 --- a/interface/web/mail/lib/lang/hr_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_relay_recipient_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_transport_list.lng b/interface/web/mail/lib/lang/hr_mail_transport_list.lng index a96c081e6..d86d9e551 100644 --- a/interface/web/mail/lib/lang/hr_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_transport_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_whitelist_list.lng b/interface/web/mail/lib/lang/hr_mail_whitelist_list.lng index eaa7eb3fc..445906172 100644 --- a/interface/web/mail/lib/lang/hr_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_whitelist_list.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng index 12de2e616..b63b9f5e1 100644 --- a/interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng index d209d17a4..2f39adf9d 100644 --- a/interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng @@ -1,6 +1,6 @@ - diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng index 16b70991b..0a3d047d9 100644 --- a/interface/web/mail/lib/lang/pl_mail_alias.lng +++ b/interface/web/mail/lib/lang/pl_mail_alias.lng @@ -10,4 +10,3 @@ $wb['limit_mailalias_txt'] = 'Maksymalna ilość aliasów e-mail dla Twojego kon $wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa z e-mailem o takiej nazwie.'; $wb['domain_txt'] = 'Domena'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_alias_list.lng b/interface/web/mail/lib/lang/pl_mail_alias_list.lng index f5567ce92..b6ce95d0c 100644 --- a/interface/web/mail/lib/lang/pl_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_alias_list.lng @@ -6,4 +6,3 @@ $wb['destination_txt'] = 'Element docelowy'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Dodaj nowy alias e-mail'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng index ebbc0d020..7735a4e87 100644 --- a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng @@ -9,4 +9,3 @@ $wb['source_error_empty'] = 'Domena źródłowa jest pusta.'; $wb['source_error_unique'] = 'Duplikat źródłowej domeny.'; $wb['source_error_regex'] = 'Nieprawidłowa nazwa domeny źródłowej.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng index bdccec7d6..ba2e3b957 100644 --- a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng @@ -5,4 +5,3 @@ $wb['source_txt'] = 'Źródło'; $wb['destination_txt'] = 'Cel'; $wb['add_new_record_txt'] = 'Dodaj nowy alias domeny'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng index 448658d83..528f2f741 100644 --- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng @@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Adres jest pusty.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów dla Twojego konta została przekroczona.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng index 8351885ca..ebef66657 100644 --- a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng @@ -8,4 +8,3 @@ $wb['recipient_txt'] = 'Odbiorca'; $wb['add_new_record_txt'] = 'Dodaj nowy wpis czarnej listy'; $wb['access_txt'] = 'dostęp'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter.lng b/interface/web/mail/lib/lang/pl_mail_content_filter.lng index 6ca25bccd..54efa4fed 100644 --- a/interface/web/mail/lib/lang/pl_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/pl_mail_content_filter.lng @@ -7,4 +7,3 @@ $wb['action_txt'] = 'Akcja'; $wb['active_txt'] = 'Aktywny'; $wb['pattern_error_empty'] = 'Wzór jest pusty.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng index fe5a78fd6..9fc964cf5 100644 --- a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng @@ -6,4 +6,3 @@ $wb['pattern_txt'] = 'Wzór'; $wb['action_txt'] = 'Akcja'; $wb['add_new_record_txt'] = 'Dodaj nowy zbiór filtrów'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng index 0e76cd0f0..6f9c68cdc 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain.lng @@ -11,4 +11,3 @@ $wb['limit_maildomain_txt'] = 'Maksymalna ilość domen e-mail dla Twojego konta $wb['policy_txt'] = 'Filtr spamu'; $wb['no_policy'] = '-nie używane-'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng index de3a6654f..e214d92a9 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng @@ -6,4 +6,3 @@ $wb['add_new_record_txt'] = 'Dodaj nową domenę'; $wb['active_txt'] = 'Aktywne'; $wb['sys_groupid_txt'] = 'Klient'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng index 89f46100d..fc27d33dc 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng @@ -7,4 +7,3 @@ $wb['no_domain_perm'] = 'Nie masz dostępu do tej domeny.'; $wb['domain_error_regex'] = 'Nieprawidłowa nazwa domeny. Domena zawiera niedozolone znaki.'; $wb['limit_mailcatchall_txt'] = 'Maksymalna ilość kont e-mail catchall dla Twojej domeny została przekroczona.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng index 304bc3d9a..1f0aad197 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng @@ -7,4 +7,3 @@ $wb['server_id_txt'] = 'Serwer'; $wb['domain_txt'] = 'Domena'; $wb['add_new_record_txt'] = 'Dodaj nowy Catchall'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_domain_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_list.lng index e14f2f088..ec51e2cdb 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_list.lng @@ -5,4 +5,3 @@ $wb['domain_txt'] = 'Domena'; $wb['add_new_record_txt'] = 'Dodaj nową domenę'; $wb['active_txt'] = 'Aktywny'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_forward.lng b/interface/web/mail/lib/lang/pl_mail_forward.lng index 60a4aef5f..44944a36a 100644 --- a/interface/web/mail/lib/lang/pl_mail_forward.lng +++ b/interface/web/mail/lib/lang/pl_mail_forward.lng @@ -6,4 +6,3 @@ $wb['limit_mailforward_txt'] = 'Maksymalna ilość przekierowań e-mail dla Twoj $wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa o podanym adresie e-mail'; $wb['domain_txt'] = 'Domain'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_forward_list.lng b/interface/web/mail/lib/lang/pl_mail_forward_list.lng index 3f27975cf..1044bd512 100644 --- a/interface/web/mail/lib/lang/pl_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_forward_list.lng @@ -6,4 +6,3 @@ $wb['destination_txt'] = 'Element docelowy'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Dodaj nowe przekierowanie E-mail'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng index c8cf34281..535bf7a26 100644 --- a/interface/web/mail/lib/lang/pl_mail_get.lng +++ b/interface/web/mail/lib/lang/pl_mail_get.lng @@ -15,4 +15,3 @@ $wb['destination_error_isemail'] = 'Nie wybrano elementu docelowego.'; $wb['source_server_error_regex'] = 'Serwer Pop3/Imap nie jest poprawną nazwą domenową.'; $wb['source_read_all_txt'] = 'Pobierz wszystkie maile (razem z przeczytanymi)'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_get_list.lng b/interface/web/mail/lib/lang/pl_mail_get_list.lng index cf5844f0d..cd473d9de 100644 --- a/interface/web/mail/lib/lang/pl_mail_get_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_get_list.lng @@ -7,4 +7,3 @@ $wb['source_username_txt'] = 'Nazwa użytkownika'; $wb['destination_txt'] = 'Element docelowy'; $wb['add_new_record_txt'] = 'Dodaj nowe konto'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng index 495b9baa0..fe6d3d8a0 100644 --- a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng @@ -13,4 +13,3 @@ $wb['client_txt'] = 'Klient'; $wb['email_txt'] = 'Email'; $wb['password_txt'] = 'Hasło'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng index 96cd9604d..649db47bd 100644 --- a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Lista mailingowa'; $wb['domain_txt'] = 'Domena'; $wb['listname_txt'] = 'Nazwa listy'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng index ab7926f89..594aba1f2 100644 --- a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng @@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Adres jest pusty.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta została przekroczona.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng index 84d08ba61..310e27ca3 100644 --- a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng @@ -7,4 +7,3 @@ $wb['recipient_txt'] = 'Odbiorca'; $wb['add_new_record_txt'] = 'Dodaj nowego odbiorcę przekierowania'; $wb['access_txt'] = 'dostęp'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng index 2849430c6..3879f2424 100644 --- a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng @@ -15,4 +15,3 @@ $wb['email_error_unique'] = 'Istnieje już wpis z filtrem spamu dla tego adresu $wb['spam_redirect_maildir_purge_txt'] = 'Wyczyść później Maildir'; $wb['days_txt'] = 'Dni.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng index a6959a26e..d6097bb33 100644 --- a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng @@ -6,4 +6,3 @@ $wb['server_name_txt'] = 'nazwa_serwera'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Dodaj nowy wpis z filtrem spamu'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_transport.lng b/interface/web/mail/lib/lang/pl_mail_transport.lng index 0e4119c68..035a5b049 100644 --- a/interface/web/mail/lib/lang/pl_mail_transport.lng +++ b/interface/web/mail/lib/lang/pl_mail_transport.lng @@ -8,4 +8,3 @@ $wb['sort_order_txt'] = 'Sortuj według'; $wb['active_txt'] = 'Aktywny'; $wb['limit_mailrouting_txt'] = 'Maksymalna ilość ścieżek dla Twojego konta została przekroczona.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_transport_list.lng b/interface/web/mail/lib/lang/pl_mail_transport_list.lng index 837972c4f..fa5c58431 100644 --- a/interface/web/mail/lib/lang/pl_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_transport_list.lng @@ -7,4 +7,3 @@ $wb['transport_txt'] = 'Przenieś'; $wb['sort_order_txt'] = 'Sortuj według'; $wb['add_new_record_txt'] = 'Dodaj nowe przeniesienie'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng index 441f1589b..dc9343d13 100644 --- a/interface/web/mail/lib/lang/pl_mail_user.lng +++ b/interface/web/mail/lib/lang/pl_mail_user.lng @@ -42,4 +42,3 @@ $wb['login_error_regex'] = 'Poprawne znaki to A-Z, a-z, 0-9, ., _ oraz -.'; $wb['login_txt'] = 'Login (opcjonalnie)'; $wb['error_login_email_txt'] = 'Ten login nie jest poprawny. Proszę wpisać inny lub użyć adresu e-mail jako loginu.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter.lng b/interface/web/mail/lib/lang/pl_mail_user_filter.lng index 1e1a7fd89..99ac6a9e7 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng @@ -18,4 +18,3 @@ $wb['ends_with_txt'] = 'Kończy się na'; $wb['move_to_txt'] = 'Przenieś do'; $wb['delete_txt'] = 'Usuń'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng index 4d45c5d23..ce235b892 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng @@ -5,4 +5,3 @@ $wb['page_txt'] = 'Strona'; $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Czy na pewno chcesz skasować filtr?'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_user_list.lng b/interface/web/mail/lib/lang/pl_mail_user_list.lng index 8e47f96dc..7c13db38d 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng @@ -6,4 +6,3 @@ $wb['add_new_record_txt'] = 'Dodaj nową skrzynkę pocztową'; $wb['name_txt'] = 'Nazwa rzeczywista'; $wb['login_txt'] = 'Login'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng index 9e876805b..b9780687d 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng @@ -6,4 +6,3 @@ $wb['last_month_txt'] = 'Ostatni miesiąc'; $wb['this_year_txt'] = 'Ten rok'; $wb['last_year_txt'] = 'Ostatni rok'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist.lng b/interface/web/mail/lib/lang/pl_mail_whitelist.lng index 4aa2f0560..203c5bae7 100644 --- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng @@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Adres jest pusty.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta zosała przekroczona.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng index a7239ca95..10e6dfcf0 100644 --- a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng @@ -8,4 +8,3 @@ $wb['recipient_txt'] = 'odbiorca'; $wb['add_new_record_txt'] = 'Dodaj nowy wpis białej listy'; $wb['access_txt'] = 'dostęp'; ?> - diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng index 6c4c8d78f..6da8ddc9d 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng @@ -7,4 +7,3 @@ $wb['priority_txt'] = 'Priorytet'; $wb['active_txt'] = 'Aktywny'; $wb['limit_spamfilter_wblist_txt'] = 'Maksymalna ilość wpisów do białej i czarnej listy dla Twojego konta została przekroczona.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng index 65a9d37fd..c237a7a77 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng @@ -7,4 +7,3 @@ $wb['rid_txt'] = 'Użytkownik'; $wb['email_txt'] = 'E-mail dodany do czarnej listy'; $wb['add_new_record_txt'] = 'Dodaj wpis czarnej listy'; ?> - diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config.lng b/interface/web/mail/lib/lang/pl_spamfilter_config.lng index 43fab4d4f..c750d9593 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_config.lng @@ -18,4 +18,3 @@ $wb['relayhost_password_txt'] = 'Hasło Relayhost'; $wb['mailbox_size_limit_txt'] = 'Limit wielkości skrzynki pocztowej'; $wb['message_size_limit_txt'] = 'Limit wielkości wiadomości'; ?> - diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng index d31d7857e..45b3f315c 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Konfiguracja serwer'; $wb['server_name_txt'] = 'Serwer'; $wb['server_id_txt'] = 'id_serwera'; ?> - diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng index b7bc37de8..8a825b559 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng @@ -36,4 +36,3 @@ $wb['spam_admin_txt'] = 'Admin obsługi spamu'; $wb['message_size_limit_txt'] = 'Limit wielkości wiadomości'; $wb['banned_rulenames_txt'] = 'Zabronione nazwy zasad'; ?> - diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng index 906006e75..43d9d414d 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng @@ -7,4 +7,3 @@ $wb['banned_files_lover_txt'] = 'Przyjmuj zablokowane pliki'; $wb['bad_header_lover_txt'] = 'Przyjmuj złe nagłowki'; $wb['add_new_record_txt'] = 'Dodaj wpis plityki'; ?> - diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users.lng b/interface/web/mail/lib/lang/pl_spamfilter_users.lng index 8529e455c..656c29ea1 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_users.lng @@ -6,4 +6,3 @@ $wb['email_txt'] = 'E-mail (wzór)'; $wb['fullname_txt'] = 'Nazwa'; $wb['local_txt'] = 'Lokalne'; ?> - diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng index 0951df528..dde2a62c6 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng @@ -8,4 +8,3 @@ $wb['fullname_txt'] = 'Nazwa'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Dodaj filtr spamu użytkownika'; ?> - diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng index a6f2e4306..be836015d 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng @@ -7,4 +7,3 @@ $wb['priority_txt'] = 'Priorytet'; $wb['active_txt'] = 'Aktywny'; $wb['limit_spamfilter_wblist_txt'] = 'Maksymalna liczba wpisów białej lub czarnej listy została przekroczona.'; ?> - diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng index 425a6fe35..6517cf41a 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng @@ -7,4 +7,3 @@ $wb['rid_txt'] = 'Użytkownik'; $wb['email_txt'] = 'Adres e-mail dodany do białej listy'; $wb['add_new_record_txt'] = 'Dodaj wpis do białej listy'; ?> - diff --git a/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng b/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng index bd01792fb..91dc11aae 100755 --- a/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng +++ b/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng @@ -5,4 +5,3 @@ $wb['name_txt'] = 'Nazwa'; $wb['email_txt'] = 'Adres e-mail'; $wb['used_txt'] = 'Użycie dysku'; ?> - diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php index 814668bf2..f57a4e8d1 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -75,7 +75,8 @@ class page_action extends tform_actions { $app->tpl->setVar("email_local_part",$email_parts[0]); // Getting Domains of the user - $sql = "SELECT domain, server_id FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain'; + // $sql = "SELECT domain, server_id FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain'; + $sql = "SELECT domain, server_id FROM mail_domain WHERE domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain') AND ".$app->tform->getAuthSQL('r')." ORDER BY domain"; $domains = $app->db->queryAllRecords($sql); $domain_select = ''; if(is_array($domains)) { diff --git a/interface/web/mail/mail_user_filter_del.php b/interface/web/mail/mail_user_filter_del.php index 52164d957..0a408c87e 100644 --- a/interface/web/mail/mail_user_filter_del.php +++ b/interface/web/mail/mail_user_filter_del.php @@ -51,6 +51,8 @@ $app->load('tform_actions'); class page_action extends tform_actions { + /* + //* Code moved to mailfilter plugin function onAfterDelete() { global $app, $conf; @@ -74,6 +76,7 @@ class page_action extends tform_actions { $app->db->datalogUpdate('mail_user', "custom_mailfilter = '$out'", 'mailuser_id', $this->dataRecord["mailuser_id"]); } + */ } diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index 829a661d4..5e911b1c8 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -101,7 +101,7 @@ $wb['monitor_serverstate_mailqhigher_txt'] = 'Ο φόρτος της ουράς $wb['monitor_serverstate_mailqhighest_txt'] = 'Ο φόρτος της ουράς Mail είναι μέγιστος'; $wb['monitor_serverstate_mailqunknown_txt'] = 'Ουρά Mail: ???'; $wb['monitor_serverstate_raidok_txt'] = 'Η κατάσταση του RAID είναι εντάξει'; -$wb['monitor_serverstate_raidresync_txt'] = 'Το RAID είναι σε κατάσταση RESYNC'; +$wb['monitor_serverstate_raid_txt'] = 'Το RAID είναι σε κατάσταση RESYNC'; $wb['monitor_serverstate_raidfault_txt'] = 'Στο RAID υπάρχει ελαττωματικός δίσκος. Αντικαταστήστε τον το συντομότερο δυνατό!'; $wb['monitor_serverstate_raiderror_txt'] = 'Το RAID δεν λειτουργεί πλέον'; $wb['monitor_serverstate_raidunknown_txt'] = 'Κατάσταση RAID: ???'; @@ -148,3 +148,4 @@ $wb['Show IPTables'] = 'Εμφάνιση IPTables'; $wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> + diff --git a/interface/web/monitor/lib/lang/el_syslog_list.lng b/interface/web/monitor/lib/lang/el_syslog_list.lng index 8789a4336..a2782dfa5 100644 --- a/interface/web/monitor/lib/lang/el_syslog_list.lng +++ b/interface/web/monitor/lib/lang/el_syslog_list.lng @@ -6,3 +6,4 @@ $wb['loglevel_txt'] = 'Επίπεδο καταγραφής'; $wb['message_txt'] = 'Μήνυμα'; ?> + diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng index 071381898..f10766953 100644 --- a/interface/web/monitor/lib/lang/fr.lng +++ b/interface/web/monitor/lib/lang/fr.lng @@ -1,151 +1,149 @@ Aucun des deux n'a été trouvé sur votre serveur.

Nous ne supportons donc pas votre RAID."; -$wb['monitor_norkhunter_txt'] = "RKHunter nest pas installé, il ny a donc pas de logs"; -$wb['monitor_serverstate_server_txt'] = "Serveur"; -$wb['monitor_serverstate_state_txt'] = "Etat"; -$wb['monitor_serverstate_unknown_txt'] = "inconnu"; -$wb['monitor_serverstate_info_txt'] = "info"; -$wb['monitor_serverstate_warning_txt'] = "avertissement"; -$wb['monitor_serverstate_critical_txt'] = "critique"; -$wb['monitor_serverstate_error_txt'] = "erreur"; -$wb['monitor_serverstate_moreinfo_txt'] = "Plus dinformations..."; -$wb['monitor_serverstate_more_txt'] = "Plus..."; -$wb['monitor_serverstate_fclamok_txt'] = "Votre protection virus est OK"; -$wb['monitor_serverstate_fclamoutdated_txt'] = "Votre protection virus est PERIMEE"; -$wb['monitor_serverstate_fclamunknown_txt'] = "Freshclam : ???!"; -$wb['monitor_serverstate_hdok_txt'] = "L'état de l'usage de votre disque est correcte"; -$wb['monitor_serverstate_hdgoingfull_txt'] = "Votre disque commence à être chargé"; -$wb['monitor_serverstate_hdnearlyfull_txt'] = "Votre disque est très chargé"; -$wb['monitor_serverstate_hdveryfull_txt'] = "Votre disque est bientôt plein"; -$wb['monitor_serverstate_hdfull_txt'] = "Votre disque est plein"; -$wb['monitor_serverstate_hdunknown_txt'] = "Disque dur : ???"; -$wb['monitor_serverstate_listok_txt'] = "ok"; -$wb['monitor_serverstate_listinfo_txt'] = "info"; -$wb['monitor_serverstate_listwarning_txt'] = "avertissement"; -$wb['monitor_serverstate_listcritical_txt'] = "critique"; -$wb['monitor_serverstate_listerror_txt'] = "erreur"; -$wb['monitor_serverstate_listunknown_txt'] = "inconnu"; -$wb['monitor_serverstate_loadok_txt'] = "La charge de votre serveur est correcte"; -$wb['monitor_serverstate_loadheavy_txt'] = "La charge de votre serveur est légèrement élevée"; -$wb['monitor_serverstate_loadhigh_txt'] = "La charge de votre serveur est élevée"; -$wb['monitor_serverstate_loaghigher_txt'] = "La charge de votre serveur est très élevée"; -$wb['monitor_serverstate_loadhighest_txt'] = "La charge de votre serveur est extrèmement élevée"; -$wb['monitor_serverstate_loadunknown_txt'] = "Charge du serveur : ???"; -$wb['monitor_serverstate_mailqok_txt'] = "La charge de votre Mail Queue est correcte"; -$wb['monitor_serverstate_mailqheavy_txt'] = "La charge de votre Mail Queue est légèrement élevée"; -$wb['monitor_serverstate_mailqhigh_txt'] = "La charge de votre Mail Queue est élevée"; -$wb['monitor_serverstate_mailqhigher_txt'] = "La charge de votre Mail Queue est très élevée"; -$wb['monitor_serverstate_mailqhighest_txt'] = "La charge de votre Mail Queue est extrèmement élevée"; -$wb['monitor_serverstate_mailqunknown_txt'] = "Mail Queue : ???"; -$wb['monitor_serverstate_raidok_txt'] = "Votre RAID est ok"; -$wb['monitor_serverstate_raidresync_txt'] = "Votre RAID est en mode RESYNC"; -$wb['monitor_serverstate_raidfault_txt'] = "Votre RAID a une erreur FAULT de disque. Remplacez le rapidement !"; -$wb['monitor_serverstate_raiderror_txt'] = "Votre RAID n'est pas fonctionnel"; -$wb['monitor_serverstate_raidunknown_txt'] = "Etat RAID : ???"; -$wb['monitor_serverstate_servicesonline_txt'] = "Tous les services nécessaires sont en ligne"; -$wb['monitor_serverstate_servicesoffline_txt'] = "Un ou plusieurs services sont hors-ligne"; -$wb['monitor_serverstate_servicesunknown_txt'] = "Services : ???"; -$wb['monitor_serverstate_syslogok_txt'] = "Votre log système est OK"; -$wb['monitor_serverstate_syslogwarning_txt'] = "Il y a des avertissements dans votre log système"; -$wb['monitor_serverstate_syslogerror_txt'] = "Il y a des erreurs dans votre log système"; -$wb['monitor_serverstate_syslogunknown_txt'] = "Log système : ???"; -$wb['monitor_serverstate_updatesok_txt'] = "Votre système est à jour."; -$wb['monitor_serverstate_updatesneeded_txt'] = "Un ou plusieurs composants nécessitent une mise à jour"; -$wb['monitor_serverstate_updatesunknown_txt'] = "Mise à jour du système : ???"; -$wb['monitor_serverstate_beancounterok_txt'] = "Le compteur est correcte"; -$wb['monitor_serverstate_beancounterinfo_txt'] = "Il y a quelques échecs dans le compteur"; -$wb['monitor_serverstate_beancounterwarning_txt'] = "Il y a des échecs dans le compteur"; -$wb['monitor_serverstate_beancountercritical_txt'] = "Il y a beaucoup déchecs dans le compteur"; -$wb['monitor_serverstate_beancountererror_txt'] = "Il y a trop d'échecs dans le compteur"; -$wb['monitor_services_online_txt'] = "En ligne"; -$wb['monitor_services_offline_txt'] = "Hors-ligne"; -$wb['monitor_services_web_txt'] = "Serveur Web :"; -$wb['monitor_services_ftp_txt'] = "Serveur FTP :"; -$wb['monitor_services_smtp_txt'] = "Serveur SMTP :"; -$wb['monitor_services_pop_txt'] = "Serveur POP3 :"; -$wb['monitor_services_imap_txt'] = "Serveur IMAP :"; -$wb['monitor_services_mydns_txt'] = "Serveur DNS :"; -$wb['monitor_services_mysql_txt'] = "Serveur MySQL :"; -$wb['monitor_settings_datafromdate_txt'] = "Données du : "; -$wb['monitor_settings_datetimeformat_txt'] = "d-m-Y H:i"; -$wb['monitor_settings_refreshsq_txt'] = "Séquence de rafraichissement:"; -$wb['monitor_settings_server_txt'] = "Serveur"; -$wb['monitor_title_cpuinfo_txt'] = "Informations CPU"; -$wb['monitor_title_updatestate_txt'] = "Statut de mise à jour"; -$wb['monitor_title_mailq_txt'] = "Mail Queue"; -$wb['monitor_title_raidstate_txt'] = "Statut RAID"; -$wb['monitor_title_rkhunterlog_txt'] = "Log RKHunter"; -$wb['monitor_title_fail2ban_txt'] = "Log Fail2Ban"; -$wb['monitor_title_iptables_txt'] = "Règles IPTables"; -$wb['monitor_title_beancounter_txt'] = "Compteur OpenVz VE"; -$wb['monitor_updates_nosupport_txt'] = "Votre distribution nest pas supportée par le moniteur"; -$wb['monitor_beancounter_nosupport_txt'] = "Ce serveur n'est pas un VE OpenVz et n'a pas d'information de compteur"; +$wb['Server online since'] = 'Serveur en ligne depuis'; +$wb['Users online'] = 'Utilisateurs en ligne'; +$wb['System load 1 minute'] = 'Charge du système sur 1 minute'; +$wb['System load 5 minutes'] = 'Charge du système sur 5 minutes'; +$wb['System load 15 minutes'] = 'Charge du système sur 15 minutes'; +$wb['Server Load'] = 'Charge du serveur'; +$wb['Disk usage'] = 'Usage disque'; +$wb['Memory usage'] = 'Utilisation mémoire'; +$wb['no_data_serverload_txt'] = 'Aucune donnée concernant la charge du serveur actuellement. Réésayez plus tard.'; +$wb['no_data_memusage_txt'] = 'Aucune donnée concernant lutilisation mémoire actuellement. Réésayez plus tard.'; +$wb['no_data_diskusage_txt'] = 'Aucune donnée concernant lusage disque actuellement. Réésayez plus tard.'; +$wb['no_data_cpuinfo_txt'] = 'Aucune donnée concernant la charge CPU actuellement. Réésayez plus tard.'; +$wb['no_data_services_txt'] = 'Aucune donnée concernant les services actuellement. Réésayez plus tard.'; +$wb['no_data_updates_txt'] = 'Aucune donnée concernant les mises à jour actuellement. Réésayez plus tard.'; +$wb['no_data_raid_txt'] = 'Aucune donnée concernant le RAID actuellement. Réésayez plus tard.'; +$wb['no_data_rkhunter_txt'] = 'Aucune donnée concernant RKHunter actuellement. Réésayez plus tard.'; +$wb['no_data_mailq_txt'] = 'Aucune donnée concernant la queue de mails actuellement. Réésayez plus tard.'; +$wb['no_logdata_txt'] = 'Pas de logs disponibles actuellement. Réésayez plus tard.'; +$wb['Monitoring'] = 'Surveillance'; +$wb['Server to Monitor'] = 'Serveur à surveiller'; +$wb['Logfiles'] = 'Fichiers de logs'; +$wb['Status of services'] = 'Statut des services'; +$wb['No Refresh'] = 'Pas de rafraichissement'; +$wb['minutes'] = 'minutes'; +$wb['Show Overview'] = 'Vue générale'; +$wb['System State (All Servers)'] = 'Etat du système (Tous les serveurs)'; +$wb['Hardware-Information'] = 'Informations sur le matériel'; +$wb['Show CPU info'] = 'Voir les informations CPU'; +$wb['Server State'] = 'Etat du serveur'; +$wb['Show Update State'] = 'Voir l\'état de la mise à jour'; +$wb['Show RAID state'] = 'Voir l\'état du RAID'; +$wb['Show Server load'] = 'Voir la charge du serveur'; +$wb['Show Disk usage'] = 'Voir l\'usage disque'; +$wb['Show Memory usage'] = 'Voir l\'utilisation mémoire'; +$wb['Show Services'] = 'Voir les services'; +$wb['Show Mail-Queue'] = 'Voir la Mail Queue'; +$wb['Show Mail-Log'] = 'Voir les logs mails'; +$wb['Show Mail warn-Log'] = 'Voir les logs mails d\'avertissement'; +$wb['Show Mail err-Log'] = 'Voir les logs mails d\'erreur'; +$wb['Show System-Log'] = 'Voir les logs système'; +$wb['Show ISPC Cron-Log'] = 'Voir les logs des crons ISPC'; +$wb['Show Freshclam-Log'] = 'Voir les logs de Freshclam'; +$wb['Show Clamav-Log'] = 'Voir les logs de Clamav'; +$wb['Show ISPConfig-Log'] = 'Voir les logs dISPConfig'; +$wb['Show RKHunter-Log'] = 'Voir les logs de RKHunter'; +$wb['Show Jobqueue'] = 'Voir la file d\'attente'; +$wb['Show fail2ban-Log'] = 'Voir les logs de fail2ban'; +$wb['Show IPTables'] = 'Voir les IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Voir OpenVz VE BeanCounter'; +$wb['monitor_general_serverstate_txt'] = 'Statut du serveur'; +$wb['monitor_general_systemstate_txt'] = 'Statut du système'; +$wb['monitor_diskusage_filesystem_txt'] = 'Système de fichiers'; +$wb['monitor_diskusage_type_txt'] = 'Type'; +$wb['monitor_diskusage_size_txt'] = 'Taille'; +$wb['monitor_diskusage_used_txt'] = 'Utilisé'; +$wb['monitor_diskusage_available_txt'] = 'Disponible'; +$wb['monitor_diskusage_usage_txt'] = 'Utilisé%'; +$wb['monitor_diskusage_mounted_txt'] = 'Monté sur'; +$wb['monitor_logs_mail_txt'] = 'Mail - Log'; +$wb['monitor_logs_mailwarn_txt'] = 'Avertissements Mail - Log'; +$wb['monitor_logs_mailerr_txt'] = 'Erreurs Mail - Log'; +$wb['monitor_logs_messages_txt'] = 'Messages Système - Log'; +$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; +$wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; +$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; +$wb['monitor_nosupportedraid1_txt'] = 'Pour le moment, seuls mdadm ou mpt-status sont supportés pour surveiller le RAID.
Aucun des deux n\'a été trouvé sur votre serveur.

Nous ne supportons donc pas votre RAID.'; +$wb['monitor_norkhunter_txt'] = 'RKHunter nest pas installé, il ny a donc pas de logs'; +$wb['monitor_serverstate_server_txt'] = 'Serveur'; +$wb['monitor_serverstate_state_txt'] = 'Etat'; +$wb['monitor_serverstate_unknown_txt'] = 'inconnu'; +$wb['monitor_serverstate_info_txt'] = 'info'; +$wb['monitor_serverstate_warning_txt'] = 'avertissement'; +$wb['monitor_serverstate_critical_txt'] = 'critique'; +$wb['monitor_serverstate_error_txt'] = 'erreur'; +$wb['monitor_serverstate_moreinfo_txt'] = 'Plus dinformations...'; +$wb['monitor_serverstate_more_txt'] = 'Plus...'; +$wb['monitor_serverstate_fclamok_txt'] = 'Votre protection virus est OK'; +$wb['monitor_serverstate_fclamoutdated_txt'] = 'Votre protection virus est PERIMEE'; +$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam : ???!'; +$wb['monitor_serverstate_hdok_txt'] = 'L\'état de l\'usage de votre disque est correcte'; +$wb['monitor_serverstate_hdgoingfull_txt'] = 'Votre disque commence à être chargé'; +$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Votre disque est très chargé'; +$wb['monitor_serverstate_hdveryfull_txt'] = 'Votre disque est bientôt plein'; +$wb['monitor_serverstate_hdfull_txt'] = 'Votre disque est plein'; +$wb['monitor_serverstate_hdunknown_txt'] = 'Disque dur : ???'; +$wb['monitor_serverstate_listok_txt'] = 'ok'; +$wb['monitor_serverstate_listinfo_txt'] = 'info'; +$wb['monitor_serverstate_listwarning_txt'] = 'avertissement'; +$wb['monitor_serverstate_listcritical_txt'] = 'critique'; +$wb['monitor_serverstate_listerror_txt'] = 'erreur'; +$wb['monitor_serverstate_listunknown_txt'] = 'inconnu'; +$wb['monitor_serverstate_loadok_txt'] = 'La charge de votre serveur est correcte'; +$wb['monitor_serverstate_loadheavy_txt'] = 'La charge de votre serveur est légèrement élevée'; +$wb['monitor_serverstate_loadhigh_txt'] = 'La charge de votre serveur est élevée'; +$wb['monitor_serverstate_loaghigher_txt'] = 'La charge de votre serveur est très élevée'; +$wb['monitor_serverstate_loadhighest_txt'] = 'La charge de votre serveur est extrèmement élevée'; +$wb['monitor_serverstate_loadunknown_txt'] = 'Charge du serveur : ???'; +$wb['monitor_serverstate_mailqok_txt'] = 'La charge de votre Mail Queue est correcte'; +$wb['monitor_serverstate_mailqheavy_txt'] = 'La charge de votre Mail Queue est légèrement élevée'; +$wb['monitor_serverstate_mailqhigh_txt'] = 'La charge de votre Mail Queue est élevée'; +$wb['monitor_serverstate_mailqhigher_txt'] = 'La charge de votre Mail Queue est très élevée'; +$wb['monitor_serverstate_mailqhighest_txt'] = 'La charge de votre Mail Queue est extrèmement élevée'; +$wb['monitor_serverstate_mailqunknown_txt'] = 'Mail Queue : ???'; +$wb['monitor_serverstate_raidok_txt'] = 'Votre RAID est ok'; +$wb['monitor_serverstate_raidresync_txt'] = 'Votre RAID est en mode RESYNC'; +$wb['monitor_serverstate_raidfault_txt'] = 'Votre RAID a une erreur FAULT de disque. Remplacez le rapidement !'; +$wb['monitor_serverstate_raiderror_txt'] = 'Votre RAID n\'est pas fonctionnel'; +$wb['monitor_serverstate_raidunknown_txt'] = 'Etat RAID : ???'; +$wb['monitor_serverstate_servicesonline_txt'] = 'Tous les services nécessaires sont en ligne'; +$wb['monitor_serverstate_servicesoffline_txt'] = 'Un ou plusieurs services sont hors-ligne'; +$wb['monitor_serverstate_servicesunknown_txt'] = 'Services : ???'; +$wb['monitor_serverstate_syslogok_txt'] = 'Votre log système est OK'; +$wb['monitor_serverstate_syslogwarning_txt'] = 'Il y a des avertissements dans votre log système'; +$wb['monitor_serverstate_syslogerror_txt'] = 'Il y a des erreurs dans votre log système'; +$wb['monitor_serverstate_syslogunknown_txt'] = 'Log système : ???'; +$wb['monitor_serverstate_updatesok_txt'] = 'Votre système est à jour.'; +$wb['monitor_serverstate_updatesneeded_txt'] = 'Un ou plusieurs composants nécessitent une mise à jour'; +$wb['monitor_serverstate_updatesunknown_txt'] = 'Mise à jour du système : ???'; +$wb['monitor_serverstate_beancounterok_txt'] = 'Le compteur est correcte'; +$wb['monitor_serverstate_beancounterinfo_txt'] = 'Il y a quelques échecs dans le compteur'; +$wb['monitor_serverstate_beancounterwarning_txt'] = 'Il y a des échecs dans le compteur'; +$wb['monitor_serverstate_beancountercritical_txt'] = 'Il y a beaucoup déchecs dans le compteur'; +$wb['monitor_serverstate_beancountererror_txt'] = 'Il y a trop d\'échecs dans le compteur'; +$wb['monitor_services_online_txt'] = 'En ligne'; +$wb['monitor_services_offline_txt'] = 'Hors-ligne'; +$wb['monitor_services_web_txt'] = 'Serveur Web :'; +$wb['monitor_services_ftp_txt'] = 'Serveur FTP :'; +$wb['monitor_services_smtp_txt'] = 'Serveur SMTP :'; +$wb['monitor_services_pop_txt'] = 'Serveur POP3 :'; +$wb['monitor_services_imap_txt'] = 'Serveur IMAP :'; +$wb['monitor_services_mydns_txt'] = 'Serveur DNS :'; +$wb['monitor_services_mysql_txt'] = 'Serveur MySQL :'; +$wb['monitor_settings_datafromdate_txt'] = 'Données du : '; +$wb['monitor_settings_datetimeformat_txt'] = 'd-m-Y H:i'; +$wb['monitor_settings_refreshsq_txt'] = 'Séquence de rafraichissement:'; +$wb['monitor_settings_server_txt'] = 'Serveur'; +$wb['monitor_title_cpuinfo_txt'] = 'Informations CPU'; +$wb['monitor_title_updatestate_txt'] = 'Statut de mise à jour'; +$wb['monitor_title_mailq_txt'] = 'Mail Queue'; +$wb['monitor_title_raidstate_txt'] = 'Statut RAID'; +$wb['monitor_title_rkhunterlog_txt'] = 'Log RKHunter'; +$wb['monitor_title_fail2ban_txt'] = 'Log Fail2Ban'; +$wb['monitor_title_iptables_txt'] = 'Règles IPTables'; +$wb['monitor_title_beancounter_txt'] = 'Compteur OpenVz VE'; +$wb['monitor_updates_nosupport_txt'] = 'Votre distribution nest pas supportée par le moniteur'; +$wb['monitor_beancounter_nosupport_txt'] = 'Ce serveur n\'est pas un VE OpenVz et n\'a pas d\'information de compteur'; ?> - - diff --git a/interface/web/monitor/lib/lang/fr_datalog_list.lng b/interface/web/monitor/lib/lang/fr_datalog_list.lng index 41f1e6494..e47b9f09e 100644 --- a/interface/web/monitor/lib/lang/fr_datalog_list.lng +++ b/interface/web/monitor/lib/lang/fr_datalog_list.lng @@ -6,5 +6,3 @@ $wb['dbtable_txt'] = 'Table DB'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; ?> - - diff --git a/interface/web/monitor/lib/lang/fr_syslog_list.lng b/interface/web/monitor/lib/lang/fr_syslog_list.lng index f4d916f3d..1b01a35df 100644 --- a/interface/web/monitor/lib/lang/fr_syslog_list.lng +++ b/interface/web/monitor/lib/lang/fr_syslog_list.lng @@ -5,5 +5,3 @@ $wb['server_id_txt'] = 'Serveur'; $wb['loglevel_txt'] = 'Niveau de log '; $wb['message_txt'] = 'Message'; ?> - - diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng index 5692863c4..d5e147009 100644 --- a/interface/web/monitor/lib/lang/hr.lng +++ b/interface/web/monitor/lib/lang/hr.lng @@ -1,9 +1,9 @@ Ne možemo pronaći niti jedan na vašem serveru.

To znači da ne možemo podržati vaš RAID.'; $wb['monitor_norkhunter_txt'] = 'RKHunter nije instaliran, stoga nema log podataka.'; $wb['monitor_serverstate_server_txt'] = 'Server'; -$wb['monitor_serverstate_state_txt'] = 'State'; +$wb['monitor_serverstate_state_txt'] = 'Stanje'; $wb['monitor_serverstate_unknown_txt'] = 'nepoznatih'; $wb['monitor_serverstate_info_txt'] = 'informacija'; $wb['monitor_serverstate_warning_txt'] = 'upozorenja'; @@ -94,12 +94,12 @@ $wb['monitor_serverstate_loadhigh_txt'] = 'Server je pod velikim opterećenjem'; $wb['monitor_serverstate_loaghigher_txt'] = 'Server je pod vrlo velikim opterećenjem'; $wb['monitor_serverstate_loadhighest_txt'] = 'Server je maksimalno opterećen'; $wb['monitor_serverstate_loadunknown_txt'] = 'Opterećenje servera: ???'; -$wb['monitor_serverstate_mailqok_txt'] = 'Mail queue opterećenje je ok'; -$wb['monitor_serverstate_mailqheavy_txt'] = 'Mail queue je pod opterećenjem'; -$wb['monitor_serverstate_mailqhigh_txt'] = 'Mail queue je pod velikim opterećenjem'; -$wb['monitor_serverstate_mailqhigher_txt'] = 'Mail queue je pod vrlo velikim opterećenjem'; -$wb['monitor_serverstate_mailqhighest_txt'] = 'Mail queue je maksimalno opterećen'; -$wb['monitor_serverstate_mailqunknown_txt'] = 'Mail queue: ???'; +$wb['monitor_serverstate_mailqok_txt'] = 'Mail redoslijed opterećenje je ok'; +$wb['monitor_serverstate_mailqheavy_txt'] = 'Mail redoslijed je pod opterećenjem'; +$wb['monitor_serverstate_mailqhigh_txt'] = 'Mail redoslijed je pod velikim opterećenjem'; +$wb['monitor_serverstate_mailqhigher_txt'] = 'Mail redoslijed je pod vrlo velikim opterećenjem'; +$wb['monitor_serverstate_mailqhighest_txt'] = 'Mail redoslijed je maksimalno opterećen'; +$wb['monitor_serverstate_mailqunknown_txt'] = 'Mail redoslijed: ???'; $wb['monitor_serverstate_raidok_txt'] = 'RAID je ok'; $wb['monitor_serverstate_raidresync_txt'] = 'RAID je u RESYNC modu'; $wb['monitor_serverstate_raidfault_txt'] = 'Jedan RAID disk je neispravan. Zamjenite disk što prije'; @@ -133,17 +133,17 @@ $wb['monitor_settings_datafromdate_txt'] = 'Podaci od: '; $wb['monitor_settings_datetimeformat_txt'] = 'd.m.Y. H:i'; $wb['monitor_settings_refreshsq_txt'] = 'Osvježavanje:'; $wb['monitor_settings_server_txt'] = 'Server'; -$wb['monitor_title_cpuinfo_txt'] = 'Procesor'; +$wb['monitor_title_cpuinfo_txt'] = 'Stanje procesora'; $wb['monitor_title_updatestate_txt'] = 'Stanje nadogradnje'; -$wb['monitor_title_mailq_txt'] = 'Mail Queue'; +$wb['monitor_title_mailq_txt'] = 'Stanje mail redoslijeda'; $wb['monitor_title_raidstate_txt'] = 'Stanje RAID-a'; $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter log'; $wb['monitor_title_fail2ban_txt'] = 'Fail2Ban log'; $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_updates_nosupport_txt'] = 'Ova distribucija nije podržana za ovaj nadzor'; $wb['monitor_beancounter_nosupport_txt'] = 'Ovaj server nije OpenVz VE i nema beancounter informacije'; -$wb['monitor_title_iptables_txt'] = 'IPTables pravila'; -$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; -$wb['Show IPTables'] = 'Show IPTables'; -$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; +$wb['monitor_title_iptables_txt'] = 'IPTables zaštita'; +$wb['Show fail2ban-Log'] = 'Prikaži Fail2Ban log'; +$wb['Show IPTables'] = 'Prikaži IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Prikaži OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index f53964045..88497b423 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -147,4 +147,3 @@ $wb['Show fail2ban-Log'] = 'Pokaż log fail2ban'; $wb['Show IPTables'] = 'Pokaż IPTables'; $wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> - diff --git a/interface/web/monitor/lib/lang/pl_datalog_list.lng b/interface/web/monitor/lib/lang/pl_datalog_list.lng index 0b969b133..398ca51ed 100644 --- a/interface/web/monitor/lib/lang/pl_datalog_list.lng +++ b/interface/web/monitor/lib/lang/pl_datalog_list.lng @@ -6,4 +6,3 @@ $wb['dbtable_txt'] = 'Tabele DB'; $wb['action_txt'] = 'Akcja'; $wb['status_txt'] = 'Status'; ?> - diff --git a/interface/web/monitor/lib/lang/pl_syslog_list.lng b/interface/web/monitor/lib/lang/pl_syslog_list.lng index f5e0645fe..e37799c47 100644 --- a/interface/web/monitor/lib/lang/pl_syslog_list.lng +++ b/interface/web/monitor/lib/lang/pl_syslog_list.lng @@ -5,4 +5,3 @@ $wb['server_id_txt'] = 'Serwer'; $wb['loglevel_txt'] = 'Poziom logowania'; $wb['message_txt'] = 'Wiadomość'; ?> - diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php index 88fa3c9d4..20f0b05e8 100644 --- a/interface/web/monitor/show_sys_state.php +++ b/interface/web/monitor/show_sys_state.php @@ -196,7 +196,7 @@ function _getServerState($serverId, $serverName) { $ispcData = null; foreach($records as $record) { /* get the state from the db-data */ - _processDbState($record['type'], $serverId, &$serverState, &$messages); + _processDbState($record['type'], $serverId, $serverState, $messages); /* if we have the os-info, get it */ if ($record['type'] == 'os_info') { $osData = unserialize($record['data']); diff --git a/interface/web/sites/database_phpmyadmin.php b/interface/web/sites/database_phpmyadmin.php index 1df863b45..e0ab32477 100644 --- a/interface/web/sites/database_phpmyadmin.php +++ b/interface/web/sites/database_phpmyadmin.php @@ -56,15 +56,23 @@ $serverData = $app->db->queryOneRecord( $app->uses('getconf'); $global_config = $app->getconf->get_global_config('sites'); +$web_config = $app->getconf->get_server_config($serverId,'web'); /* * We only redirect to the login-form, so there is no need, to check any rights */ + if($global_config['phpmyadmin_url'] != '') { - header('Location:'.$global_config['phpmyadmin_url']); + $phpmyadmin_url = $global_config['phpmyadmin_url']; + $phpmyadmin_url = str_replace('[SERVERNAME]',$serverData['server_name'],$phpmyadmin_url); + header('Location:'.$phpmyadmin_url); } else { isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http'; - header('location:' . $http . '://' . $serverData['server_name'] . '/phpmyadmin'); + if($web_config['server_type'] == 'nginx') { + header('location:' . $http . '://' . $serverData['server_name'] . ':8081/phpmyadmin'); + } else { + header('location:' . $http . '://' . $serverData['server_name'] . '/phpmyadmin'); + } } exit; ?> \ No newline at end of file diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php index 513c396aa..ffb711fbf 100644 --- a/interface/web/sites/form/database.tform.php +++ b/interface/web/sites/form/database.tform.php @@ -107,7 +107,8 @@ $form["tabs"]['database'] = array ( ), 'database_password' => array ( 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', + 'formtype' => 'PASSWORD', + 'encryption' => 'MYSQL', 'default' => '', 'value' => '', 'width' => '30', diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php index 3c191736a..1eb79c596 100644 --- a/interface/web/sites/form/web_aliasdomain.tform.php +++ b/interface/web/sites/form/web_aliasdomain.tform.php @@ -106,7 +106,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', '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') ), 'redirect_path' => array ( 'datatype' => 'VARCHAR', @@ -123,7 +123,7 @@ $form["tabs"]['domain'] = array ( 'subdomain' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', - 'default' => 'y', + 'default' => 'www', 'value' => array('none' => 'none_txt', 'www' => 'www.', '*' => '*.') ), 'active' => array ( diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index c28083011..34cbbc8f5 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -248,7 +248,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', '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') ), 'redirect_path' => array ( 'datatype' => 'VARCHAR', diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php index ced53bb52..482476a9b 100644 --- a/interface/web/sites/form/web_subdomain.tform.php +++ b/interface/web/sites/form/web_subdomain.tform.php @@ -106,7 +106,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', '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') ), 'redirect_path' => array ( 'datatype' => 'VARCHAR', diff --git a/interface/web/sites/lib/lang/el.lng b/interface/web/sites/lib/lang/el.lng index da8b1a53c..90aec30f8 100644 --- a/interface/web/sites/lib/lang/el.lng +++ b/interface/web/sites/lib/lang/el.lng @@ -24,3 +24,4 @@ $wb['Web traffic'] = 'Κίνηση Web'; $wb['Website quota (Harddisk)'] = 'Όριο δίσκου Website (Harddisk)'; ?> + diff --git a/interface/web/sites/lib/lang/el_cron.lng b/interface/web/sites/lib/lang/el_cron.lng index dbc8eccf6..300ec1be0 100644 --- a/interface/web/sites/lib/lang/el_cron.lng +++ b/interface/web/sites/lib/lang/el_cron.lng @@ -20,3 +20,4 @@ $wb['command_error_format'] = 'Η μορφοποίηση για την εντο $wb['unknown_fieldtype_error'] = 'Χρησιμοποιήθηκε άγνωστός τύπος πεδίου.'; ?> + diff --git a/interface/web/sites/lib/lang/el_cron_list.lng b/interface/web/sites/lib/lang/el_cron_list.lng index b629b8900..d2bb97ffe 100644 --- a/interface/web/sites/lib/lang/el_cron_list.lng +++ b/interface/web/sites/lib/lang/el_cron_list.lng @@ -12,3 +12,4 @@ $wb['add_new_cron_txt'] = 'Νέα εργασία Cron'; $wb['parent_domain_id_txt'] = 'Website'; ?> + diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng index 78190bd63..583786b51 100644 --- a/interface/web/sites/lib/lang/el_database.lng +++ b/interface/web/sites/lib/lang/el_database.lng @@ -24,3 +24,4 @@ $wb['database_name_error_len'] = 'Το όνομα της βάσης δεδομέ $wb['database_user_error_len'] = 'Το όνομα χρήστη της βάσης δεδομένων - {user}- είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 16 χαρακτήρες.'; ?> + diff --git a/interface/web/sites/lib/lang/el_database_admin_list.lng b/interface/web/sites/lib/lang/el_database_admin_list.lng index 404162248..c8b30ae40 100644 --- a/interface/web/sites/lib/lang/el_database_admin_list.lng +++ b/interface/web/sites/lib/lang/el_database_admin_list.lng @@ -9,3 +9,4 @@ $wb['add_new_record_txt'] = 'Νέα βάση δεδομένων'; $wb['sys_groupid_txt'] = 'Πελάτης'; ?> + diff --git a/interface/web/sites/lib/lang/el_database_list.lng b/interface/web/sites/lib/lang/el_database_list.lng index 20f1320cb..c277c4d74 100644 --- a/interface/web/sites/lib/lang/el_database_list.lng +++ b/interface/web/sites/lib/lang/el_database_list.lng @@ -8,3 +8,4 @@ $wb['database_name_txt'] = 'Όνομα Βάσης Δεδομένων'; $wb['add_new_record_txt'] = 'Νέα Βάσης Δεδομένων'; ?> + diff --git a/interface/web/sites/lib/lang/el_ftp_user.lng b/interface/web/sites/lib/lang/el_ftp_user.lng index 863d82279..e00efa67e 100644 --- a/interface/web/sites/lib/lang/el_ftp_user.lng +++ b/interface/web/sites/lib/lang/el_ftp_user.lng @@ -27,3 +27,4 @@ $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.'; $wb['quota_size_error_regex'] = 'Όριο: εισάγετε -1 για απεριόριστα ή έναν αριθμό > 0'; ?> + diff --git a/interface/web/sites/lib/lang/el_ftp_user_list.lng b/interface/web/sites/lib/lang/el_ftp_user_list.lng index 66db7de7e..a1983b46f 100644 --- a/interface/web/sites/lib/lang/el_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/el_ftp_user_list.lng @@ -7,3 +7,4 @@ $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['add_new_record_txt'] = 'Νεός χρήστης FTP'; ?> + diff --git a/interface/web/sites/lib/lang/el_shell_user.lng b/interface/web/sites/lib/lang/el_shell_user.lng index ab7e321c0..7f3f12201 100644 --- a/interface/web/sites/lib/lang/el_shell_user.lng +++ b/interface/web/sites/lib/lang/el_shell_user.lng @@ -22,3 +22,4 @@ $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website'; $wb['ssh_rsa_txt'] = 'Δημόσιο Κλειδί SSH-RSA (για key-based logins)'; ?> + diff --git a/interface/web/sites/lib/lang/el_shell_user_list.lng b/interface/web/sites/lib/lang/el_shell_user_list.lng index 71db71542..6dd262c9c 100644 --- a/interface/web/sites/lib/lang/el_shell_user_list.lng +++ b/interface/web/sites/lib/lang/el_shell_user_list.lng @@ -7,3 +7,4 @@ $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['add_new_record_txt'] = 'Νεός χρήστης Shell'; ?> + diff --git a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng index 1e1072bdc..0c54d4f0f 100644 --- a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng @@ -7,3 +7,4 @@ $wb['hard_txt'] = 'Απόλυτο όριο'; $wb['soft_txt'] = 'Διαλακτικό όριο'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng index 6ad7f1af5..fc2b2169a 100644 --- a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng @@ -13,3 +13,4 @@ $wb['no_flag_txt'] = 'No flag'; $wb['none_txt'] = 'None'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng index 240ed48d9..6dcaf8004 100644 --- a/interface/web/sites/lib/lang/el_web_domain.lng +++ b/interface/web/sites/lib/lang/el_web_domain.lng @@ -1,6 +1,6 @@ + diff --git a/interface/web/sites/lib/lang/el_web_domain_admin_list.lng b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng index 155393393..07e8537a5 100644 --- a/interface/web/sites/lib/lang/el_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng @@ -8,3 +8,4 @@ $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Νέο website'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_domain_list.lng b/interface/web/sites/lib/lang/el_web_domain_list.lng index a35fad5e7..ee596543a 100644 --- a/interface/web/sites/lib/lang/el_web_domain_list.lng +++ b/interface/web/sites/lib/lang/el_web_domain_list.lng @@ -7,3 +7,4 @@ $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Νέο website'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_folder.lng b/interface/web/sites/lib/lang/el_web_folder.lng index 410cd3f0d..96280a25a 100644 --- a/interface/web/sites/lib/lang/el_web_folder.lng +++ b/interface/web/sites/lib/lang/el_web_folder.lng @@ -6,3 +6,4 @@ $wb['active_txt'] = 'Ενεργό'; $wb['path_error_regex'] = 'Μη έγκυρη διαδρομή φακέλου.'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_folder_list.lng b/interface/web/sites/lib/lang/el_web_folder_list.lng index 761a6c1b4..795114105 100644 --- a/interface/web/sites/lib/lang/el_web_folder_list.lng +++ b/interface/web/sites/lib/lang/el_web_folder_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Website'; $wb['path_txt'] = 'Διαδρομή'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_folder_user.lng b/interface/web/sites/lib/lang/el_web_folder_user.lng index c10412c2f..b809fc2cd 100644 --- a/interface/web/sites/lib/lang/el_web_folder_user.lng +++ b/interface/web/sites/lib/lang/el_web_folder_user.lng @@ -6,3 +6,4 @@ $wb['active_txt'] = "Ενεργός"; $wb['folder_error_empty'] = "Δεν επιλέχθηκε φάκελος web."; ?> + diff --git a/interface/web/sites/lib/lang/el_web_folder_user_list.lng b/interface/web/sites/lib/lang/el_web_folder_user_list.lng index 4f6ec2080..5668855f9 100644 --- a/interface/web/sites/lib/lang/el_web_folder_user_list.lng +++ b/interface/web/sites/lib/lang/el_web_folder_user_list.lng @@ -5,3 +5,4 @@ $wb['web_folder_id_txt'] = 'Φάκελος'; $wb['username_txt'] = 'Όνομα Χρήστη'; ?> + 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 b7e9d5962..a8631addf 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 @@ -7,3 +7,4 @@ $wb['this_year_txt'] = 'Αυτό το χρόνο'; $wb['last_year_txt'] = 'Τον τελευταίο χρόνο'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng index 0b0167fbd..99c0cdcf2 100644 --- a/interface/web/sites/lib/lang/el_web_subdomain.lng +++ b/interface/web/sites/lib/lang/el_web_subdomain.lng @@ -41,3 +41,4 @@ $wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση'; $wb['no_flag_txt'] = 'Χωρίς Σημαία'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_subdomain_list.lng index b24ae4daf..70b1e2543 100644 --- a/interface/web/sites/lib/lang/el_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/el_web_subdomain_list.lng @@ -7,3 +7,4 @@ $wb['domain_txt'] = 'Subdomain'; $wb['add_new_record_txt'] = 'Νέο subdomain'; ?> + diff --git a/interface/web/sites/lib/lang/el_webdav_user.lng b/interface/web/sites/lib/lang/el_webdav_user.lng index dd052b031..0652d98d6 100644 --- a/interface/web/sites/lib/lang/el_webdav_user.lng +++ b/interface/web/sites/lib/lang/el_webdav_user.lng @@ -14,3 +14,4 @@ $wb['directory_error_empty'] = 'Ο φάκελος δεν έχει οριστεί $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.'; ?> + diff --git a/interface/web/sites/lib/lang/el_webdav_user_list.lng b/interface/web/sites/lib/lang/el_webdav_user_list.lng index 565012752..08f44bfe2 100644 --- a/interface/web/sites/lib/lang/el_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/el_webdav_user_list.lng @@ -7,3 +7,4 @@ $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['add_new_record_txt'] = 'Νεός χρήστης Webdav'; ?> + diff --git a/interface/web/sites/lib/lang/fr.lng b/interface/web/sites/lib/lang/fr.lng index 05b2986f8..4adc58866 100644 --- a/interface/web/sites/lib/lang/fr.lng +++ b/interface/web/sites/lib/lang/fr.lng @@ -16,12 +16,10 @@ $wb['Shell'] = 'Shell'; $wb['Webdav-User'] = 'Utilisateur WebDav'; $wb['Webdav'] = 'WebDav'; $wb['Websites'] = 'Sites web'; -$wb["Stats"] = 'Statistiques'; -$wb["Cron"] = 'Cron'; -$wb["Cron Jobs"] = 'Tâches cron'; -$wb["Statistics"] = 'Statistiques'; -$wb["Web traffic"] = 'Trafic web'; -$wb["Website quota (Harddisk)"] = 'Quota du site web (disque dur)'; +$wb['Stats'] = 'Statistiques'; +$wb['Cron'] = 'Cron'; +$wb['Cron Jobs'] = 'Tâches cron'; +$wb['Statistics'] = 'Statistiques'; +$wb['Web traffic'] = 'Trafic web'; +$wb['Website quota (Harddisk)'] = 'Quota du site web (disque dur)'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_cron.lng b/interface/web/sites/lib/lang/fr_cron.lng index 51690a9b2..4dba4344d 100644 --- a/interface/web/sites/lib/lang/fr_cron.lng +++ b/interface/web/sites/lib/lang/fr_cron.lng @@ -19,5 +19,3 @@ $wb['run_wday_error_format'] = 'Format invalide pour les jours du mois.'; $wb['command_error_format'] = 'Format de la commande invalide.'; $wb['unknown_fieldtype_error'] = 'Un champ inconnu a été utilisé'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_cron_list.lng b/interface/web/sites/lib/lang/fr_cron_list.lng index 5a3f5097b..25fb854f6 100644 --- a/interface/web/sites/lib/lang/fr_cron_list.lng +++ b/interface/web/sites/lib/lang/fr_cron_list.lng @@ -11,5 +11,3 @@ $wb['command_txt'] = 'Commande'; $wb['add_new_cron_txt'] = 'Nouveau Cron'; $wb['parent_domain_id_txt'] = 'Site web'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_database.lng b/interface/web/sites/lib/lang/fr_database.lng index d3cce2eba..ab2712b76 100644 --- a/interface/web/sites/lib/lang/fr_database.lng +++ b/interface/web/sites/lib/lang/fr_database.lng @@ -1,27 +1,25 @@ - - diff --git a/interface/web/sites/lib/lang/fr_database_admin_list.lng b/interface/web/sites/lib/lang/fr_database_admin_list.lng index 4b9d57a9b..d6be240fd 100644 --- a/interface/web/sites/lib/lang/fr_database_admin_list.lng +++ b/interface/web/sites/lib/lang/fr_database_admin_list.lng @@ -8,5 +8,3 @@ $wb['database_name_txt'] = 'Nom de la base de données'; $wb['add_new_record_txt'] = 'Ajouter une base de données'; $wb['sys_groupid_txt'] = 'Client'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_database_list.lng b/interface/web/sites/lib/lang/fr_database_list.lng index 5caf0da14..b530a6e5a 100644 --- a/interface/web/sites/lib/lang/fr_database_list.lng +++ b/interface/web/sites/lib/lang/fr_database_list.lng @@ -7,5 +7,3 @@ $wb['database_name_txt'] = 'Nom de la base'; $wb['add_new_record_txt'] = 'Nouvelle base de données'; $wb['database_user_txt'] = 'Utilisateur BDD'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_ftp_user.lng b/interface/web/sites/lib/lang/fr_ftp_user.lng index 2a201fea3..3e5b099c5 100644 --- a/interface/web/sites/lib/lang/fr_ftp_user.lng +++ b/interface/web/sites/lib/lang/fr_ftp_user.lng @@ -26,5 +26,3 @@ $wb['directory_error_notinweb'] = 'Le répertoire nest pas dans la racine web.'; $wb['parent_domain_id_error_empty'] = 'Pas de site web sélectionné.'; $wb['quota_size_error_regex'] = 'Quota: entrez -1 pour illimité ou un nombre > 0'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_ftp_user_list.lng b/interface/web/sites/lib/lang/fr_ftp_user_list.lng index 597e53ce1..51c89069e 100644 --- a/interface/web/sites/lib/lang/fr_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/fr_ftp_user_list.lng @@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Site web'; $wb['username_txt'] = 'Nom d\'utilisateur'; $wb['add_new_record_txt'] = 'Nouvel utilisateur FTP'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_shell_user.lng b/interface/web/sites/lib/lang/fr_shell_user.lng index 6ddcbd880..5712dcbc4 100644 --- a/interface/web/sites/lib/lang/fr_shell_user.lng +++ b/interface/web/sites/lib/lang/fr_shell_user.lng @@ -21,5 +21,3 @@ $wb['puser_txt'] = 'Utilisateur web'; $wb['pgroup_txt'] = 'Groupe web'; $wb['ssh_rsa_txt'] = 'Clé publique SSH-RSA (pour les authentifications par clé)'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_shell_user_list.lng b/interface/web/sites/lib/lang/fr_shell_user_list.lng index 2a3e24561..ccad82ef0 100644 --- a/interface/web/sites/lib/lang/fr_shell_user_list.lng +++ b/interface/web/sites/lib/lang/fr_shell_user_list.lng @@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Site web'; $wb['username_txt'] = 'Nom d\'utilisateur'; $wb['add_new_record_txt'] = 'Nouvel utilisateur Shell'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng b/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng index 7ded4a0eb..b14c2df84 100644 --- a/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng @@ -6,5 +6,3 @@ $wb['used_txt'] = 'Espace utilisé'; $wb['hard_txt'] = 'Limite dure'; $wb['soft_txt'] = 'Limite douce'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng index 9900ee9e7..5837931f6 100644 --- a/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng @@ -12,5 +12,3 @@ $wb['no_redirect_txt'] = 'Aucune redirection'; $wb['no_flag_txt'] = 'Aucun flag'; $wb['none_txt'] = 'Aucun'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_domain.lng b/interface/web/sites/lib/lang/fr_web_domain.lng index 7e9636e92..a14e6a8ee 100644 --- a/interface/web/sites/lib/lang/fr_web_domain.lng +++ b/interface/web/sites/lib/lang/fr_web_domain.lng @@ -90,5 +90,3 @@ $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positi $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.'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_domain_admin_list.lng b/interface/web/sites/lib/lang/fr_web_domain_admin_list.lng index fb619c70c..6706332f5 100644 --- a/interface/web/sites/lib/lang/fr_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/fr_web_domain_admin_list.lng @@ -7,5 +7,3 @@ $wb['server_id_txt'] = 'Serveur'; $wb['domain_txt'] = 'Domaine'; $wb['add_new_record_txt'] = 'Ajouter un nouveau site'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_domain_list.lng b/interface/web/sites/lib/lang/fr_web_domain_list.lng index b04b9fc1d..ddf66f8d9 100644 --- a/interface/web/sites/lib/lang/fr_web_domain_list.lng +++ b/interface/web/sites/lib/lang/fr_web_domain_list.lng @@ -6,5 +6,3 @@ $wb['server_id_txt'] = 'Serveur'; $wb['domain_txt'] = 'Domaine'; $wb['add_new_record_txt'] = 'Nouveau site web'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_folder.lng b/interface/web/sites/lib/lang/fr_web_folder.lng index ecbaf2a87..2682bf9b9 100644 --- a/interface/web/sites/lib/lang/fr_web_folder.lng +++ b/interface/web/sites/lib/lang/fr_web_folder.lng @@ -5,5 +5,3 @@ $wb['path_txt'] = 'Chemin'; $wb['active_txt'] = 'Actif'; $wb['path_error_regex'] = 'Chemin de dossier invalide.'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_folder_list.lng b/interface/web/sites/lib/lang/fr_web_folder_list.lng index b0194618f..f358f8c88 100644 --- a/interface/web/sites/lib/lang/fr_web_folder_list.lng +++ b/interface/web/sites/lib/lang/fr_web_folder_list.lng @@ -5,5 +5,3 @@ $wb['server_id_txt'] = 'Serveur'; $wb['parent_domain_id_txt'] = 'Site web'; $wb['path_txt'] = 'Chemin'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_folder_user.lng b/interface/web/sites/lib/lang/fr_web_folder_user.lng index 54ac46948..dc47177c9 100644 --- a/interface/web/sites/lib/lang/fr_web_folder_user.lng +++ b/interface/web/sites/lib/lang/fr_web_folder_user.lng @@ -5,5 +5,3 @@ $wb['password_txt'] = 'Mot de passe'; $wb['active_txt'] = 'Actif'; $wb['folder_error_empty'] = 'Aucun dossier web sélectionné.'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_folder_user_list.lng b/interface/web/sites/lib/lang/fr_web_folder_user_list.lng index 0f2075c84..e1824e2fe 100644 --- a/interface/web/sites/lib/lang/fr_web_folder_user_list.lng +++ b/interface/web/sites/lib/lang/fr_web_folder_user_list.lng @@ -4,5 +4,3 @@ $wb['active_txt'] = 'Actif'; $wb['web_folder_id_txt'] = 'Dossier'; $wb['username_txt'] = 'Nom de l\'utilisateur'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng index 3a836630b..a50a1de41 100644 --- a/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng @@ -6,5 +6,3 @@ $wb['last_month_txt'] = 'Le mois précédent'; $wb['this_year_txt'] = 'L\'année en cours'; $wb['last_year_txt'] = 'L\'année précédente'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_subdomain.lng b/interface/web/sites/lib/lang/fr_web_subdomain.lng index 3b393ba25..059acf48c 100644 --- a/interface/web/sites/lib/lang/fr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/fr_web_subdomain.lng @@ -40,5 +40,3 @@ $wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemples de redir $wb['no_redirect_txt'] = 'Aucune redirecton'; $wb['no_flag_txt'] = 'Aucun flag'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_web_subdomain_list.lng b/interface/web/sites/lib/lang/fr_web_subdomain_list.lng index 786a4dc38..9bfbd30f2 100644 --- a/interface/web/sites/lib/lang/fr_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/fr_web_subdomain_list.lng @@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Site web'; $wb['domain_txt'] = 'Sous-domaine'; $wb['add_new_record_txt'] = 'Nouveau sous-domaine'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_webdav_user.lng b/interface/web/sites/lib/lang/fr_webdav_user.lng index 075f9833e..81a59b133 100644 --- a/interface/web/sites/lib/lang/fr_webdav_user.lng +++ b/interface/web/sites/lib/lang/fr_webdav_user.lng @@ -13,5 +13,3 @@ $wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères no $wb['directory_error_empty'] = 'Dossier vide.'; $wb['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.'; ?> - - diff --git a/interface/web/sites/lib/lang/fr_webdav_user_list.lng b/interface/web/sites/lib/lang/fr_webdav_user_list.lng index 5779740ee..1a2bebebe 100644 --- a/interface/web/sites/lib/lang/fr_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/fr_webdav_user_list.lng @@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Site web'; $wb['username_txt'] = 'Nom d\'utilisateur'; $wb['add_new_record_txt'] = 'Ajouter un utilisateur WebDAV'; ?> - - diff --git a/interface/web/sites/lib/lang/hr_cron.lng b/interface/web/sites/lib/lang/hr_cron.lng index fecb4ab45..93808464f 100644 --- a/interface/web/sites/lib/lang/hr_cron.lng +++ b/interface/web/sites/lib/lang/hr_cron.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/sites/lib/lang/hr_database.lng b/interface/web/sites/lib/lang/hr_database.lng index 91bd7a8d7..7c473b624 100644 --- a/interface/web/sites/lib/lang/hr_database.lng +++ b/interface/web/sites/lib/lang/hr_database.lng @@ -1,6 +1,6 @@ any)'; $wb['database_remote_error_ips'] = 'At least one of the entered ip addresses is invalid.'; $wb['client_txt'] = 'Client'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $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/hr_database_list.lng b/interface/web/sites/lib/lang/hr_database_list.lng index e56806e45..e02346707 100644 --- a/interface/web/sites/lib/lang/hr_database_list.lng +++ b/interface/web/sites/lib/lang/hr_database_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/sites/lib/lang/hr_shell_user.lng b/interface/web/sites/lib/lang/hr_shell_user.lng index c4d822d2d..d5ed7e97a 100644 --- a/interface/web/sites/lib/lang/hr_shell_user.lng +++ b/interface/web/sites/lib/lang/hr_shell_user.lng @@ -5,12 +5,12 @@ $wb['shell_txt'] = 'Shell'; $wb['dir_txt'] = 'Dir'; $wb['server_id_txt'] = 'Server'; $wb['parent_domain_id_txt'] = 'Site'; -$wb['username_txt'] = 'Username'; -$wb['password_txt'] = 'Password'; +$wb['username_txt'] = 'Korisničko ime'; +$wb['password_txt'] = 'Šifra'; $wb['password_strength_txt'] = 'Password strength'; $wb['chroot_txt'] = 'Chroot Shell'; $wb['quota_size_txt'] = 'Quota'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $wb['username_error_empty'] = 'Username is empty.'; $wb['username_error_unique'] = 'The username must be unique.'; $wb['username_error_regex'] = 'The username contains charachters that are not allowed.'; diff --git a/interface/web/sites/lib/lang/hr_shell_user_list.lng b/interface/web/sites/lib/lang/hr_shell_user_list.lng index 4a9d7cb9a..9212ee4b7 100644 --- a/interface/web/sites/lib/lang/hr_shell_user_list.lng +++ b/interface/web/sites/lib/lang/hr_shell_user_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng index 8ea34c440..39bc1df0b 100644 --- a/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/sites/lib/lang/hr_web_domain_list.lng b/interface/web/sites/lib/lang/hr_web_domain_list.lng index 88ec412da..2f85d7cd4 100644 --- a/interface/web/sites/lib/lang/hr_web_domain_list.lng +++ b/interface/web/sites/lib/lang/hr_web_domain_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/hr_web_folder.lng b/interface/web/sites/lib/lang/hr_web_folder.lng index 93cd40a08..f6243344c 100644 --- a/interface/web/sites/lib/lang/hr_web_folder.lng +++ b/interface/web/sites/lib/lang/hr_web_folder.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/sites/lib/lang/hr_web_folder_list.lng b/interface/web/sites/lib/lang/hr_web_folder_list.lng index 76d97029b..17774408b 100644 --- a/interface/web/sites/lib/lang/hr_web_folder_list.lng +++ b/interface/web/sites/lib/lang/hr_web_folder_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/sites/lib/lang/hr_web_folder_user.lng b/interface/web/sites/lib/lang/hr_web_folder_user.lng index f877df209..b892a1b05 100644 --- a/interface/web/sites/lib/lang/hr_web_folder_user.lng +++ b/interface/web/sites/lib/lang/hr_web_folder_user.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/sites/lib/lang/hr_web_folder_user_list.lng b/interface/web/sites/lib/lang/hr_web_folder_user_list.lng index 9a7286a95..9a1e187ed 100644 --- a/interface/web/sites/lib/lang/hr_web_folder_user_list.lng +++ b/interface/web/sites/lib/lang/hr_web_folder_user_list.lng @@ -1,6 +1,6 @@ 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 b217f80cc..9cec89fbc 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 @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng index 726e1c105..1d1bd891a 100644 --- a/interface/web/sites/lib/lang/hr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/hr_web_subdomain.lng @@ -9,12 +9,12 @@ $wb['ssl_cert_txt'] = 'SSL Certificate'; $wb['ssl_bundle_txt'] = 'SSL Bundle'; $wb['ssl_action_txt'] = 'SSL Action'; $wb['server_id_txt'] = 'Server'; -$wb['domain_txt'] = 'Domain'; -$wb['type_txt'] = 'Type'; +$wb['domain_txt'] = 'Domena'; +$wb['type_txt'] = 'Vrsta'; $wb['parent_domain_id_txt'] = 'Parent Website'; $wb['redirect_type_txt'] = 'Redirect Type'; $wb['redirect_path_txt'] = 'Redirect Path'; -$wb['active_txt'] = 'Active'; +$wb['active_txt'] = 'Aktivno'; $wb['document_root_txt'] = 'Documentroot'; $wb['system_user_txt'] = 'Linux User'; $wb['system_group_txt'] = 'Linux Group'; diff --git a/interface/web/sites/lib/lang/hr_web_subdomain_list.lng b/interface/web/sites/lib/lang/hr_web_subdomain_list.lng index 1c16bcda2..942454e11 100644 --- a/interface/web/sites/lib/lang/hr_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/hr_web_subdomain_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/hr_webdav_user.lng b/interface/web/sites/lib/lang/hr_webdav_user.lng index 05c9892a7..06bcd59aa 100644 --- a/interface/web/sites/lib/lang/hr_webdav_user.lng +++ b/interface/web/sites/lib/lang/hr_webdav_user.lng @@ -1,11 +1,11 @@ diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng index e4f1c8057..0045281ca 100644 --- a/interface/web/sites/lib/lang/pl.lng +++ b/interface/web/sites/lib/lang/pl.lng @@ -23,4 +23,3 @@ $wb['Webdav-User'] = 'Użytkownik Webdav'; $wb['Webdav'] = 'Webdav'; $wb['Website quota (Harddisk)'] = 'Uzycie dysku strony (Harddisk)'; ?> - diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng index a5d3b8b89..a097d0813 100644 --- a/interface/web/sites/lib/lang/pl_cron.lng +++ b/interface/web/sites/lib/lang/pl_cron.lng @@ -19,4 +19,3 @@ $wb['run_wday_error_format'] = 'Niepoprawny format dni w tygodniu.'; $wb['command_error_format'] = 'Niepoprawny format polecenia. W zbiorze url może być tylko adres http/https który ma pozwolenie.'; $wb['unknown_fieldtype_error'] = 'Został użyty niepoprawny format pola.'; ?> - diff --git a/interface/web/sites/lib/lang/pl_cron_list.lng b/interface/web/sites/lib/lang/pl_cron_list.lng index 67e2e6fba..467cae6ed 100644 --- a/interface/web/sites/lib/lang/pl_cron_list.lng +++ b/interface/web/sites/lib/lang/pl_cron_list.lng @@ -11,4 +11,3 @@ $wb['command_txt'] = 'Komenda'; $wb['add_new_cron_txt'] = 'Dodaj nowe zadanie Cron'; $wb['parent_domain_id_txt'] = 'Witryna'; ?> - diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng index 1dd6b87b1..5ff0ad78c 100644 --- a/interface/web/sites/lib/lang/pl_database.lng +++ b/interface/web/sites/lib/lang/pl_database.lng @@ -23,4 +23,3 @@ $wb['database_charset_change_txt'] = 'Nie można zmienić kodowania bazy danych. $wb['database_name_error_len'] = 'Nazwa bazy danych - {db} - za długa. Maksymalna długość wynosi 64 znaki łącznie z prefiksem.'; $wb['database_user_error_len'] = 'Nazwa użytkownika bazy - {user}- za długa. Maksymalna długość wynosi 16 znaków łącznie z prefiksem.'; ?> - diff --git a/interface/web/sites/lib/lang/pl_database_admin_list.lng b/interface/web/sites/lib/lang/pl_database_admin_list.lng index 653657ee1..5785a779f 100644 --- a/interface/web/sites/lib/lang/pl_database_admin_list.lng +++ b/interface/web/sites/lib/lang/pl_database_admin_list.lng @@ -8,4 +8,3 @@ $wb['database_name_txt'] = 'Nazwa bazy danych'; $wb['add_new_record_txt'] = 'Dodaj nową bazę danych'; $wb['sys_groupid_txt'] = 'Klient'; ?> - diff --git a/interface/web/sites/lib/lang/pl_database_list.lng b/interface/web/sites/lib/lang/pl_database_list.lng index 0b419fef4..2162a15a2 100644 --- a/interface/web/sites/lib/lang/pl_database_list.lng +++ b/interface/web/sites/lib/lang/pl_database_list.lng @@ -7,4 +7,3 @@ $wb['database_name_txt'] = 'Nazwa bazy danych'; $wb['add_new_record_txt'] = 'Dodaj nową bazę danych'; $wb['database_user_txt'] = 'Użytkownik bazy danych'; ?> - diff --git a/interface/web/sites/lib/lang/pl_ftp_user.lng b/interface/web/sites/lib/lang/pl_ftp_user.lng index 13621bbbd..0c6bf62e4 100644 --- a/interface/web/sites/lib/lang/pl_ftp_user.lng +++ b/interface/web/sites/lib/lang/pl_ftp_user.lng @@ -26,4 +26,3 @@ $wb['directory_error_notinweb'] = 'Katalog nie jest wewnątrz katalogu root www. $wb['parent_domain_id_error_empty'] = 'Nie wybrano żadnej strony www.'; $wb['quota_size_error_regex'] = 'Quota: wpisz -1 dla wartości bez limitu lub liczbę > 0'; ?> - diff --git a/interface/web/sites/lib/lang/pl_ftp_user_list.lng b/interface/web/sites/lib/lang/pl_ftp_user_list.lng index 957720936..fecbba355 100644 --- a/interface/web/sites/lib/lang/pl_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/pl_ftp_user_list.lng @@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Strona www'; $wb['username_txt'] = 'Nazwa użytkownika'; $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika FTP'; ?> - diff --git a/interface/web/sites/lib/lang/pl_shell_user.lng b/interface/web/sites/lib/lang/pl_shell_user.lng index 465ce1a18..26dda704a 100644 --- a/interface/web/sites/lib/lang/pl_shell_user.lng +++ b/interface/web/sites/lib/lang/pl_shell_user.lng @@ -21,4 +21,3 @@ $wb['puser_txt'] = 'Nazwa użytkownika strony www'; $wb['pgroup_txt'] = 'Nazwa grupy strony www'; $wb['ssh_rsa_txt'] = 'Klucz publiczny SSH-RSA (dla logowania po kluczu)'; ?> - diff --git a/interface/web/sites/lib/lang/pl_shell_user_list.lng b/interface/web/sites/lib/lang/pl_shell_user_list.lng index 0f179803d..10f9e433a 100644 --- a/interface/web/sites/lib/lang/pl_shell_user_list.lng +++ b/interface/web/sites/lib/lang/pl_shell_user_list.lng @@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Strona'; $wb['username_txt'] = 'Nazwa użytkownika'; $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika Shell'; ?> - diff --git a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng index 7a0c9e7bf..679b73113 100644 --- a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng @@ -6,4 +6,3 @@ $wb['used_txt'] = 'Wykorzystana przestrzeń'; $wb['hard_txt'] = 'Limit twardy'; $wb['soft_txt'] = 'Limit miękki'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng index a57741558..5bdd8e831 100644 --- a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng @@ -12,4 +12,3 @@ $wb['no_redirect_txt'] = 'Bez przekierowania'; $wb['no_flag_txt'] = 'Bez flagi'; $wb['none_txt'] = 'Brak'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng index e209eef09..d55c5b4d6 100644 --- a/interface/web/sites/lib/lang/pl_web_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_domain.lng @@ -90,4 +90,3 @@ $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positi $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.'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng index 1aab019c0..56634eb62 100644 --- a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng @@ -7,4 +7,3 @@ $wb['server_id_txt'] = 'Serwer'; $wb['domain_txt'] = 'Domena'; $wb['add_new_record_txt'] = 'Dodaj nową stronę'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_domain_list.lng b/interface/web/sites/lib/lang/pl_web_domain_list.lng index 8a74d05dd..62b7455ff 100644 --- a/interface/web/sites/lib/lang/pl_web_domain_list.lng +++ b/interface/web/sites/lib/lang/pl_web_domain_list.lng @@ -6,4 +6,3 @@ $wb['server_id_txt'] = 'Serwer'; $wb['domain_txt'] = 'Domena'; $wb['add_new_record_txt'] = 'Dodaj nową stronę'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_folder.lng b/interface/web/sites/lib/lang/pl_web_folder.lng index 053a2c012..6eec2fd5f 100644 --- a/interface/web/sites/lib/lang/pl_web_folder.lng +++ b/interface/web/sites/lib/lang/pl_web_folder.lng @@ -5,4 +5,3 @@ $wb['path_txt'] = 'Ścieżka'; $wb['active_txt'] = 'Aktywny'; $wb['path_error_regex'] = 'Nieprawidłowa ścieżka katalogu.'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_folder_list.lng b/interface/web/sites/lib/lang/pl_web_folder_list.lng index cd1672167..87a769008 100644 --- a/interface/web/sites/lib/lang/pl_web_folder_list.lng +++ b/interface/web/sites/lib/lang/pl_web_folder_list.lng @@ -5,4 +5,3 @@ $wb['server_id_txt'] = 'Serwer'; $wb['parent_domain_id_txt'] = 'Witryna'; $wb['path_txt'] = 'Ścieżka'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_folder_user.lng b/interface/web/sites/lib/lang/pl_web_folder_user.lng index 605587c26..4e9bfb37a 100644 --- a/interface/web/sites/lib/lang/pl_web_folder_user.lng +++ b/interface/web/sites/lib/lang/pl_web_folder_user.lng @@ -5,4 +5,3 @@ $wb['password_txt'] = 'Hasło'; $wb['active_txt'] = 'Aktywny'; $wb['folder_error_empty'] = 'Nie wybrano katalogu.'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_folder_user_list.lng b/interface/web/sites/lib/lang/pl_web_folder_user_list.lng index 462d3b9de..81769bd9d 100644 --- a/interface/web/sites/lib/lang/pl_web_folder_user_list.lng +++ b/interface/web/sites/lib/lang/pl_web_folder_user_list.lng @@ -4,4 +4,3 @@ $wb['active_txt'] = 'Aktywny'; $wb['web_folder_id_txt'] = 'Katalog'; $wb['username_txt'] = 'Login'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng index 3f73e8eaf..e7b96d715 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 @@ -6,4 +6,3 @@ $wb['last_month_txt'] = 'Ostatni miesiąc'; $wb['this_year_txt'] = 'Ten rok'; $wb['last_year_txt'] = 'Ostatni rok'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng index e31599e72..a0e7222b6 100644 --- a/interface/web/sites/lib/lang/pl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng @@ -40,4 +40,3 @@ $wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne $wb['no_redirect_txt'] = 'Bez przekierowania'; $wb['no_flag_txt'] = 'Bez flagi'; ?> - diff --git a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng index d20a14cb7..9ccb0a3c7 100644 --- a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng @@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Strona www'; $wb['domain_txt'] = 'Subdomena'; $wb['add_new_record_txt'] = 'Dodaj nową subdomene'; ?> - diff --git a/interface/web/sites/lib/lang/pl_webdav_user.lng b/interface/web/sites/lib/lang/pl_webdav_user.lng index 126c88b44..4ec79743a 100644 --- a/interface/web/sites/lib/lang/pl_webdav_user.lng +++ b/interface/web/sites/lib/lang/pl_webdav_user.lng @@ -13,4 +13,3 @@ $wb['username_error_regex'] = 'Nazwa użytkownika zawiera niedozwolone znaki.'; $wb['directory_error_empty'] = 'Pusty katalog.'; $wb['parent_domain_id_error_empty'] = 'Nie wybrano strony www.'; ?> - diff --git a/interface/web/sites/lib/lang/pl_webdav_user_list.lng b/interface/web/sites/lib/lang/pl_webdav_user_list.lng index f679685e8..5e7e4b6a5 100644 --- a/interface/web/sites/lib/lang/pl_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/pl_webdav_user_list.lng @@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Strona'; $wb['username_txt'] = 'Nazwa użytkownika'; $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika Webdav'; ?> - diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php index acbf7b320..6cff9e8db 100644 --- a/interface/web/sites/web_aliasdomain_edit.php +++ b/interface/web/sites/web_aliasdomain_edit.php @@ -130,7 +130,7 @@ class page_action extends tform_actions { $this->parent_domain_record = $parent_domain; - //* make sure that the email domain is lowercase + //* make sure that the domain is lowercase if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]); parent::onSubmit(); @@ -143,6 +143,31 @@ class page_action extends tform_actions { } + function onAfterUpdate() { + global $app, $conf; + + //* Check if parent domain has been changed + if($this->dataRecord['parent_domain_id'] != $this->oldDataRecord['parent_domain_id']) { + + //* Update the domain owner + $app->db->query('UPDATE web_domain SET sys_groupid = '.intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id); + + //* Update the old website, so that the vhost alias gets removed + //* We force the update by inserting a transaction record without changes manually. + $old_website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$this->oldDataRecord['domain_id']); + $diffrec_full = array(); + $diffrec_full['old'] = $old_website; + $diffrec_full['new'] = $old_website; + $diffstr = $app->db->quote(serialize($diffrec_full)); + $username = $app->db->quote($_SESSION['s']['user']['username']); + $dbidx = 'domsin_id:'.$this->id; + $server_id = $this->oldDataRecord['server_id']; + $sql = "INSERT INTO sys_datalog (dbtable,dbidx,server_id,action,tstamp,user,data) VALUES ('web_domain','$dbidx','$server_id','u','".time()."','$username','$diffstr')"; + $app->db->query($sql); + } + + } + } $page = new page_action; diff --git a/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng index 036a6afc1..3f3558346 100644 --- a/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng @@ -7,3 +7,4 @@ $wb['password_strength_4_txt'] = 'Δυνατό'; $wb['password_strength_5_txt'] = 'Πολύ δυνατό'; ?> + diff --git a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng index 79d031777..df85c9712 100644 --- a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng @@ -6,4 +6,3 @@ $wb['password_strength_3_txt'] = 'Dobre'; $wb['password_strength_4_txt'] = 'Silne'; $wb['password_strength_5_txt'] = 'Bardzo mocne'; ?> - diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default/css/screen/content_ispc.css index 2a1a64dc4..9f53502fe 100644 --- a/interface/web/themes/default/css/screen/content_ispc.css +++ b/interface/web/themes/default/css/screen/content_ispc.css @@ -481,6 +481,7 @@ select.withicons option[value="EE"] { background-image:url(../../icons/flags/ee.png); } select.withicons option[value="EG"] { background-image:url(../../icons/flags/eg.png); } select.withicons option[value="EH"] { background-image:url(../../icons/flags/eh.png); } + select.withicons option[value="EL"] { background-image:url(../../icons/flags/gr.png); } select.withicons option[value="ER"] { background-image:url(../../icons/flags/er.png); } select.withicons option[value="ES"] { background-image:url(../../icons/flags/es.png); } select.withicons option[value="ET"] { background-image:url(../../icons/flags/et.png); } @@ -724,6 +725,7 @@ select.withicons option[value="ee"] { background-image:url(../../icons/flags/ee.png); } select.withicons option[value="eg"] { background-image:url(../../icons/flags/eg.png); } select.withicons option[value="eh"] { background-image:url(../../icons/flags/eh.png); } + select.withicons option[value="el"] { background-image:url(../../icons/flags/gr.png); } select.withicons option[value="en"] { background-image:url(../../icons/flags/gb.png); } select.withicons option[value="er"] { background-image:url(../../icons/flags/er.png); } select.withicons option[value="es"] { background-image:url(../../icons/flags/es.png); } @@ -769,6 +771,7 @@ select.withicons option[value="it"] { background-image:url(../../icons/flags/it.png); } select.withicons option[value="jm"] { background-image:url(../../icons/flags/jm.png); } select.withicons option[value="jo"] { background-image:url(../../icons/flags/jo.png); } + select.withicons option[value="ja"] { background-image:url(../../icons/flags/jp.png); } select.withicons option[value="jp"] { background-image:url(../../icons/flags/jp.png); } select.withicons option[value="ke"] { background-image:url(../../icons/flags/ke.png); } select.withicons option[value="kg"] { background-image:url(../../icons/flags/kg.png); } diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm index 7894c85a3..0152727a4 100644 --- a/interface/web/themes/default/templates/main.tpl.htm +++ b/interface/web/themes/default/templates/main.tpl.htm @@ -105,7 +105,7 @@ . - LOGOUT +

ISPConfig 3

diff --git a/interface/web/tools/lib/lang/ar.lng b/interface/web/tools/lib/lang/ar.lng index cebb41baa..f33fe1a64 100644 --- a/interface/web/tools/lib/lang/ar.lng +++ b/interface/web/tools/lib/lang/ar.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Settings'; $wb['ISPConfig Tools'] = 'ISPConfig Tools'; $wb['Password and Language'] = 'Password and Language'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/bg.lng b/interface/web/tools/lib/lang/bg.lng index 5775e8254..d302dc516 100644 --- a/interface/web/tools/lib/lang/bg.lng +++ b/interface/web/tools/lib/lang/bg.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Настройки'; $wb['ISPConfig Tools'] = 'ISPConfig инструменти'; $wb['Password and Language'] = 'Парола и език'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/br.lng b/interface/web/tools/lib/lang/br.lng index e1023bc79..db8af6042 100644 --- a/interface/web/tools/lib/lang/br.lng +++ b/interface/web/tools/lib/lang/br.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Configurações'; $wb['ISPConfig Tools'] = 'Ferramentas'; $wb['Password and Language'] = 'Senha e Idioma'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng index 26aecbb1b..7dc8e9098 100644 --- a/interface/web/tools/lib/lang/cz.lng +++ b/interface/web/tools/lib/lang/cz.lng @@ -4,4 +4,6 @@ $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['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/de.lng b/interface/web/tools/lib/lang/de.lng index deb9fe144..5fc2d0345 100644 --- a/interface/web/tools/lib/lang/de.lng +++ b/interface/web/tools/lib/lang/de.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Einstellungen'; $wb['ISPConfig Tools'] = 'Einstellungen'; $wb['Password and Language'] = 'Passwort und Sprache'; $wb['ispconfig_tools_note'] = 'Dieses Modul erlaubt Ihnen, das Passwort und die Sprache zu ändern sowie einen Resync der DNS-Records anzustoßen.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/el.lng b/interface/web/tools/lib/lang/el.lng index 29fea410d..897826ef0 100644 --- a/interface/web/tools/lib/lang/el.lng +++ b/interface/web/tools/lib/lang/el.lng @@ -6,3 +6,4 @@ $wb['Password and Language'] = 'Συνθηματικό και Γλώσσα'; $wb['ispconfig_tools_note'] = 'Το άρθρωμα σας επιτρέπει να αλλάξετε το συνθηματικό και την γλώσσα και να ξεκινήσετε έναν επανασυγχρονισμό των εγγραφών DNS.'; ?> + diff --git a/interface/web/tools/lib/lang/el_usersettings.lng b/interface/web/tools/lib/lang/el_usersettings.lng index 103489c3e..5a43500ac 100644 --- a/interface/web/tools/lib/lang/el_usersettings.lng +++ b/interface/web/tools/lib/lang/el_usersettings.lng @@ -7,3 +7,4 @@ $wb['Form to edit the user password and language.'] = 'Φόρμα επεξεργ $wb['Settings'] = 'Ρυθμίσεις'; ?> + diff --git a/interface/web/tools/lib/lang/en.lng b/interface/web/tools/lib/lang/en.lng index abf0ecf7d..1dee19df8 100644 --- a/interface/web/tools/lib/lang/en.lng +++ b/interface/web/tools/lib/lang/en.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Settings'; $wb['ISPConfig Tools'] = 'ISPConfig Tools'; $wb['Password and Language'] = 'Password and Language'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> \ No newline at end of file diff --git a/interface/web/tools/lib/lang/es.lng b/interface/web/tools/lib/lang/es.lng index acc1bb007..41205f0ed 100644 --- a/interface/web/tools/lib/lang/es.lng +++ b/interface/web/tools/lib/lang/es.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Configuraciones'; $wb['ISPConfig Tools'] = 'Herramientas ISPConfig'; $wb['Password and Language'] = 'Contraseña e Idioma'; $wb['ispconfig_tools_note'] = 'Este módulo le permite cambiar la contraseña y el idioma y para iniciar una resincronización de los registros de DNS.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/fi.lng b/interface/web/tools/lib/lang/fi.lng index 1f876dcb1..1e2164117 100755 --- a/interface/web/tools/lib/lang/fi.lng +++ b/interface/web/tools/lib/lang/fi.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Asetukset'; $wb['ISPConfig Tools'] = 'ISPConfig-työkalut'; $wb['Password and Language'] = 'Salasanat ja kielet'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/fr.lng b/interface/web/tools/lib/lang/fr.lng index fa2dad82d..52320c240 100644 --- a/interface/web/tools/lib/lang/fr.lng +++ b/interface/web/tools/lib/lang/fr.lng @@ -4,6 +4,6 @@ $wb['Settings'] = 'Paramètres'; $wb['ISPConfig Tools'] = 'Outils ISPConfig'; $wb['Password and Language'] = 'Mot de passe et Langue'; $wb['ispconfig_tools_note'] = 'Ce module vous permet de changer le mot de passe utilisateur et la langue et de démarrer une resynchronisation des enregistrement DNS.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> - - diff --git a/interface/web/tools/lib/lang/fr_usersettings.lng b/interface/web/tools/lib/lang/fr_usersettings.lng index e9b667307..db2657792 100644 --- a/interface/web/tools/lib/lang/fr_usersettings.lng +++ b/interface/web/tools/lib/lang/fr_usersettings.lng @@ -6,5 +6,3 @@ $wb['password_mismatch'] = 'Le mot de passe de confirmation ne correspond avec l $wb['Form to edit the user password and language.'] = 'Formulaire d\'édition du mot de passe utilisateur et de la langue.'; $wb['Settings'] = 'Paramètres'; ?> - - diff --git a/interface/web/tools/lib/lang/hr.lng b/interface/web/tools/lib/lang/hr.lng index 149bf59dc..3a9c3c33a 100644 --- a/interface/web/tools/lib/lang/hr.lng +++ b/interface/web/tools/lib/lang/hr.lng @@ -3,5 +3,7 @@ $wb['User Settings'] = 'Korisničke postavke'; $wb['Settings'] = 'Postavke'; $wb['ISPConfig Tools'] = 'Control panel alati'; $wb['Password and Language'] = 'Šifra i jezik'; -$wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['ispconfig_tools_note'] = 'Ovaj modul omogućava promjenu šifre i jezika te možete pokrenuti sinkronizaciju DNS zapisa.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/hu.lng b/interface/web/tools/lib/lang/hu.lng index ff58227a6..e2c17f003 100644 --- a/interface/web/tools/lib/lang/hu.lng +++ b/interface/web/tools/lib/lang/hu.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Beállítások'; $wb['ISPConfig Tools'] = 'ISPConfig eszközök'; $wb['Password and Language'] = 'Jelszó és nyelv'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/id.lng b/interface/web/tools/lib/lang/id.lng index 29b94b926..9a2dc8f1e 100644 --- a/interface/web/tools/lib/lang/id.lng +++ b/interface/web/tools/lib/lang/id.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Pengaturan'; $wb['ISPConfig Tools'] = 'Perkakas ISPConfig'; $wb['Password and Language'] = 'Sandi dan Bahasa'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/it.lng b/interface/web/tools/lib/lang/it.lng index 62b18fdad..672bf853b 100644 --- a/interface/web/tools/lib/lang/it.lng +++ b/interface/web/tools/lib/lang/it.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Impostazioni'; $wb['ISPConfig Tools'] = 'Strumenti ISPConfig'; $wb['Password and Language'] = 'Password e Lingua'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/ja.lng b/interface/web/tools/lib/lang/ja.lng index b4729191f..ecb77161b 100644 --- a/interface/web/tools/lib/lang/ja.lng +++ b/interface/web/tools/lib/lang/ja.lng @@ -4,4 +4,6 @@ $wb['Settings'] = '設定'; $wb['ISPConfig Tools'] = 'ISPConfig Tools'; $wb['Password and Language'] = 'パスワードと言語'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/nl.lng b/interface/web/tools/lib/lang/nl.lng index da1268aa3..bc0f721b4 100644 --- a/interface/web/tools/lib/lang/nl.lng +++ b/interface/web/tools/lib/lang/nl.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Instellingen'; $wb['ISPConfig Tools'] = 'ISPConfig Tools'; $wb['Password and Language'] = 'Wachtwoord en taal'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/pl.lng b/interface/web/tools/lib/lang/pl.lng index e4cb49a30..365e81b8f 100644 --- a/interface/web/tools/lib/lang/pl.lng +++ b/interface/web/tools/lib/lang/pl.lng @@ -4,5 +4,6 @@ $wb['Settings'] = 'Ustawienia'; $wb['ISPConfig Tools'] = 'Narzędzia ISPConfig'; $wb['Password and Language'] = 'Hasło i język'; $wb['ispconfig_tools_note'] = 'Ten moduł pozwala na zmianę hasła i języka oraz na ponowną synchronizację rekordów DNS.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> - diff --git a/interface/web/tools/lib/lang/pl_usersettings.lng b/interface/web/tools/lib/lang/pl_usersettings.lng index 655168bf6..f8d76658a 100644 --- a/interface/web/tools/lib/lang/pl_usersettings.lng +++ b/interface/web/tools/lib/lang/pl_usersettings.lng @@ -6,4 +6,3 @@ $wb['password_mismatch'] = 'Hasła nie pasują do siebie.'; $wb['Form to edit the user password and language.'] = 'Formularz do edycji języka i hasła użytkownika.'; $wb['Settings'] = 'Ustawienia'; ?> - diff --git a/interface/web/tools/lib/lang/pt.lng b/interface/web/tools/lib/lang/pt.lng index f765d4814..637f10055 100644 --- a/interface/web/tools/lib/lang/pt.lng +++ b/interface/web/tools/lib/lang/pt.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Configurações'; $wb['ISPConfig Tools'] = 'Ferramentas'; $wb['Password and Language'] = 'Senha e Idioma'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/ro.lng b/interface/web/tools/lib/lang/ro.lng index eaf78e514..a120b37b1 100644 --- a/interface/web/tools/lib/lang/ro.lng +++ b/interface/web/tools/lib/lang/ro.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Setari'; $wb['ISPConfig Tools'] = 'ISPConfig Utilitare'; $wb['Password and Language'] = 'Parola si Limba'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/ru.lng b/interface/web/tools/lib/lang/ru.lng index 65ba4ed71..5e7cf8d43 100644 --- a/interface/web/tools/lib/lang/ru.lng +++ b/interface/web/tools/lib/lang/ru.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Установки'; $wb['ISPConfig Tools'] = 'ISPConfig утилиты'; $wb['Password and Language'] = 'Пароли и языки'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/se.lng b/interface/web/tools/lib/lang/se.lng index cebb41baa..f33fe1a64 100644 --- a/interface/web/tools/lib/lang/se.lng +++ b/interface/web/tools/lib/lang/se.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Settings'; $wb['ISPConfig Tools'] = 'ISPConfig Tools'; $wb['Password and Language'] = 'Password and Language'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/sk.lng b/interface/web/tools/lib/lang/sk.lng index da21028ae..22b11ad1e 100644 --- a/interface/web/tools/lib/lang/sk.lng +++ b/interface/web/tools/lib/lang/sk.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Nastavenia'; $wb['ISPConfig Tools'] = '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['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/tools/lib/lang/tr.lng b/interface/web/tools/lib/lang/tr.lng index 3e252f08d..4bcc975f1 100644 --- a/interface/web/tools/lib/lang/tr.lng +++ b/interface/web/tools/lib/lang/tr.lng @@ -4,4 +4,6 @@ $wb['Settings'] = 'Ayarlar'; $wb['ISPConfig Tools'] = 'ISPConfig Araçları'; $wb['Password and Language'] = 'Şifre ve Dil'; $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['Dns Tools'] = 'Dns Tools'; +$wb['Resync'] = 'Resync'; ?> diff --git a/interface/web/vm/lib/lang/el.lng b/interface/web/vm/lib/lang/el.lng index 1a8468176..96e19833f 100644 --- a/interface/web/vm/lib/lang/el.lng +++ b/interface/web/vm/lib/lang/el.lng @@ -6,3 +6,4 @@ $wb['IP addresses'] = 'Διευθύνσεις IP'; $wb['OpenVZ'] = 'OpenVZ'; ?> + diff --git a/interface/web/vm/lib/lang/el_openvz_action.lng b/interface/web/vm/lib/lang/el_openvz_action.lng index 96a735242..0c6b4e34d 100644 --- a/interface/web/vm/lib/lang/el_openvz_action.lng +++ b/interface/web/vm/lib/lang/el_openvz_action.lng @@ -15,3 +15,4 @@ $wb['ostemplate_name_unique_error'] = 'Υπάρχει ήδη ένα OSTemplate $wb['ostemplate_exec_txt'] = 'Η εντολή δημιουργίας του OSTemplate εστάλει στον server. Μπορεί να διαρκέσει αρκετά λεπτά η πλήρης δημιουργία του OSTemplate.'; ?> + diff --git a/interface/web/vm/lib/lang/el_openvz_ip.lng b/interface/web/vm/lib/lang/el_openvz_ip.lng index a0252fc95..68393693c 100644 --- a/interface/web/vm/lib/lang/el_openvz_ip.lng +++ b/interface/web/vm/lib/lang/el_openvz_ip.lng @@ -8,3 +8,4 @@ $wb['ip_error_unique'] = 'Η διεύθυνση IP υπάρχει ήδη.'; $wb['IP address'] = 'Διεύθυνση IP'; ?> + diff --git a/interface/web/vm/lib/lang/el_openvz_ip_list.lng b/interface/web/vm/lib/lang/el_openvz_ip_list.lng index 388df1997..270dd4f31 100644 --- a/interface/web/vm/lib/lang/el_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/el_openvz_ip_list.lng @@ -5,3 +5,4 @@ $wb['ip_address_txt'] = 'Διεύθυνση IP'; $wb['reserved_txt'] = 'Reserved'; ?> + diff --git a/interface/web/vm/lib/lang/el_openvz_ostemplate.lng b/interface/web/vm/lib/lang/el_openvz_ostemplate.lng index 802ed8274..8e5c8259a 100644 --- a/interface/web/vm/lib/lang/el_openvz_ostemplate.lng +++ b/interface/web/vm/lib/lang/el_openvz_ostemplate.lng @@ -10,3 +10,4 @@ $wb['template_file_error_empty'] = 'Το αρχείο του προτύπου δ $wb['Template'] = 'Πρότυπο'; ?> + diff --git a/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng index a950faad1..9440536af 100644 --- a/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng @@ -7,3 +7,4 @@ $wb['allservers_txt'] = 'Υπάρχει σε όλους τους servers'; $wb['ostemplate_id_txt'] = 'ID'; ?> + diff --git a/interface/web/vm/lib/lang/el_openvz_template.lng b/interface/web/vm/lib/lang/el_openvz_template.lng index 023aa0713..274693c7e 100644 --- a/interface/web/vm/lib/lang/el_openvz_template.lng +++ b/interface/web/vm/lib/lang/el_openvz_template.lng @@ -92,3 +92,4 @@ $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; ?> + diff --git a/interface/web/vm/lib/lang/el_openvz_template_list.lng b/interface/web/vm/lib/lang/el_openvz_template_list.lng index 781ef0af5..811ebd11b 100644 --- a/interface/web/vm/lib/lang/el_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/el_openvz_template_list.lng @@ -4,3 +4,4 @@ $wb['active_txt'] = 'Ενεργό'; $wb['template_name_txt'] = 'Όνομα Προτύπου'; ?> + diff --git a/interface/web/vm/lib/lang/el_openvz_vm.lng b/interface/web/vm/lib/lang/el_openvz_vm.lng index a4f6a2ebf..30690fda2 100644 --- a/interface/web/vm/lib/lang/el_openvz_vm.lng +++ b/interface/web/vm/lib/lang/el_openvz_vm.lng @@ -39,3 +39,4 @@ $wb['Virtual server'] = 'Εικονικός server'; $wb['Advanced'] = 'Για προχωρημένους'; ?> + diff --git a/interface/web/vm/lib/lang/el_openvz_vm_list.lng b/interface/web/vm/lib/lang/el_openvz_vm_list.lng index dee8b9d22..884d6b144 100644 --- a/interface/web/vm/lib/lang/el_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/el_openvz_vm_list.lng @@ -9,3 +9,4 @@ $wb['ip_address_txt'] = 'Διεύθυνση IP'; $wb['veid_txt'] = 'VEID'; ?> + diff --git a/interface/web/vm/lib/lang/fr.lng b/interface/web/vm/lib/lang/fr.lng index 8842cceb8..12ed30c07 100644 --- a/interface/web/vm/lib/lang/fr.lng +++ b/interface/web/vm/lib/lang/fr.lng @@ -5,5 +5,3 @@ $wb['VM Templates'] = 'Modèles de machine virtuelle'; $wb['IP addresses'] = 'Adresses IP'; $wb['OpenVZ'] = 'OpenVZ'; ?> - - diff --git a/interface/web/vm/lib/lang/fr_openvz_action.lng b/interface/web/vm/lib/lang/fr_openvz_action.lng index cb3194a22..52f732858 100644 --- a/interface/web/vm/lib/lang/fr_openvz_action.lng +++ b/interface/web/vm/lib/lang/fr_openvz_action.lng @@ -14,5 +14,3 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte $wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.'; $wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.'; ?> - - diff --git a/interface/web/vm/lib/lang/fr_openvz_ip.lng b/interface/web/vm/lib/lang/fr_openvz_ip.lng index 6afda0271..6016681df 100644 --- a/interface/web/vm/lib/lang/fr_openvz_ip.lng +++ b/interface/web/vm/lib/lang/fr_openvz_ip.lng @@ -7,5 +7,3 @@ $wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.'; $wb['ip_error_unique'] = 'This IP address does already exist.'; $wb['IP address'] = 'IP address'; ?> - - diff --git a/interface/web/vm/lib/lang/fr_openvz_ip_list.lng b/interface/web/vm/lib/lang/fr_openvz_ip_list.lng index 55d3e0b81..c5f06013b 100644 --- a/interface/web/vm/lib/lang/fr_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/fr_openvz_ip_list.lng @@ -4,5 +4,3 @@ $wb['server_id_txt'] = 'Server'; $wb['ip_address_txt'] = 'IP address'; $wb['reserved_txt'] = 'Reserved'; ?> - - diff --git a/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng b/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng index 8d643a3ff..256750f19 100644 --- a/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng +++ b/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng @@ -9,5 +9,3 @@ $wb['template_name_error_empty'] = 'Template name is empty.'; $wb['template_file_error_empty'] = 'Template filename is empty.'; $wb['Template'] = 'Template'; ?> - - diff --git a/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng index afc00af0e..6471ec0e2 100644 --- a/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng @@ -6,5 +6,3 @@ $wb['server_id_txt'] = 'Server'; $wb['allservers_txt'] = 'Exists on all servers'; $wb['ostemplate_id_txt'] = 'ID'; ?> - - diff --git a/interface/web/vm/lib/lang/fr_openvz_template.lng b/interface/web/vm/lib/lang/fr_openvz_template.lng index 2b091a095..d285512dc 100644 --- a/interface/web/vm/lib/lang/fr_openvz_template.lng +++ b/interface/web/vm/lib/lang/fr_openvz_template.lng @@ -91,5 +91,3 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; ?> - - diff --git a/interface/web/vm/lib/lang/fr_openvz_template_list.lng b/interface/web/vm/lib/lang/fr_openvz_template_list.lng index bc95cab28..de4045c36 100644 --- a/interface/web/vm/lib/lang/fr_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/fr_openvz_template_list.lng @@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template'; $wb['active_txt'] = 'Active'; $wb['template_name_txt'] = 'Template name'; ?> - - diff --git a/interface/web/vm/lib/lang/fr_openvz_vm.lng b/interface/web/vm/lib/lang/fr_openvz_vm.lng index d3868ec90..f2be022dd 100644 --- a/interface/web/vm/lib/lang/fr_openvz_vm.lng +++ b/interface/web/vm/lib/lang/fr_openvz_vm.lng @@ -38,5 +38,3 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; ?> - - diff --git a/interface/web/vm/lib/lang/fr_openvz_vm_list.lng b/interface/web/vm/lib/lang/fr_openvz_vm_list.lng index 387305460..2238e2b8f 100644 --- a/interface/web/vm/lib/lang/fr_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/fr_openvz_vm_list.lng @@ -8,5 +8,3 @@ $wb['hostname_txt'] = 'Hostname'; $wb['ip_address_txt'] = 'IP address'; $wb['veid_txt'] = 'VEID'; ?> - - diff --git a/interface/web/vm/lib/lang/hr.lng b/interface/web/vm/lib/lang/hr.lng index 4167e14a8..4f5dbe9e6 100644 --- a/interface/web/vm/lib/lang/hr.lng +++ b/interface/web/vm/lib/lang/hr.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/vm/lib/lang/hr_openvz_action.lng b/interface/web/vm/lib/lang/hr_openvz_action.lng index 52f732858..f7f199bc1 100644 --- a/interface/web/vm/lib/lang/hr_openvz_action.lng +++ b/interface/web/vm/lib/lang/hr_openvz_action.lng @@ -1,12 +1,12 @@ diff --git a/interface/web/vm/lib/lang/hr_openvz_ip_list.lng b/interface/web/vm/lib/lang/hr_openvz_ip_list.lng index c5f06013b..14f91f05e 100644 --- a/interface/web/vm/lib/lang/hr_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/hr_openvz_ip_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng b/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng index 256750f19..73e64ff27 100644 --- a/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng +++ b/interface/web/vm/lib/lang/hr_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'] = 'Aktivno'; $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/hr_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/hr_openvz_ostemplate_list.lng index 6471ec0e2..430d36b92 100644 --- a/interface/web/vm/lib/lang/hr_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/hr_openvz_ostemplate_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/vm/lib/lang/hr_openvz_template.lng b/interface/web/vm/lib/lang/hr_openvz_template.lng index d285512dc..62e9dcab7 100644 --- a/interface/web/vm/lib/lang/hr_openvz_template.lng +++ b/interface/web/vm/lib/lang/hr_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'] = 'Aktivno'; $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/hr_openvz_template_list.lng b/interface/web/vm/lib/lang/hr_openvz_template_list.lng index de4045c36..f9c8642f1 100644 --- a/interface/web/vm/lib/lang/hr_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/hr_openvz_template_list.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/vm/lib/lang/hr_openvz_vm.lng b/interface/web/vm/lib/lang/hr_openvz_vm.lng index f2be022dd..af3fd1188 100644 --- a/interface/web/vm/lib/lang/hr_openvz_vm.lng +++ b/interface/web/vm/lib/lang/hr_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'] = 'Aktivno'; $wb['description_txt'] = 'Description'; $wb['client_group_id_txt'] = 'Client'; $wb['veid_txt'] = 'VEID'; diff --git a/interface/web/vm/lib/lang/hr_openvz_vm_list.lng b/interface/web/vm/lib/lang/hr_openvz_vm_list.lng index 2238e2b8f..ab3ef5252 100644 --- a/interface/web/vm/lib/lang/hr_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/hr_openvz_vm_list.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/vm/lib/lang/pl.lng b/interface/web/vm/lib/lang/pl.lng index 5c1ab5822..4167e14a8 100644 --- a/interface/web/vm/lib/lang/pl.lng +++ b/interface/web/vm/lib/lang/pl.lng @@ -5,4 +5,3 @@ $wb['VM Templates'] = 'VM Templates'; $wb['IP addresses'] = 'IP addresses'; $wb['OpenVZ'] = 'OpenVZ'; ?> - diff --git a/interface/web/vm/lib/lang/pl_openvz_action.lng b/interface/web/vm/lib/lang/pl_openvz_action.lng index 71e7263f9..52f732858 100644 --- a/interface/web/vm/lib/lang/pl_openvz_action.lng +++ b/interface/web/vm/lib/lang/pl_openvz_action.lng @@ -14,4 +14,3 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte $wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.'; $wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.'; ?> - diff --git a/interface/web/vm/lib/lang/pl_openvz_ip.lng b/interface/web/vm/lib/lang/pl_openvz_ip.lng index 67f688576..6016681df 100644 --- a/interface/web/vm/lib/lang/pl_openvz_ip.lng +++ b/interface/web/vm/lib/lang/pl_openvz_ip.lng @@ -7,4 +7,3 @@ $wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.'; $wb['ip_error_unique'] = 'This IP address does already exist.'; $wb['IP address'] = 'IP address'; ?> - diff --git a/interface/web/vm/lib/lang/pl_openvz_ip_list.lng b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng index 8787f6d97..c5f06013b 100644 --- a/interface/web/vm/lib/lang/pl_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng @@ -4,4 +4,3 @@ $wb['server_id_txt'] = 'Server'; $wb['ip_address_txt'] = 'IP address'; $wb['reserved_txt'] = 'Reserved'; ?> - diff --git a/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng index df01680e1..6471ec0e2 100644 --- a/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng @@ -6,4 +6,3 @@ $wb['server_id_txt'] = 'Server'; $wb['allservers_txt'] = 'Exists on all servers'; $wb['ostemplate_id_txt'] = 'ID'; ?> - diff --git a/interface/web/vm/lib/lang/pl_openvz_template.lng b/interface/web/vm/lib/lang/pl_openvz_template.lng index 0887164d3..d285512dc 100644 --- a/interface/web/vm/lib/lang/pl_openvz_template.lng +++ b/interface/web/vm/lib/lang/pl_openvz_template.lng @@ -91,4 +91,3 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; ?> - diff --git a/interface/web/vm/lib/lang/pl_openvz_template_list.lng b/interface/web/vm/lib/lang/pl_openvz_template_list.lng index 6e4d911c6..de4045c36 100644 --- a/interface/web/vm/lib/lang/pl_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/pl_openvz_template_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template'; $wb['active_txt'] = 'Active'; $wb['template_name_txt'] = 'Template name'; ?> - diff --git a/interface/web/vm/lib/lang/pl_openvz_vm.lng b/interface/web/vm/lib/lang/pl_openvz_vm.lng index 4698fe681..f2be022dd 100644 --- a/interface/web/vm/lib/lang/pl_openvz_vm.lng +++ b/interface/web/vm/lib/lang/pl_openvz_vm.lng @@ -38,4 +38,3 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; ?> - diff --git a/interface/web/vm/lib/lang/pl_openvz_vm_list.lng b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng index a534a65f2..2238e2b8f 100644 --- a/interface/web/vm/lib/lang/pl_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng @@ -8,4 +8,3 @@ $wb['hostname_txt'] = 'Hostname'; $wb['ip_address_txt'] = 'IP address'; $wb['veid_txt'] = 'VEID'; ?> - diff --git a/remoting_client/examples/sites_web_domain_add.php b/remoting_client/examples/sites_web_domain_add.php index 2905db0a0..9481cd3ab 100644 --- a/remoting_client/examples/sites_web_domain_add.php +++ b/remoting_client/examples/sites_web_domain_add.php @@ -18,8 +18,8 @@ try { $client_id = 1; $params = array( - 'server_id' => 0, - 'ip_address' => '', + 'server_id' => 1, + 'ip_address' => '*', 'domain' => 'test2.int', 'type' => 'vhost', 'parent_domain_id' => 0, diff --git a/server/conf/awstats_index.php.master b/server/conf/awstats_index.php.master index e0f185e84..f3867d371 100644 --- a/server/conf/awstats_index.php.master +++ b/server/conf/awstats_index.php.master @@ -5,29 +5,36 @@ $script = "