From 8cf78b31b28b9183579c7939b947e1f7e9f5c2fa Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Jan 2012 04:54:19 -0500
Subject: [PATCH] Merged revisions 2812-2883 from staböe branch.
---
interface/web/admin/lib/lang/fr_users_list.lng | 2
interface/web/dns/lib/lang/el_dns_mx.lng | 1
install/tpl/opensuse_dovecot.conf.master | 3
interface/web/admin/lib/lang/pl_language_complete.lng | 1
interface/web/dns/lib/lang/hr_dns_cname.lng | 4
interface/web/sites/lib/lang/fr_web_subdomain_list.lng | 2
interface/web/mail/lib/lang/el_mail_transport.lng | 1
interface/web/mail/lib/lang/pl_mail_get.lng | 1
interface/web/client/lib/lang/ja_reseller.lng | 2
interface/web/dns/lib/lang/pl_dns_slave.lng | 1
interface/web/admin/lib/lang/pl_server.lng | 1
interface/web/designer/lib/lang/fr_module_edit.lng | 2
interface/web/dns/lib/lang/pl_dns_mx.lng | 1
interface/web/client/lib/lang/hr_client_del.lng | 8
interface/web/dns/lib/lang/fr_dns_alias.lng | 2
interface/web/dns/lib/lang/fr_dns_a.lng | 1
interface/web/admin/lib/lang/pl_groups.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_policy.lng | 1
interface/web/client/lib/lang/nl.lng | 2
interface/web/dns/lib/lang/fi.lng | 2
interface/web/mail/lib/lang/fr_mail_user_list.lng | 2
interface/web/sites/lib/lang/pl_shell_user_list.lng | 1
interface/web/tools/lib/lang/sk.lng | 2
interface/web/admin/lib/lang/hr_language_add.lng | 12
interface/web/admin/lib/lang/pl_language_list.lng | 1
interface/web/mail/lib/lang/el_mail_blacklist.lng | 1
interface/web/client/lib/lang/tr_reseller.lng | 2
interface/web/tools/lib/lang/el_usersettings.lng | 1
interface/web/client/lib/lang/ar_reseller.lng | 2
interface/web/client/lib/lang/bg.lng | 2
interface/web/admin/lib/lang/fr_iptables_list.lng | 2
interface/web/dns/lib/lang/id.lng | 2
interface/web/sites/lib/lang/fr_web_sites_stats_list.lng | 2
interface/web/dns/lib/lang/el_dns_template.lng | 1
interface/web/admin/lib/lang/el_language_export.lng | 1
interface/web/vm/lib/lang/el_openvz_template_list.lng | 1
interface/web/help/lib/lang/fr_faq_manage_questions_list.lng | 2
interface/web/sites/lib/lang/fr_cron.lng | 2
interface/web/vm/lib/lang/hr.lng | 8
interface/web/admin/lib/lang/fr_language_add.lng | 2
interface/web/admin/lib/lang/br_remote_action.lng | 2
interface/web/vm/lib/lang/hr_openvz_vm_list.lng | 14
interface/web/dns/lib/lang/el_dns_soa_list.lng | 1
interface/web/mail/lib/lang/hr_mail_content_filter_list.lng | 2
interface/web/vm/lib/lang/fr_openvz_ip.lng | 2
interface/web/client/lib/lang/hr_resellers_list.lng | 12
interface/web/dns/lib/lang/el_dns_txt.lng | 1
interface/web/admin/lib/lang/pl_language_edit.lng | 1
interface/web/dns/lib/lang/ro.lng | 2
interface/web/dns/lib/lang/hr_dns_slave.lng | 2
interface/web/admin/lib/lang/en_server_config.lng | 5
interface/web/dns/lib/lang/el.lng | 1
interface/web/admin/lib/lang/ro_remote_action.lng | 2
interface/web/mail/lib/lang/fr_mail_blacklist_list.lng | 2
interface/web/dns/lib/lang/el_dns_a_list.lng | 1
interface/web/sites/lib/lang/pl_webdav_user.lng | 1
interface/web/admin/lib/lang/el.lng | 3
interface/web/dns/lib/lang/pl_dns_cname.lng | 1
interface/web/admin/lib/lang/el_groups.lng | 1
interface/web/sites/lib/lang/hr_web_subdomain.lng | 6
interface/web/designer/lib/lang/fr_module_nav_item_edit.lng | 2
interface/web/mail/lib/lang/el_mail_user.lng | 1
interface/web/admin/lib/lang/it_remote_action.lng | 2
interface/web/mail/lib/lang/pl_mail_blacklist_list.lng | 1
interface/web/admin/lib/lang/el_language_complete.lng | 1
interface/web/help/lib/lang/pl.lng | 1
interface/web/sites/lib/lang/pl_database_admin_list.lng | 1
interface/web/client/lib/lang/el_client_template_list.lng | 1
interface/web/sites/lib/lang/fr_web_folder_user_list.lng | 2
interface/web/admin/lib/lang/hu_server_config.lng | 4
interface/web/admin/lib/lang/el_server_config.lng | 17
interface/web/dns/lib/lang/fr_dns_txt.lng | 1
interface/web/client/lib/lang/it_client.lng | 2
interface/web/mail/lib/lang/hr_mail_mailinglist.lng | 4
interface/web/vm/lib/lang/hr_openvz_ostemplate_list.lng | 8
interface/web/admin/lib/lang/fr_software_repo_list.lng | 2
interface/web/client/lib/lang/pl_reseller.lng | 3
interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng | 1
interface/web/sites/lib/lang/fr_web_folder.lng | 2
interface/lib/config.inc.php | 1
interface/web/sites/lib/lang/hr_web_folder_user_list.lng | 4
interface/web/admin/lib/lang/hr_software_package_list.lng | 14
interface/web/mail/lib/lang/el_mail_alias.lng | 1
interface/web/mail/lib/lang/hr_mail_forward.lng | 4
interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng | 2
interface/web/vm/lib/lang/hr_openvz_ip.lng | 14
interface/web/dashboard/lib/lang/el_dashlet_limits.lng | 1
interface/web/client/lib/lang/el_client_template.lng | 1
interface/web/mail/lib/lang/el_spamfilter_blacklist.lng | 1
interface/web/sites/lib/lang/el_ftp_user.lng | 1
interface/web/mail/lib/lang/fr_mail_forward_list.lng | 2
interface/web/mail/lib/lang/hr.lng | 2
interface/web/dns/lib/lang/ja.lng | 2
interface/web/sites/lib/lang/el_user_quota_stats_list.lng | 1
interface/web/mail/lib/lang/pl_mail_user_stats_list.lng | 1
interface/web/admin/lib/lang/el_users_list.lng | 1
interface/web/admin/lib/lang/pl_iptables.lng | 1
interface/web/admin/lib/lang/el_server.lng | 1
interface/web/client/lib/lang/fr_client_template.lng | 2
interface/web/designer/lib/lang/pl_module_list.lng | 1
interface/web/mail/lib/lang/fr_spamfilter_users.lng | 2
interface/web/tools/lib/lang/cz.lng | 2
interface/web/admin/lib/lang/hr_server_config_list.lng | 2
interface/web/dns/lib/lang/br.lng | 2
interface/web/mail/lib/lang/pl_mail_user_filter_list.lng | 1
interface/web/mail/lib/lang/hr_mail_domain_catchall.lng | 4
interface/lib/lang/hr.lng | 59
interface/web/admin/lib/lang/ru_remote_action.lng | 2
interface/web/mail/lib/lang/el_mail_user_filter_list.lng | 1
interface/web/admin/lib/lang/hr_language_import.lng | 12
interface/web/sites/lib/lang/pl_user_quota_stats_list.lng | 1
interface/web/mail/lib/lang/pl_mail_get_list.lng | 1
interface/web/vm/lib/lang/hr_openvz_action.lng | 12
interface/web/mail/lib/lang/hr_mail_content_filter.lng | 2
interface/web/client/lib/lang/hr_client_template.lng | 140
interface/web/dns/lib/lang/el_dns_rp.lng | 1
interface/web/mail/lib/lang/el_spamfilter_users.lng | 1
interface/web/designer/lib/lang/fr_module_show.lng | 2
interface/web/help/lib/lang/fr.lng | 2
interface/web/designer/lib/lang/el_module_nav_item_edit.lng | 1
interface/web/admin/lib/lang/fr_firewall_list.lng | 2
interface/web/sites/lib/lang/hr_ftp_user_list.lng | 10
interface/web/sites/lib/lang/hr_web_folder_list.lng | 4
interface/web/mail/lib/lang/fr_spamfilter_blacklist_list.lng | 2
interface/web/tools/lib/lang/fi.lng | 2
interface/web/admin/lib/lang/se_server_config.lng | 4
interface/web/mail/lib/lang/pl_mail_content_filter_list.lng | 1
interface/web/admin/lib/lang/hr_software_repo.lng | 8
interface/web/tools/lib/lang/ja.lng | 2
interface/web/dns/lib/lang/fr_dns_a_list.lng | 1
interface/web/admin/lib/lang/fr_language_import.lng | 2
interface/web/admin/lib/lang/fr_system_config.lng | 2
interface/web/login/lib/lang/pl.lng | 1
interface/web/admin/lib/module.conf.php | 4
interface/lib/lang/sk.lng | 1
interface/web/admin/lib/lang/ja_remote_action.lng | 2
server/conf/nginx_vhost.conf.master | 4
interface/web/designer/lib/lang/el.lng | 1
interface/web/mail/lib/lang/el_mail_spamfilter.lng | 1
interface/web/dns/lib/lang/el_dns_cname.lng | 1
interface/web/dashboard/dashboard.php | 4
interface/web/dns/lib/lang/pl_dns_alias.lng | 1
interface/web/mail/lib/lang/fr_mail_aliasdomain_list.lng | 2
interface/web/sites/lib/lang/el_web_folder_list.lng | 1
interface/web/dns/lib/lang/ar.lng | 2
interface/web/admin/lib/lang/fr_users.lng | 2
interface/web/domain/lib/lang/el.lng | 1
interface/web/sites/lib/lang/el_web_folder.lng | 1
interface/web/sites/lib/lang/el_web_sites_stats_list.lng | 1
interface/web/dashboard/lib/custom_menu.inc.php | 2
interface/web/admin/lib/lang/pl_remote_user.lng | 1
interface/web/domain/lib/lang/fr_domain.lng | 2
interface/web/monitor/lib/lang/hr.lng | 44
interface/web/dns/lib/lang/el_dns_slave_list.lng | 1
interface/web/client/templates/client_edit_limits.htm | 4
interface/web/mail/lib/lang/fr_spamfilter_whitelist.lng | 2
interface/lib/plugins/mail_user_filter_plugin.inc.php | 26
interface/web/designer/lib/lang/pl_module_edit.lng | 1
interface/web/mail/lib/lang/pl_mail_whitelist_list.lng | 1
interface/web/sites/lib/lang/hr_web_domain.lng | 6
interface/web/dns/lib/lang/el_dns_slave.lng | 1
interface/lib/app.inc.php | 15
interface/web/client/lib/lang/pt_client.lng | 2
interface/web/mail/lib/lang/el_mail_spamfilter_list.lng | 1
interface/web/admin/lib/lang/fi_remote_action.lng | 2
interface/web/help/lib/lang/fr_support_message.lng | 2
interface/web/dns/lib/lang/fr_dns_slave.lng | 1
interface/web/dashboard/lib/lang/el_dashlet_modules.lng | 1
interface/web/mail/lib/lang/fr_mail_forward.lng | 2
interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng | 2
interface/web/mail/lib/lang/el_spamfilter_whitelist.lng | 1
interface/web/admin/lib/lang/pl_software_repo.lng | 1
interface/web/mail/lib/lang/pl_mail_relay_recipient.lng | 1
interface/web/dns/lib/lang/hu.lng | 2
interface/web/vm/lib/lang/el_openvz_ip_list.lng | 1
interface/web/dns/lib/lang/pl_dns_ns.lng | 1
interface/web/mail/lib/lang/hr_mail_domain_catchall_list.lng | 4
interface/web/sites/lib/lang/el_database_admin_list.lng | 1
interface/web/dns/lib/lang/fr_dns_srv.lng | 1
interface/web/sites/lib/lang/pl_web_domain_list.lng | 1
interface/web/admin/lib/lang/pl_server_ip.lng | 1
interface/web/client/lib/lang/pl_client_template_list.lng | 1
interface/web/client/lib/lang/el_client_del.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng | 1
interface/web/admin/lib/lang/hr_system_config.lng | 50
interface/web/admin/lib/lang/el_software_package_list.lng | 1
interface/web/dns/lib/lang/en.lng | 2
interface/web/tools/lib/lang/ar.lng | 2
interface/web/tools/lib/lang/el.lng | 1
interface/lib/lang/cz.lng | 1
interface/web/dns/lib/lang/fr_dns_cname.lng | 2
interface/web/sites/lib/lang/fr_database_admin_list.lng | 2
interface/web/domain/lib/lang/pl_domain_list.lng | 1
interface/web/admin/remote_action_ispcupdate.php | 7
interface/web/mail/lib/lang/el_mail_domain_list.lng | 1
interface/web/client/lib/lang/id.lng | 2
interface/web/mail/lib/lang/pl_mail_mailinglist.lng | 1
interface/web/sites/lib/lang/el_web_domain.lng | 7
interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng | 1
interface/web/designer/lib/lang/fr_form_show.lng | 2
interface/web/vm/lib/lang/pl_openvz_ip.lng | 1
interface/web/sites/lib/lang/el_database_list.lng | 1
interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng | 1
interface/web/vm/lib/lang/pl_openvz_template_list.lng | 1
interface/web/mail/lib/lang/hr_mail_alias.lng | 4
interface/web/client/lib/lang/de.lng | 2
interface/web/client/form/client.tform.php | 6
interface/web/tools/lib/lang/hr.lng | 4
interface/web/help/lib/lang/pl_support_message_list.lng | 1
interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng | 1
interface/web/admin/lib/lang/es_remote_action.lng | 2
interface/web/monitor/lib/lang/fr.lng | 296 ++--
interface/web/help/lib/lang/fr_faq_sections_form.lng | 2
interface/web/client/lib/lang/sk_reseller.lng | 2
interface/web/dns/lib/lang/hr_dns_aaaa.lng | 4
interface/web/admin/lib/lang/cz_remote_action.lng | 2
interface/web/designer/lib/lang/fr_form_edit.lng | 2
interface/web/sites/lib/lang/pl_database.lng | 1
interface/web/tools/lib/lang/fr.lng | 4
interface/web/monitor/lib/lang/fr_datalog_list.lng | 2
interface/web/dns/lib/lang/hr_dns_mx.lng | 22
interface/lib/lang/id.lng | 1
interface/web/client/lib/lang/nl_client.lng | 2
server/plugins-available/mysql_clientdb_plugin.inc.php | 13
interface/web/admin/lib/lang/el_server_list.lng | 1
interface/web/dashboard/lib/lang/pl.lng | 1
interface/web/sites/lib/lang/pl_cron.lng | 1
interface/web/mail/lib/lang/pl_mail_alias.lng | 1
interface/web/admin/lib/lang/hr_firewall.lng | 16
server/conf/bastille-firewall.cfg.master | 2
interface/web/help/lib/lang/pl_help_faq_sections_list.lng | 1
interface/web/dashboard/dashlets/modules.php | 6
interface/web/designer/lib/lang/fr_form_list.lng | 2
interface/web/dns/lib/lang/hr_dns_template.lng | 2
interface/web/admin/lib/lang/pl_software_package_install.lng | 1
interface/web/designer/lib/lang/el_module_list.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_users_list.lng | 1
interface/web/admin/lib/lang/el_language_list.lng | 1
interface/web/mail/lib/lang/el_mail_forward.lng | 1
interface/web/admin/lib/lang/pl_remote_action.lng | 3
interface/web/mail/lib/lang/fr_mail_mailinglist_list.lng | 2
interface/web/tools/lib/lang/pt.lng | 2
interface/web/admin/lib/lang/hr_users.lng | 50
interface/lib/lang/pl.lng | 2
interface/web/mail/lib/lang/el_spamfilter_users_list.lng | 1
interface/web/sites/lib/lang/pl_web_domain.lng | 1
interface/web/client/lib/lang/es_client.lng | 2
interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng | 1
interface/web/admin/lib/lang/el_language_edit.lng | 1
interface/web/sites/lib/lang/fr.lng | 14
interface/web/vm/lib/lang/hr_openvz_template_list.lng | 6
interface/web/admin/lib/lang/fr_server.lng | 2
interface/web/admin/lib/lang/hr_server.lng | 16
interface/web/sites/database_phpmyadmin.php | 12
interface/web/mail/lib/lang/el_mail_content_filter.lng | 1
interface/web/mail/lib/lang/fr_mail_spamfilter_list.lng | 2
interface/web/admin/lib/lang/el_firewall.lng | 1
interface/lib/lang/hu.lng | 1
interface/lib/lang/ro.lng | 1
interface/web/monitor/lib/lang/fr_syslog_list.lng | 2
interface/web/admin/lib/lang/el_server_ip.lng | 7
interface/web/admin/lib/lang/hr_server_ip.lng | 16
interface/web/mail/lib/lang/pl_user_quota_stats_list.lng | 1
interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng | 1
interface/web/sites/lib/lang/hr_web_subdomain_list.lng | 10
interface/web/mail/lib/lang/pl_mail_transport_list.lng | 1
interface/web/tools/lib/lang/it.lng | 2
interface/web/mail/lib/lang/el_user_quota_stats_list.lng | 11
interface/lib/lang/es.lng | 1
interface/web/admin/lib/lang/fr_software_package_install.lng | 2
interface/web/sites/lib/lang/el_web_folder_user_list.lng | 1
interface/web/vm/lib/lang/fr_openvz_template.lng | 2
interface/web/mail/lib/lang/fr_mail_whitelist_list.lng | 2
interface/web/designer/lib/lang/pl_module_show.lng | 1
interface/web/mail/lib/lang/pl_mail_forward_list.lng | 1
interface/web/dns/lib/lang/el_dns_wizard.lng | 1
interface/web/vm/lib/lang/fr.lng | 2
interface/web/client/lib/lang/hr_client_template_list.lng | 6
interface/web/tools/lib/lang/id.lng | 2
interface/web/admin/lib/lang/fr_language_edit.lng | 2
interface/web/admin/lib/lang/el_language_add.lng | 1
interface/web/admin/lib/lang/hr_firewall_list.lng | 8
interface/web/mail/lib/lang/fr_mail_alias.lng | 2
interface/web/sites/lib/lang/pl_ftp_user_list.lng | 1
interface/web/sites/lib/lang/fr_database_list.lng | 2
interface/web/sites/lib/lang/fr_web_folder_user.lng | 2
interface/web/client/lib/lang/se_reseller.lng | 2
interface/web/dns/lib/lang/fr_dns_template_list.lng | 1
interface/web/mail/lib/lang/el_mail_user_list.lng | 1
interface/web/tools/lib/lang/es.lng | 2
interface/web/designer/lib/lang/pl_form_list.lng | 1
interface/web/admin/lib/lang/fr_software_update_list.lng | 2
interface/web/admin/lib/lang/fr_remote_user.lng | 2
interface/web/vm/lib/lang/pl_openvz_ip_list.lng | 1
interface/web/tools/lib/lang/ro.lng | 2
interface/web/dns/lib/lang/el_dns_ns.lng | 1
interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng | 2
interface/web/admin/lib/lang/sk_server_config.lng | 4
interface/web/sites/lib/lang/fr_web_domain.lng | 2
interface/web/admin/lib/lang/id_server_config.lng | 4
interface/web/client/lib/lang/pl.lng | 3
interface/web/client/lib/lang/fi.lng | 2
interface/web/mail/lib/lang/fr_mail_domain_catchall.lng | 2
interface/web/admin/lib/lang/el_groups_list.lng | 1
interface/web/admin/lib/lang/fr_language_export.lng | 2
interface/web/vm/lib/lang/hr_openvz_ostemplate.lng | 2
interface/web/client/lib/lang/en_reseller.lng | 2
interface/web/admin/form/server_config.tform.php | 29
interface/web/client/lib/lang/pt_reseller.lng | 2
interface/web/client/client_edit.php | 14
interface/lib/lang/ru.lng | 140
interface/web/tools/lib/lang/en.lng | 2
interface/web/admin/lib/lang/el_server_ip_list.lng | 1
interface/web/help/lib/lang/el_help_faq_sections_list.lng | 1
interface/web/sites/lib/lang/hr_shell_user.lng | 6
server/cron_daily.php | 13
interface/web/dns/lib/lang/hr_dns_srv.lng | 4
interface/web/sites/lib/lang/el_database.lng | 1
interface/web/mail/lib/lang/hr_mail_forward_list.lng | 2
interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng | 2
interface/web/dns/lib/lang/hr_dns_soa_list.lng | 2
interface/web/help/lib/lang/pl_faq_manage_questions_list.lng | 1
interface/web/mail/lib/lang/el_mail_domain_catchall.lng | 1
interface/web/client/lib/lang/fr_reseller.lng | 4
interface/web/client/lib/lang/se.lng | 2
interface/web/vm/lib/lang/el.lng | 1
interface/web/admin/lib/lang/ar_server_config.lng | 4
interface/web/dns/lib/lang/sk.lng | 2
interface/web/admin/lib/lang/hr_software_repo_list.lng | 6
interface/web/mail/lib/lang/hr_mail_domain_list.lng | 4
interface/web/help/lib/lang/el_support_message.lng | 1
interface/web/client/lib/lang/cz_reseller.lng | 2
interface/web/vm/lib/lang/pl_openvz_template.lng | 1
interface/web/admin/lib/lang/fr_server_ip.lng | 2
interface/web/dns/lib/lang/el_dns_srv.lng | 1
interface/lib/lang/ar.lng | 1
interface/web/admin/lib/lang/hr_software_package_install.lng | 8
interface/web/vm/lib/lang/pl.lng | 1
interface/web/admin/lib/lang/hr.lng | 4
interface/web/mail/lib/lang/hr_mail_transport.lng | 6
interface/web/login/lib/lang/el.lng | 1
interface/web/client/lib/lang/fi_client.lng | 2
interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng | 1
interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng | 1
interface/web/domain/lib/lang/fr_domain_list.lng | 2
interface/web/admin/lib/lang/fr_firewall.lng | 2
interface/web/dashboard/lib/lang/hr_dashlet_limits.lng | 8
interface/web/sites/lib/lang/pl_web_subdomain_list.lng | 1
interface/web/mail/lib/lang/fr_mail_content_filter_list.lng | 2
interface/web/mail/lib/lang/fr_spamfilter_policy_list.lng | 2
interface/web/mail/lib/lang/pl_mail_alias_list.lng | 1
interface/web/mail/lib/lang/fr_mail_domain_admin_list.lng | 2
interface/web/designer/lib/lang/el_module_nav_edit.lng | 1
interface/web/mail/lib/lang/fr_mail_aliasdomain.lng | 2
interface/web/sites/lib/lang/pl_web_folder_user.lng | 1
interface/web/mail/lib/lang/hr_mail_blacklist.lng | 4
interface/web/vm/lib/lang/el_openvz_ip.lng | 1
interface/web/sites/lib/lang/fr_webdav_user.lng | 2
interface/web/domain/lib/lang/el_domain_list.lng | 1
interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng | 1
interface/web/dns/lib/lang/fr_dns_slave_list.lng | 1
server/conf/awstats_index.php.master | 53
interface/web/client/lib/lang/hu_client.lng | 2
interface/web/mail/lib/lang/pl_mail_user.lng | 1
interface/web/admin/lib/lang/fr_remote_action.lng | 4
interface/web/mail/lib/lang/el_mail_domain.lng | 1
interface/web/dns/lib/lang/pl_dns_rp.lng | 1
interface/web/client/lib/lang/br_reseller.lng | 2
interface/web/client/lib/lang/ru.lng | 2
interface/lib/classes/tform.inc.php | 11
interface/web/admin/lib/lang/pl_software_update_list.lng | 1
interface/web/admin/lib/lang/pl_language_add.lng | 1
interface/web/dns/lib/lang/pl_dns_template_list.lng | 1
interface/web/mail/lib/lang/fr_mail_domain_list.lng | 2
interface/web/admin/lib/lang/el_software_package_install.lng | 1
interface/web/vm/lib/lang/el_openvz_action.lng | 1
interface/web/designer/lib/lang/el_form_list.lng | 1
interface/web/admin/lib/lang/pl_package_install.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_users.lng | 1
install/tpl/config.inc.php.master | 5
interface/web/sites/lib/lang/hr_ftp_user.lng | 8
interface/web/client/lib/lang/hu.lng | 2
interface/web/mail/lib/lang/el_mail_whitelist.lng | 1
interface/web/sites/lib/lang/fr_user_quota_stats_list.lng | 2
interface/web/admin/lib/lang/pl_software_package_list.lng | 1
interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng | 1
interface/web/client/lib/lang/es_reseller.lng | 2
interface/web/sites/lib/lang/pl_shell_user.lng | 1
interface/web/mail/lib/lang/el_mail_domain_admin_list.lng | 1
interface/web/vm/lib/lang/el_openvz_vm.lng | 1
interface/web/monitor/lib/lang/pl.lng | 1
interface/web/sites/form/web_domain.tform.php | 2
interface/web/client/lib/lang/cz_client.lng | 2
interface/web/mail/lib/lang/el_mail_mailinglist.lng | 1
interface/web/admin/lib/lang/fr_groups_list.lng | 2
interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng | 1
interface/lib/lang/se.lng | 1
interface/web/mail/lib/lang/pl_mail_user_list.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng | 1
interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng | 1
interface/web/client/lib/lang/el_clients_list.lng | 1
interface/web/dns/lib/lang/el_dns_template_list.lng | 1
interface/web/admin/lib/lang/el_software_repo.lng | 1
interface/web/designer/lib/lang/el_module_show.lng | 1
interface/web/mail/lib/lang/el_spamfilter_policy_list.lng | 1
interface/lib/lang/fi.lng | 1
interface/web/vm/lib/lang/fr_openvz_ip_list.lng | 2
interface/web/designer/lib/lang/fr_module_list.lng | 2
interface/web/client/lib/lang/el_reseller.lng | 1
interface/web/vm/lib/lang/fr_openvz_vm.lng | 2
interface/web/login/lib/lang/fr.lng | 2
interface/web/admin/lib/lang/el_server_config_list.lng | 1
interface/web/dns/lib/lang/pl.lng | 3
interface/web/sites/lib/lang/fr_ftp_user.lng | 2
interface/web/client/lib/lang/ro_reseller.lng | 2
interface/web/sites/lib/lang/pl_database_list.lng | 1
interface/web/designer/lib/lang/pl_form_show.lng | 1
interface/web/admin/lib/lang/pl_language_export.lng | 1
interface/web/dns/lib/lang/fr_dns_ptr.lng | 1
interface/web/tools/lib/lang/br.lng | 2
install/dist/lib/gentoo.lib.php | 3
interface/web/sites/lib/lang/pl_webdav_user_list.lng | 1
interface/web/monitor/show_sys_state.php | 2
interface/web/designer/lib/lang/pl_form_edit.lng | 1
interface/web/mail/lib/lang/pl_mail_forward.lng | 1
interface/web/admin/lib/lang/pl_software_repo_list.lng | 1
interface/web/admin/lib/lang/el_remote_user.lng | 1
interface/web/sites/lib/lang/pl_web_folder_user_list.lng | 1
interface/web/designer/lib/lang/el_module_edit.lng | 1
interface/web/sites/lib/lang/el_web_subdomain.lng | 1
interface/web/admin/lib/lang/pt_server_config.lng | 4
interface/web/sites/lib/lang/el_web_folder_user.lng | 1
interface/web/sites/lib/lang/hr_cron.lng | 2
interface/web/mail/lib/lang/el_mail_transport_list.lng | 1
interface/web/admin/lib/lang/es_server_config.lng | 5
interface/web/mail/lib/lang/pl_mail_domain_catchall.lng | 1
interface/web/sites/lib/lang/fr_shell_user.lng | 2
interface/web/admin/lib/lang/de_server_config.lng | 4
interface/web/dns/lib/lang/tr.lng | 2
interface/web/mail/lib/lang/el_mail_content_filter_list.lng | 1
interface/web/admin/lib/lang/nl_server_config.lng | 4
interface/web/client/lib/lang/tr_client.lng | 2
interface/web/mail/lib/lang/hr_mail_whitelist_list.lng | 4
interface/web/themes/default/css/screen/content_ispc.css | 3
interface/web/admin/lib/lang/el_remote_action.lng | 1
interface/web/client/lib/lang/hr_clients_list.lng | 14
interface/web/vm/lib/lang/hr_openvz_vm.lng | 2
interface/web/admin/lib/lang/pl_server_ip_list.lng | 1
interface/web/mail/lib/lang/el_spamfilter_config.lng | 1
interface/lib/lang/bg.lng | 1
interface/web/vm/lib/lang/pl_openvz_vm.lng | 1
interface/web/client/lib/lang/fr_clients_list.lng | 2
interface/web/mail/lib/lang/pl_mail_domain.lng | 1
interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng | 1
interface/web/client/lib/lang/fr_client.lng | 4
interface/web/admin/lib/lang/pl_system_config.lng | 1
interface/web/sites/lib/lang/pl_web_folder.lng | 1
interface/web/help/lib/lang/el_help_faq_list.lng | 1
interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng | 1
interface/web/client/lib/lang/hr_client.lng | 204 +-
interface/web/mail/lib/lang/hr_mail_alias_list.lng | 2
interface/web/admin/lib/lang/hr_remote_user_list.lng | 8
interface/web/mail/lib/lang/hr_mail_relay_recipient_list.lng | 2
interface/web/sites/lib/lang/pl_cron_list.lng | 1
interface/web/admin/lib/lang/ru_server_config.lng | 4
interface/web/admin/lib/lang/el_iptables.lng | 1
interface/web/admin/lib/lang/fr_server_list.lng | 2
interface/lib/lang/nl.lng | 1
interface/web/sites/lib/lang/hr_web_domain_admin_list.lng | 4
interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng | 1
server/plugins-available/shelluser_jailkit_plugin.inc.php | 139 -
interface/web/dns/lib/lang/el_dns_ptr.lng | 1
interface/web/sites/lib/lang/fr_shell_user_list.lng | 2
interface/web/sites/lib/lang/el_web_domain_admin_list.lng | 1
interface/web/admin/lib/lang/pl_remote_user_list.lng | 1
interface/web/sites/lib/lang/pl_web_domain_admin_list.lng | 1
interface/web/sites/lib/lang/hr_cron_list.lng | 4
interface/web/client/lib/lang/cz.lng | 2
interface/web/vm/lib/lang/el_openvz_template.lng | 1
interface/web/sites/lib/lang/el_cron_list.lng | 1
interface/web/dns/lib/lang/es.lng | 2
interface/web/mail/lib/lang/hr_mail_get_list.lng | 4
interface/web/mail/lib/lang/pl_mail_whitelist.lng | 1
interface/web/admin/lib/lang/fr_server_ip_list.lng | 2
interface/web/client/lib/lang/pl_clients_list.lng | 1
interface/web/vm/lib/lang/fr_openvz_ostemplate.lng | 2
interface/web/dns/lib/lang/hr_dns_slave_list.lng | 2
interface/web/mail/lib/lang/pl_mail_user_filter.lng | 1
install/tpl/bastille-firewall.cfg.master | 2
interface/web/admin/lib/lang/fr_package_install.lng | 2
server/plugins-available/apache2_plugin.inc.php | 102 +
interface/web/admin/lib/lang/pl.lng | 1
interface/web/dns/lib/lang/ru.lng | 2
interface/web/admin/lib/lang/hr_iptables.lng | 20
interface/web/admin/lib/lang/fr_software_repo.lng | 2
interface/web/tools/lib/lang/nl.lng | 2
interface/web/admin/lib/lang/fr_software_package_list.lng | 2
interface/web/dns/lib/lang/de.lng | 2
interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng | 2
interface/web/mail/lib/lang/pl_mail_content_filter.lng | 1
interface/web/mail/lib/lang/el_mail_whitelist_list.lng | 1
interface/web/mail/lib/lang/fr_mail_content_filter.lng | 2
interface/web/admin/lib/lang/el_software_update_list.lng | 1
interface/web/domain/lib/lang/pl.lng | 1
interface/web/designer/lib/lang/fr_module_nav_edit.lng | 2
interface/web/sites/lib/lang/hr_web_domain_list.lng | 8
interface/web/admin/lib/lang/pl_server_config_list.lng | 1
interface/web/dns/lib/lang/pl_dns_srv.lng | 1
interface/web/mail/lib/lang/hr_mail_domain_admin_list.lng | 4
interface/web/admin/lib/lang/pl_firewall_list.lng | 1
interface/web/designer/lib/lang/pl.lng | 1
interface/web/mail/lib/lang/fr_mail_relay_recipient.lng | 2
interface/web/sites/lib/lang/pl_web_folder_list.lng | 1
interface/web/admin/lib/lang/ro_server_config.lng | 4
server/plugins-available/nginx_plugin.inc.php | 210 +-
interface/web/admin/lib/lang/br_server_config.lng | 4
interface/web/mail/lib/lang/fr_spamfilter_config_list.lng | 2
interface/web/admin/lib/lang/hr_server_config.lng | 86
interface/web/mail/lib/lang/el_mail_get.lng | 1
interface/web/mail/lib/lang/hr_mail_transport_list.lng | 4
interface/web/sites/lib/lang/el_ftp_user_list.lng | 1
interface/web/client/lib/lang/ar_client.lng | 2
interface/web/admin/lib/lang/bg_remote_action.lng | 2
interface/web/dns/lib/lang/hr_dns_ptr.lng | 4
interface/web/admin/lib/lang/hr_package_install.lng | 8
interface/web/help/lib/lang/pl_faq_form.lng | 1
interface/web/sites/lib/lang/el_web_aliasdomain_list.lng | 1
interface/web/tools/lib/lang/bg.lng | 2
interface/web/help/lib/lang/fr_support_message_list.lng | 2
interface/web/mail/lib/lang/hr_mail_relay_recipient.lng | 4
server/plugins-available/shelluser_base_plugin.inc.php | 56
interface/web/admin/lib/lang/en_remote_action.lng | 2
interface/web/domain/lib/lang/el_domain.lng | 1
interface/web/help/lib/lang/el.lng | 1
interface/web/admin/lib/lang/ja_server_config.lng | 4
interface/web/client/lib/lang/hr_reseller.lng | 206 +-
interface/web/mail/lib/lang/fr_mail_user_stats_list.lng | 2
interface/web/client/lib/lang/el_resellers_list.lng | 1
interface/web/sites/lib/lang/hr_web_folder.lng | 4
interface/web/sites/web_aliasdomain_edit.php | 27
interface/web/admin/lib/lang/hu_remote_action.lng | 2
interface/web/admin/lib/lang/tr_server_config.lng | 4
interface/web/mail/mail_user_filter_del.php | 3
interface/web/tools/lib/lang/se.lng | 2
interface/web/domain/lib/lang/fr.lng | 2
interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng | 2
interface/web/client/lib/lang/sk.lng | 2
interface/web/mail/lib/lang/hr_mail_aliasdomain.lng | 2
interface/web/mail/lib/lang/el_mail_forward_list.lng | 1
interface/web/sites/lib/lang/fr_web_domain_list.lng | 2
interface/web/vm/lib/lang/el_openvz_vm_list.lng | 1
interface/web/admin/lib/lang/pl_server_list.lng | 1
interface/web/client/lib/lang/hr.lng | 24
interface/web/mail/lib/lang/pl.lng | 1
interface/web/mail/lib/lang/pl_mail_aliasdomain.lng | 1
interface/web/admin/lib/lang/pl_groups_list.lng | 1
interface/web/designer/lib/lang/fr.lng | 2
interface/web/dns/lib/lang/pl_dns_soa.lng | 1
interface/web/sites/lib/lang/el_shell_user.lng | 1
interface/web/mail/lib/lang/hr_mail_spamfilter.lng | 2
interface/web/client/form/reseller.tform.php | 6
interface/web/admin/lib/lang/hr_language_list.lng | 10
interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng | 1
interface/web/strengthmeter/lib/lang/el_strengthmeter.lng | 1
interface/web/dns/lib/lang/fr.lng | 4
interface/web/dns/lib/lang/hr_dns_a.lng | 22
interface/web/help/lib/lang/fr_help_faq_list.lng | 1
interface/web/client/lib/lang/id_client.lng | 2
interface/web/mail/lib/lang/fr_mail_user_filter_list.lng | 2
interface/lib/lang/de.lng | 1
interface/lib/lang/it.lng | 1
interface/web/client/lib/lang/ar.lng | 2
interface/web/designer/lib/lang/pl_module_nav_item_edit.lng | 1
interface/web/help/lib/lang/el_faq_sections_form.lng | 1
install/dist/lib/opensuse.lib.php | 4
interface/web/client/lib/lang/ru_client.lng | 2
interface/web/dns/lib/lang/pl_dns_slave_list.lng | 1
interface/web/admin/lib/lang/hr_users_list.lng | 14
interface/web/mail/lib/lang/hr_mail_spamfilter_list.lng | 2
interface/web/admin/lib/lang/hr_server_ip_list.lng | 12
interface/web/admin/lib/lang/cz_server_config.lng | 4
interface/web/client/lib/lang/fr_client_del.lng | 2
interface/web/tools/lib/lang/de.lng | 2
interface/web/sites/form/web_subdomain.tform.php | 2
interface/web/dns/lib/lang/pl_dns_wizard.lng | 1
interface/web/vm/lib/lang/pl_openvz_action.lng | 1
interface/web/admin/lib/lang/pl_language_import.lng | 1
install/dist/lib/fedora.lib.php | 4
interface/web/dns/lib/lang/fr_dns_aaaa.lng | 1
interface/web/mail/lib/lang/fr_mail_domain.lng | 2
install/lib/installer_base.lib.php | 4
interface/web/help/lib/lang/el_faq_manage_questions_list.lng | 1
interface/web/mail/lib/lang/hr_mail_get.lng | 8
interface/web/sites/lib/lang/fr_ftp_user_list.lng | 2
interface/web/admin/lib/lang/pl_users.lng | 1
interface/lib/classes/remoting.inc.php | 5
interface/web/client/lib/lang/fi_reseller.lng | 2
install/tpl/fedora_dovecot.conf.master | 5
server/plugins-available/bind_plugin.inc.php | 24
interface/web/admin/lib/lang/fr_language_list.lng | 2
interface/web/admin/lib/lang/fr_remote_user_list.lng | 2
interface/web/mail/lib/lang/fr_mail_relay_recipient_list.lng | 2
interface/web/mail/lib/lang/pl_spamfilter_config_list.lng | 1
interface/web/domain/lib/lang/pl_domain.lng | 1
interface/web/help/lib/lang/fr_help_faq_sections_list.lng | 2
interface/web/sites/lib/lang/hr_database.lng | 4
interface/web/client/lib/lang/de_client.lng | 2
interface/web/dashboard/lib/lang/pl_dashlet_modules.lng | 1
interface/web/dns/lib/lang/bg.lng | 2
interface/web/client/lib/lang/ja.lng | 2
interface/web/dns/lib/lang/se.lng | 2
interface/web/mail/lib/lang/hr_mail_whitelist.lng | 4
interface/web/monitor/lib/lang/el.lng | 3
interface/web/client/lib/lang/pl_client_template.lng | 1
interface/web/designer/lib/lang/el_form_edit.lng | 1
interface/web/admin/lib/lang/pl_users_list.lng | 1
interface/web/admin/lib/lang/se_remote_action.lng | 2
interface/web/dns/lib/lang/fr_dns_soa_list.lng | 1
interface/web/admin/lib/lang/fr_language_complete.lng | 2
interface/web/mail/lib/lang/el_spamfilter_config_list.lng | 1
interface/web/admin/templates/remote_action_ispcupdate.htm | 8
interface/web/sites/lib/lang/el_webdav_user_list.lng | 1
interface/web/client/lib/lang/bg_reseller.lng | 2
interface/web/dns/lib/lang/fr_dns_ns.lng | 1
interface/web/sites/lib/lang/el_webdav_user.lng | 1
interface/web/client/lib/lang/br_client.lng | 2
interface/web/sites/lib/lang/el.lng | 1
interface/web/monitor/lib/lang/el_syslog_list.lng | 1
interface/web/mail/lib/lang/fr_mail_whitelist.lng | 2
interface/web/sites/lib/lang/pl_web_subdomain.lng | 1
interface/web/tools/lib/lang/fr_usersettings.lng | 2
interface/web/mail/lib/lang/fr_mail_get.lng | 2
interface/web/help/lib/lang/pl_faq_sections_form.lng | 1
interface/web/dns/lib/lang/pl_dns_txt.lng | 1
interface/web/admin/lib/lang/pl_iptables_list.lng | 1
interface/web/tools/lib/lang/tr.lng | 2
interface/web/sites/lib/lang/fr_database.lng | 48
interface/web/admin/lib/lang/it_server_config.lng | 4
interface/web/client/lib/lang/pl_client.lng | 3
interface/web/dns/lib/lang/pl_dns_aaaa.lng | 1
interface/web/mail/lib/lang/fr_mail_alias_list.lng | 2
interface/web/sites/lib/lang/hr_webdav_user.lng | 8
interface/web/designer/lib/lang/el_form_show.lng | 1
interface/web/admin/templates/server_config_web_edit.htm | 22
interface/web/admin/lib/lang/hr_groups.lng | 6
interface/web/admin/lib/lang/el_remote_user_list.lng | 1
interface/web/mail/mail_user_edit.php | 3
interface/web/admin/lib/lang/fr_groups.lng | 2
interface/web/dashboard/lib/lang/el.lng | 1
interface/web/dns/lib/lang/fr_dns_mx.lng | 1
install/tpl/debian_dovecot.conf.master | 3
interface/web/admin/lib/lang/hr_language_export.lng | 8
interface/web/mail/lib/lang/el_mail_user_stats_list.lng | 1
interface/web/mail/lib/lang/fr_spamfilter_policy.lng | 2
interface/web/admin/lib/lang/el_users.lng | 1
interface/web/client/lib/lang/el_client.lng | 1
interface/web/admin/lib/lang/fi_server_config.lng | 4
interface/web/help/lib/lang/pl_help_faq_list.lng | 1
interface/web/sites/lib/lang/el_web_subdomain_list.lng | 1
interface/web/client/lib/lang/ro.lng | 2
interface/web/mail/lib/lang/el_mail_alias_list.lng | 1
interface/web/admin/lib/lang/el_system_config.lng | 7
interface/web/tools/lib/lang/hu.lng | 2
interface/web/client/lib/lang/es.lng | 2
interface/web/dns/lib/lang/cz.lng | 2
interface/web/help/lib/lang/pl_support_message.lng | 1
server/lib/classes/monitor_tools.inc.php | 10
interface/web/admin/lib/lang/fr_server_config_list.lng | 2
interface/web/client/lib/lang/hu_reseller.lng | 2
install/lib/update.lib.php | 15
interface/web/admin/lib/lang/hr_iptables_list.lng | 22
interface/web/client/lib/lang/bg_client.lng | 2
install/tpl/mm_cfg.py.master | 2
interface/web/client/lib/lang/el.lng | 1
interface/web/mail/lib/lang/fr_mail_mailinglist.lng | 2
interface/web/client/lib/lang/se_client.lng | 2
interface/web/sites/form/database.tform.php | 3
interface/web/admin/form/server_ip.tform.php | 4
interface/web/client/lib/lang/tr.lng | 2
interface/lib/lang/el.lng | 1
interface/web/dns/lib/lang/fr_dns_wizard.lng | 2
interface/web/dns/lib/lang/nl.lng | 2
server/lib/app.inc.php | 3
interface/web/mail/lib/lang/pl_mail_transport.lng | 1
interface/web/mail/lib/lang/fr_mail_domain_catchall_list.lng | 2
install/install.php | 9
interface/web/dns/lib/lang/el_dns_hinfo.lng | 1
interface/web/vm/lib/lang/hr_openvz_template.lng | 2
interface/web/mail/lib/lang/pl_mail_blacklist.lng | 1
interface/web/mail/lib/lang/fr_mail_get_list.lng | 2
interface/web/mail/lib/lang/hr_mail_blacklist_list.lng | 4
interface/web/sites/lib/lang/fr_web_subdomain.lng | 2
interface/web/admin/lib/lang/hr_software_update_list.lng | 12
interface/web/mail/lib/lang/fr_mail_user_filter.lng | 2
interface/web/dns/lib/lang/pl_dns_hinfo.lng | 1
interface/lib/lang/ja.lng | 1
interface/web/sites/lib/lang/pl_web_sites_stats_list.lng | 1
interface/web/tools/lib/lang/pl.lng | 3
interface/web/admin/lib/lang/hr_groups_list.lng | 10
interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng | 8
interface/lib/lang/pt.lng | 1
interface/web/client/lib/lang/en_client.lng | 2
interface/web/dns/lib/lang/pl_dns_a_list.lng | 1
install/sql/ispconfig3.sql | 2
interface/web/admin/lib/lang/pl_server_config.lng | 5
interface/web/admin/language_complete.php | 4
interface/web/vm/lib/lang/fr_openvz_vm_list.lng | 2
interface/web/admin/lib/lang/ar_remote_action.lng | 2
interface/web/sites/lib/lang/el_web_domain_list.lng | 1
server/lib/classes/db_mysql.inc.php | 20
interface/web/client/lib/lang/fr_resellers_list.lng | 2
interface/web/admin/lib/lang/tr_remote_action.lng | 2
interface/web/client/lib/lang/fr_client_template_list.lng | 2
interface/web/mail/lib/lang/el_mail_mailinglist_list.lng | 1
interface/web/sites/lib/lang/hr_web_sites_stats_list.lng | 12
interface/web/sites/lib/lang/el_cron.lng | 1
interface/web/sites/form/web_aliasdomain.tform.php | 4
interface/web/mail/lib/lang/pl_mail_spamfilter.lng | 1
interface/web/admin/lib/lang/sk_remote_action.lng | 2
interface/web/monitor/lib/lang/pl_datalog_list.lng | 1
interface/web/dns/lib/lang/el_dns_alias.lng | 1
interface/web/dns/lib/lang/el_dns_aaaa.lng | 1
interface/web/sites/lib/lang/hr_webdav_user_list.lng | 6
interface/web/dns/lib/lang/el_dns_soa.lng | 9
interface/web/mail/lib/lang/el_mail_relay_recipient.lng | 1
interface/web/sites/lib/lang/fr_web_domain_admin_list.lng | 2
interface/web/mail/lib/lang/el_mail_get_list.lng | 1
interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng | 2
interface/web/client/lib/lang/ru_reseller.lng | 2
interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng | 2
interface/web/admin/lib/lang/id_remote_action.lng | 2
interface/web/help/lib/lang/el_support_message_list.lng | 1
interface/web/mail/lib/lang/fr_mail_transport_list.lng | 2
interface/web/dns/lib/lang/pl_dns_template.lng | 1
interface/web/sites/lib/lang/hr_web_folder_user.lng | 10
interface/web/admin/lib/lang/el_firewall_list.lng | 1
interface/web/mail/lib/lang/el_mail_aliasdomain.lng | 1
interface/web/admin/lib/lang/el_software_repo_list.lng | 1
interface/web/dns/lib/lang/pl_dns_ptr.lng | 1
interface/lib/lang/tr.lng | 1
interface/web/admin/lib/lang/fr_server_config.lng | 6
interface/web/mail/lib/lang/fr_spamfilter_blacklist.lng | 2
interface/web/mail/lib/lang/el_mail_user_filter.lng | 1
interface/web/mail/lib/lang/fr_spamfilter_whitelist_list.lng | 2
interface/web/admin/lib/lang/el_package_install.lng | 1
interface/web/themes/default/templates/main.tpl.htm | 2
interface/web/client/lib/lang/nl_reseller.lng | 2
interface/web/dns/lib/lang/hr.lng | 10
interface/web/dns/lib/lang/fr_dns_template.lng | 1
interface/web/admin/lib/lang/el_language_import.lng | 1
interface/lib/lang/br.lng | 1
interface/web/vm/lib/lang/fr_openvz_action.lng | 2
interface/web/dashboard/lib/lang/fr_dashlet_limits.lng | 45
interface/web/client/lib/lang/fr.lng | 4
interface/web/admin/lib/lang/hr_language_edit.lng | 12
interface/web/dns/lib/lang/fr_dns_rp.lng | 1
interface/web/dns/lib/lang/hr_dns_soa.lng | 2
interface/web/client/lib/lang/pl_resellers_list.lng | 1
interface/web/client/lib/lang/it.lng | 2
interface/web/vm/lib/lang/pl_openvz_vm_list.lng | 1
interface/lib/classes/remoting_lib.inc.php | 8
interface/web/sites/lib/lang/fr_cron_list.lng | 2
interface/web/sites/lib/lang/hr_database_list.lng | 2
interface/web/admin/lib/lang/el_iptables_list.lng | 1
interface/web/dns/lib/lang/it.lng | 2
interface/web/sites/lib/lang/el_shell_user_list.lng | 1
interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng | 1
interface/web/vm/lib/lang/fr_openvz_template_list.lng | 2
interface/web/dns/lib/lang/fr_dns_hinfo.lng | 1
interface/web/client/lib/lang/it_reseller.lng | 2
interface/web/admin/lib/lang/fr.lng | 2
interface/web/dns/lib/lang/el_dns_a.lng | 1
interface/web/client/lib/lang/ro_client.lng | 2
interface/web/help/lib/lang/fr_faq_form.lng | 2
interface/lib/lang/en.lng | 1
interface/web/admin/lib/lang/hr_server_list.lng | 6
interface/web/dns/lib/lang/hr_dns_alias.lng | 4
interface/web/mail/lib/lang/fr_mail_transport.lng | 2
install/tpl/debian6_dovecot.conf.master | 3
interface/lib/classes/plugin.inc.php | 2
interface/web/vm/lib/lang/el_openvz_ostemplate.lng | 1
interface/web/admin/lib/lang/fr_iptables.lng | 2
interface/web/admin/lib/lang/hr_remote_action.lng | 18
interface/web/mail/lib/lang/fr_spamfilter_users_list.lng | 2
interface/web/sites/lib/lang/pl.lng | 1
interface/web/mail/lib/lang/fr_mail_spamfilter.lng | 2
interface/web/mail/lib/lang/el.lng | 3
interface/web/sites/lib/lang/fr_web_folder_list.lng | 2
interface/web/dns/lib/lang/pt.lng | 2
interface/web/client/lib/lang/pt.lng | 2
remoting_client/examples/sites_web_domain_add.php | 4
interface/web/monitor/lib/lang/pl_syslog_list.lng | 1
interface/web/admin/lib/lang/pt_remote_action.lng | 2
interface/web/client/lib/lang/en.lng | 3
interface/web/client/lib/lang/de_reseller.lng | 2
interface/web/mail/lib/lang/el_spamfilter_policy.lng | 1
interface/web/vm/lib/lang/hr_openvz_ip_list.lng | 6
interface/web/client/lib/lang/pl_client_del.lng | 1
interface/web/mail/lib/lang/fr_mail_blacklist.lng | 2
interface/web/dashboard/lib/lang/fr_dashlet_modules.lng | 2
interface/web/client/lib/lang/id_reseller.lng | 2
interface/web/mail/lib/lang/hr_mail_user.lng | 10
interface/web/admin/lib/lang/bg_server_config.lng | 4
interface/lib/lang/fr.lng | 2
interface/web/admin/lib/lang/hr_remote_user.lng | 82
interface/web/dns/lib/lang/pl_dns_a.lng | 1
interface/web/admin/lib/lang/hr_language_complete.lng | 10
install/update.php | 29
interface/web/dns/lib/lang/fr_dns_soa.lng | 1
interface/web/mail/lib/lang/el_mail_blacklist_list.lng | 1
interface/web/mail/lib/lang/hr_mail_domain.lng | 6
interface/web/admin/lib/lang/pl_firewall.lng | 1
interface/web/dashboard/lib/lang/fr.lng | 2
interface/web/sites/lib/lang/fr_webdav_user_list.lng | 2
interface/web/client/lib/lang/ja_client.lng | 2
interface/web/sites/lib/lang/hr_shell_user_list.lng | 4
interface/web/mail/lib/lang/fr_spamfilter_config.lng | 2
interface/web/admin/lib/lang/de_remote_action.lng | 2
interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng | 1
interface/web/client/lib/lang/br.lng | 2
server/scripts/create_daily_nginx_access_logs.sh | 2
interface/web/mail/lib/lang/fr.lng | 2
interface/web/dns/lib/lang/pl_dns_soa_list.lng | 1
interface/web/help/lib/lang/el_faq_form.lng | 1
interface/web/mail/lib/lang/fr_user_quota_stats_list.lng | 2
interface/web/tools/lib/lang/pl_usersettings.lng | 1
install/tpl/server.ini.master | 6
interface/web/admin/lib/lang/nl_remote_action.lng | 2
interface/web/designer/lib/lang/pl_module_nav_edit.lng | 1
interface/web/mail/lib/lang/hr_mail_user_filter.lng | 2
interface/web/mail/lib/lang/pl_spamfilter_config.lng | 1
interface/web/dns/lib/lang/hr_dns_ns.lng | 4
interface/web/sites/lib/lang/pl_ftp_user.lng | 1
interface/web/client/reseller_edit.php | 13
interface/web/dns/lib/lang/hr_dns_a_list.lng | 22
interface/web/client/lib/lang/sk_client.lng | 2
interface/web/mail/lib/lang/pl_mail_domain_list.lng | 1
interface/web/dashboard/lib/lang/pl_dashlet_limits.lng | 1
interface/web/tools/lib/lang/ru.lng | 2
839 files changed, 2,410 insertions(+), 1,935 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 51f2dff..a3da18a 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -718,6 +718,7 @@
$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 @@
$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 @@
// 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 c5fdad0..5b9d5bf 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -733,6 +733,7 @@
$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 @@
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 eed2226..7b51cac 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -756,6 +756,7 @@
$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 @@
$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 @@
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 a31efbc..0255c12 100644
--- a/install/install.php
+++ b/install/install.php
@@ -102,8 +102,9 @@
//** 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 @@
$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 c47d7e3..7508ad4 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1608,6 +1608,7 @@
$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 @@
$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 @@
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 729ee04..5a3c9bb 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -56,7 +56,11 @@
//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 @@
//* 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 @@
//* 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 @@
$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 @@
$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 11d1b6c..9c2d5cf 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1919,6 +1919,6 @@
-- 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 e43d0df..728a731 100644
--- a/install/tpl/bastille-firewall.cfg.master
+++ b/install/tpl/bastille-firewall.cfg.master
@@ -75,7 +75,7 @@
# 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 a6abb12..75fa92e 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -56,7 +56,7 @@
//** 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['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 d9088d8..2b82ba7 100644
--- a/install/tpl/debian6_dovecot.conf.master
+++ b/install/tpl/debian6_dovecot.conf.master
@@ -12,6 +12,9 @@
# 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 d32537b..9eca0e1 100644
--- a/install/tpl/debian_dovecot.conf.master
+++ b/install/tpl/debian_dovecot.conf.master
@@ -99,6 +99,9 @@
#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 7dfcc3e..a49244d 100644
--- a/install/tpl/fedora_dovecot.conf.master
+++ b/install/tpl/fedora_dovecot.conf.master
@@ -87,7 +87,7 @@
#ssl_listen =
# SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt>
-#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 @@
#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 9ec47a7..9501c61 100644
--- a/install/tpl/mm_cfg.py.master
+++ b/install/tpl/mm_cfg.py.master
@@ -57,7 +57,7 @@
#-------------------------------------------------------------
# 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 1ee8934..287e96a 100644
--- a/install/tpl/opensuse_dovecot.conf.master
+++ b/install/tpl/opensuse_dovecot.conf.master
@@ -103,6 +103,9 @@
#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 8817e00..71e61e6 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -45,7 +45,7 @@
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_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 769cdce..8786658 100644
--- a/install/update.php
+++ b/install/update.php
@@ -96,6 +96,8 @@
$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 @@
//** 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 7e0d10a..7fa8c03 100755
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -28,12 +28,20 @@
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 @@
/* 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 910cc57..1cc9a06 100644
--- a/interface/lib/classes/plugin.inc.php
+++ b/interface/lib/classes/plugin.inc.php
@@ -136,7 +136,7 @@
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 318b268..26199c2 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -2158,6 +2158,11 @@
$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<br />";
+
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 a9dd870..06d5dfd 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -208,7 +208,13 @@
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 324d5b8..5610162 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -364,7 +364,12 @@
$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 @@
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 fc94da8..40de432 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -45,6 +45,7 @@
//** 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 20b68a8..07ebf53 100644
--- a/interface/lib/lang/ar.lng
+++ b/interface/lib/lang/ar.lng
@@ -67,4 +67,5 @@
$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 734f134..3e99a70 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -67,4 +67,5 @@
$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 89e7a51..98ed94a 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -67,4 +67,5 @@
$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 72379d5..4963dba 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -67,4 +67,5 @@
$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 f2f208d..fbb5207 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -67,4 +67,5 @@
$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 add04e6..77b75bb 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -69,3 +69,4 @@
$wb['monthnamesshort_dec'] = "Δεκ";
?>
+
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index 00d54e7..302b3e8 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -39,6 +39,7 @@
$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 137711f..5c4627a 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -67,4 +67,5 @@
$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 8e96384..45615bc 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -67,4 +67,5 @@
$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 f0c885a..c75f32b 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -67,5 +67,5 @@
$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 937d88a..5ff48ac 100644
--- a/interface/lib/lang/hr.lng
+++ b/interface/lib/lang/hr.lng
@@ -17,7 +17,7 @@
$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_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 0b7ee93..de6cf26 100644
--- a/interface/lib/lang/hu.lng
+++ b/interface/lib/lang/hu.lng
@@ -67,4 +67,5 @@
$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 91a7d9d..9a9cf11 100644
--- a/interface/lib/lang/id.lng
+++ b/interface/lib/lang/id.lng
@@ -67,4 +67,5 @@
$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 772267a..92e7ebf 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -67,4 +67,5 @@
$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 8dfcc29..cd23480 100644
--- a/interface/lib/lang/ja.lng
+++ b/interface/lib/lang/ja.lng
@@ -67,4 +67,5 @@
$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 73d0720..badb322 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -67,4 +67,5 @@
$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 5741bcc..d2319c7 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -67,5 +67,5 @@
$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 0b5cdb1..846979d 100644
--- a/interface/lib/lang/pt.lng
+++ b/interface/lib/lang/pt.lng
@@ -67,4 +67,5 @@
$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 e85d2d1..12ff91e 100644
--- a/interface/lib/lang/ro.lng
+++ b/interface/lib/lang/ro.lng
@@ -67,4 +67,5 @@
$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 54ee291..0568b5e 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -1,70 +1,70 @@
-<?php
-$wb['conf_format_dateshort'] = 'Y-m-d';
-$wb['conf_format_datelong'] = 'l dS of F Y';
-$wb['conf_format_timeshort'] = 'H:i';
-$wb['conf_format_timelong'] = 'H:i:s';
-$wb['conf_format_datetime'] = 'Y-m-d H:i';
-$wb['number_format_decimals'] = '2';
-$wb['number_format_dec_point'] = '.';
-$wb['number_format_thousands_sep'] = '';
-$wb['delete_confirmation'] = 'Вы действительно хотите удалить эту запись?';
-$wb['error_no_view_permission'] = 'Вы не имеете прав для удаления или запись отсутсвует!';
-$wb['error_no_delete_permission'] = 'Вы не имеете прав для удаления этой записи!';
-$wb['page_txt'] = 'Страница';
-$wb['page_of_txt'] = 'из';
-$wb['page_next_txt'] = 'Далее';
-$wb['page_back_txt'] = 'Назад';
-$wb['delete_txt'] = 'Удалить';
-$wb['filter_txt'] = 'Фильтр';
-$wb['add_new_record_txt'] = 'Добавить новую запись';
-$wb['btn_save_txt'] = 'Сохранить';
-$wb['btn_cancel_txt'] = 'Отмена';
-$wb['toolsarea_head_txt'] = 'Утилиты';
-$wb['page_and_txt'] = 'и';
-$wb['top_menu_system'] = 'Сиситема';
-$wb['top_menu_client'] = 'Клиент';
-$wb['top_menu_email'] = 'Почта';
-$wb['top_menu_monitor'] = 'Монитор';
-$wb['top_menu_sites'] = 'Сайты';
-$wb['top_menu_dns'] = 'ДНС';
-$wb['top_menu_tools'] = 'Утилиты';
-$wb['top_menu_help'] = 'Помощь';
-$wb['top_menu_billing'] = 'Billing';
-$wb['top_menu_domain'] = 'Domains';
-$wb['top_menu_dashboard'] = 'Home';
-$wb['latest_news_txt'] = 'Latest news';
-$wb['error_301'] = 'Module not permitted for the current user.';
-$wb['error_302'] = 'Module invalid.';
-$wb['error_1001'] = 'The username and password cannot be empty !';
-$wb['error_1002'] = 'The username and/or password are not correct !';
-$wb['error_1003'] = 'The username is deactivated!';
-$wb['top_menu_vm'] = 'VServer';
-$wb['datepicker_nextText'] = 'Next';
-$wb['datepicker_prevText'] = 'Prev';
-$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';
-?>
+<?php
+$wb['conf_format_dateshort'] = "Y-m-d";
+$wb['conf_format_datelong'] = "l dS of F Y";
+$wb['conf_format_timeshort'] = "H:i";
+$wb['conf_format_timelong'] = "H:i:s";
+$wb['conf_format_datetime'] = "Y-m-d H:i";
+$wb['number_format_decimals'] = "2";
+$wb['number_format_dec_point'] = ",";
+$wb['number_format_thousands_sep'] = "";
+$wb['delete_confirmation'] = "Вы действительно хотите удалить эту запись?";
+$wb['error_no_view_permission'] = "Вы не имеете прав для удаления или запись отсутсвует!";
+$wb['error_no_delete_permission'] = "Вы не имеете прав для удаления этой записи!";
+$wb['page_txt'] = "Страница";
+$wb['page_of_txt'] = "из";
+$wb['page_next_txt'] = "Далее";
+$wb['page_back_txt'] = "Назад";
+$wb['delete_txt'] = "Удалить";
+$wb['filter_txt'] = "Фильтр";
+$wb['add_new_record_txt'] = "Добавить новую запись";
+$wb['btn_save_txt'] = "Сохранить";
+$wb['btn_cancel_txt'] = "Отмена";
+$wb['toolsarea_head_txt'] = "Утилиты";
+$wb['page_and_txt'] = "и";
+$wb['top_menu_system'] = "Система";
+$wb['top_menu_client'] = "Клиент";
+$wb['top_menu_email'] = "Почта";
+$wb['top_menu_monitor'] = "Монитор";
+$wb['top_menu_sites'] = "Сайты";
+$wb['top_menu_dns'] = "ДНС";
+$wb['top_menu_tools'] = "Утилиты";
+$wb['top_menu_help'] = "Помощь";
+$wb['top_menu_billing'] = "Билинг";
+$wb['top_menu_domain'] = "Домены";
+$wb['top_menu_dashboard'] = "Главная";
+$wb['latest_news_txt'] = "Последние новости";
+$wb['error_301'] = "Модуль не доступен текущему пользователю.";
+$wb['error_302'] = "Модуль неиспарвный.";
+$wb['error_1001'] = "Имя пользователя и пароль не могут быть пустыми!";
+$wb['error_1002'] = "Имя пользователя и/или пароль некорректны !";
+$wb['error_1003'] = "Имя пользователя отключено!";
+$wb['top_menu_vm'] = "VServer";
+$wb['datepicker_nextText'] = "Далее";
+$wb['datepicker_prevText'] = "Назад";
+$wb['daynamesmin_su'] = "Вс";
+$wb['daynamesmin_mo'] = "Пн";
+$wb['daynamesmin_tu'] = "Вт";
+$wb['daynamesmin_we'] = "Ср";
+$wb['daynamesmin_th'] = "Чт";
+$wb['daynamesmin_fr'] = "Пт";
+$wb['daynamesmin_sa'] = "Сб";
+$wb['daynames_sunday'] = "Воскресенье";
+$wb['daynames_monday'] = "Понедельник";
+$wb['daynames_tuesday'] = "Вторник";
+$wb['daynames_wednesday'] = "Среда";
+$wb['daynames_thursday'] = "Черверг";
+$wb['daynames_friday'] = "Пятница";
+$wb['daynames_saturday'] = "Суббота";
+$wb['monthnamesshort_jan'] = "Янв";
+$wb['monthnamesshort_feb'] = "Фев";
+$wb['monthnamesshort_mar'] = "Мар";
+$wb['monthnamesshort_apr'] = "Апр";
+$wb['monthnamesshort_may'] = "Май";
+$wb['monthnamesshort_jun'] = "Июн";
+$wb['monthnamesshort_jul'] = "Июл";
+$wb['monthnamesshort_aug'] = "Авг";
+$wb['monthnamesshort_sep'] = "Сен";
+$wb['monthnamesshort_oct'] = "Окт";
+$wb['monthnamesshort_nov'] = "Ноя";
+$wb['monthnamesshort_dec'] = "Дек";
+?>
\ No newline at end of file
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index 104ba9c..3664fa2 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -67,4 +67,5 @@
$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 d9a40a9..4e9f0b0 100644
--- a/interface/lib/lang/sk.lng
+++ b/interface/lib/lang/sk.lng
@@ -67,4 +67,5 @@
$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 ffbb861..fdfca9c 100644
--- a/interface/lib/lang/tr.lng
+++ b/interface/lib/lang/tr.lng
@@ -67,4 +67,5 @@
$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 3b62524..7b22da8 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 @@
$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 @@
}
+ 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 f9ec365..027328d 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -440,6 +440,18 @@
'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 @@
'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 a6d9bcf..1bc21d5 100644
--- a/interface/web/admin/form/server_ip.tform.php
+++ b/interface/web/admin/form/server_ip.tform.php
@@ -100,9 +100,9 @@
'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 1ac6988..5c071a3 100644
--- a/interface/web/admin/language_complete.php
+++ b/interface/web/admin/language_complete.php
@@ -137,8 +137,8 @@
$file_content = "<?php\n";
foreach($wb as $key => $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 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index 44f4f74..0cc0b92 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/bg_remote_action.lng b/interface/web/admin/lib/lang/bg_remote_action.lng
index 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 1d570d4..7d15039 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/br_remote_action.lng b/interface/web/admin/lib/lang/br_remote_action.lng
index a455c10..d6578c9 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_desc'] = 'Esta ação fará uma atualização do ISPConfig3 no servidor selecionado.<br><br><strong>UTILIZE POR SUA CONTA E RISCO!</strong>';
$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<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index 64f7056..d57c4e0 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng
index 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index 2518aba..0d23e13 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/de_remote_action.lng b/interface/web/admin/lib/lang/de_remote_action.lng
index fee0b06..0c7a704 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_desc'] = 'Diese Aktion wird ein Update des ISPConfig3-Systems auf Ihrem ausgewählten Server ausführen.<br><br><strong>DIES GESCHIEHT AUF IHRE EIGENE VERANTWORTUNG!</strong>';
$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<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 71bc79f..fd78f1b 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_mail_txt'] = 'Deaktiviere Email Monitoring';
$wb['rescue_description_txt'] = '<b>Information:</b> Falls Sie MySQL stoppen möchten, wählen Sie die "Deaktiviere MySQL Monitoring" Checkbox und warten Sie 2-3 Minuten.<br>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 732f716..6941af2 100644
--- a/interface/web/admin/lib/lang/el.lng
+++ b/interface/web/admin/lib/lang/el.lng
@@ -5,7 +5,7 @@
$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['1002'] = 'Το όνομα χρήστη ή το συνθηματικό είναι λάθος.';
?>
+
diff --git a/interface/web/admin/lib/lang/el_firewall.lng b/interface/web/admin/lib/lang/el_firewall.lng
index 83260ed..c19e09e 100644
--- a/interface/web/admin/lib/lang/el_firewall.lng
+++ b/interface/web/admin/lib/lang/el_firewall.lng
@@ -10,3 +10,4 @@
$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 91cab72..67be85a 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['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 b50df79..3a81b51 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_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 10ce5eb..6022935 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['warning_txt'] = '<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b>Μην επεξεργάζεστε οποιαδήποτε ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
?>
+
diff --git a/interface/web/admin/lib/lang/el_iptables.lng b/interface/web/admin/lib/lang/el_iptables.lng
index 9236d47..aea9270 100644
--- a/interface/web/admin/lib/lang/el_iptables.lng
+++ b/interface/web/admin/lib/lang/el_iptables.lng
@@ -12,3 +12,4 @@
$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 a2da45d..ebe1310 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['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 f783f91..f088dc7 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_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 cf10cab..3da2a83 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_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 6faa60e..0b92579 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_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 4ff092f..34700ed 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_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 e30eb1f..58d31d8 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['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 a9cfee1..c648437 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_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 1c98589..5bc9709 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['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 59b017c..d020ab5 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['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 4033a34..c979169 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['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 93fc165..a40f313 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['username_txt'] = 'Όνομα Χρήστη';
?>
+
diff --git a/interface/web/admin/lib/lang/el_server.lng b/interface/web/admin/lib/lang/el_server.lng
index 2f961c6..34d6207 100644
--- a/interface/web/admin/lib/lang/el_server.lng
+++ b/interface/web/admin/lib/lang/el_server.lng
@@ -14,3 +14,4 @@
$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 1f2a86e..1fec280 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_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['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_error_empty'] = 'PHP-FPM start port is empty.';
$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
-$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
-$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
-$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
-$wb['enable_sni_txt'] = 'Enable SNI';
-$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['try_rescue_txt'] = 'Ενεργοποίηση εποπτείας υπηρεσιών και επανεκκινησης σε περίπτωση αποτυχίας';
+$wb['do_not_try_rescue_mysql_txt'] = 'Απενεργοποίηση εποπτείας MySQL';
+$wb['do_not_try_rescue_mail_txt'] = 'Απενεργοποίηση εποπτείας Email';
+$wb['rescue_description_txt'] = '<b>Πληροφορία:</b> Αν θέλετε να τερματίσετε την MySQL πρέπει να επιλέξετε την επιλογή Απενεργοποίηση εποπτείας MySQL και μετά να περιμένετε 2-3 λεπτά.<br>Αν δεν περιμένετε 2-3 λεπτά, η εποπτεία και αποκατάσταση θα προσπαθήσει να επανεκκινήσει την MySQL!';
+$wb['enable_sni_txt'] = 'Ενεργοποίηση SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Απενεργοποίηση εποπτείας HTTPD';
?>
+
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 e75bda0..a9f2d4f 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['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 00185a1..823b9f5 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['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 f19dc82..3422184 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['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 2f7b569..549e4cc 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['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 5e1f630..3a271da 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_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 f3e22fb..148c233 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['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 d52666d..9126fec 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['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 cb3f2c4..a43fdbb 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_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 50a4b47..e5ebe6d 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['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 6c5b8b5..da1cb30 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_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 eacd385..e97db54 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -27,3 +27,4 @@
$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 69b640d..09218d2 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['warning_txt'] = '<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b>Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
?>
+
diff --git a/interface/web/admin/lib/lang/en_remote_action.lng b/interface/web/admin/lib/lang/en_remote_action.lng
index 4d6a062..ad96e1f 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_desc'] = "This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>";
$wb['action_scheduled'] = "The action is scheduled for execution";
$wb['select_all_server'] = "All 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<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href='http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/' target='_blank'>Click here for detailed update instructins</a>";
?>
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index b3e9f60..ec2e053 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_mail_txt"] = 'Disable Email monitoring';
$wb["rescue_description_txt"] = '<b>Information:</b> If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.<br>If you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb["enable_sni_txt"] = 'Enable SNI';
+$wb["set_folder_permissions_on_update_txt"] = 'Set folder permissions on update';
+$wb["add_web_users_to_sshusers_group_txt"] = 'Add web users to -sshusers- group';
+$wb["connect_userid_to_webid_txt"] = 'Connect Linux userid to webid';
+$wb["connect_userid_to_webid_start_txt"] = 'Start ID for userid/webid connect';
+
$wb["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 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index db7f0ca..99dc89e 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
-$wb["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 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index d04966b..8949826 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/fr.lng b/interface/web/admin/lib/lang/fr.lng
index 96a8c74..d7ab95d 100644
--- a/interface/web/admin/lib/lang/fr.lng
+++ b/interface/web/admin/lib/lang/fr.lng
@@ -41,5 +41,3 @@
$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 83b2870..53b762c 100644
--- a/interface/web/admin/lib/lang/fr_firewall.lng
+++ b/interface/web/admin/lib/lang/fr_firewall.lng
@@ -9,5 +9,3 @@
$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 dbb27ef..965eb01 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['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 97e85c9..e0a92d7 100644
--- a/interface/web/admin/lib/lang/fr_groups.lng
+++ b/interface/web/admin/lib/lang/fr_groups.lng
@@ -3,5 +3,3 @@
$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 531d400..e51afd1 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['add_new_record_txt'] = 'Ajouter un nouveau groupe';
$wb['warning_txt'] = '<b>ATTENTION:</b> 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 b1aee34..40760b9 100644
--- a/interface/web/admin/lib/lang/fr_iptables.lng
+++ b/interface/web/admin/lib/lang/fr_iptables.lng
@@ -11,5 +11,3 @@
$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 6d732da..15c8bad 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['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 65b508e..f60bdac 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_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 552ccb7..30dea02 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_cancel_txt'] = 'Précédent';
$wb['list_desc_txt'] = 'Fusionne le langage sélectionné avec le langage principal anglais. <br />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 3fe5354..744f44d 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['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 b08d4a2..dbe3fbf 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['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 94fbda2..710847c 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['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 b85a0f7..8e9f26a 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['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 f13ffdb..e32084b 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_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 b822eac..3df14f3 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_desc'] = 'Cette action met à jour ISPConfig3 sur le serveur sélectionné.<br/><br/><strong>UTILISEZ A VOS RISQUES ET PERILS !</strong>';
$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<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=\'http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/\' target=\'_blank\'>Click here for detailed update instructins</a>';
?>
-
-
diff --git a/interface/web/admin/lib/lang/fr_remote_user.lng b/interface/web/admin/lib/lang/fr_remote_user.lng
index 83be161..5f740a4 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 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 bbde2db..e78707e 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['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 14890c6..7224e1d 100644
--- a/interface/web/admin/lib/lang/fr_server.lng
+++ b/interface/web/admin/lib/lang/fr_server.lng
@@ -13,5 +13,3 @@
$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 e8ea156..f73e4bf 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
-
-
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 c3c7be4..850cdd1 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 2b93c78..5c2f23e 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['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 5e33340..e911e52 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_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 c2bc1ec..054195f 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['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 2ea530a..39f643d 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['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 3636458..cb8f3f3 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['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 c12f700..7b3ec48 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_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 34b5bf0..5674989 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['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 9ab12f5..3c66539 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['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 4f23095..14d194f 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['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 a1af1ad..43500b6 100644
--- a/interface/web/admin/lib/lang/fr_users.lng
+++ b/interface/web/admin/lib/lang/fr_users.lng
@@ -26,5 +26,3 @@
$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 9d607df..af8cebc 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['add_new_record_txt'] = 'Ajouter un nouvel utilisateur';
$wb['warning_txt'] = '<b>ATTENTION:</b> 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 0f6e471..b7f72f8 100644
--- a/interface/web/admin/lib/lang/hr.lng
+++ b/interface/web/admin/lib/lang/hr.lng
@@ -16,7 +16,7 @@
$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['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 e626345..7b5b63d 100644
--- a/interface/web/admin/lib/lang/hr_firewall.lng
+++ b/interface/web/admin/lib/lang/hr_firewall.lng
@@ -1,11 +1,11 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['tcp_port_txt'] = 'Open TCP ports';
-$wb['udp_port_txt'] = 'Open UDP ports';
-$wb['tcp_port_help_txt'] = 'Separated by comma';
-$wb['udp_port_help_txt'] = 'Separated by comma';
-$wb['active_txt'] = 'Active';
-$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
+$wb['tcp_port_txt'] = 'Otvoreni TCP portovi';
+$wb['udp_port_txt'] = 'Otvoreni UDP portovi';
+$wb['tcp_port_help_txt'] = 'Odvojeno zarezom';
+$wb['udp_port_help_txt'] = 'Odvojeno zarezom';
+$wb['active_txt'] = 'Aktivno';
+$wb['firewall_error_unique'] = 'Već postoji firewall zapis za ovaj server.';
+$wb['tcp_ports_error_regex'] = 'Nedozvoljeni znak pri definiciji tcp porta. Dozvoljeni znakovi su znamenke, : i ,.';
+$wb['udp_ports_error_regex'] = 'Nedozvoljeni znak pri definiciji udp porta. Dozvoljeni znakovi su znamenke, : i ,.';
?>
diff --git a/interface/web/admin/lib/lang/hr_firewall_list.lng b/interface/web/admin/lib/lang/hr_firewall_list.lng
index 24a34be..568d915 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 @@
<?php
$wb['list_head_txt'] = 'Firewall';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['tcp_port_txt'] = 'Open TCP ports';
-$wb['udp_port_txt'] = 'Open UDP ports';
-$wb['add_new_record_txt'] = 'Add Firewall record';
+$wb['tcp_port_txt'] = 'Otvoreni TCP portovi';
+$wb['udp_port_txt'] = 'Otvoreni UDP portovi';
+$wb['add_new_record_txt'] = 'Dodaj Firewall zapis';
?>
diff --git a/interface/web/admin/lib/lang/hr_groups.lng b/interface/web/admin/lib/lang/hr_groups.lng
index 61c3dc5..33c1e70 100644
--- a/interface/web/admin/lib/lang/hr_groups.lng
+++ b/interface/web/admin/lib/lang/hr_groups.lng
@@ -1,5 +1,5 @@
<?php
-$wb['description_txt'] = 'Description';
-$wb['name_txt'] = 'Group';
-$wb['name_err'] = 'Group must be min 1, max 30 Chars.';
+$wb['description_txt'] = 'Opis';
+$wb['name_txt'] = 'Grupa';
+$wb['name_err'] = 'Grupa mora biti barem jedan do maksimalno 30 znakova.';
?>
diff --git a/interface/web/admin/lib/lang/hr_groups_list.lng b/interface/web/admin/lib/lang/hr_groups_list.lng
index f1d8e2c..e88fae2 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 @@
<?php
-$wb['list_head_txt'] = 'Systemuser groups';
-$wb['description_txt'] = 'Description';
-$wb['name_txt'] = 'Group';
-$wb['add_new_record_txt'] = 'Add new Group';
-$wb['warning_txt'] = '<b>WARNING:</b> 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'] = '<b>UPOZORENJE:</b> 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 40760b9..5a6cef9 100644
--- a/interface/web/admin/lib/lang/hr_iptables.lng
+++ b/interface/web/admin/lib/lang/hr_iptables.lng
@@ -1,13 +1,13 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['multiport_txt'] = 'Multi Port';
-$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+$wb['multiport_txt'] = 'Više portova';
+$wb['singleport_txt'] = 'Jedan port';
+$wb['protocol_txt'] = 'Protokol';
+$wb['table_txt'] = 'Tablica';
+$wb['target_txt'] = 'Meta';
+$wb['state_txt'] = 'Stanje';
+$wb['destination_ip_txt'] = 'Adresa destinacije';
+$wb['source_ip_txt'] = 'Adresa izvora';
+$wb['active_txt'] = 'Aktivno';
+$wb['iptables_error_unique'] = 'Već postoji firewall zapis za ovaj server.';
?>
diff --git a/interface/web/admin/lib/lang/hr_iptables_list.lng b/interface/web/admin/lib/lang/hr_iptables_list.lng
index 15c8bad..869bd17 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 @@
<?php
$wb['list_head_txt'] = 'IPTables';
-$wb['add_new_rule_txt'] = 'Add IPTables Rule';
+$wb['add_new_rule_txt'] = 'Dodaj IPTables pravilo';
$wb['server_id_txt'] = 'Server';
-$wb['multiport_txt'] = 'Multi Port';
-$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+$wb['multiport_txt'] = 'Više portova';
+$wb['singleport_txt'] = 'Jedan port';
+$wb['protocol_txt'] = 'Protokol';
+$wb['table_txt'] = 'Tablica';
+$wb['target_txt'] = 'Meta';
+$wb['state_txt'] = 'Stanje';
+$wb['destination_ip_txt'] = 'Adresa destinacije';
+$wb['source_ip_txt'] = 'Adresa izvora';
+$wb['active_txt'] = 'Aktivno';
+$wb['iptables_error_unique'] = 'Već postoji firewall zapis za ovaj server.';
?>
diff --git a/interface/web/admin/lib/lang/hr_language_add.lng b/interface/web/admin/lib/lang/hr_language_add.lng
index dc6b2d1..d4a3e1b 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 @@
<?php
-$wb['list_head_txt'] = 'Add new language';
-$wb['language_select_txt'] = 'Select language basis';
-$wb['language_new_txt'] = 'New language';
-$wb['language_new_hint_txt'] = '2 characters ISO 639-1 language-code (See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
-$wb['btn_save_txt'] = 'Create new language file set';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['list_head_txt'] = 'Dodaj novi jezik';
+$wb['language_select_txt'] = 'Izaberi bazični jezik';
+$wb['language_new_txt'] = 'Novi jezik';
+$wb['language_new_hint_txt'] = '2 znaka ISO 639-1 jezičnog-koda (Pogledaj http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
+$wb['btn_save_txt'] = 'Kreiraj novu jezičnu datoteku';
+$wb['btn_cancel_txt'] = 'Natrag';
?>
diff --git a/interface/web/admin/lib/lang/hr_language_complete.lng b/interface/web/admin/lib/lang/hr_language_complete.lng
index db7c05b..8562ced 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 @@
<?php
-$wb['list_head_txt'] = 'Merge language';
-$wb['list_desc_txt'] = 'Merge the selected language file with the english master language file. <br />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. <br />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 4c50e88..b223069 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 @@
<?php
-$wb['list_head_txt'] = 'Language file editor';
-$wb['language_select_txt'] = 'Select language';
-$wb['module_txt'] = 'Module';
-$wb['lang_file_txt'] = 'Language file';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['list_head_txt'] = 'Editor jezika';
+$wb['language_select_txt'] = 'Izaberi jezik';
+$wb['module_txt'] = 'Modul';
+$wb['lang_file_txt'] = 'Jezična datoteka';
+$wb['btn_save_txt'] = 'Spremi';
+$wb['btn_cancel_txt'] = 'Natrag';
?>
diff --git a/interface/web/admin/lib/lang/hr_language_export.lng b/interface/web/admin/lib/lang/hr_language_export.lng
index f45d47b..4799ddf 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 @@
<?php
-$wb['list_head_txt'] = 'Export language files';
-$wb['language_select_txt'] = 'Select language';
-$wb['btn_save_txt'] = 'Export the selected language file set';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['list_head_txt'] = 'Eksportiraj jezičnu datoteku';
+$wb['language_select_txt'] = 'Izaberi jezik';
+$wb['btn_save_txt'] = 'Eksportiraj izabranu jezičnu datoteku';
+$wb['btn_cancel_txt'] = 'Natrag';
?>
diff --git a/interface/web/admin/lib/lang/hr_language_import.lng b/interface/web/admin/lib/lang/hr_language_import.lng
index 4c31ec3..6a31f39 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 @@
<?php
-$wb['list_head_txt'] = 'Import language file';
-$wb['language_import_txt'] = 'Select language file';
-$wb['btn_save_txt'] = 'Import the selected language file';
-$wb['language_overwrite_txt'] = 'Overwrite file, if exists.';
-$wb['btn_cancel_txt'] = 'Back';
-$wb['ignore_version_txt'] = 'Skip ISPConfig version check';
+$wb['list_head_txt'] = 'Importiraj jezičnu datoteku';
+$wb['language_import_txt'] = 'Izaberi jezičnu datoteku';
+$wb['btn_save_txt'] = 'Importiraj selektiranu jezičnu datoteku';
+$wb['language_overwrite_txt'] = 'Prebriši datoteku, ukoliko već postoji.';
+$wb['btn_cancel_txt'] = 'Natrag';
+$wb['ignore_version_txt'] = 'Preskoči provjeru ISPConfig verzije';
?>
diff --git a/interface/web/admin/lib/lang/hr_language_list.lng b/interface/web/admin/lib/lang/hr_language_list.lng
index 1c784ed..68f9cca 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 @@
<?php
-$wb['list_head_txt'] = 'Language file editor';
-$wb['language_select_txt'] = 'Select language';
-$wb['module_txt'] = 'Module';
-$wb['lang_file_txt'] = 'Language file';
-$wb['lang_file_date_txt'] = 'Last modify';
+$wb['list_head_txt'] = 'Editor jezičnih datoteka';
+$wb['language_select_txt'] = 'Izaberi jezik';
+$wb['module_txt'] = 'Modul';
+$wb['lang_file_txt'] = 'Jezična datoteka';
+$wb['lang_file_date_txt'] = 'Zadnja promjena';
?>
diff --git a/interface/web/admin/lib/lang/hr_package_install.lng b/interface/web/admin/lib/lang/hr_package_install.lng
index 574dd11..181c797 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 @@
<?php
-$wb['repo_name_txt'] = 'Repository';
+$wb['repo_name_txt'] = 'Repozitorij';
$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
+$wb['repo_username_txt'] = 'Korisničko ime (opcionalno)';
+$wb['repo_password_txt'] = 'Šifra (opcionalno)';
+$wb['active_txt'] = 'Aktivno';
?>
diff --git a/interface/web/admin/lib/lang/hr_remote_action.lng b/interface/web/admin/lib/lang/hr_remote_action.lng
index 2bb2a12..0ebb53d 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 @@
<?php
-$wb['select_server_txt'] = 'Select Server';
-$wb['btn_do_txt'] = 'Execute action';
-$wb['do_osupdate_caption'] = 'Do OS-Update at remote server';
-$wb['do_osupdate_desc'] = 'This Action does a aptitude -y upgrade at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
-$wb['do_ispcupdate_caption'] = 'Do ISPConfig 3 - Update at remote server';
-$wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
-$wb['action_scheduled'] = 'The action is scheduled for execution';
-$wb['select_all_server'] = 'All 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.<br><br><strong>KORISTITE NA VLASTITU ODGOVORNOST!</strong>';
+$wb['do_ispcupdate_caption'] = 'Nadogradi ISPConfig 3 na udaljenom serveru';
+$wb['do_ispcupdate_desc'] = 'Ovime pokrećete nadogradnju ISPConfig3-a na izabranom serveru.<br><br><strong>KORISTITE NA VLASTITU ODGOVORNOST!</strong>';
+$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<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/hr_remote_user.lng b/interface/web/admin/lib/lang/hr_remote_user.lng
index 879385a..ae35c92 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 @@
<?php
-$wb['username_txt'] = 'Username:';
-$wb['password_txt'] = 'Password:';
-$wb['function_txt'] = 'Functions:';
-$wb['username_error_unique'] = 'Username must be unique';
-$wb['username_error_empty'] = 'Username cannot be empty';
-$wb['password_error_empty'] = 'Password cannot be empty';
-$wb['password_strength_txt'] = 'Password Strength:';
-$wb['Mail domain functions'] = 'Mail domain functions';
-$wb['Mail user functions'] = 'Mail user functions';
-$wb['Mail alias functions'] = 'Mail alias functions';
-$wb['Mail forward functions'] = 'Mail forward functions';
-$wb['Mail catchall functions'] = 'Mail catchall functions';
-$wb['Mail transport functions'] = 'Mail transport functions';
-$wb['Mail whitelist functions'] = 'Mail whitelist functions';
-$wb['Mail blacklist functions'] = 'Mail blacklist functions';
-$wb['Mail spamfilter user functions'] = 'Mail spamfilter user functions';
-$wb['Mail spamfilter policy functions'] = 'Mail spamfilter policy functions';
-$wb['Mail fetchmail functions'] = 'Mail fetchmail functions';
-$wb['Mail user filter functions'] = 'Mail user filter functions';
-$wb['Mail filter functions'] = 'Mail filter functions';
-$wb['Client functions'] = 'Client functions';
-$wb['Sites cron functions'] = 'Sites cron functions';
-$wb['Sites database functions'] = 'Sites database functions';
-$wb['Sites FTP-User functions'] = 'Sites FTP-User functions';
-$wb['Sites Shell-User functions'] = 'Sites Shell-User functions';
-$wb['Sites Domain functions'] = 'Sites Domain functions';
-$wb['Sites Aliasdomain functions'] = 'Sites Aliasdomain functions';
-$wb['Sites Subdomain functions'] = 'Sites Subdomain functions';
-$wb['DNS zone functions'] = 'DNS zone functions';
-$wb['DNS a functions'] = 'DNS a functions';
-$wb['DNS aaaa functions'] = 'DNS aaaa functions';
-$wb['DNS alias functions'] = 'DNS alias functions';
-$wb['DNS cname functions'] = 'DNS cname functions';
-$wb['DNS hinfo functions'] = 'DNS hinfo functions';
-$wb['DNS mx functions'] = 'DNS mx functions';
-$wb['DNS ns functions'] = 'DNS ns functions';
-$wb['DNS ptr functions'] = 'DNS ptr functions';
-$wb['DNS rp functions'] = 'DNS rp functions';
-$wb['DNS srv functions'] = 'DNS srv functions';
-$wb['DNS txt functions'] = 'DNS txt functions';
-$wb['Mail mailing list functions'] = 'Mail mailinglist functions';
+$wb['username_txt'] = 'Korisničko ime:';
+$wb['password_txt'] = 'Šifra:';
+$wb['function_txt'] = 'Funkcije:';
+$wb['username_error_unique'] = 'Korisničko ime mora biti jedinstveno';
+$wb['username_error_empty'] = 'Korisničko ime ne može biti prazno';
+$wb['password_error_empty'] = 'Šifra ne može biti prazna';
+$wb['password_strength_txt'] = 'Jačina šifre:';
+$wb['Mail domain functions'] = 'Funkcije mail domena';
+$wb['Mail user functions'] = 'Mail user funkcije';
+$wb['Mail alias functions'] = 'Mail alias funkcije';
+$wb['Mail forward functions'] = 'Mail forward funkcije';
+$wb['Mail catchall functions'] = 'Mail catchall funkcije';
+$wb['Mail transport functions'] = 'Mail transport funkcije';
+$wb['Mail whitelist functions'] = 'Mail whitelist funkcije';
+$wb['Mail blacklist functions'] = 'Mail blacklist funkcije';
+$wb['Mail spamfilter user functions'] = 'Mail spamfilter user funkcije';
+$wb['Mail spamfilter policy functions'] = 'Mail spamfilter policy funkcije';
+$wb['Mail fetchmail functions'] = 'Mail fetchmail funkcije';
+$wb['Mail user filter functions'] = 'Mail user filter funkcije';
+$wb['Mail filter functions'] = 'Mail filter funkcije';
+$wb['Client functions'] = 'Klijent funkcije';
+$wb['Sites cron functions'] = 'Cron funkcije';
+$wb['Sites database functions'] = 'Funkcije baza';
+$wb['Sites FTP-User functions'] = 'FTP funkcije';
+$wb['Sites Shell-User functions'] = 'Shell funkcije';
+$wb['Sites Domain functions'] = 'Funkcije domena';
+$wb['Sites Aliasdomain functions'] = 'Funkcije alias domena';
+$wb['Sites Subdomain functions'] = 'Funkcije poddomena';
+$wb['DNS zone functions'] = 'Funkcije DNS-a';
+$wb['DNS a functions'] = 'DNS a funkcije';
+$wb['DNS aaaa functions'] = 'DNS aaaa funkcije';
+$wb['DNS alias functions'] = 'DNS alias funkcije';
+$wb['DNS cname functions'] = 'DNS cname funkcije';
+$wb['DNS hinfo functions'] = 'DNS hinfo funkcije';
+$wb['DNS mx functions'] = 'DNS mx funkcije';
+$wb['DNS ns functions'] = 'DNS ns funkcije';
+$wb['DNS ptr functions'] = 'DNS ptr funkcije';
+$wb['DNS rp functions'] = 'DNS rp funkcije';
+$wb['DNS srv functions'] = 'DNS srv funkcije';
+$wb['DNS txt functions'] = 'DNS txt funkcije';
+$wb['Mail mailing list functions'] = 'Funkcije mailing lista';
?>
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 152a75f..2da20fc 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 @@
<?php
-$wb['list_head_txt'] = 'Remote Users';
-$wb['list_desc_txt'] = '';
-$wb['add_new_record_txt'] = 'Add new user';
+$wb['list_head_txt'] = 'Udaljeni klijenti';
+$wb['list_desc_txt'] = 'Udaljeni klijenti';
+$wb['add_new_record_txt'] = 'Dodaj';
$wb['parent_remote_userid_txt'] = 'ID';
-$wb['username_txt'] = 'Username';
+$wb['username_txt'] = 'Korisničko ime';
?>
diff --git a/interface/web/admin/lib/lang/hr_server.lng b/interface/web/admin/lib/lang/hr_server.lng
index 0ece5aa..39b7f36 100644
--- a/interface/web/admin/lib/lang/hr_server.lng
+++ b/interface/web/admin/lib/lang/hr_server.lng
@@ -1,15 +1,15 @@
<?php
$wb['config_txt'] = 'konfiguracija';
$wb['server_name_txt'] = 'Ime servera';
-$wb['mail_server_txt'] = 'Mailserver';
-$wb['web_server_txt'] = 'Webserver';
-$wb['dns_server_txt'] = 'DNS-Server';
-$wb['file_server_txt'] = 'Fileserver';
-$wb['db_server_txt'] = 'DB-Server';
-$wb['vserver_server_txt'] = 'VServer-Server';
+$wb['mail_server_txt'] = 'Mail server';
+$wb['web_server_txt'] = 'Web server';
+$wb['dns_server_txt'] = 'DNS server';
+$wb['file_server_txt'] = 'File server';
+$wb['db_server_txt'] = 'DB server';
+$wb['vserver_server_txt'] = 'VServer';
$wb['active_txt'] = 'Aktivan';
$wb['mirror_server_id_txt'] = 'je kopija servera';
$wb['- None -'] = '- izaberi server -';
-$wb['proxy_server_txt'] = 'Proxy-Server';
-$wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['proxy_server_txt'] = 'Proxy server';
+$wb['firewall_server_txt'] = 'Firewall server';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index 3110f4f..b0c445e 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 @@
<?php
-$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
-$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
-$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
-$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
-$wb['website_path_txt'] = 'Website path';
-$wb['website_symlinks_txt'] = 'Website symlinks';
-$wb['website_basedir_txt'] = 'Website basedir';
-$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
-$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
-$wb['getmail_config_dir_txt'] = 'Getmail config dir';
-$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
-$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
-$wb['fastcgi_alias_txt'] = 'FastCGI Alias';
-$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot direktorij';
+$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sekcije';
+$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrootane aplikacije';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrootane aplikacije';
+$wb['website_path_txt'] = 'Put do Internet stranice';
+$wb['website_symlinks_txt'] = 'Symlinkovi Internet stranice';
+$wb['website_basedir_txt'] = 'Bazni direktorij Internet stranice';
+$wb['vhost_conf_dir_txt'] = 'Vhost konfiguracijski direktorij';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost dozvoljeni konfiguracijski direktorij';
+$wb['getmail_config_dir_txt'] = 'Getmail konfiguracijski direktorij';
+$wb['fastcgi_starter_path_txt'] = 'Put do FastCGI-a';
+$wb['fastcgi_starter_script_txt'] = 'FastCGI početna skripta';
+$wb['fastcgi_alias_txt'] = 'FastCGI alias';
+$wb['fastcgi_phpini_path_txt'] = 'Put do FastCGI php.ini datoteke';
$wb['fastcgi_children_txt'] = 'FastCGI Children';
-$wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
+$wb['fastcgi_max_requests_txt'] = 'Maks. broj FastCGI zahtjeva';
$wb['fastcgi_bin_txt'] = 'FastCGI Bin';
-$wb['module_txt'] = 'Module';
-$wb['maildir_path_txt'] = 'Maildir Path';
-$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['module_txt'] = 'Modul';
+$wb['maildir_path_txt'] = 'Put do Maildir-a';
+$wb['homedir_path_txt'] = 'Put do početne stranice';
$wb['mailuser_uid_txt'] = 'Mailuser UID';
$wb['mailuser_gid_txt'] = 'Mailuser GID';
-$wb['mailuser_name_txt'] = 'Mailuser Name';
-$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['mailuser_name_txt'] = 'Mailuser ime';
+$wb['mailuser_group_txt'] = 'Mailuser grupa';
$wb['relayhost_txt'] = 'Relayhost';
-$wb['relayhost_user_txt'] = 'Relayhost User';
-$wb['relayhost_password_txt'] = 'Relayhost Password';
-$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
-$wb['message_size_limit_txt'] = 'Message Size Limit';
-$wb['ip_address_txt'] = 'IP Address';
+$wb['relayhost_user_txt'] = 'Relayhost korisnik';
+$wb['relayhost_password_txt'] = 'Relayhost šifra';
+$wb['mailbox_size_limit_txt'] = 'Dozvoljena veličina mailboxa';
+$wb['message_size_limit_txt'] = 'Dozvoljena veličina emaila';
+$wb['ip_address_txt'] = 'IP adresa';
$wb['netmask_txt'] = 'Netmask';
$wb['gateway_txt'] = 'Gateway';
$wb['hostname_txt'] = 'Hostname';
-$wb['nameservers_txt'] = 'Nameservers';
-$wb['auto_network_configuration_txt'] = 'Network Configuration';
-$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
-$wb['netmask_error_wrong'] = 'Invalid Netmask format.';
-$wb['gateway_error_wrong'] = 'Invalid Gateway format.';
-$wb['hostname_error_empty'] = 'Hostname is empty.';
-$wb['nameservers_error_empty'] = 'Nameserver is empty.';
-$wb['config_dir_txt'] = 'Config directory';
+$wb['nameservers_txt'] = 'Nameserveri';
+$wb['auto_network_configuration_txt'] = 'Konfiguracija mreže';
+$wb['ip_address_error_wrong'] = 'Neispravan format IP adrese.';
+$wb['netmask_error_wrong'] = 'Neispravni format netmask-a.';
+$wb['gateway_error_wrong'] = 'Neispravan format gateway-a.';
+$wb['hostname_error_empty'] = 'Hostname polje je prazno.';
+$wb['nameservers_error_empty'] = 'Nameserver polje je prazno.';
+$wb['config_dir_txt'] = 'Config direktorij';
$wb['init_script_txt'] = 'Cron init script name';
$wb['crontab_dir_txt'] = 'Path for individual crontabs';
$wb['wget_txt'] = 'Path to wget program';
@@ -69,14 +69,14 @@
$wb['awstats_data_dir_txt'] = 'awstats data folder';
$wb['awstats_pl_txt'] = 'awstats.pl script';
$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
-$wb['backup_dir_txt'] = 'Backup directory';
+$wb['backup_dir_txt'] = 'Backup direktorij';
$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
-$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
-$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['php_ini_path_cgi_txt'] = 'Put do CGI php.ini';
+$wb['php_ini_path_apache_txt'] = 'Put do Apache php.ini';
$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
-$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_enable_txt'] = 'Omogući';
$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
-$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_ipv6_txt'] = 'Omogući IPv6';
$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
@@ -88,7 +88,7 @@
$wb['CA_pass_txt'] = 'CA passphrase';
$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
$wb['backup_dir_ftpread_txt'] = 'Backup dir. readable for website FTP users.';
-$wb['server_type_txt'] = 'Server Type';
+$wb['server_type_txt'] = 'Vrsta servera';
$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
$wb['nginx_user_txt'] = 'Nginx user';
@@ -147,6 +147,10 @@
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
-$wb['enable_sni_txt'] = 'Enable SNI';
-$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['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 636c2e0..4b814eb 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 @@
<?php
-$wb['list_head_txt'] = 'Server Configuration';
+$wb['list_head_txt'] = 'Konfiguracija servera';
$wb['server_name_txt'] = 'Server';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_ip.lng b/interface/web/admin/lib/lang/hr_server_ip.lng
index 88d8a2f..0ddf8be 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 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP Address';
-$wb['virtualhost_txt'] = 'HTTP NameVirtualHost';
-$wb['ip_error_wrong'] = 'The IP address is invalid';
-$wb['ip_error_unique'] = 'The IP address must be unique';
-$wb['client_id_txt'] = 'Client';
-$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';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['virtualhost_txt'] = 'HTTP ime virtualnog hosta';
+$wb['ip_error_wrong'] = 'Neispravna IP adresa';
+$wb['ip_error_unique'] = 'IP adresa mora biti jedinstvena';
+$wb['client_id_txt'] = 'Klijent';
+$wb['ip_type_txt'] = 'Vrsta';
+$wb['virtualhost_port_txt'] = 'HTTP portovi';
+$wb['error_port_syntax'] = 'Nedozvoljeni znakovi u port polju, unesite samo znamenke odvojene zarezom. Primjer: 80,443';
?>
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 ea40668..d4210d3 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 @@
<?php
-$wb['list_head_txt'] = 'IP Addresses';
+$wb['list_head_txt'] = 'IP adrese';
$wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP Address';
-$wb['add_new_record_txt'] = 'Add new IP Address';
-$wb['client_id_txt'] = 'Client';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['add_new_record_txt'] = 'Dodaj novu IP adresu';
+$wb['client_id_txt'] = 'Klijent';
$wb['virtualhost_txt'] = 'HTTP Vhost';
-$wb['virtualhost_port_txt'] = 'HTTP Ports';
-$wb['ip_type_txt'] = 'Type';
+$wb['virtualhost_port_txt'] = 'HTTP portovi';
+$wb['ip_type_txt'] = 'Vrsta';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_list.lng b/interface/web/admin/lib/lang/hr_server_list.lng
index 40cc28e..320b45f 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 @@
<?php
$wb['list_head_txt'] = 'Server';
-$wb['server_name_txt'] = 'Name';
+$wb['server_name_txt'] = 'Ime';
$wb['mail_server_txt'] = 'Mail';
$wb['web_server_txt'] = 'Web';
$wb['dns_server_txt'] = 'DNS';
$wb['file_server_txt'] = 'File';
-$wb['db_server_txt'] = 'DB';
+$wb['db_server_txt'] = 'Baza';
$wb['vserver_server_txt'] = 'VServer';
-$wb['add_new_record_txt'] = 'Add new Server';
+$wb['add_new_record_txt'] = 'Dodaj novi server';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
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 5c8b756..22d7e0c 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 @@
<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['head_txt'] = 'Instaliraj softverski paket';
+$wb['install_key_txt'] = 'Unesi instalacijski ključ';
+$wb['btn_save_txt'] = 'Pokreni instalaciju';
+$wb['btn_cancel_txt'] = 'Odustani';
?>
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 29ad555..0240c2d 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 @@
<?php
-$wb['list_head_txt'] = 'Apps & Addon packages';
+$wb['list_head_txt'] = 'Aplikacije i dodatni paketi';
$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Package';
-$wb['package_description_txt'] = 'Description';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
+$wb['package_title_txt'] = 'Paketi';
+$wb['package_description_txt'] = 'Opis';
+$wb['action_txt'] = 'Akcija';
+$wb['toolsarea_head_txt'] = 'Paketi';
+$wb['repoupdate_txt'] = 'Obnovi listu paketa';
+$wb['package_id_txt'] = 'lokalni App-ID';
?>
diff --git a/interface/web/admin/lib/lang/hr_software_repo.lng b/interface/web/admin/lib/lang/hr_software_repo.lng
index 574dd11..181c797 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 @@
<?php
-$wb['repo_name_txt'] = 'Repository';
+$wb['repo_name_txt'] = 'Repozitorij';
$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
+$wb['repo_username_txt'] = 'Korisničko ime (opcionalno)';
+$wb['repo_password_txt'] = 'Šifra (opcionalno)';
+$wb['active_txt'] = 'Aktivno';
?>
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 b7a219f..b79045b 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 @@
<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
+$wb['list_head_txt'] = 'Repozitorij';
+$wb['active_txt'] = 'Aktivno';
+$wb['repo_name_txt'] = 'Repozitorij';
$wb['repo_url_txt'] = 'URL';
?>
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 ec4af23..59f910b 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 @@
<?php
-$wb['list_head_txt'] = 'Software updates';
-$wb['server_select_txt'] = 'Select server';
-$wb['installed_txt'] = 'Action';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
+$wb['list_head_txt'] = 'Softverske nadogradnje';
+$wb['server_select_txt'] = 'Izaberi server';
+$wb['installed_txt'] = 'Akcija';
+$wb['update_title_txt'] = 'Nadogradi';
+$wb['version_txt'] = 'Verzija';
+$wb['action_txt'] = 'Akcija';
?>
diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng
index 8a4e872..665d564 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 @@
<?php
-$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
-$wb['dbname_prefix_txt'] = 'Database name prefix';
-$wb['dbuser_prefix_txt'] = 'Database user prefix';
-$wb['shelluser_prefix_txt'] = 'Shell user prefix';
-$wb['webdavuser_prefix_txt'] = 'Webdav user prefix';
-$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
-$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
-$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
-$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
-$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
-$wb['webdavuser_prefix_error_regex'] = 'Char not allowed in webdav user prefix.';
-$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
-$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
+$wb['warning'] = 'Oprezno mijenjajte prefikse i postavke! Nemojte brisati prefikse na sistemima gdje postoji više od jednog klijenata.';
+$wb['dbname_prefix_txt'] = 'Prefiks nazivu baze';
+$wb['dbuser_prefix_txt'] = 'Prefiks nazivu korisnika baze';
+$wb['shelluser_prefix_txt'] = 'Prefiks Shell računu';
+$wb['webdavuser_prefix_txt'] = 'Prefix Webdav računu';
+$wb['ftpuser_prefix_txt'] = 'Prefiks FTP računu';
+$wb['dbname_prefix_error_regex'] = 'Nedozvoljeni znak u prefiksu naziva baze.';
+$wb['dbuser_prefix_error_regex'] = 'Nedozvoljeni znak u prefiksu naziva korisnika baze.';
+$wb['ftpuser_prefix_error_regex'] = 'Nedozvoljeni znak u prefiksu FTP računa.';
+$wb['shelluser_prefix_error_regex'] = 'Nedozvoljeni znak u prefiksu Shell računa.';
+$wb['webdavuser_prefix_error_regex'] = 'Nedozvoljeni znak u prefiksu webdav računa.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link za phpmyadmin u DB listi';
+$wb['mailboxlist_webmail_link_txt'] = 'Link za webmail u Mailbox listi';
$wb['webmail_url_txt'] = 'Webmail URL';
$wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL';
-$wb['use_domain_module_txt'] = 'Use the domain-module to add new domains';
-$wb['use_domain_module_hint'] = 'If you use this module, your customers can only select one of the domains the admin creates for them. They cannot free edit the domain-field.You have to re-login after changing this value, to make the changes visible.';
-$wb['new_domain_txt'] = 'HTML to create a new domain';
+$wb['use_domain_module_txt'] = 'Koristi modul Domene za dodavanje novih domena';
+$wb['use_domain_module_hint'] = 'Ukoliko koristite ovaj modul, vaši klijenti mogu izabrati samo domenu koju im je admin kreirao. Klijenti ne mogu slobodno mijenjati postavke domene. Morate se ponovno logirati nakon mijenjanja ove postavke da bi promjene bile vidljive.';
+$wb['new_domain_txt'] = 'HTML za kreiranje nove domene';
$wb['webftp_url_txt'] = 'WebFTP URL';
-$wb['monitor_key_txt'] = 'Monitor keyword';
-$wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)';
-$wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)';
-$wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)';
-$wb['enable_custom_login_txt'] = 'Allow custom login name';
-$wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
-$wb['mailmailinglist_url_txt'] = 'Mailing list URL';
-$wb['admin_mail_txt'] = 'Administrators e-mail';
-$wb['admin_name_txt'] = 'Administrators name';
+$wb['monitor_key_txt'] = 'Monitoriranje riječi';
+$wb['dashboard_atom_url_admin_txt'] = 'RSS URL za početnu stranicu (admin)';
+$wb['dashboard_atom_url_reseller_txt'] = 'RSS URL za početnu stranicu (reseller)';
+$wb['dashboard_atom_url_client_txt'] = 'RSS URL za početnu stranicu (client)';
+$wb['enable_custom_login_txt'] = 'Dozvoli izbor korisničkog imena';
+$wb['mailmailinglist_link_txt'] = 'Link na mailing listu u Mailing listi';
+$wb['mailmailinglist_url_txt'] = 'URL mailing liste';
+$wb['admin_mail_txt'] = 'e-mail administratora';
+$wb['admin_name_txt'] = 'Ime administratora';
?>
diff --git a/interface/web/admin/lib/lang/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng
index 8e70364..cae0264 100644
--- a/interface/web/admin/lib/lang/hr_users.lng
+++ b/interface/web/admin/lib/lang/hr_users.lng
@@ -1,28 +1,28 @@
<?php
-$wb['username_txt'] = 'Username';
-$wb['username_err'] = 'The username is too long or contains invalid characters.';
-$wb['username_empty'] = 'The username is empty.';
-$wb['username_unique'] = 'There is already a user with this username.';
-$wb['passwort_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['modules_txt'] = 'Module';
-$wb['startmodule_txt'] = 'Startmodule';
-$wb['app_theme_txt'] = 'Design';
-$wb['typ_txt'] = 'Type';
-$wb['active_txt'] = 'Active';
-$wb['language_txt'] = 'Language';
-$wb['name_txt'] = 'Name';
-$wb['vorname_txt'] = 'Forename';
-$wb['unternehmen_txt'] = 'Company';
-$wb['strasse_txt'] = 'Street';
-$wb['ort_txt'] = 'City';
-$wb['plz_txt'] = 'ZIP';
-$wb['land_txt'] = 'Country';
+$wb['username_txt'] = 'Korisničko ime';
+$wb['username_err'] = 'Korisničko ime je predugačko ili sadrži nedozvoljene znakove.';
+$wb['username_empty'] = 'Korisničko ime je prazno.';
+$wb['username_unique'] = 'Već postoji korisnik sa ovim korisničkim imenom.';
+$wb['passwort_txt'] = 'Šifra';
+$wb['password_strength_txt'] = 'Jačina šifre';
+$wb['modules_txt'] = 'Modul';
+$wb['startmodule_txt'] = 'Početni modul';
+$wb['app_theme_txt'] = 'Izgled';
+$wb['typ_txt'] = 'Vrsta';
+$wb['active_txt'] = 'Aktivno';
+$wb['language_txt'] = 'Jezik';
+$wb['name_txt'] = 'Ime';
+$wb['vorname_txt'] = 'Prezime';
+$wb['unternehmen_txt'] = 'Poduzeće';
+$wb['strasse_txt'] = 'Ulica';
+$wb['ort_txt'] = 'Grad';
+$wb['plz_txt'] = 'Poštanski broj';
+$wb['land_txt'] = 'Država';
$wb['email_txt'] = 'Email';
-$wb['url_txt'] = 'Url';
-$wb['telefon_txt'] = 'Telephone';
-$wb['fax_txt'] = 'Fax';
-$wb['groups_txt'] = 'Groups';
-$wb['default_group_txt'] = 'Default Group';
-$wb['startmodule_err'] = 'Start module is not within modules.';
+$wb['url_txt'] = 'URL';
+$wb['telefon_txt'] = 'Telefon';
+$wb['fax_txt'] = 'Faks';
+$wb['groups_txt'] = 'Grupe';
+$wb['default_group_txt'] = 'Standardna grupa';
+$wb['startmodule_err'] = 'Početni modul nije u izabranim modulima.';
?>
diff --git a/interface/web/admin/lib/lang/hr_users_list.lng b/interface/web/admin/lib/lang/hr_users_list.lng
index 0de8cdc..b960e14 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 @@
<?php
-$wb['list_head_txt'] = 'Users';
-$wb['username_txt'] = 'Username';
-$wb['name_txt'] = 'Name';
-$wb['vorname_txt'] = 'Forename';
-$wb['ort_txt'] = 'city';
-$wb['add_new_record_txt'] = 'Add new user';
-$wb['warning_txt'] = '<b>WARNING:</b> 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'] = '<b>UPOZORENJE:</b> 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 0589540..8fe6314 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'Ö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<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index 6a1c67e..33785e8 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/id_remote_action.lng b/interface/web/admin/lib/lang/id_remote_action.lng
index e004d06..3a1b851 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_desc'] = 'Tindakan ini melakukan pemutakhiran ISPConfig3 di server yang Anda pilih.<br><br><strong>PENGGUNAANNYA MENJADI TANGGUNG JAWAB ANDA SENDIRI!</strong>';
$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<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index cab99a1..15aa4d2 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/it_remote_action.lng b/interface/web/admin/lib/lang/it_remote_action.lng
index 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index b9ba257..ca56ef8 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_mail_txt'] = 'Disable Email monitoring';
$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>If you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/ja_remote_action.lng b/interface/web/admin/lib/lang/ja_remote_action.lng
index 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 778009e..c06e10f 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/nl_remote_action.lng b/interface/web/admin/lib/lang/nl_remote_action.lng
index e30d4d5..c0046ff 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_desc'] = 'Deze actie voert een ISPConfig3 update uit op de soor u geselecteerde server.<br><br><strong>GEBRUIK OP EIGEN RISICO!</strong>';
$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<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index ac60ba5..5267610 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng
index 7141978..6d5e887 100644
--- a/interface/web/admin/lib/lang/pl.lng
+++ b/interface/web/admin/lib/lang/pl.lng
@@ -41,4 +41,3 @@
$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 8098fcc..5681789 100644
--- a/interface/web/admin/lib/lang/pl_firewall.lng
+++ b/interface/web/admin/lib/lang/pl_firewall.lng
@@ -9,4 +9,3 @@
$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 fe80e43..6a4b838 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['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 a97ac3f..b3c8b9c 100644
--- a/interface/web/admin/lib/lang/pl_groups.lng
+++ b/interface/web/admin/lib/lang/pl_groups.lng
@@ -3,4 +3,3 @@
$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 9409d32..75756bc 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['add_new_record_txt'] = 'Dodaj nową grupę';
$wb['warning_txt'] = '<b>OSTRZEŻENIE:</b> Nie modyfikuj żadnych ustawień użytkownika w tym miejscu. Użyj ustawień Klienta lub Resellera w module Klient. Modyfikacja ustawień użytkownika lub grupy tutaj grozi utratą danych!';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_iptables.lng b/interface/web/admin/lib/lang/pl_iptables.lng
index 8073e5d..f6be566 100644
--- a/interface/web/admin/lib/lang/pl_iptables.lng
+++ b/interface/web/admin/lib/lang/pl_iptables.lng
@@ -11,4 +11,3 @@
$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 255a829..2f74b18 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['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 df1a5f3..82e42ef 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['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 6d6d8ec..0096c69 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['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 b4ec35d..3a5e706 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['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 0b38a48..e58dbf0 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['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 e78238a..077d0c0 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['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 14b7cdb..05fd6e3 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['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 ce5c73c..3043908 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_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 4d07f29..7d03089 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_desc'] = 'Ta akcja przeprowadzi aktualizację ISPConfig3 na wybranym serwerze.<br><br><strong>UŻYWASZ JEJ NA WŁASNĄ ODPOWIEDZIALNOŚĆ!</strong>';
$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<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
-
diff --git a/interface/web/admin/lib/lang/pl_remote_user.lng b/interface/web/admin/lib/lang/pl_remote_user.lng
index 5daa2c7..dd8a368 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 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 976e313..6dd12ae 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['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 2ebbeb2..5e9c411 100644
--- a/interface/web/admin/lib/lang/pl_server.lng
+++ b/interface/web/admin/lib/lang/pl_server.lng
@@ -13,4 +13,3 @@
$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 f0d93a8..998a755 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Włącz SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
-
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 e700889..f9e8dcf 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 2c107d0..cb16e10 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['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 dcf8951..64b004d 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_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 9ca9eb8..81356ac 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['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 ea9290b..fd2f293 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['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 5fbd652..e50d34f 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['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 84d9c9e..d11a1b3 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_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 85a54b0..7ca6af9 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['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 5cf9ccd..e38bdf8 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['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 8bf4293..3135b19 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['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 191185e..99e5fd3 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -26,4 +26,3 @@
$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 aa2294c..17d7225 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['add_new_record_txt'] = 'Dodaj nowego użytkownika';
$wb['warning_txt'] = '<b>OSTRZEŻENIE:</b> 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 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 642d0c9..a0042d0 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/ro_remote_action.lng b/interface/web/admin/lib/lang/ro_remote_action.lng
index 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index dd7a521..c497a0b 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/ru_remote_action.lng b/interface/web/admin/lib/lang/ru_remote_action.lng
index 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 87e40ef..ddbb8c8 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/se_remote_action.lng b/interface/web/admin/lib/lang/se_remote_action.lng
index 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index 1d570d4..7d15039 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/sk_remote_action.lng b/interface/web/admin/lib/lang/sk_remote_action.lng
index 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index 69308b9..8361653 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/lang/tr_remote_action.lng b/interface/web/admin/lib/lang/tr_remote_action.lng
index 949f7eb..f268527 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_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index fd0f147..56a6465 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['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 20fb322..84959d6 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -193,13 +193,13 @@
'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 5bde7e1..a72f942 100644
--- a/interface/web/admin/remote_action_ispcupdate.php
+++ b/interface/web/admin/remote_action_ispcupdate.php
@@ -27,7 +27,7 @@
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 @@
/*
* We need a list of all Servers
*/
+
$sysServers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
$dropDown = "<option value='*'>" . $wb['select_all_server'] . "</option>";
foreach ($sysServers as $server) {
@@ -62,7 +63,9 @@
/*
* 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 156949a..7baca7a 100644
--- a/interface/web/admin/templates/remote_action_ispcupdate.htm
+++ b/interface/web/admin/templates/remote_action_ispcupdate.htm
@@ -1,9 +1,15 @@
+<!--
<h2><tmpl_var name="do_ispcupdate_caption"></h2>
<p><tmpl_var name="do_ispcupdate_desc"></p>
+-->
+
+<h2><tmpl_var name="ispconfig_update_title"></h2>
+<p style="margin-top:50px; font-size:14px;"><tmpl_var name="ispconfig_update_text"></p>
<div class="panel panel_language_add">
<div class="pnl_formsarea">
+ <!--
<fieldset class="inlineLabels"><legend>{tmpl_var name='do_ispcupdate_caption'}</legend>
<div class="ctrlHolder">
<label for="server_select">{tmpl_var name='select_server_txt'}</label>
@@ -17,9 +23,11 @@
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
+
<div class="buttonHolder buttons">
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_do_txt'}" onClick="submitForm('pageForm','admin/remote_action_ispcupdate.php');"><span>{tmpl_var name='btn_do_txt'}</span></button>
</div>
+ -->
</div>
</div>
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index a2b5f49..da93a2e 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -76,6 +76,28 @@
</div>
</div>
<div class="ctrlHolder apache">
+ <p class="label">{tmpl_var name='set_folder_permissions_on_update_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='set_folder_permissions_on_update'}
+ </div>
+ </div>
+ <div class="ctrlHolder apache">
+ <p class="label">{tmpl_var name='add_web_users_to_sshusers_group_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='add_web_users_to_sshusers_group'}
+ </div>
+ </div>
+ <div class="ctrlHolder apache">
+ <p class="label">{tmpl_var name='connect_userid_to_webid_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='connect_userid_to_webid'}
+ </div>
+ </div>
+ <div class="ctrlHolder apache">
+ <label for="connect_userid_to_webid_start">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
+ <input name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder apache">
<label for="user">{tmpl_var name='web_user_txt'}</label>
<input name="user" id="user" value="{tmpl_var name='user'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 5896361..f0c9727 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -97,7 +97,6 @@
parent::onSubmit();
}
-
function onShowEnd() {
global $app;
@@ -169,8 +168,19 @@
$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 7b64147..6e76992 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -604,6 +604,9 @@
'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 @@
'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 a402bc7..5447070 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -593,6 +593,9 @@
'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 @@
'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 38bbbb5..9d70b06 100644
--- a/interface/web/client/lib/lang/ar.lng
+++ b/interface/web/client/lib/lang/ar.lng
@@ -10,4 +10,6 @@
$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 da332ae..f688fd5 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -104,4 +104,6 @@
$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 cc83780..ea62daf 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_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 f835dfd..5f1f246 100644
--- a/interface/web/client/lib/lang/bg.lng
+++ b/interface/web/client/lib/lang/bg.lng
@@ -10,4 +10,6 @@
$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 aad7d82..830109f 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -104,4 +104,6 @@
$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 cc83780..ea62daf 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_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 3dcb5e3..c47aa91 100644
--- a/interface/web/client/lib/lang/br.lng
+++ b/interface/web/client/lib/lang/br.lng
@@ -10,4 +10,6 @@
$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 ad0b957..f900d5b 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -104,4 +104,6 @@
$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 257ea50..670d675 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_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 026b6f5..eeef0fc 100644
--- a/interface/web/client/lib/lang/cz.lng
+++ b/interface/web/client/lib/lang/cz.lng
@@ -10,4 +10,6 @@
$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 9ed5ced..b6a4d22 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_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 45ce44c..75d4cf4 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_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 2ab45de..89617e2 100644
--- a/interface/web/client/lib/lang/de.lng
+++ b/interface/web/client/lib/lang/de.lng
@@ -10,4 +10,6 @@
$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 6f42cf0..2dca1c7 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -104,4 +104,6 @@
$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 0b4430f..55dbfe0 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_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 e2bb0ab..4359ba7 100644
--- a/interface/web/client/lib/lang/el.lng
+++ b/interface/web/client/lib/lang/el.lng
@@ -12,3 +12,4 @@
$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 44e2bf1..3361cce 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_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 7bd4284..e9056cd 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_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 c2e6044..d6ad0ff 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_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 30e6969..ba8ddd3 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_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 dd652bf..8a51898 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['username_txt'] = 'Username';
?>
+
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index f3e2dff..7deacd0 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_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 53eecc9..dbd2286 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['add_new_record_txt'] = 'Νεός Μεταπωλητής';
?>
+
diff --git a/interface/web/client/lib/lang/en.lng b/interface/web/client/lib/lang/en.lng
index 2c598f3..4b10b2b 100644
--- a/interface/web/client/lib/lang/en.lng
+++ b/interface/web/client/lib/lang/en.lng
@@ -10,5 +10,6 @@
$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 cc7a28c..ce4805e 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -107,4 +107,6 @@
$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 a553dd7..b93f54e 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -106,4 +106,6 @@
$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 f1b1d75..9f72fe5 100644
--- a/interface/web/client/lib/lang/es.lng
+++ b/interface/web/client/lib/lang/es.lng
@@ -10,4 +10,6 @@
$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 8b278d4..3c461a5 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_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 0b1bdef..23ea38e 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_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 184f155..5389024 100755
--- a/interface/web/client/lib/lang/fi.lng
+++ b/interface/web/client/lib/lang/fi.lng
@@ -10,4 +10,6 @@
$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 a6f723d..45fbefa 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -104,4 +104,6 @@
$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 4d3c5a3..bc4b368 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_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 6bb06dc..624247c 100644
--- a/interface/web/client/lib/lang/fr.lng
+++ b/interface/web/client/lib/lang/fr.lng
@@ -10,6 +10,6 @@
$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 354d114..3254ca0 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -104,6 +104,6 @@
$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 6112325..b4d7d55 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['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 02b0da0..0aed251 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['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 6e8fb69..3405427 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['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 e090ccb..05d7cb9 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['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 3c64a30..40b3502 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_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 0023cae..954bd10 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['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 38bbbb5..c314f46 100644
--- a/interface/web/client/lib/lang/hr.lng
+++ b/interface/web/client/lib/lang/hr.lng
@@ -1,13 +1,15 @@
<?php
-$wb['Client'] = 'Client';
-$wb['Address'] = 'Address';
-$wb['Limits'] = 'Limits';
-$wb['Add Client'] = 'Add Client';
-$wb['Edit Client'] = 'Edit Client';
-$wb['Clients'] = 'Clients';
-$wb['Edit Client-Templates'] = 'Edit Client-Templates';
-$wb['Add Reseller'] = 'Add Reseller';
-$wb['Edit Reseller'] = 'Edit Reseller';
-$wb['Resellers'] = 'Resellers';
-$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.';
+$wb['Client'] = 'Klijent';
+$wb['Address'] = 'Adresa';
+$wb['Limits'] = 'Limiti';
+$wb['Add Client'] = 'Dodaj klijenta';
+$wb['Edit Client'] = 'Editiraj klijenta';
+$wb['Clients'] = 'Klijenti';
+$wb['Edit Client-Templates'] = 'Editiraj predložak za klijente';
+$wb['Add Reseller'] = 'Dodaj preprodavača';
+$wb['Edit Reseller'] = 'Editiraj preprodavača';
+$wb['Resellers'] = 'Preprodavači';
+$wb['error_has_clients'] = 'Ovaj preprodavač ima klijente. Prvo morate obrisati klijente preprodavača.';
+$wb['add_additional_template_txt'] = 'Add additional template';
+$wb['delete_additional_template_txt'] = 'Delete additional template';
?>
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index 36c7b1a..0637b90 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -1,107 +1,109 @@
<?php
-$wb['limit_maildomain_txt'] = 'Max. number of email domains';
-$wb['limit_mailbox_txt'] = 'Max. number of mailboxes';
-$wb['limit_mailalias_txt'] = 'Max. number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
-$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
-$wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
-$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
-$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
-$wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
-$wb['limit_mailquota_txt'] = 'Mailbox quota';
-$wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
-$wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
-$wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policys';
-$wb['default_mailserver_txt'] = 'Default Mailserver';
-$wb['company_name_txt'] = 'Company name';
-$wb['contact_name_txt'] = 'Contact name';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['language_txt'] = 'Language';
-$wb['usertheme_txt'] = 'Theme';
-$wb['street_txt'] = 'Street';
-$wb['zip_txt'] = 'ZIP';
-$wb['city_txt'] = 'City';
-$wb['state_txt'] = 'State';
-$wb['country_txt'] = 'Country';
-$wb['telephone_txt'] = 'Telephone';
-$wb['mobile_txt'] = 'Mobile';
+$wb['limit_maildomain_txt'] = 'Maks. broj email domena';
+$wb['limit_mailbox_txt'] = 'Maks. broj mailboxa';
+$wb['limit_mailalias_txt'] = 'Maks. broj email aliasa';
+$wb['limit_mailaliasdomain_txt'] = 'Maks. broj aliasa email domena';
+$wb['limit_mailforward_txt'] = 'Maks. broj email forwardera';
+$wb['limit_mailcatchall_txt'] = 'Maks. broj email catchall računa';
+$wb['limit_mailrouting_txt'] = 'Maks. broj email ruta';
+$wb['limit_mailfilter_txt'] = 'Maks. broj email filtera';
+$wb['limit_fetchmail_txt'] = 'Maks. broj fetchmail računa';
+$wb['limit_mailquota_txt'] = 'Veličina mailboxa';
+$wb['limit_spamfilter_wblist_txt'] = 'Maks. broj spamfilter white / blacklist filtera';
+$wb['limit_spamfilter_user_txt'] = 'Maks. broj spamfilter korisnika';
+$wb['limit_spamfilter_policy_txt'] = 'Maks. broj spamfilter pravila';
+$wb['default_mailserver_txt'] = 'Izaberi email server';
+$wb['company_name_txt'] = 'Poduzeće';
+$wb['contact_name_txt'] = 'Kontakt osoba';
+$wb['username_txt'] = 'Korisničko ime';
+$wb['password_txt'] = 'Šifra';
+$wb['password_strength_txt'] = 'Jačina šifre';
+$wb['language_txt'] = 'Jezik';
+$wb['usertheme_txt'] = 'Tema';
+$wb['street_txt'] = 'Ulica';
+$wb['zip_txt'] = 'Poštanski broj';
+$wb['city_txt'] = 'Grad';
+$wb['state_txt'] = 'Županija';
+$wb['country_txt'] = 'Država';
+$wb['telephone_txt'] = 'Telefon';
+$wb['mobile_txt'] = 'Mobitel';
$wb['fax_txt'] = 'Fax';
$wb['email_txt'] = 'Email';
$wb['internet_txt'] = 'Internet';
$wb['icq_txt'] = 'ICQ';
-$wb['notes_txt'] = 'Notes';
-$wb['company_txt'] = 'Company';
-$wb['title_txt'] = 'Title';
-$wb['firstname_txt'] = 'Firstname';
-$wb['surname_txt'] = 'Surname';
-$wb['limit_domain_txt'] = 'limit_domain';
-$wb['limit_subdomain_txt'] = 'limit_subdomain';
-$wb['limit_webquota_txt'] = 'limit_webquota';
-$wb['limit_database_txt'] = 'Max. number of Databases';
-$wb['limit_cron_txt'] = 'Allowed cron job types';
-$wb['limit_cron_type_txt'] = 'Max. type of cron jobs (chrooted and full implies url)';
-$wb['limit_cron_frequency_txt'] = 'Min. delay between executions';
-$wb['ip_address_txt'] = 'ip_address';
-$wb['limit_client_error_notint'] = 'The sub client limit must be a number.';
-$wb['firstname_error_empty'] = 'Firstname is empty.';
-$wb['contact_error_empty'] = 'Contact name is empty.';
-$wb['default_webserver_txt'] = 'Default Webserver';
-$wb['limit_web_domain_txt'] = 'Max. number of web domains';
-$wb['limit_web_aliasdomain_txt'] = 'Max. number of web aliasdomains';
-$wb['limit_web_subdomain_txt'] = 'Max. number of web subdomains';
-$wb['limit_ftp_user_txt'] = 'Max. number of FTP users';
-$wb['default_dnsserver_txt'] = 'Default DNS Server';
-$wb['limit_dns_zone_txt'] = 'Max. number of DNS zones';
-$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
-$wb['limit_dns_record_txt'] = 'Max. number DNS records';
-$wb['limit_shell_user_txt'] = 'Max. number of Shell users';
-$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
-$wb['limit_client_txt'] = 'Max. number of Clients';
-$wb['username_error_empty'] = 'Username is empty.';
-$wb['username_error_unique'] = 'The username must be unique.';
-$wb['limit_maildomain_error_notint'] = 'The email domain limit must be a number.';
-$wb['limit_mailbox_error_notint'] = 'The mailbox limit must be a number.';
-$wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
-$wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must be a number.';
-$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
-$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
-$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
-$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
-$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
-$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
-$wb['limit_spamfilter_wblist_error_notint'] = 'The spamfilter white / blacklist limit must be a number.';
-$wb['limit_spamfilter_user_error_notint'] = 'The spamfilter user limit must be a number.';
-$wb['limit_spamfilter_policy_error_notint'] = 'The spamfilter policy limit must be a number.';
-$wb['limit_web_domain_error_notint'] = 'The website limit must be a number.';
-$wb['limit_web_aliasdomain_error_notint'] = 'The website alias domain limit must be a number.';
-$wb['limit_web_subdomain_error_notint'] = 'The website subdomain limit must be a number.';
-$wb['limit_ftp_user_error_notint'] = 'The ftp user limit must be a number.';
-$wb['limit_shell_user_error_notint'] = 'The shell user limit must be a number.';
-$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['limit_dns_zone_error_notint'] = 'The dns record limit must be a number.';
-$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.';
-$wb['default_dbserver_txt'] = 'Default Database Server';
-$wb['limit_database_error_notint'] = 'The database limit must be a number.';
-$wb['limit_cron_error_notint'] = 'The cron limit must be a number.';
-$wb['limit_cron_error_frequency'] = 'The cron frequency limit must be a number.';
-$wb['username_error_regex'] = 'The Username contains invalid chracaters.';
-$wb['template_master_txt'] = 'Master template';
-$wb['template_additional_txt'] = 'Addon template';
-$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
-$wb['web_php_options_txt'] = 'PHP Options';
-$wb['limit_client_error'] = 'The max. number of clients is reached.';
-$wb['limit_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['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['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_mailaliasdomain_error_notint'] = 'Maks. broj email alias domena 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_shell_user_error_notint'] = 'Maks. broj Shell računa mora biti znamenka.';
+$wb['limit_webdav_user_error_notint'] = 'Maks. broj Webdav 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['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_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'] = 'Mušterija 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['company_id_txt'] = 'ID poduzeća';
+$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_client_del.lng b/interface/web/client/lib/lang/hr_client_del.lng
index a826d64..240f0c8 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 @@
<?php
-$wb['confirm_action_txt'] = 'Confirm action';
-$wb['delete_explanation'] = 'This action will delete the following number of records associated with this client';
-$wb['btn_save_txt'] = 'Delete the client';
-$wb['btn_cancel_txt'] = 'Cancel without deleting the client';
+$wb['confirm_action_txt'] = 'Potvrdi brisanje';
+$wb['delete_explanation'] = 'Ukoliko potvrdite izbrisati će se svi zapisi povezani sa ovim klijentom';
+$wb['btn_save_txt'] = 'Obriši klijenta';
+$wb['btn_cancel_txt'] = 'Prekini i ne briši klijenta';
?>
diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng
index 3aceddb..535a191 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 @@
<?php
-$wb['limit_client_error_notint'] = 'Client Limit is not a number.';
-$wb['limit_maildomain_txt'] = 'Max. number of email domains';
-$wb['limit_mailbox_txt'] = 'Max. number of mailboxes';
-$wb['limit_mailalias_txt'] = 'Max. number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
-$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
-$wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
-$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
-$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
-$wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
-$wb['limit_mailquota_txt'] = 'Mailbox quota';
-$wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
-$wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
-$wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policys';
-$wb['limit_domain_txt'] = 'limit_domain';
-$wb['limit_subdomain_txt'] = 'limit_subdomain';
-$wb['limit_webquota_txt'] = 'limit_webquota';
-$wb['limit_database_txt'] = 'Max. number of Databases';
-$wb['limit_cron_txt'] = 'Max. number of cron jobs';
-$wb['limit_cron_type_txt'] = 'Max. type of cron jobs (chrooted and full implies url)';
-$wb['limit_cron_frequency_txt'] = 'Min. delay between executions';
-$wb['limit_web_domain_txt'] = 'Max. number of web domains';
-$wb['limit_web_aliasdomain_txt'] = 'Max. number of web aliasdomains';
-$wb['limit_web_subdomain_txt'] = 'Max. number of web subdomains';
-$wb['limit_ftp_user_txt'] = 'Max. number of FTP users';
-$wb['limit_dns_zone_txt'] = 'Max. number of DNS zones';
-$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
-$wb['limit_dns_record_txt'] = 'Max. number DNS records';
-$wb['limit_shell_user_txt'] = 'Max. number of Shell users';
-$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
-$wb['limit_client_txt'] = 'Max. number of Clients';
-$wb['limit_maildomain_error_notint'] = 'The email domain limit must be a number.';
-$wb['limit_mailbox_error_notint'] = 'The mailbox limit must be a number.';
-$wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
-$wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must be a number.';
-$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
-$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
-$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
-$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
-$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
-$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
-$wb['limit_spamfilter_wblist_error_notint'] = 'The spamfilter white / blacklist limit must be a number.';
-$wb['limit_spamfilter_user_error_notint'] = 'The spamfilter user limit must be a number.';
-$wb['limit_spamfilter_policy_error_notint'] = 'The spamfilter policy limit must be a number.';
-$wb['limit_web_domain_error_notint'] = 'The website limit must be a number.';
-$wb['limit_web_aliasdomain_error_notint'] = 'The website alias domain limit must be a number.';
-$wb['limit_web_subdomain_error_notint'] = 'The website subdomain limit must be a number.';
-$wb['limit_ftp_user_error_notint'] = 'The ftp user limit must be a number.';
-$wb['limit_shell_user_error_notint'] = 'The shell user limit must be a number.';
-$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['limit_dns_zone_error_notint'] = 'The dns zone limit must be a number.';
-$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.';
-$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
-$wb['limit_database_error_notint'] = 'The database limit must be a number.';
-$wb['limit_cron_error_notint'] = 'The cron limit must be a number.';
-$wb['limit_cron_error_frequency'] = 'The cron frequency limit must be a number.';
-$wb['error_template_name_empty'] = 'Please enter a Template name';
-$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['template_del_aborted_txt'] = 'Delete aborted. There is still a client which has this template selected.';
-$wb['template_type_txt'] = 'Template type';
-$wb['template_name_txt'] = 'Template name';
-$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['ssh_chroot_txt'] = 'SSH-Chroot Options';
-$wb['web_php_options_txt'] = 'PHP Options';
+$wb['limit_client_error_notint'] = 'Limit broja klijenata mora biti znamenka.';
+$wb['limit_maildomain_txt'] = 'Maks. broj email domena';
+$wb['limit_mailbox_txt'] = 'Maks. broj mailboxa';
+$wb['limit_mailalias_txt'] = 'Maks. broj email aliasa';
+$wb['limit_mailaliasdomain_txt'] = 'Maks. broj aliasa email domena';
+$wb['limit_mailforward_txt'] = 'Maks. broj email forwardera';
+$wb['limit_mailcatchall_txt'] = 'Maks. broj email catchall računa';
+$wb['limit_mailrouting_txt'] = 'Maks. broj email ruta';
+$wb['limit_mailfilter_txt'] = 'Maks. broj email filtera';
+$wb['limit_fetchmail_txt'] = 'Maks. broj fetchmail računa';
+$wb['limit_mailquota_txt'] = 'Veličina mailboxa';
+$wb['limit_spamfilter_wblist_txt'] = 'Maks. broj spamfilter white / blacklist filtera';
+$wb['limit_spamfilter_user_txt'] = 'Maks. broj spamfilter korisnika';
+$wb['limit_spamfilter_policy_txt'] = 'Maks. broj spamfilter pravila';
+$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['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['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['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_mailaliasdomain_error_notint'] = 'Maks. broj email alias domena 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_shell_user_error_notint'] = 'Maks. broj Shell računa mora biti znamenka.';
+$wb['limit_webdav_user_error_notint'] = 'Maks. broj Webdav 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['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['error_template_name_empty'] = 'Unesite ime predloška.';
+$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['template_del_aborted_txt'] = 'Brisanje nije izvršeno. Postoje klijenti koji još koriste ovaj predložak..';
+$wb['template_type_txt'] = 'Vrsta predložka';
+$wb['template_name_txt'] = 'Naziv predloška';
+$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['ssh_chroot_txt'] = 'SSH-Chroot opcije';
+$wb['web_php_options_txt'] = 'PHP opcije';
?>
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 b93a5f9..fa00990 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 @@
<?php
-$wb['list_head_txt'] = 'Client-Templates';
-$wb['template_type_txt'] = 'Type';
-$wb['template_name_txt'] = 'Template name';
+$wb['list_head_txt'] = 'Predlošci za klijente';
+$wb['template_type_txt'] = 'Vrsta';
+$wb['template_name_txt'] = 'Ime predloška';
?>
diff --git a/interface/web/client/lib/lang/hr_clients_list.lng b/interface/web/client/lib/lang/hr_clients_list.lng
index a1c0f87..6039798 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 @@
<?php
-$wb['list_head_txt'] = 'Clients';
+$wb['list_head_txt'] = 'Klijenti';
$wb['client_id_txt'] = 'ID';
-$wb['company_name_txt'] = 'Company name';
-$wb['contact_name_txt'] = 'Contact name';
-$wb['city_txt'] = 'City';
-$wb['country_txt'] = 'Country';
-$wb['add_new_record_txt'] = 'Add new client';
-$wb['username_txt'] = 'Username';
+$wb['company_name_txt'] = 'Poduzeće';
+$wb['contact_name_txt'] = 'Kontakt osoba';
+$wb['city_txt'] = 'Grad';
+$wb['country_txt'] = 'Država';
+$wb['add_new_record_txt'] = 'Dodaj klijenta';
+$wb['username_txt'] = 'Korisničko ime';
?>
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index 59f21f7..37c350b 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -1,107 +1,109 @@
<?php
-$wb['limit_maildomain_txt'] = 'Max. number of email domains';
-$wb['limit_mailbox_txt'] = 'Max. number of mailboxes';
-$wb['limit_mailalias_txt'] = 'Max. number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
-$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
-$wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
-$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
-$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
-$wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
-$wb['limit_mailquota_txt'] = 'Mailbox quota';
-$wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
-$wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
-$wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
-$wb['default_mailserver_txt'] = 'Default Mailserver';
-$wb['company_name_txt'] = 'Company name';
-$wb['contact_name_txt'] = 'Contact name';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['language_txt'] = 'Language';
-$wb['usertheme_txt'] = 'Theme';
-$wb['street_txt'] = 'Street';
-$wb['zip_txt'] = 'ZIP';
-$wb['city_txt'] = 'City';
-$wb['state_txt'] = 'State';
-$wb['country_txt'] = 'Country';
-$wb['telephone_txt'] = 'Telephone';
-$wb['mobile_txt'] = 'Mobile';
+$wb['limit_maildomain_txt'] = 'Maks. broj email domena';
+$wb['limit_mailbox_txt'] = 'Maks. broj mailboxa';
+$wb['limit_mailalias_txt'] = 'Maks. broj email aliasa';
+$wb['limit_mailaliasdomain_txt'] = 'Maks. broj aliasa email domena';
+$wb['limit_mailforward_txt'] = 'Maks. broj email forwardera';
+$wb['limit_mailcatchall_txt'] = 'Maks. broj email catchall računa';
+$wb['limit_mailrouting_txt'] = 'Maks. broj email ruta';
+$wb['limit_mailfilter_txt'] = 'Maks. broj email filtera';
+$wb['limit_fetchmail_txt'] = 'Maks. broj fetchmail računa';
+$wb['limit_mailquota_txt'] = 'Veličina mailboxa';
+$wb['limit_spamfilter_wblist_txt'] = 'Maks. broj spamfilter white / blacklist filtera';
+$wb['limit_spamfilter_user_txt'] = 'Maks. broj spamfilter korisnika';
+$wb['limit_spamfilter_policy_txt'] = 'Maks. broj spamfilter pravila';
+$wb['default_mailserver_txt'] = 'Izaberi email server';
+$wb['company_name_txt'] = 'Poduzeće';
+$wb['contact_name_txt'] = 'Kontakt osoba';
+$wb['username_txt'] = 'Korisničko ime';
+$wb['password_txt'] = 'Šifra';
+$wb['password_strength_txt'] = 'Jačina šifre';
+$wb['language_txt'] = 'Jezik';
+$wb['usertheme_txt'] = 'Tema';
+$wb['street_txt'] = 'Ulica';
+$wb['zip_txt'] = 'Poštanski broj';
+$wb['city_txt'] = 'Grad';
+$wb['state_txt'] = 'Županija';
+$wb['country_txt'] = 'Država';
+$wb['telephone_txt'] = 'Telefon';
+$wb['mobile_txt'] = 'Mobitel';
$wb['fax_txt'] = 'Fax';
$wb['email_txt'] = 'Email';
-$wb['internet_txt'] = 'Internet';
+$wb['internet_txt'] = 'Internet stranica';
$wb['icq_txt'] = 'ICQ';
-$wb['notes_txt'] = 'Notes';
-$wb['company_txt'] = 'Company';
-$wb['title_txt'] = 'Title';
-$wb['firstname_txt'] = 'Firstname';
-$wb['surname_txt'] = 'Surname';
-$wb['limit_domain_txt'] = 'limit_domain';
-$wb['limit_subdomain_txt'] = 'limit_subdomain';
-$wb['limit_webquota_txt'] = 'limit_webquota';
-$wb['limit_database_txt'] = 'Max. number of Databases';
-$wb['limit_cron_txt'] = 'Max. number of cron jobs';
-$wb['limit_cron_type_txt'] = 'Max. type of cron jobs (chrooted and full implies url)';
-$wb['limit_cron_frequency_txt'] = 'Min. delay between executions';
-$wb['ip_address_txt'] = 'ip_address';
-$wb['limit_client_error_notint'] = 'The sub client limit must be a number.';
-$wb['firstname_error_empty'] = 'Firstname is empty.';
-$wb['contact_error_empty'] = 'Contact name is empty.';
-$wb['default_webserver_txt'] = 'Default Webserver';
-$wb['limit_web_domain_txt'] = 'Max. number of web domains';
-$wb['limit_web_aliasdomain_txt'] = 'Max. number of web aliasdomains';
-$wb['limit_web_subdomain_txt'] = 'Max. number of web subdomains';
-$wb['limit_ftp_user_txt'] = 'Max. number of FTP users';
-$wb['default_dnsserver_txt'] = 'Default DNS Server';
-$wb['limit_dns_zone_txt'] = 'Max. number of DNS zones';
-$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
-$wb['limit_dns_record_txt'] = 'Max. number DNS records';
-$wb['limit_shell_user_txt'] = 'Max. number of Shell users';
-$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
-$wb['limit_client_txt'] = 'Max. number of Clients';
-$wb['username_error_empty'] = 'Username is empty.';
-$wb['username_error_unique'] = 'The username must be unique.';
-$wb['limit_maildomain_error_notint'] = 'The email domain limit must be a number.';
-$wb['limit_mailbox_error_notint'] = 'The mailbox limit must be a number.';
-$wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
-$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
-$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
-$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
-$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
-$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
-$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
-$wb['limit_spamfilter_wblist_error_notint'] = 'The spamfilter white / blacklist limit must be a number.';
-$wb['limit_spamfilter_user_error_notint'] = 'The spamfilter user limit must be a number.';
-$wb['limit_spamfilter_policy_error_notint'] = 'The spamfilter policy limit must be a number.';
-$wb['limit_web_domain_error_notint'] = 'The website limit must be a number.';
-$wb['limit_web_aliasdomain_error_notint'] = 'The website alias domain limit must be a number.';
-$wb['limit_web_subdomain_error_notint'] = 'The website subdomain limit must be a number.';
-$wb['limit_ftp_user_error_notint'] = 'The ftp user limit must be a number.';
-$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['limit_shell_user_error_notint'] = 'The shell user limit must be a number.';
-$wb['limit_dns_zone_error_notint'] = 'The dns zone limit must be a number.';
-$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.';
-$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
-$wb['default_dbserver_txt'] = 'Default Database Server';
-$wb['limit_database_error_notint'] = 'The database limit must be a number.';
-$wb['limit_cron_error_notint'] = 'The cron limit must be a number.';
-$wb['limit_cron_error_frequency'] = 'The cron frequency limit must be a number.';
-$wb['username_error_regex'] = 'The Username contains invalid chracaters.';
-$wb['template_master_txt'] = 'Master template';
-$wb['template_additional_txt'] = 'Addon template';
-$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
-$wb['web_php_options_txt'] = 'PHP Options';
-$wb['limit_client_error'] = 'The max. number of clients is reached.';
-$wb['limit_client_error_positive'] = 'The number of clients must be > 0';
-$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 34d0896..ebdf7dd 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 @@
<?php
-$wb['list_head_txt'] = 'Resellers';
+$wb['list_head_txt'] = 'Preprodavač';
$wb['client_id_txt'] = 'ID';
-$wb['company_name_txt'] = 'Company name';
-$wb['contact_name_txt'] = 'Contact name';
-$wb['city_txt'] = 'City';
-$wb['country_txt'] = 'Country';
-$wb['add_new_record_txt'] = 'Add new reseller';
+$wb['company_name_txt'] = 'Poduzeće';
+$wb['contact_name_txt'] = 'Kontakt osoba';
+$wb['city_txt'] = 'Grad';
+$wb['country_txt'] = 'Država';
+$wb['add_new_record_txt'] = 'Dodaj novog preprodavača';
?>
diff --git a/interface/web/client/lib/lang/hu.lng b/interface/web/client/lib/lang/hu.lng
index 2673a46..ee5a41d 100644
--- a/interface/web/client/lib/lang/hu.lng
+++ b/interface/web/client/lib/lang/hu.lng
@@ -10,4 +10,6 @@
$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 2b4d837..6bc3a8b 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -104,4 +104,6 @@
$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 37984d7..b1d8e01 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_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 0536b06..09bf4fb 100644
--- a/interface/web/client/lib/lang/id.lng
+++ b/interface/web/client/lib/lang/id.lng
@@ -10,4 +10,6 @@
$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 fdef291..5465034 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -104,4 +104,6 @@
$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 7b20607..4ce8649 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_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 4d6a7a3..44d29f7 100644
--- a/interface/web/client/lib/lang/it.lng
+++ b/interface/web/client/lib/lang/it.lng
@@ -10,4 +10,6 @@
$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 6120bef..a0f5bba 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -104,4 +104,6 @@
$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 cc83780..ea62daf 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_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 a6edbc1..66ed95e 100644
--- a/interface/web/client/lib/lang/ja.lng
+++ b/interface/web/client/lib/lang/ja.lng
@@ -10,4 +10,6 @@
$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 de1a63f..edf1a4f 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -104,4 +104,6 @@
$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 7178fd6..b3b08a6 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_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 9ec9454..abfdc91 100644
--- a/interface/web/client/lib/lang/nl.lng
+++ b/interface/web/client/lib/lang/nl.lng
@@ -10,4 +10,6 @@
$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 3746c68..35234e5 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -104,4 +104,6 @@
$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 340a0e6..59913a1 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_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 f99fead..f0200d3 100644
--- a/interface/web/client/lib/lang/pl.lng
+++ b/interface/web/client/lib/lang/pl.lng
@@ -10,5 +10,6 @@
$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 d9c2d80..b822079 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -104,5 +104,6 @@
$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 aab69a4..666e12a 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['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 f49db5b..f5f966c 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['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 7620441..06a3976 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['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 7b5cf1d..a9fad58 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['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 2f45396..e0631f2 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_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 256f3b9..fecbc20 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['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 564bd60..8ec6dd1 100644
--- a/interface/web/client/lib/lang/pt.lng
+++ b/interface/web/client/lib/lang/pt.lng
@@ -10,4 +10,6 @@
$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 4452a68..bdc3f7e 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -104,4 +104,6 @@
$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 164cf87..83c9fa9 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_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 38bbbb5..9d70b06 100644
--- a/interface/web/client/lib/lang/ro.lng
+++ b/interface/web/client/lib/lang/ro.lng
@@ -10,4 +10,6 @@
$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 5509411..1380813 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -104,4 +104,6 @@
$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 cc83780..ea62daf 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_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 bc900f9..ec39c06 100644
--- a/interface/web/client/lib/lang/ru.lng
+++ b/interface/web/client/lib/lang/ru.lng
@@ -10,4 +10,6 @@
$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 ef42008..ab7c448 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -104,4 +104,6 @@
$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 7ef6c8d..3c36e5b 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_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 38bbbb5..9d70b06 100644
--- a/interface/web/client/lib/lang/se.lng
+++ b/interface/web/client/lib/lang/se.lng
@@ -10,4 +10,6 @@
$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 3ba3ecf..bcefadd 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -104,4 +104,6 @@
$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 cc83780..ea62daf 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_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 5dc2b70..a6f182e 100644
--- a/interface/web/client/lib/lang/sk.lng
+++ b/interface/web/client/lib/lang/sk.lng
@@ -10,4 +10,6 @@
$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 165d118..72cd853 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -104,4 +104,6 @@
$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 f41b585..2008e6c 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_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 5a0a4a8..9caa4cb 100644
--- a/interface/web/client/lib/lang/tr.lng
+++ b/interface/web/client/lib/lang/tr.lng
@@ -10,4 +10,6 @@
$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 d6da752..117eb4f 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -104,4 +104,6 @@
$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 9170b5e..ba24fda 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_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 9ab6369..8a1a1b9 100644
--- a/interface/web/client/reseller_edit.php
+++ b/interface/web/client/reseller_edit.php
@@ -165,6 +165,19 @@
//* 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 74b28ef..472fb87 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -7,8 +7,8 @@
<div class="pnl_toolsarea">
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
- <button class="positive iconstxt icoAdd" type="button" value="Add additional template" onClick="addAdditionalTemplate();"><span>Add additional template</span></button>
- <button class="negative iconstxt icoDelete" type="button" value="Delete additional template" onClick="delAdditionalTemplate();"><span>Delete additional template</span></button>
+ <button class="positive iconstxt icoAdd" type="button" value="{tmpl_var name='add_additional_template_txt'}" onClick="addAdditionalTemplate();"><span>Add additional template</span></button>
+ <button class="negative iconstxt icoDelete" type="button" value="{tmpl_var name='delete_additional_template_txt'}" onClick="delAdditionalTemplate();"><span>Delete additional template</span></button>
</div>
</fieldset>
</div>
diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php
index 88d459f..c077881 100644
--- a/interface/web/dashboard/dashboard.php
+++ b/interface/web/dashboard/dashboard.php
@@ -100,14 +100,14 @@
$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!<br>' .
'This Version: ' . $v1 . '<br>' .
diff --git a/interface/web/dashboard/dashlets/modules.php b/interface/web/dashboard/dashlets/modules.php
index cfb2e12..2f16329 100644
--- a/interface/web/dashboard/dashlets/modules.php
+++ b/interface/web/dashboard/dashlets/modules.php
@@ -29,7 +29,11 @@
/* 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 247f3c1..8796023 100644
--- a/interface/web/dashboard/lib/custom_menu.inc.php
+++ b/interface/web/dashboard/lib/custom_menu.inc.php
@@ -51,6 +51,8 @@
$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 39bf4b8..562b361 100644
--- a/interface/web/dashboard/lib/lang/el.lng
+++ b/interface/web/dashboard/lib/lang/el.lng
@@ -3,3 +3,4 @@
$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 351e982..a3553dd 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_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 17d42ed..64678ba 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 07dc5b7..a33b5e4 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 afcf28b..60e3ef2 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['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 910a04f..4d6a5d8 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 @@
<?php
$wb['available_modules_txt'] = 'Modules disponibles';
?>
-
-
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
index 65e0d44..cc5b322 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_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_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_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 9a8b669..5ef320a 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 b0c28ec..d69a551 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_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 e329a25..fafcc61 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
@@ -1,4 +1,3 @@
<?php
$wb['available_modules_txt'] = 'Dostępne moduły';
?>
-
diff --git a/interface/web/designer/lib/lang/el.lng b/interface/web/designer/lib/lang/el.lng
index 29f4a51..dd815ad 100644
--- a/interface/web/designer/lib/lang/el.lng
+++ b/interface/web/designer/lib/lang/el.lng
@@ -1,3 +1,4 @@
<?php
?>
+
diff --git a/interface/web/designer/lib/lang/el_form_edit.lng b/interface/web/designer/lib/lang/el_form_edit.lng
index 1e65387..e4ae9c3 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_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 f428b69..68a5f47 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['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 1cedf26..fff12a7 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['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 a253cbc..7abbb08 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['description_txt'] = '<b>Περιγραφή</b> <br><br> <b>Όνομα αρθρώματος:</b> Όνομα του φακέλου του αρθρώματος. Επιτρέπονται μόνο αριθμοί, χαρακτήρες και η κάτω παύλα.<br> <b>Τίτλος Αρθώματος:</b> Θα εμφανιστεί στο βασικό μενού (επάνω).<br> <b>Αρχείο προτύπου:</b> Το αρχείο προτύπου του αρθρώματος. Προς το παρών διαθέσιμα: module.tpl.htm και module_tree.tpl.htm. Το προεπιλεγμένο είναι το module.tpl.htm.<br> <b>NaviFrame:</b> Αν το module_tree.tpl.htm επιλέχθηκε ώα αρχείο προτύπου, εισάγετε εδώ την διαδρομή για το script που αφορά το αριστερό frame.<br> <b>Προεπιλεγμένη Σελίδα:</b> Αυτή σελίδα θα εμφανίζεται όταν ανοίξει το άρθρωμα.<br> <b>Πλάτος Καρτέλας:</b>Το πλάτος της καρτέλας στο βασικό μενού. Το πεδίο είναι άδειο εξ ορισμού. Μπορείτε να εισάγετε απόλυτες τιμές σε pixel (π.χ. 20) ή σχετικές (π.χ. 20%).<br> <b>Βοήθεια:</b> Όλες οι διαδρομές είναι σχετικές ως προς τον φάκελο ';
?>
+
diff --git a/interface/web/designer/lib/lang/el_module_list.lng b/interface/web/designer/lib/lang/el_module_list.lng
index c5c484d..fb598b1 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['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 b41f138..972c487 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['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 af3c434..673d954 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['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 be99c92..450281b 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['item_del_txt'] = 'Θέλετε να διαγράψετε το στοιχείο;';
?>
+
diff --git a/interface/web/designer/lib/lang/fr.lng b/interface/web/designer/lib/lang/fr.lng
index dd815ad..acb6c35 100644
--- a/interface/web/designer/lib/lang/fr.lng
+++ b/interface/web/designer/lib/lang/fr.lng
@@ -1,4 +1,2 @@
<?php
?>
-
-
diff --git a/interface/web/designer/lib/lang/fr_form_edit.lng b/interface/web/designer/lib/lang/fr_form_edit.lng
index 0a4ca94..eb3f5a3 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_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 bec1e46..a61e61a 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['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 7e0f219..3cb420f 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['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 3029358..282c73c 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['header_txt'] = 'Propriétés du module';
$wb['description_txt'] = ' <b>Description</b><br /><br /><b>Nom du Module:</b> Nom du répertoire du module. Seuls les nombres, lettres et underscores sont autorisés.<br/><b>Titre du module:</b> Sera affiché dans le menu de navigation (supérieur).<br/><b>Fichier gabarit:</b> Fichier';
?>
-
-
diff --git a/interface/web/designer/lib/lang/fr_module_list.lng b/interface/web/designer/lib/lang/fr_module_list.lng
index 57b4a3d..927c65e 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['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 b22b3c0..53c5e41 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['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 64d9131..21852e2 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['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 bf1a74b..c9c8570 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['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 29f4a51..acb6c35 100644
--- a/interface/web/designer/lib/lang/pl.lng
+++ b/interface/web/designer/lib/lang/pl.lng
@@ -1,3 +1,2 @@
<?php
?>
-
diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng
index cff6b51..ee4f4c4 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_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 a0aacc3..ac85722 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['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 fbb82a4..db62af1 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['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 d05cb9f..b87d04b 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 @@
<b>Podpowiedź:</b> Wszystkie ścieżki są względne według strony www..
';
?>
-
diff --git a/interface/web/designer/lib/lang/pl_module_list.lng b/interface/web/designer/lib/lang/pl_module_list.lng
index 2751633..308d1c6 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['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 54095f9..fe8edab 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['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 1e2fde4..779b3b4 100644
--- a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
@@ -6,4 +6,3 @@
$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 6daf82e..9b98c49 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['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 c08339f..8b25f73 100644
--- a/interface/web/dns/lib/lang/ar.lng
+++ b/interface/web/dns/lib/lang/ar.lng
@@ -20,4 +20,6 @@
$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 c08339f..8b25f73 100644
--- a/interface/web/dns/lib/lang/bg.lng
+++ b/interface/web/dns/lib/lang/bg.lng
@@ -20,4 +20,6 @@
$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 b7a7a7c..fd2eb37 100644
--- a/interface/web/dns/lib/lang/br.lng
+++ b/interface/web/dns/lib/lang/br.lng
@@ -20,4 +20,6 @@
$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 432c8fe..6a93827 100644
--- a/interface/web/dns/lib/lang/cz.lng
+++ b/interface/web/dns/lib/lang/cz.lng
@@ -20,4 +20,6 @@
$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 7242257..8200e56 100644
--- a/interface/web/dns/lib/lang/de.lng
+++ b/interface/web/dns/lib/lang/de.lng
@@ -20,4 +20,6 @@
$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 4514422..9f513f2 100644
--- a/interface/web/dns/lib/lang/el.lng
+++ b/interface/web/dns/lib/lang/el.lng
@@ -22,3 +22,4 @@
$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 7772b5f..6ccc368 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_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 05ed360..06cd76a 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['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 76a4687..a29de3d 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_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 46bcfe2..ff6f54a 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_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 4a8cc63..b972d7d 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_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 8c86953..af2c1bb 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_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 85718b7..761b5cc 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_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 06ad7cf..b47c01f 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_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 ceb8b13..8d3544b 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_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 b63597c..7d8e522 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_regex'] = 'Η μορφοποίηση του υπεύθυνου δεν είναι έγκυρη';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_slave.lng b/interface/web/dns/lib/lang/el_dns_slave.lng
index ae3f5d0..749ef59 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['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 aa50cae..1aa01b2 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['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 a05a49e..59e3f98 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['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'] = 'Άδεια μεταφοράς ζώνης από <br />αυτές τς IP (λίστα χωρισμένη με κόμα)';
$wb['active_txt'] = 'Ενεργή';
@@ -30,3 +30,4 @@
$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 17446da..68a1829 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_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 1dc24f9..3ba3ae6 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['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 2ba9b4d..3930572 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['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 64da2e8..ba73fc8 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['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 c98ceca..e08978e 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_regex'] = 'Κείμενο με μη έγκυρη μορφοποίηση';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng
index 6ed6d91..fa060aa 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_email_regex'] = 'Το Email δεν περιέχει μια έγκυρη διεύθυνση.';
?>
+
diff --git a/interface/web/dns/lib/lang/en.lng b/interface/web/dns/lib/lang/en.lng
index f2311c0..565d92a 100644
--- a/interface/web/dns/lib/lang/en.lng
+++ b/interface/web/dns/lib/lang/en.lng
@@ -21,4 +21,6 @@
$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 f71ae16..80cbbfd 100644
--- a/interface/web/dns/lib/lang/es.lng
+++ b/interface/web/dns/lib/lang/es.lng
@@ -20,4 +20,6 @@
$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 8814a77..1c628f8 100755
--- a/interface/web/dns/lib/lang/fi.lng
+++ b/interface/web/dns/lib/lang/fi.lng
@@ -20,4 +20,6 @@
$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 33710fe..d7e7901 100644
--- a/interface/web/dns/lib/lang/fr.lng
+++ b/interface/web/dns/lib/lang/fr.lng
@@ -1,5 +1,4 @@
<?php
-
$wb['DNS'] = 'DNS';
$wb['Zones'] = 'Zones';
$wb['DNS A'] = 'DNS A';
@@ -21,5 +20,6 @@
$wb['zone_file_successfully_imported_txt'] = 'Le fichier de zone a été importé avec succès !';
$wb['error_no_valid_zone_file_txt'] = 'Ce fichier de zone semble être invalide !';
$wb['zonefile_to_import_txt'] = 'Fichier de zone';
+$wb['Secondary Zones'] = 'Secondary Zones';
+$wb['Import Zone File'] = 'Import Zone File';
?>
-
diff --git a/interface/web/dns/lib/lang/fr_dns_a.lng b/interface/web/dns/lib/lang/fr_dns_a.lng
index e77166d..d3e7a7c 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_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 8aec347..a12c9b5 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_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 0719417..efe3a69 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['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 315a589..58fbe25 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['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 77e94ae..0975103 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_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 1949ace..4845f64 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['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 12b0b37..b625c12 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['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 a5348f7..09dc9cb 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['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 7db0265..f417771 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['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 be78caf..e9493dc 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['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 3c22ded..6256571 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['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 f2fc488..c85acf2 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['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 7defd1c..4b949d9 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_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 ed2ef50..0abb4c0 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['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 bfb63f0..597e992 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_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 dffdae2..1202cfd 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['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 2a1dcdf..7f28cad 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['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 d91e4f6..8264ba9 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['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 79e220e..feefbae 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 @@
<?php
-
$wb['template_id_txt'] = 'Modèle';
$wb['server_id_txt'] = 'Serveur';
$wb['client_txt'] = 'Client';
@@ -28,4 +27,3 @@
$wb['error_ns2_regex'] = 'NS2 contient des caractères invalides.';
$wb['error_email_regex'] = 'L\'email ne contient pas une adresse email valide.';
?>
-
diff --git a/interface/web/dns/lib/lang/hr.lng b/interface/web/dns/lib/lang/hr.lng
index 6b4df51..39d393f 100644
--- a/interface/web/dns/lib/lang/hr.lng
+++ b/interface/web/dns/lib/lang/hr.lng
@@ -15,9 +15,11 @@
$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 045af15..19ff54a 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 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
+$wb['zone_txt'] = 'Zona';
$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'IP-Address';
+$wb['type_txt'] = 'vrsta';
+$wb['data_txt'] = 'IP adresa';
$wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The hostname is empty.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'IP-Address empty';
-$wb['data_error_regex'] = 'IP-Address format invalid';
-$wb['data_error_duplicate'] = 'Duplicate A-Record or CNAME-Record';
+$wb['active_txt'] = 'Aktivno';
+$wb['limit_dns_record_txt'] = 'Unešen je maksimalan broj DNS zapisa za ovaj račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanje zapisa ovoj DNS. zoni.';
+$wb['name_error_empty'] = 'Hostname je prazan.';
+$wb['name_error_regex'] = 'Hostname je pogrešnog formata.';
+$wb['data_error_empty'] = 'Polje IP adresa je prazno';
+$wb['data_error_regex'] = 'Neispravan format polja IP adresa';
+$wb['data_error_duplicate'] = 'Već postoji ovaj A ili CNAME zapis';
?>
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 87c9cd8..808e4a8 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 @@
<?php
-$wb['list_head_txt'] = 'A-Record';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'A zapis';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Name';
-$wb['data_txt'] = 'Data';
-$wb['aux_txt'] = 'Priority';
-$wb['type_txt'] = 'Type';
-$wb['add_new_record_txt'] = 'Add new DNS A-Record';
-$wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
-$wb['delete_confirmation'] = 'Do you really want to delete this record?';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Ime';
+$wb['data_txt'] = 'Podaci';
+$wb['aux_txt'] = 'Prioritet';
+$wb['type_txt'] = 'Vrsta';
+$wb['add_new_record_txt'] = 'Dodaj novi A zapis';
+$wb['page_txt'] = 'Stranica';
+$wb['page_of_txt'] = 'od';
+$wb['delete_confirmation'] = 'Sigurno želite obrisati obaj zapis?';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_aaaa.lng b/interface/web/dns/lib/lang/hr_dns_aaaa.lng
index 31ef0da..705c723 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 827e5a8..5842cd1 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 184f776..9474a15 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 648827f..97e801a 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 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
+$wb['zone_txt'] = 'Zona';
$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Mailserver hostname';
-$wb['aux_txt'] = 'Priority';
+$wb['type_txt'] = 'vrsta';
+$wb['data_txt'] = 'Naziv mail hostname-a';
+$wb['aux_txt'] = 'Prioritet';
$wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The hostname is empty.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'Mailserver hostname empty';
-$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['active_txt'] = 'Aktivno';
+$wb['limit_dns_record_txt'] = 'Iskoristili ste maksimalan broj DNS zapisa.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanje zapisa u ovu DNS zonu.';
+$wb['name_error_empty'] = 'Ime hosta je prazno.';
+$wb['name_error_regex'] = 'Hostname je u krivom formatu.';
+$wb['data_error_empty'] = 'Mail hostname polje je prazno';
+$wb['data_error_regex'] = 'Pogrešan format mail hostname-a';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_ns.lng b/interface/web/dns/lib/lang/hr_dns_ns.lng
index 713ec28..6a7ad8a 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 c026384..08d6b34 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 51d4ab2..b77fda5 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 <br />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 4ced2dd..3d3b9bc 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 @@
<?php
$wb['list_head_txt'] = 'DNS Secondary Zones';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['origin_txt'] = 'Zone';
$wb['ns_txt'] = 'NS';
diff --git a/interface/web/dns/lib/lang/hr_dns_soa.lng b/interface/web/dns/lib/lang/hr_dns_soa.lng
index 6bfc82a..dad8dc6 100644
--- a/interface/web/dns/lib/lang/hr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/hr_dns_soa.lng
@@ -10,7 +10,7 @@
$wb['minimum_txt'] = 'Minimum';
$wb['ttl_txt'] = 'TTL';
$wb['xfer_txt'] = 'Allow zone transfers to <br />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 d37d319..2007397 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 @@
<?php
$wb['list_head_txt'] = 'DNS Zones';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['origin_txt'] = 'Zone';
$wb['ns_txt'] = 'NS';
diff --git a/interface/web/dns/lib/lang/hr_dns_srv.lng b/interface/web/dns/lib/lang/hr_dns_srv.lng
index 6c1cd1b..2826f01 100644
--- a/interface/web/dns/lib/lang/hr_dns_srv.lng
+++ b/interface/web/dns/lib/lang/hr_dns_srv.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'] = 'Server Record';
$wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['aux_txt'] = 'Priority';
$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.';
diff --git a/interface/web/dns/lib/lang/hr_dns_template.lng b/interface/web/dns/lib/lang/hr_dns_template.lng
index 74263b9..100c5c8 100644
--- a/interface/web/dns/lib/lang/hr_dns_template.lng
+++ b/interface/web/dns/lib/lang/hr_dns_template.lng
@@ -1,6 +1,6 @@
<?php
$wb['name_txt'] = 'Naziv';
$wb['fields_txt'] = 'Polja';
-$wb['template_txt'] = 'Template';
+$wb['template_txt'] = 'Predložak';
$wb['visible_txt'] = 'Vidljivo';
?>
diff --git a/interface/web/dns/lib/lang/hu.lng b/interface/web/dns/lib/lang/hu.lng
index bab1419..5882a28 100644
--- a/interface/web/dns/lib/lang/hu.lng
+++ b/interface/web/dns/lib/lang/hu.lng
@@ -20,4 +20,6 @@
$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 74b5f80..b47b55c 100644
--- a/interface/web/dns/lib/lang/id.lng
+++ b/interface/web/dns/lib/lang/id.lng
@@ -20,4 +20,6 @@
$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 c08339f..8b25f73 100644
--- a/interface/web/dns/lib/lang/it.lng
+++ b/interface/web/dns/lib/lang/it.lng
@@ -20,4 +20,6 @@
$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 549cd2d..06608e6 100644
--- a/interface/web/dns/lib/lang/ja.lng
+++ b/interface/web/dns/lib/lang/ja.lng
@@ -20,4 +20,6 @@
$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 c08339f..8b25f73 100644
--- a/interface/web/dns/lib/lang/nl.lng
+++ b/interface/web/dns/lib/lang/nl.lng
@@ -20,4 +20,6 @@
$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 8ea63ff..2c8e152 100644
--- a/interface/web/dns/lib/lang/pl.lng
+++ b/interface/web/dns/lib/lang/pl.lng
@@ -20,5 +20,6 @@
$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 3aa2d68..f9b0997 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_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 9141abe..41b5dbb 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_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 8c90e3f..f8e44e5 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['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 44c377e..a950805 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['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 5fbe693..c007ea6 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_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 18f3b9f..d408e14 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['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 d244013..4a3936a 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['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 d82dc48..18d7efd 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['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 eeb03d6..eae3981 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['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 587c735..43cbc51 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['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 71a2922..ce7902e 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['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 010d78f..bbdb368 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['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 ea69f2c..8c17246 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_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 0b17c90..d440e05 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['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 a0f13dd..3e93bc2 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['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 fc7a0d6..f3e7563 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['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 a74e0c5..7deac3b 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['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 324bf06..f84620e 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['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 cacbf3a..f900309 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_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 316981a..6619a86 100644
--- a/interface/web/dns/lib/lang/pt.lng
+++ b/interface/web/dns/lib/lang/pt.lng
@@ -20,4 +20,6 @@
$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 f545b07..5707dfc 100644
--- a/interface/web/dns/lib/lang/ro.lng
+++ b/interface/web/dns/lib/lang/ro.lng
@@ -20,4 +20,6 @@
$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 e52b2d6..edc717e 100644
--- a/interface/web/dns/lib/lang/ru.lng
+++ b/interface/web/dns/lib/lang/ru.lng
@@ -20,4 +20,6 @@
$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 c08339f..8b25f73 100644
--- a/interface/web/dns/lib/lang/se.lng
+++ b/interface/web/dns/lib/lang/se.lng
@@ -20,4 +20,6 @@
$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 e6f62f8..70b57d6 100644
--- a/interface/web/dns/lib/lang/sk.lng
+++ b/interface/web/dns/lib/lang/sk.lng
@@ -20,4 +20,6 @@
$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 e519b9a..37fb8b1 100644
--- a/interface/web/dns/lib/lang/tr.lng
+++ b/interface/web/dns/lib/lang/tr.lng
@@ -20,4 +20,6 @@
$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 aab3355..af485ae 100644
--- a/interface/web/domain/lib/lang/el.lng
+++ b/interface/web/domain/lib/lang/el.lng
@@ -8,3 +8,4 @@
$wb['error_client_group_id_empty'] = 'Πρέπει να επιλέξετε πελάτη<br>';
?>
+
diff --git a/interface/web/domain/lib/lang/el_domain.lng b/interface/web/domain/lib/lang/el_domain.lng
index 79bf5a8..62f7637 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'] = 'Domain';
?>
+
diff --git a/interface/web/domain/lib/lang/el_domain_list.lng b/interface/web/domain/lib/lang/el_domain_list.lng
index 7d3a53b..1af9826 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['domain_txt'] = 'Domain';
?>
+
diff --git a/interface/web/domain/lib/lang/fr.lng b/interface/web/domain/lib/lang/fr.lng
index 2ee424c..827483d 100644
--- a/interface/web/domain/lib/lang/fr.lng
+++ b/interface/web/domain/lib/lang/fr.lng
@@ -7,5 +7,3 @@
$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<br />';
?>
-
-
diff --git a/interface/web/domain/lib/lang/fr_domain.lng b/interface/web/domain/lib/lang/fr_domain.lng
index 47b53e1..4465c83 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_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 e1fa112..cc6eb11 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['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 2503e95..3ee1d5d 100644
--- a/interface/web/domain/lib/lang/pl.lng
+++ b/interface/web/domain/lib/lang/pl.lng
@@ -7,4 +7,3 @@
$wb['error_client_can_not_add_domain'] = 'Nie możesz dodać nowej domeny';
$wb['error_client_group_id_empty'] = 'Musisz wybrać klienta<br>';
?>
-
diff --git a/interface/web/domain/lib/lang/pl_domain.lng b/interface/web/domain/lib/lang/pl_domain.lng
index 9854e89..9f3e80f 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_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 1ff9016..a341403 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['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 1a690af..5274baf 100644
--- a/interface/web/help/lib/lang/el.lng
+++ b/interface/web/help/lib/lang/el.lng
@@ -13,3 +13,4 @@
$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 9f84708..fecacec 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_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 a05a0a8..3432e0c 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_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 e8fdc0a..1fb687d 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 b6c7b46..db89761 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 @@
<?php
$wb['edit_txt'] = 'Edit';
?>
+
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 0811629..7e5f71b 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_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 1613a71..a46bf8c 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['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 97381d8..58cc6a2 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['add_new_record_txt'] = 'Νέο μήνυμα υποστήριξης';
?>
+
diff --git a/interface/web/help/lib/lang/fr.lng b/interface/web/help/lib/lang/fr.lng
index 0db28d0..5c09ff8 100644
--- a/interface/web/help/lib/lang/fr.lng
+++ b/interface/web/help/lib/lang/fr.lng
@@ -12,5 +12,3 @@
$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 06cb6e8..c251b42 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_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 bd1b7b3..6a9754b 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_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 96c67b0..ee014e0 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 @@
<?php
$wb['faq_section_name_txt'] = 'Nom de la Section';
?>
-
-
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 db89761..b6c7b46 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 @@
<?php
$wb['edit_txt'] = 'Edit';
?>
-
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 bc7295c..a99ab07 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_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 366eb14..6d64344 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['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 ee8a654..ac63d3f 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['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 3357604..6d9412c 100644
--- a/interface/web/help/lib/lang/pl.lng
+++ b/interface/web/help/lib/lang/pl.lng
@@ -12,4 +12,3 @@
$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 6495e63..a39383e 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_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 c50ff01..4c07503 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_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 21615bd..d4bb7ef 100644
--- a/interface/web/help/lib/lang/pl_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/pl_faq_sections_form.lng
@@ -1,4 +1,3 @@
<?php
$wb['faq_section_name_txt'] = 'Nazwa sekcji';
?>
-
diff --git a/interface/web/help/lib/lang/pl_help_faq_list.lng b/interface/web/help/lib/lang/pl_help_faq_list.lng
index 10a98c5..072e3ed 100644
--- a/interface/web/help/lib/lang/pl_help_faq_list.lng
+++ b/interface/web/help/lib/lang/pl_help_faq_list.lng
@@ -1,4 +1,3 @@
<?php
$wb['edit_txt'] = 'Edycja';
?>
-
diff --git a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng
index 53a56a9..e21792d 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_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 82ef3de..5758dad 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['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 13c678e..bc32856 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['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 849537b..189799b 100644
--- a/interface/web/login/lib/lang/el.lng
+++ b/interface/web/login/lib/lang/el.lng
@@ -16,3 +16,4 @@
$wb['login_button_txt'] = 'Είσοδος';
?>
+
diff --git a/interface/web/login/lib/lang/fr.lng b/interface/web/login/lib/lang/fr.lng
index 43f8fe1..a6d082f 100644
--- a/interface/web/login/lib/lang/fr.lng
+++ b/interface/web/login/lib/lang/fr.lng
@@ -15,5 +15,3 @@
$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 1d02b39..78d3558 100644
--- a/interface/web/login/lib/lang/pl.lng
+++ b/interface/web/login/lib/lang/pl.lng
@@ -15,4 +15,3 @@
$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 5180b8d..1ddf783 100644
--- a/interface/web/mail/lib/lang/el.lng
+++ b/interface/web/mail/lib/lang/el.lng
@@ -10,7 +10,7 @@
$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['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 8b8a3ae..b1b2b59 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['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 b3e1f7e..9579667 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['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 52f26a0..ab3ae6e 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_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 dbbe300..2a65ce3 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['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 75485e4..cc252a5 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['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 3f3a4d2..66c42c2 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['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 c974878..94c3afe 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['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 200058f..7b52950 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['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 9c29f47..da0c0bc 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['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 4a1a84e..5bb1c51 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['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 fdf5e40..5047b0d 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['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 55d0e08..5c427da 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['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 393171c..d3ddcbd 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['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 0245070..bfe431b 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['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 11e5650..0e56a2f 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['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 4cba326..c385429 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_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 658e6b2..45e2f34 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['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 485d7a1..7d74373 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['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 4701821..c39d88f 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['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 769e306..1a33bc3 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['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 1028112..2ce9b2d 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['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 b6cd719..4e53c7c 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['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 4b2f141..e24251b 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['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 34c779d..72d812e 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['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 72ae994..425578e 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['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 dd2e684..cac5297 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['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 39ad5ea..1780f85 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['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 9f2aa40..2c95001 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['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 aa82d04..4fbc7a8 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['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 e51cbd3..92db1c7 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['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 80f7c8f..1e221e5 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['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 f744f35..d80490c 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['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 a237748..9dfc038 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['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 169c21a..bc25acd 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['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 4654dd2..f6d9ebf 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['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 84bd401..4f2bc7a 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_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 f928816..3d34164 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['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 4b89409..162984d 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['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 e5b6d04..be56852 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['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 1176465..3e620cf 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['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 acbe6cc..d9fdabe 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['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 811ebea..abbb516 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['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 dde63a0..3dca89e 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 @@
<?php
-$wb['list_head_txt'] = 'Mailbox quota';
-$wb['quota_txt'] = 'Quota';
-$wb['name_txt'] = 'Name';
-$wb['email_txt'] = 'Email Address';
-$wb['used_txt'] = 'Used space';
+$wb['list_head_txt'] = 'Όριο Mailbox';
+$wb['quota_txt'] = 'Όριο';
+$wb['name_txt'] = 'Όνομα';
+$wb['email_txt'] = 'Διεύθυνση Email';
+$wb['used_txt'] = 'Χώρος σε χρήση';
?>
+
diff --git a/interface/web/mail/lib/lang/fr.lng b/interface/web/mail/lib/lang/fr.lng
index f240545..ad2f79c 100644
--- a/interface/web/mail/lib/lang/fr.lng
+++ b/interface/web/mail/lib/lang/fr.lng
@@ -45,5 +45,3 @@
$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 fd30467..55450d4 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['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 29091c4..406d52a 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['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 4f00dc0..c0493fd 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_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 011c9f0..f377975 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['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 b82fb54..3f5f970 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['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 b367d45..a740f38 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['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 2dfa25b..5aa0caa 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['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 e753903..2011396 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['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 978b01b..55e8c26 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['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 62c71e2..11a957b 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['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 11abb62..41b7e83 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['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 7ec84ea..51f21be 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['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 a250978..dca99fb 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['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 fb5ab01..7f9b277 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['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 7e3827a..e901dde 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['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 144fd47..81aa6e5 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['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 441535e..a93db85 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['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 a16cbd1..ca7b5b3 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['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 ae21364..d04d99a 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['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 cdda912..4851835 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['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 61ba358..27353de 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['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 f9e174c..a312fad 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['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 d16b47a..1be0c0e 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['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 02388c6..e99e2a8 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['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 9ffe29c..60c51c3 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['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 86650bc..b847c90 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['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 a62536c..96bde24 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_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 dfa2367..59652ba 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['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 8e8ce59..9e5b4b9 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['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 edb22f8..0d621c9 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['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 f7fc6a7..244c2b3 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['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 2e5ffb7..de9c43a 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['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 9e245ca..7758b12 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['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 65a6758..081594c 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['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 fab9055..d59ed84 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['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 fd052d6..e23c901 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['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 c4845a9..3a0e77f 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['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 7257dbf..e88d33e 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['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 2ca2fdd..f7047b1 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['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 1cc257c..a4a9649 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['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 fa7fc48..5c0fab1 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['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 9cd26f5..258d73f 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['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 e3a31e3..1563955 100644
--- a/interface/web/mail/lib/lang/hr.lng
+++ b/interface/web/mail/lib/lang/hr.lng
@@ -5,7 +5,7 @@
$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 7f149eb..f78f29d 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 @@
<?php
$wb['email_txt'] = 'Email';
$wb['destination_txt'] = 'Destination';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['email_error_isemail'] = 'Email address is invalid.';
$wb['email_error_unique'] = 'Duplicate Emailaddress.';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
$wb['destination_error_isemail'] = 'Destination Emailaddress is invalid.';
$wb['limit_mailalias_txt'] = 'The max. number of email aliases for your account is reached.';
$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
?>
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 0a44ea4..de017ff 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 @@
<?php
$wb['list_head_txt'] = 'Email Alias';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['source_txt'] = 'source';
$wb['destination_txt'] = 'Destination';
$wb['email_txt'] = 'Email';
diff --git a/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng b/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng
index 5815d1e..ed78dab 100644
--- a/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng
@@ -1,7 +1,7 @@
<?php
$wb['source_txt'] = 'Source';
$wb['destination_txt'] = 'Destination';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
$wb['limit_mailaliasdomain_txt'] = 'The max. number of email alias domains for your account is reached.';
$wb['source_destination_identical_txt'] = 'Source and target Domain are the same.';
diff --git a/interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng
index d96a63e..e7bfeb0 100644
--- a/interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Domain alias';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['source_txt'] = 'Source';
$wb['destination_txt'] = 'Destination';
$wb['add_new_record_txt'] = 'Add new Domain alias';
diff --git a/interface/web/mail/lib/lang/hr_mail_blacklist.lng b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
index 5b2815c..3f0269c 100644
--- a/interface/web/mail/lib/lang/hr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
@@ -2,8 +2,8 @@
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Blacklist Address';
$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_blacklist_list.lng b/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng
index a72052f..0d1231f 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 @@
<?php
$wb['list_head_txt'] = 'Email Blacklist';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Blacklisted address';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Vrsta';
$wb['recipient_txt'] = 'Recipient';
$wb['add_new_record_txt'] = 'Add new Blacklist record';
$wb['access_txt'] = 'access';
diff --git a/interface/web/mail/lib/lang/hr_mail_content_filter.lng b/interface/web/mail/lib/lang/hr_mail_content_filter.lng
index 9d5e5f9..2b02a00 100644
--- a/interface/web/mail/lib/lang/hr_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/hr_mail_content_filter.lng
@@ -4,6 +4,6 @@
$wb['pattern_txt'] = 'Regexp. Pattern';
$wb['data_txt'] = 'Data';
$wb['action_txt'] = 'Action';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['pattern_error_empty'] = 'Pattern is empty.';
?>
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 8c1e5e2..d3c273e 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 @@
<?php
$wb['list_head_txt'] = 'Postfix Header and Body Checks';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['pattern_txt'] = 'Pattern';
$wb['action_txt'] = 'Action';
diff --git a/interface/web/mail/lib/lang/hr_mail_domain.lng b/interface/web/mail/lib/lang/hr_mail_domain.lng
index 6120e82..2a3127f 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain.lng
@@ -1,8 +1,8 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Type';
-$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Vrsta';
+$wb['active_txt'] = 'Aktivno';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'Duplicate Domain.';
$wb['domain_error_regex'] = 'Invalid domain name.';
diff --git a/interface/web/mail/lib/lang/hr_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/hr_mail_domain_admin_list.lng
index aaab4b4..6566459 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain_admin_list.lng
@@ -1,8 +1,8 @@
<?php
$wb['list_head_txt'] = 'Email Domain';
$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
$wb['add_new_record_txt'] = 'Add new Domain';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['sys_groupid_txt'] = 'Client';
?>
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 382e97f..e154524 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 @@
<?php
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
$wb['destination_txt'] = 'Destination';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['domain_error_unique'] = 'There is already a Catchall record for this domain.';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
$wb['domain_error_regex'] = 'Invalid domain name od domain contains invalid characters.';
diff --git a/interface/web/mail/lib/lang/hr_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/hr_mail_domain_catchall_list.lng
index 7d076dd..ae11977 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain_catchall_list.lng
@@ -1,9 +1,9 @@
<?php
$wb['list_head_txt'] = 'Email Catchall';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['source_txt'] = 'source';
$wb['destination_txt'] = 'Destination email address';
$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
$wb['add_new_record_txt'] = 'Add new Catchall';
?>
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 d844781..8b80909 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 @@
<?php
$wb['list_head_txt'] = 'Email Domain';
$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
$wb['add_new_record_txt'] = 'Add new Domain';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_forward.lng b/interface/web/mail/lib/lang/hr_mail_forward.lng
index 9ac60a2..328a685 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 @@
<?php
$wb['email_txt'] = 'Email';
$wb['destination_txt'] = 'Destination Email';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['limit_mailforward_txt'] = 'The max. number of email forwarders for your account is reached.';
$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
?>
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 f452944..3312f63 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 @@
<?php
$wb['list_head_txt'] = 'Mail Forward';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['source_txt'] = 'source';
$wb['destination_txt'] = 'Destination';
$wb['email_txt'] = 'Email';
diff --git a/interface/web/mail/lib/lang/hr_mail_get.lng b/interface/web/mail/lib/lang/hr_mail_get.lng
index 1d51045..dcfb4c3 100644
--- a/interface/web/mail/lib/lang/hr_mail_get.lng
+++ b/interface/web/mail/lib/lang/hr_mail_get.lng
@@ -1,12 +1,12 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Vrsta';
$wb['source_server_txt'] = 'Pop3/Imap Server';
-$wb['source_username_txt'] = 'Username';
-$wb['source_password_txt'] = 'Password';
+$wb['source_username_txt'] = 'Korisničko ime';
+$wb['source_password_txt'] = 'Šifra';
$wb['source_delete_txt'] = 'Delete emails after retrieval';
$wb['destination_txt'] = 'Destination';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['limit_fetchmail_txt'] = 'The max. number of Fetchmail records for your account is reached.';
$wb['source_server_error_isempty'] = 'Server is empty.';
$wb['source_username_error_isempty'] = 'Username is empty.';
diff --git a/interface/web/mail/lib/lang/hr_mail_get_list.lng b/interface/web/mail/lib/lang/hr_mail_get_list.lng
index 4baf67e..624d587 100644
--- a/interface/web/mail/lib/lang/hr_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_get_list.lng
@@ -1,9 +1,9 @@
<?php
$wb['list_head_txt'] = 'Fetch emails from external POP3 / IMAP servers';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['source_server_txt'] = 'External Server';
-$wb['source_username_txt'] = 'Username';
+$wb['source_username_txt'] = 'Korisničko ime';
$wb['destination_txt'] = 'Destination';
$wb['add_new_record_txt'] = 'Add new Account';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_mailinglist.lng b/interface/web/mail/lib/lang/hr_mail_mailinglist.lng
index d9c3059..3209ff1 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['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 dac225a..8eebde9 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 @@
<?php
$wb['list_head_txt'] = 'Mailing List';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
$wb['listname_txt'] = 'Listname';
?>
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 b5c8724..5d28478 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 36045f4..3b4586b 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 @@
<?php
$wb['list_head_txt'] = 'Relay recipients';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Recipient address';
$wb['recipient_txt'] = 'Recipient';
diff --git a/interface/web/mail/lib/lang/hr_mail_spamfilter.lng b/interface/web/mail/lib/lang/hr_mail_spamfilter.lng
index e0a2a2f..90321d0 100644
--- a/interface/web/mail/lib/lang/hr_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/hr_mail_spamfilter.lng
@@ -5,7 +5,7 @@
$wb['spam_delete_score_int_txt'] = 'Delete score';
$wb['spam_rewrite_subject_txt'] = 'Rewrite subject';
$wb['spam_redirect_maildir_txt'] = 'Redirect mailbox';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['spam_rewrite_txt'] = 'Rewrite email subject above this score.';
$wb['spam_redirect_txt'] = 'Redirect email above this score to the selected mailbox.';
$wb['spam_delete_txt'] = 'Delete email above this score.';
diff --git a/interface/web/mail/lib/lang/hr_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/hr_mail_spamfilter_list.lng
index 728f3d3..654bc33 100644
--- a/interface/web/mail/lib/lang/hr_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_spamfilter_list.lng
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Spamfilter';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['server_name_txt'] = 'server_name';
$wb['email_txt'] = 'Email';
diff --git a/interface/web/mail/lib/lang/hr_mail_transport.lng b/interface/web/mail/lib/lang/hr_mail_transport.lng
index a4d7bbc..d0a7b40 100644
--- a/interface/web/mail/lib/lang/hr_mail_transport.lng
+++ b/interface/web/mail/lib/lang/hr_mail_transport.lng
@@ -1,10 +1,10 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
$wb['destination_txt'] = 'Destination';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Vrsta';
$wb['mx_txt'] = 'No MX lookup';
$wb['sort_order_txt'] = 'Sort by';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['limit_mailrouting_txt'] = 'The max. number of routes for your account is reached.';
?>
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 a96c081..d86d9e5 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 @@
<?php
$wb['list_head_txt'] = 'Advanced Email Routing';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
$wb['transport_txt'] = 'Transport';
$wb['sort_order_txt'] = 'Sort by';
$wb['add_new_record_txt'] = 'Add new transport';
diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng
index 9137e61..f34de14 100644
--- a/interface/web/mail/lib/lang/hr_mail_user.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user.lng
@@ -1,13 +1,13 @@
<?php
$wb['custom_mailfilter_txt'] = 'Custom mail filter recipe';
$wb['email_txt'] = 'Email';
-$wb['cryptpwd_txt'] = 'Password';
+$wb['cryptpwd_txt'] = 'Šifra';
$wb['password_strength_txt'] = 'Password strength';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['email_error_isemail'] = 'Email address is invalid.';
$wb['email_error_unique'] = 'Duplicate Email address.';
$wb['autoresponder_text_txt'] = 'Text';
-$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_txt'] = 'Aktivno';
$wb['autoresponder_start_date_txt'] = 'Start on';
$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
@@ -17,7 +17,7 @@
$wb['quota_error_isint'] = 'Mailbox size must be a number.';
$wb['quota_txt'] = 'Quota';
$wb['server_id_txt'] = 'Aerver_id';
-$wb['password_txt'] = 'Password';
+$wb['password_txt'] = 'Šifra';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Enable Receiving';
$wb['access_txt'] = 'Enable Access';
@@ -35,7 +35,7 @@
$wb['autoresponder_active'] = 'Enable the autoresponder';
$wb['cc_txt'] = 'Send copy to';
$wb['cc_error_isemail'] = 'The -Send copy to- field does not conatin a valid email address';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
$wb['now_txt'] = 'Now';
$wb['login_error_unique'] = 'Login is already taken.';
$wb['login_error_regex'] = 'Valid characters are A-Z, a-z, 0-9, ., _ and -.';
diff --git a/interface/web/mail/lib/lang/hr_mail_user_filter.lng b/interface/web/mail/lib/lang/hr_mail_user_filter.lng
index 2e74ffd..a4952c7 100644
--- a/interface/web/mail/lib/lang/hr_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user_filter.lng
@@ -2,7 +2,7 @@
$wb['rulename_txt'] = 'Name';
$wb['action_txt'] = 'Action';
$wb['target_txt'] = 'Folder';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['rulename_error_empty'] = 'Name is empty.';
$wb['searchterm_is_empty'] = 'Search term is empty.';
$wb['source_txt'] = 'Source';
diff --git a/interface/web/mail/lib/lang/hr_mail_whitelist.lng b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
index fc47345..ce50ba9 100644
--- a/interface/web/mail/lib/lang/hr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
@@ -2,8 +2,8 @@
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Whitelist Address';
$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_whitelist_list.lng b/interface/web/mail/lib/lang/hr_mail_whitelist_list.lng
index eaa7eb3..4459061 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 @@
<?php
$wb['list_head_txt'] = 'Email Whitelist';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Whitelisted address';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Vrsta';
$wb['recipient_txt'] = 'Recipient';
$wb['add_new_record_txt'] = 'Add new Whitelist record';
$wb['access_txt'] = 'access';
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng
index 5a85949..394bfc6 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng
@@ -4,6 +4,6 @@
$wb['rid_txt'] = 'User';
$wb['email_txt'] = 'Email';
$wb['priority_txt'] = 'Priority';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['limit_spamfilter_wblist_txt'] = 'The max. number of White- or Blacklist records for your account is reached.';
?>
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 12de2e6..b63b9f5 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 @@
<?php
$wb['list_head_txt'] = 'Spamfilter Blacklist';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['priority_txt'] = 'Priority';
$wb['rid_txt'] = 'User';
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng
index 5a85949..394bfc6 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng
@@ -4,6 +4,6 @@
$wb['rid_txt'] = 'User';
$wb['email_txt'] = 'Email';
$wb['priority_txt'] = 'Priority';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['limit_spamfilter_wblist_txt'] = 'The max. number of White- or Blacklist records for your account is reached.';
?>
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 d209d17..2f39adf 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 @@
<?php
$wb['list_head_txt'] = 'Spamfilter Whitelist';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['priority_txt'] = 'Priority';
$wb['rid_txt'] = 'User';
diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng
index 9ff9d55..36133c0 100644
--- a/interface/web/mail/lib/lang/pl.lng
+++ b/interface/web/mail/lib/lang/pl.lng
@@ -45,4 +45,3 @@
$wb['Domain Alias'] = 'Alias domeny';
$wb['Relay Recipients'] = 'Odbiorcy przekierowania';
?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng
index 16b7099..0a3d047 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['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 f5567ce..b6ce95d 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['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 ebbc0d0..7735a4e 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_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 bdccec7..ba2e3b9 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['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 448658d..528f2f7 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['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 8351885..ebef666 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['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 6ca25bc..54efa4f 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['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 fe5a78f..9fc964c 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['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 0e76cd0..6f9c68c 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['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 de3a665..e214d92 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['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 89f4610..fc27d33 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['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 304bc3d..1f0aad1 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
@@ -7,4 +7,3 @@
$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 e14f2f0..ec51e2c 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['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 60a4aef..44944a3 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['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 3f27975..1044bd5 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['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 c8cf342..535bf7a 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['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 cf5844f..cd473d9 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['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 495b9ba..fe6d3d8 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['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 96cd960..649db47 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['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 ab7926f..594aba1 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['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 84d08ba..310e27c 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['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 2849430..3879f24 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['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 a6959a2..d6097bb 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['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 0e4119c..035a5b0 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['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 837972c..fa5c584 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['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 441f158..dc9343d 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_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 1e1a7fd..99ac6a9 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['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 4d45c5d..ce235b8 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_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 8e47f96..7c13db3 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['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 9e87680..b978068 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
@@ -6,4 +6,3 @@
$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 4aa2f05..203c5ba 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['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 a7239ca..10e6dfc 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['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 6c4c8d7..6da8ddc 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['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 65a9d37..c237a7a 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['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 43fab4d..c750d95 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['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 d31d785..45b3f31 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['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 b7bc37d..8a825b5 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['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 906006e..43d9d41 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['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 8529e45..656c29e 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['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 0951df5..dde2a62 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['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 a6f2e43..be83601 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['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 425a6fe..6517cf4 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['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 bd01792..91dc11a 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['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 814668b..f57a4e8 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -75,7 +75,8 @@
$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 52164d9..0a408c8 100644
--- a/interface/web/mail/mail_user_filter_del.php
+++ b/interface/web/mail/mail_user_filter_del.php
@@ -51,6 +51,8 @@
class page_action extends tform_actions {
+ /*
+ //* Code moved to mailfilter plugin
function onAfterDelete() {
global $app, $conf;
@@ -74,6 +76,7 @@
$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 829a661..5e911b1 100644
--- a/interface/web/monitor/lib/lang/el.lng
+++ b/interface/web/monitor/lib/lang/el.lng
@@ -101,7 +101,7 @@
$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 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 8789a43..a2782df 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['message_txt'] = 'Μήνυμα';
?>
+
diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng
index 0713818..f107669 100644
--- a/interface/web/monitor/lib/lang/fr.lng
+++ b/interface/web/monitor/lib/lang/fr.lng
@@ -1,151 +1,149 @@
<?php
-$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.<br>Aucun des deux n'a été trouvé sur votre serveur.<br><br>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.<br>Aucun des deux n\'a été trouvé sur votre serveur.<br><br>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 41f1e64..e47b9f0 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['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 f4d916f..1b01a35 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['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 5692863..d5e1470 100644
--- a/interface/web/monitor/lib/lang/hr.lng
+++ b/interface/web/monitor/lib/lang/hr.lng
@@ -1,9 +1,9 @@
<?php
-$wb['Server online since'] = 'Server online';
-$wb['Users online'] = 'Korisnika';
-$wb['System load 1 minute'] = 'Opterećenje sistema 1 minuta';
-$wb['System load 5 minutes'] = 'Opterećenje sistema 5 minuta';
-$wb['System load 15 minutes'] = 'Opterećenje sistema 15 minuta';
+$wb['Server online since'] = 'Server radi bez prekida';
+$wb['Users online'] = 'Spojenih korisnika';
+$wb['System load 1 minute'] = 'Opterećenje servera unutar jedne minute';
+$wb['System load 5 minutes'] = 'Opterećenje servera u zadnjih 5 minuta';
+$wb['System load 15 minutes'] = 'Opterećenje servera u zadnjih 15 minuta';
$wb['Server Load'] = 'Opterećenje servera';
$wb['Disk usage'] = 'Potrošnja diska';
$wb['Memory usage'] = 'Potrošnja memorije';
@@ -26,7 +26,7 @@
$wb['Show Overview'] = 'Prikaži stanje';
$wb['System State (All Servers)'] = 'Prikaži stanje (svi serveri)';
$wb['Hardware-Information'] = 'Informacije o hardveru';
-$wb['Show CPU info'] = 'Prikaži procesor';
+$wb['Show CPU info'] = 'Prikaži info o procesoru';
$wb['Server State'] = 'Stanje servera';
$wb['Show Update State'] = 'Prikaži stanje nadogradnje';
$wb['Show RAID state'] = 'Prikaži stanje RAID-a';
@@ -34,10 +34,10 @@
$wb['Show Disk usage'] = 'Prikaži stanje diska';
$wb['Show Memory usage'] = 'Prikaži stanje memorije';
$wb['Show Services'] = 'Prikaži servise';
-$wb['Show Mail-Queue'] = 'Prikaži mail queue';
+$wb['Show Mail-Queue'] = 'Prikaži mail redoslijed';
$wb['Show Mail-Log'] = 'Prikaži mail log';
-$wb['Show Mail warn-Log'] = 'Prikaži mail log (warn)';
-$wb['Show Mail err-Log'] = 'Prikaži mail log (error)';
+$wb['Show Mail warn-Log'] = 'Prikaži mail log (upozorenja)';
+$wb['Show Mail err-Log'] = 'Prikaži mail log (greške)';
$wb['Show System-Log'] = 'Prikaži sistemski log';
$wb['Show ISPC Cron-Log'] = 'Prikaži control panel cron log';
$wb['Show Freshclam-Log'] = 'Prikaži freshclam log';
@@ -65,7 +65,7 @@
$wb['monitor_nosupportedraid1_txt'] = 'Trenutno je podržan samo mdadm ili mpt-status za nadzor RAID-a.<br>Ne možemo pronaći niti jedan na vašem serveru.<br><br>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_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_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 f539640..88497b4 100644
--- a/interface/web/monitor/lib/lang/pl.lng
+++ b/interface/web/monitor/lib/lang/pl.lng
@@ -147,4 +147,3 @@
$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 0b969b1..398ca51 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['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 f5e0645..e37799c 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['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 88fa3c9..20f0b05 100644
--- a/interface/web/monitor/show_sys_state.php
+++ b/interface/web/monitor/show_sys_state.php
@@ -196,7 +196,7 @@
$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 1df863b..e0ab324 100644
--- a/interface/web/sites/database_phpmyadmin.php
+++ b/interface/web/sites/database_phpmyadmin.php
@@ -56,15 +56,23 @@
$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 513c396..ffb711f 100644
--- a/interface/web/sites/form/database.tform.php
+++ b/interface/web/sites/form/database.tform.php
@@ -107,7 +107,8 @@
),
'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 3c19173..1eb79c5 100644
--- a/interface/web/sites/form/web_aliasdomain.tform.php
+++ b/interface/web/sites/form/web_aliasdomain.tform.php
@@ -106,7 +106,7 @@
'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 @@
'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 c280830..34cbbc8 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -248,7 +248,7 @@
'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 ced53bb..482476a 100644
--- a/interface/web/sites/form/web_subdomain.tform.php
+++ b/interface/web/sites/form/web_subdomain.tform.php
@@ -106,7 +106,7 @@
'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 da8b1a5..90aec30 100644
--- a/interface/web/sites/lib/lang/el.lng
+++ b/interface/web/sites/lib/lang/el.lng
@@ -24,3 +24,4 @@
$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 dbc8ecc..300ec1b 100644
--- a/interface/web/sites/lib/lang/el_cron.lng
+++ b/interface/web/sites/lib/lang/el_cron.lng
@@ -20,3 +20,4 @@
$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 b629b89..d2bb97f 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['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 78190bd..583786b 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_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 4041622..c8b30ae 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['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 20f1320..c277c4d 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['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 863d822..e00efa6 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['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 66db7de..a1983b4 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['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 ab7e321..7f3f122 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['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 71db715..6dd262c 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['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 1e1072b..0c54d4f 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['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 6ad7f1a..fc2b216 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['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 240ed48..6dcaf80 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 @@
<?php
-$wb['backup_interval_txt'] = 'Χρονοδιάστημα Backup';
-$wb['backup_copies_txt'] = 'Πλήθος αντιγράφων backup';
+$wb['backup_interval_txt'] = 'Προγραμματισμός Backup';
+$wb['backup_copies_txt'] = 'Πλήθος αντιγράφων';
$wb['ssl_state_txt'] = 'Κατάσταση';
$wb['ssl_locality_txt'] = 'Τοποθεσία';
$wb['ssl_organisation_txt'] = 'Οργανισμός';
@@ -65,7 +65,7 @@
$wb['stats_user_txt'] = 'Όνομα Χρήστη Στατιστικών Web';
$wb['stats_type_txt'] = 'Πρόγραμμα Στατιστικών Web';
$wb['custom_php_ini_txt'] = 'Προσαρμοσμένες ρυθμίσεις php.ini';
-$wb['none_txt'] = 'Κανάνα';
+$wb['none_txt'] = 'Καμία';
$wb['disabled_txt'] = 'Απενεργοπ.';
$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
$wb['no_flag_txt'] = 'Χωρίς Σημαία';
@@ -91,3 +91,4 @@
$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/el_web_domain_admin_list.lng b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng
index 1553933..07e8537 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['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 a35fad5..ee59654 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['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 410cd3f..96280a2 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['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 761a6c1..7951141 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['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 c10412c..b809fc2 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['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 4f6ec20..5668855 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['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 b7e9d59..a8631ad 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['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 0b0167f..99c0cdc 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_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 b24ae4d..70b1e25 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['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 dd052b0..0652d98 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['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 5650127..08f44bf 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['add_new_record_txt'] = 'Νεός χρήστης Webdav';
?>
+
diff --git a/interface/web/sites/lib/lang/fr.lng b/interface/web/sites/lib/lang/fr.lng
index 05b2986..4adc588 100644
--- a/interface/web/sites/lib/lang/fr.lng
+++ b/interface/web/sites/lib/lang/fr.lng
@@ -16,12 +16,10 @@
$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 51690a9..4dba434 100644
--- a/interface/web/sites/lib/lang/fr_cron.lng
+++ b/interface/web/sites/lib/lang/fr_cron.lng
@@ -19,5 +19,3 @@
$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 5a3f509..25fb854 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['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 d3cce2e..ab2712b 100644
--- a/interface/web/sites/lib/lang/fr_database.lng
+++ b/interface/web/sites/lib/lang/fr_database.lng
@@ -1,27 +1,25 @@
<?php
-$wb["server_id_txt"] = 'Serveur';
-$wb["type_txt"] = 'Type';
-$wb["database_name_txt"] = 'Nom de la base';
-$wb["database_user_txt"] = 'Nom d\'utilisateur';
-$wb["database_password_txt"] = 'Mot de passe';
-$wb["password_strength_txt"] = 'Force du mot de passe';
-$wb["database_charset_txt"] = 'Jeu de caractères de la base';
-$wb["remote_access_txt"] = 'Accès à Distance';
-$wb["remote_ips_txt"] = 'IP d\'accès à distance (séparés par des virgules, ne rien mettre pour tout autoriser)';
-$wb["database_remote_error_ips"] = 'Lune des IP entrées nest pas valide';
-$wb["client_txt"] = 'Client';
-$wb["active_txt"] = 'Actif';
-$wb["database_name_error_empty"] = 'Le nom de la base ne peut être vide.';
-$wb["database_name_error_unique"] = 'Il y a déja une base portant ce nom sur le serveur.';
-$wb["database_name_error_regex"] = 'Nom de la base incorrect. Le nom de la base peut uniquement contenir ces caractères: a-z, A-Z, 0-9 et le tiret bas. Taille: 2 - 64 caractères.';
-$wb["database_user_error_empty"] = 'Le nom d\'utilisateur ne peut être vide.';
-$wb["database_user_error_unique"] = 'Il y a déja un utilisateur de base avec ce nom.';
-$wb["database_user_error_regex"] = 'Nom d\'utilisateur incorrect. Le nom d\'utilisateur peut uniquement contenir ces caractères: a-z, A-Z, 0-9 et le tiret bas. Taille: 2 - 64 caractères.';
-$wb["limit_database_txt"] = 'Le nombre maximum de bases de données a été atteint.';
-$wb["database_name_change_txt"] = 'Le nom de la base ne peut être modifié';
-$wb["database_charset_change_txt"] = 'Le charset de la base ne peut être modifié';
-$wb["database_name_error_len"] = 'Nom de base de données - {db} - trop long. La longueur maximale incluant le préfixe est de 64 caractères.';
-$wb["database_user_error_len"] = 'Nom d\'utilisateur de base de données - {user}- trop long. La longueur maximale incluant le préfixe est de 16 caractères.';
+$wb['server_id_txt'] = 'Serveur';
+$wb['type_txt'] = 'Type';
+$wb['database_name_txt'] = 'Nom de la base';
+$wb['database_user_txt'] = 'Nom d\'utilisateur';
+$wb['database_password_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['database_charset_txt'] = 'Jeu de caractères de la base';
+$wb['remote_access_txt'] = 'Accès à Distance';
+$wb['remote_ips_txt'] = 'IP d\'accès à distance (séparés par des virgules, ne rien mettre pour tout autoriser)';
+$wb['database_remote_error_ips'] = 'Lune des IP entrées nest pas valide';
+$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Actif';
+$wb['database_name_error_empty'] = 'Le nom de la base ne peut être vide.';
+$wb['database_name_error_unique'] = 'Il y a déja une base portant ce nom sur le serveur.';
+$wb['database_name_error_regex'] = 'Nom de la base incorrect. Le nom de la base peut uniquement contenir ces caractères: a-z, A-Z, 0-9 et le tiret bas. Taille: 2 - 64 caractères.';
+$wb['database_user_error_empty'] = 'Le nom d\'utilisateur ne peut être vide.';
+$wb['database_user_error_unique'] = 'Il y a déja un utilisateur de base avec ce nom.';
+$wb['database_user_error_regex'] = 'Nom d\'utilisateur incorrect. Le nom d\'utilisateur peut uniquement contenir ces caractères: a-z, A-Z, 0-9 et le tiret bas. Taille: 2 - 64 caractères.';
+$wb['limit_database_txt'] = 'Le nombre maximum de bases de données a été atteint.';
+$wb['database_name_change_txt'] = 'Le nom de la base ne peut être modifié';
+$wb['database_charset_change_txt'] = 'Le charset de la base ne peut être modifié';
+$wb['database_name_error_len'] = 'Nom de base de données - {db} - trop long. La longueur maximale incluant le préfixe est de 64 caractères.';
+$wb['database_user_error_len'] = 'Nom d\'utilisateur de base de données - {user}- trop long. La longueur maximale incluant le préfixe est de 16 caractères.';
?>
-
-
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 4b9d57a..d6be240 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['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 5caf0da..b530a6e 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['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 2a201fe..3e5b099 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['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 597e53c..51c8906 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['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 6ddcbd8..5712dcb 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['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 2a3e245..ccad82e 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['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 7ded4a0..b14c2df 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['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 9900ee9..5837931 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_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 7e9636e..a14e6a8 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_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 fb619c7..6706332 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['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 b04b9fc..ddf66f8 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['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 ecbaf2a..2682bf9 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['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 b019461..f358f8c 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['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 54ac469..dc47177 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['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 0f2075c..e1824e2 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['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 3a83663..a50a1de 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['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 3b393ba..059acf4 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['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 786a4dc..9bfbd30 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['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 075f983..81a59b1 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['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 5779740..1a2bebe 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['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 fecb4ab..9380846 100644
--- a/interface/web/sites/lib/lang/hr_cron.lng
+++ b/interface/web/sites/lib/lang/hr_cron.lng
@@ -1,7 +1,7 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Parent website';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['client_txt'] = 'Client';
$wb['run_min_txt'] = 'Minutes';
$wb['run_hour_txt'] = 'Hours';
diff --git a/interface/web/sites/lib/lang/hr_cron_list.lng b/interface/web/sites/lib/lang/hr_cron_list.lng
index 308024d..b7084f1 100644
--- a/interface/web/sites/lib/lang/hr_cron_list.lng
+++ b/interface/web/sites/lib/lang/hr_cron_list.lng
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Cron Jobs';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['run_min_txt'] = 'Minute';
$wb['run_hour_txt'] = 'Hour';
@@ -9,5 +9,5 @@
$wb['run_wday_txt'] = 'Day of week';
$wb['command_txt'] = 'Command';
$wb['add_new_cron_txt'] = 'Add new Cron job';
-$wb['parent_domain_id_txt'] = 'Website';
+$wb['parent_domain_id_txt'] = 'Web stranica';
?>
diff --git a/interface/web/sites/lib/lang/hr_database.lng b/interface/web/sites/lib/lang/hr_database.lng
index 91bd7a8..7c473b6 100644
--- a/interface/web/sites/lib/lang/hr_database.lng
+++ b/interface/web/sites/lib/lang/hr_database.lng
@@ -1,6 +1,6 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Vrsta';
$wb['database_name_txt'] = 'Database name';
$wb['database_user_txt'] = 'Database user';
$wb['database_password_txt'] = 'Database password';
@@ -10,7 +10,7 @@
$wb['remote_ips_txt'] = 'Remote Access IPs (separate by , and leave blank for <i>any</i>)';
$wb['database_remote_error_ips'] = 'At least one of the entered ip addresses is invalid.';
$wb['client_txt'] = '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 e56806e..e023467 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 @@
<?php
$wb['list_head_txt'] = 'Database';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['remote_access_txt'] = 'Remote Access';
$wb['server_id_txt'] = 'Server';
$wb['database_user_txt'] = 'Database user';
diff --git a/interface/web/sites/lib/lang/hr_ftp_user.lng b/interface/web/sites/lib/lang/hr_ftp_user.lng
index efa2d95..3cd81ba 100644
--- a/interface/web/sites/lib/lang/hr_ftp_user.lng
+++ b/interface/web/sites/lib/lang/hr_ftp_user.lng
@@ -9,12 +9,12 @@
$wb['ul_bandwidth_txt'] = 'Uploadbandwidth';
$wb['dl_bandwidth_txt'] = 'Downloadbandwidth';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
+$wb['parent_domain_id_txt'] = 'Web stranica';
+$wb['username_txt'] = 'Korisničko ime';
+$wb['password_txt'] = 'Šifra';
$wb['password_strength_txt'] = 'Password strength';
$wb['quota_size_txt'] = 'Harddisk-Quota';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['limit_ftp_user_txt'] = 'The max. number of FTP users for your account is reached.';
$wb['username_error_empty'] = 'Username is empty.';
$wb['username_error_unique'] = 'The username must be unique.';
diff --git a/interface/web/sites/lib/lang/hr_ftp_user_list.lng b/interface/web/sites/lib/lang/hr_ftp_user_list.lng
index 6ef3e37..9ed8e64 100644
--- a/interface/web/sites/lib/lang/hr_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/hr_ftp_user_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'FTP-User';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'FTP račun';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Username';
-$wb['add_new_record_txt'] = 'Add new FTP-User';
+$wb['parent_domain_id_txt'] = 'Web stranica';
+$wb['username_txt'] = 'Korisničko ime';
+$wb['add_new_record_txt'] = 'Dodaj FTP račun';
?>
diff --git a/interface/web/sites/lib/lang/hr_shell_user.lng b/interface/web/sites/lib/lang/hr_shell_user.lng
index c4d822d..d5ed7e9 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['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 4a9d7cb..9212ee4 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 @@
<?php
$wb['list_head_txt'] = 'Shell User';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Site';
-$wb['username_txt'] = 'Username';
+$wb['username_txt'] = 'Korisničko ime';
$wb['add_new_record_txt'] = 'Add new Shell-User';
?>
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 8ea34c4..39bc1df 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 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Alias domena';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
+$wb['parent_domain_id_txt'] = 'Web stranica';
+$wb['domain_txt'] = 'Alias domena';
$wb['add_new_record_txt'] = 'Add new aliasdomain';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'Domain must be unique.';
diff --git a/interface/web/sites/lib/lang/hr_web_domain.lng b/interface/web/sites/lib/lang/hr_web_domain.lng
index 3c0a31b..0e93022 100644
--- a/interface/web/sites/lib/lang/hr_web_domain.lng
+++ b/interface/web/sites/lib/lang/hr_web_domain.lng
@@ -12,12 +12,12 @@
$wb['ssl_action_txt'] = 'SSL Action';
$wb['ssl_domain_txt'] = 'SSL Domain';
$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_domain_admin_list.lng b/interface/web/sites/lib/lang/hr_web_domain_admin_list.lng
index b460e27..62ee05f 100644
--- a/interface/web/sites/lib/lang/hr_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_domain_admin_list.lng
@@ -2,8 +2,8 @@
$wb['sys_groupid_txt'] = 'Client';
$wb['list_head_txt'] = 'Websites';
$wb['domain_id_txt'] = 'ID';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domena';
$wb['add_new_record_txt'] = 'Add new website';
?>
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 88ec412..2f85d7c 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 @@
<?php
-$wb['list_head_txt'] = 'Websites';
+$wb['list_head_txt'] = 'Web stranice';
$wb['domain_id_txt'] = 'ID';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['add_new_record_txt'] = 'Add new website';
+$wb['domain_txt'] = 'Domena';
+$wb['add_new_record_txt'] = 'Dodaj novu web stranicu';
?>
diff --git a/interface/web/sites/lib/lang/hr_web_folder.lng b/interface/web/sites/lib/lang/hr_web_folder.lng
index 93cd40a..f624334 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 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
+$wb['parent_domain_id_txt'] = 'Web stranica';
$wb['path_txt'] = 'Path';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['path_error_regex'] = 'Invalid folder path.';
?>
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 76d9702..1777440 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 @@
<?php
$wb['list_head_txt'] = 'Folder';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
+$wb['parent_domain_id_txt'] = 'Web stranica';
$wb['path_txt'] = 'Path';
?>
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 f877df2..b892a1b 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 @@
<?php
-$wb['web_folder_id_txt'] = 'Folder';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['active_txt'] = 'Active';
-$wb['folder_error_empty'] = 'No web folder selecetd.';
+$wb['web_folder_id_txt'] = 'Direktorij';
+$wb['username_txt'] = 'Korisničko ime';
+$wb['password_txt'] = 'Šifra';
+$wb['active_txt'] = 'Aktivno';
+$wb['folder_error_empty'] = 'Nije izabran web direktorij.';
?>
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 9a7286a..9a1e187 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 @@
<?php
$wb['list_head_txt'] = 'Folder User';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['web_folder_id_txt'] = 'Folder';
-$wb['username_txt'] = 'Username';
+$wb['username_txt'] = 'Korisničko ime';
?>
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 b217f80..9cec89f 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 @@
<?php
-$wb['list_head_txt'] = 'Web traffic';
-$wb['domain_txt'] = 'Domain';
-$wb['this_month_txt'] = 'This month';
-$wb['last_month_txt'] = 'Last month';
-$wb['this_year_txt'] = 'This year';
-$wb['last_year_txt'] = 'Last year';
+$wb['list_head_txt'] = 'Promet web stranice';
+$wb['domain_txt'] = 'Domena';
+$wb['this_month_txt'] = 'Ovaj mjesec';
+$wb['last_month_txt'] = 'Prošli mjesec';
+$wb['this_year_txt'] = 'Ovu godinu';
+$wb['last_year_txt'] = 'Prošlu godinu';
?>
diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng
index 726e1c1..1d1bd89 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_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 1c16bcd..942454e 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 @@
<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Poddomene';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
+$wb['parent_domain_id_txt'] = 'Web stranica';
+$wb['domain_txt'] = 'Poddomena';
+$wb['add_new_record_txt'] = 'Dodaj novu poddomenu';
?>
diff --git a/interface/web/sites/lib/lang/hr_webdav_user.lng b/interface/web/sites/lib/lang/hr_webdav_user.lng
index 05c9892..06bcd59 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 @@
<?php
$wb['dir_txt'] = 'Directory';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
+$wb['parent_domain_id_txt'] = 'Web stranica';
+$wb['username_txt'] = 'Korisničko ime';
+$wb['password_txt'] = 'Šifra';
$wb['password_strength_txt'] = 'Password strength';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['limit_webdav_user_txt'] = 'The max. number of webdav users for your account is reached.';
$wb['username_error_empty'] = 'Username is empty.';
$wb['username_error_unique'] = 'The username must be unique.';
diff --git a/interface/web/sites/lib/lang/hr_webdav_user_list.lng b/interface/web/sites/lib/lang/hr_webdav_user_list.lng
index bac283b..ca1b7b8 100644
--- a/interface/web/sites/lib/lang/hr_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/hr_webdav_user_list.lng
@@ -1,8 +1,8 @@
<?php
$wb['list_head_txt'] = 'Webdav-User';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Username';
+$wb['parent_domain_id_txt'] = 'Web stranica';
+$wb['username_txt'] = 'Korisničko ime';
$wb['add_new_record_txt'] = 'Add new Webdav-User';
?>
diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng
index e4f1c80..0045281 100644
--- a/interface/web/sites/lib/lang/pl.lng
+++ b/interface/web/sites/lib/lang/pl.lng
@@ -23,4 +23,3 @@
$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 a5d3b8b..a097d08 100644
--- a/interface/web/sites/lib/lang/pl_cron.lng
+++ b/interface/web/sites/lib/lang/pl_cron.lng
@@ -19,4 +19,3 @@
$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 67e2e6f..467cae6 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['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 1dd6b87..5ff0ad7 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_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 653657e..5785a77 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['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 0b419fe..2162a15 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['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 13621bb..0c6bf62 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['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 9577209..fecbba3 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['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 465ce1a..26dda70 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['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 0f17980..10f9e43 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['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 7a0c9e7..679b731 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['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 a577415..5bdd8e8 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_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 e209eef..d55c5b4 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_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 1aab019..56634eb 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['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 8a74d05..62b7455 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['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 053a2c0..6eec2fd 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['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 cd16721..87a7690 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['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 605587c..4e9bfb3 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['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 462d3b9..81769bd 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['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 3f73e8e..e7b96d7 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['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 e31599e..a0e7222 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['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 d20a14c..9ccb0a3 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['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 126c88b..4ec7974 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['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 f679685..5e7e4b6 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['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 acbf7b3..6cff9e8 100644
--- a/interface/web/sites/web_aliasdomain_edit.php
+++ b/interface/web/sites/web_aliasdomain_edit.php
@@ -130,7 +130,7 @@
$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 @@
}
+ 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 036a6af..3f35583 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_5_txt'] = 'Πολύ δυνατό';
?>
+
diff --git a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
index 79d0317..df85c97 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_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 2a1a64d..9f53502 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 7894c85..0152727 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -105,7 +105,7 @@
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
- <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+ <span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
diff --git a/interface/web/tools/lib/lang/ar.lng b/interface/web/tools/lib/lang/ar.lng
index cebb41b..f33fe1a 100644
--- a/interface/web/tools/lib/lang/ar.lng
+++ b/interface/web/tools/lib/lang/ar.lng
@@ -4,4 +4,6 @@
$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 5775e82..d302dc5 100644
--- a/interface/web/tools/lib/lang/bg.lng
+++ b/interface/web/tools/lib/lang/bg.lng
@@ -4,4 +4,6 @@
$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 e1023bc..db8af60 100644
--- a/interface/web/tools/lib/lang/br.lng
+++ b/interface/web/tools/lib/lang/br.lng
@@ -4,4 +4,6 @@
$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 26aecbb..7dc8e90 100644
--- a/interface/web/tools/lib/lang/cz.lng
+++ b/interface/web/tools/lib/lang/cz.lng
@@ -4,4 +4,6 @@
$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 deb9fe1..5fc2d03 100644
--- a/interface/web/tools/lib/lang/de.lng
+++ b/interface/web/tools/lib/lang/de.lng
@@ -4,4 +4,6 @@
$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 29fea41..897826e 100644
--- a/interface/web/tools/lib/lang/el.lng
+++ b/interface/web/tools/lib/lang/el.lng
@@ -6,3 +6,4 @@
$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 103489c..5a43500 100644
--- a/interface/web/tools/lib/lang/el_usersettings.lng
+++ b/interface/web/tools/lib/lang/el_usersettings.lng
@@ -7,3 +7,4 @@
$wb['Settings'] = 'Ρυθμίσεις';
?>
+
diff --git a/interface/web/tools/lib/lang/en.lng b/interface/web/tools/lib/lang/en.lng
index abf0ecf..1dee19d 100644
--- a/interface/web/tools/lib/lang/en.lng
+++ b/interface/web/tools/lib/lang/en.lng
@@ -4,4 +4,6 @@
$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 acc1bb0..41205f0 100644
--- a/interface/web/tools/lib/lang/es.lng
+++ b/interface/web/tools/lib/lang/es.lng
@@ -4,4 +4,6 @@
$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 1f876dc..1e21641 100755
--- a/interface/web/tools/lib/lang/fi.lng
+++ b/interface/web/tools/lib/lang/fi.lng
@@ -4,4 +4,6 @@
$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 fa2dad8..52320c2 100644
--- a/interface/web/tools/lib/lang/fr.lng
+++ b/interface/web/tools/lib/lang/fr.lng
@@ -4,6 +4,6 @@
$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 e9b6673..db26577 100644
--- a/interface/web/tools/lib/lang/fr_usersettings.lng
+++ b/interface/web/tools/lib/lang/fr_usersettings.lng
@@ -6,5 +6,3 @@
$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 149bf59..3a9c3c3 100644
--- a/interface/web/tools/lib/lang/hr.lng
+++ b/interface/web/tools/lib/lang/hr.lng
@@ -3,5 +3,7 @@
$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 ff58227..e2c17f0 100644
--- a/interface/web/tools/lib/lang/hu.lng
+++ b/interface/web/tools/lib/lang/hu.lng
@@ -4,4 +4,6 @@
$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 29b94b9..9a2dc8f 100644
--- a/interface/web/tools/lib/lang/id.lng
+++ b/interface/web/tools/lib/lang/id.lng
@@ -4,4 +4,6 @@
$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 62b18fd..672bf85 100644
--- a/interface/web/tools/lib/lang/it.lng
+++ b/interface/web/tools/lib/lang/it.lng
@@ -4,4 +4,6 @@
$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 b472919..ecb7716 100644
--- a/interface/web/tools/lib/lang/ja.lng
+++ b/interface/web/tools/lib/lang/ja.lng
@@ -4,4 +4,6 @@
$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 da1268a..bc0f721 100644
--- a/interface/web/tools/lib/lang/nl.lng
+++ b/interface/web/tools/lib/lang/nl.lng
@@ -4,4 +4,6 @@
$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 e4cb49a..365e81b 100644
--- a/interface/web/tools/lib/lang/pl.lng
+++ b/interface/web/tools/lib/lang/pl.lng
@@ -4,5 +4,6 @@
$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 655168b..f8d7665 100644
--- a/interface/web/tools/lib/lang/pl_usersettings.lng
+++ b/interface/web/tools/lib/lang/pl_usersettings.lng
@@ -6,4 +6,3 @@
$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 f765d48..637f100 100644
--- a/interface/web/tools/lib/lang/pt.lng
+++ b/interface/web/tools/lib/lang/pt.lng
@@ -4,4 +4,6 @@
$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 eaf78e5..a120b37 100644
--- a/interface/web/tools/lib/lang/ro.lng
+++ b/interface/web/tools/lib/lang/ro.lng
@@ -4,4 +4,6 @@
$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 65ba4ed..5e7cf8d 100644
--- a/interface/web/tools/lib/lang/ru.lng
+++ b/interface/web/tools/lib/lang/ru.lng
@@ -4,4 +4,6 @@
$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 cebb41b..f33fe1a 100644
--- a/interface/web/tools/lib/lang/se.lng
+++ b/interface/web/tools/lib/lang/se.lng
@@ -4,4 +4,6 @@
$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 da21028..22b11ad 100644
--- a/interface/web/tools/lib/lang/sk.lng
+++ b/interface/web/tools/lib/lang/sk.lng
@@ -4,4 +4,6 @@
$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 3e252f0..4bcc975 100644
--- a/interface/web/tools/lib/lang/tr.lng
+++ b/interface/web/tools/lib/lang/tr.lng
@@ -4,4 +4,6 @@
$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 1a84681..96e1983 100644
--- a/interface/web/vm/lib/lang/el.lng
+++ b/interface/web/vm/lib/lang/el.lng
@@ -6,3 +6,4 @@
$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 96a7352..0c6b4e3 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_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 a0252fc..6839369 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 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 388df19..270dd4f 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['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 802ed82..8e5c825 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'] = 'Πρότυπο';
?>
+
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 a950faa..9440536 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['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 023aa07..274693c 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['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 781ef0a..811ebd1 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['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 a4f6a2e..30690fd 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['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 dee8b9d..884d6b1 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['veid_txt'] = 'VEID';
?>
+
diff --git a/interface/web/vm/lib/lang/fr.lng b/interface/web/vm/lib/lang/fr.lng
index 8842cce..12ed30c 100644
--- a/interface/web/vm/lib/lang/fr.lng
+++ b/interface/web/vm/lib/lang/fr.lng
@@ -5,5 +5,3 @@
$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 cb3194a..52f7328 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_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 6afda02..6016681 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_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 55d3e0b..c5f0601 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['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 8d643a3..256750f 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_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 afc00af..6471ec0 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['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 2b091a0..d285512 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['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 bc95cab..de4045c 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['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 d3868ec..f2be022 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['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 3873054..2238e2b 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['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 4167e14..4f5dbe9 100644
--- a/interface/web/vm/lib/lang/hr.lng
+++ b/interface/web/vm/lib/lang/hr.lng
@@ -1,7 +1,7 @@
<?php
-$wb['Virtual Servers'] = 'Virtual Servers';
-$wb['OS Templates'] = 'OS Templates';
-$wb['VM Templates'] = 'VM Templates';
-$wb['IP addresses'] = 'IP addresses';
+$wb['Virtual Servers'] = 'Virtualni serveri';
+$wb['OS Templates'] = 'Predlošci operativnih sistema';
+$wb['VM Templates'] = 'VM predlošci';
+$wb['IP addresses'] = 'IP adrese';
$wb['OpenVZ'] = 'OpenVZ';
?>
diff --git a/interface/web/vm/lib/lang/hr_openvz_action.lng b/interface/web/vm/lib/lang/hr_openvz_action.lng
index 52f7328..f7f199b 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 @@
<?php
$wb['head_txt'] = 'Virtual server actions for VM:';
-$wb['start_txt'] = 'Start virtual server';
-$wb['stop_txt'] = 'Stop virtual server';
-$wb['restart_txt'] = 'Restart virtual server';
-$wb['ostemplate_txt'] = 'Create OSTemplate';
-$wb['ostemplate_desc_txt'] = '(example: debian-6.0-i386-custom)';
+$wb['start_txt'] = 'Pokreni virualni server';
+$wb['stop_txt'] = 'Zaustavi virtualni server';
+$wb['restart_txt'] = 'Restartaj virtualni server';
+$wb['ostemplate_txt'] = 'Kreiraj predložak operativnog sistema';
+$wb['ostemplate_desc_txt'] = '(primjer: debian-6.0-i386-custom)';
$wb['btn_save_txt'] = 'Execute selected action';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['btn_cancel_txt'] = 'Prekini';
$wb['start_exec_txt'] = 'Start command has been sent to the VM host server. It may take a minute until the VM is started.';
$wb['stop_exec_txt'] = 'Stop command has been sent to the VM host server. It may take a minute until the VM is stopped.';
$wb['restart_exec_txt'] = 'Restart command has been sent to the VM host server. It may take a minute until the VM is restarted.';
diff --git a/interface/web/vm/lib/lang/hr_openvz_ip.lng b/interface/web/vm/lib/lang/hr_openvz_ip.lng
index 6016681..debb04b 100644
--- a/interface/web/vm/lib/lang/hr_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_ip.lng
@@ -1,9 +1,9 @@
<?php
-$wb['server_id_txt'] = 'Hostserver';
-$wb['ip_address_txt'] = 'IP address';
-$wb['vm_id_txt'] = 'Virtual server';
-$wb['reserved_txt'] = 'Reserved';
-$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';
+$wb['server_id_txt'] = 'Ime host servera';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['vm_id_txt'] = 'Virtualni server';
+$wb['reserved_txt'] = 'Rezervirano';
+$wb['ip_error_wrong'] = 'Unesite ispravnu IPv4 adresu.';
+$wb['ip_error_unique'] = 'Ova IP adresa već postoji.';
+$wb['IP address'] = 'IP adresa';
?>
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 c5f0601..14f91f0 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 @@
<?php
-$wb['list_head_txt'] = 'OpenVZ IP addresses';
+$wb['list_head_txt'] = 'OpenVZ IP adrese';
$wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP address';
-$wb['reserved_txt'] = 'Reserved';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['reserved_txt'] = 'Rezervirano';
?>
diff --git a/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng b/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng
index 256750f..73e64ff 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_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 6471ec0..430d36b 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 @@
<?php
-$wb['list_head_txt'] = 'OpenVZ OSTemplate';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
+$wb['list_head_txt'] = 'OpenVZ OS predložak';
+$wb['active_txt'] = 'Aktivan';
+$wb['template_name_txt'] = 'Ime predloška';
$wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
+$wb['allservers_txt'] = 'Postoji na svim serverima';
$wb['ostemplate_id_txt'] = 'ID';
?>
diff --git a/interface/web/vm/lib/lang/hr_openvz_template.lng b/interface/web/vm/lib/lang/hr_openvz_template.lng
index d285512..62e9dca 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_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 de4045c..f9c8642 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 @@
<?php
-$wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
+$wb['list_head_txt'] = 'OpenVZ VM predložak';
+$wb['active_txt'] = 'Aktivan';
+$wb['template_name_txt'] = 'Ime predloška';
?>
diff --git a/interface/web/vm/lib/lang/hr_openvz_vm.lng b/interface/web/vm/lib/lang/hr_openvz_vm.lng
index f2be022..af3fd11 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['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 2238e2b..ab3ef52 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 @@
<?php
-$wb['list_head_txt'] = 'Virtual server';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Hostserver';
-$wb['ostemplate_id_txt'] = 'OSTemplate';
-$wb['template_id_txt'] = 'Template';
-$wb['hostname_txt'] = 'Hostname';
-$wb['ip_address_txt'] = 'IP address';
+$wb['list_head_txt'] = 'Virtualni server';
+$wb['active_txt'] = 'Aktivan';
+$wb['server_id_txt'] = 'Ime servera';
+$wb['ostemplate_id_txt'] = 'Predložak operativnog sistema';
+$wb['template_id_txt'] = 'Predložak';
+$wb['hostname_txt'] = 'Ime hosta';
+$wb['ip_address_txt'] = 'IP adresa';
$wb['veid_txt'] = 'VEID';
?>
diff --git a/interface/web/vm/lib/lang/pl.lng b/interface/web/vm/lib/lang/pl.lng
index 5c1ab58..4167e14 100644
--- a/interface/web/vm/lib/lang/pl.lng
+++ b/interface/web/vm/lib/lang/pl.lng
@@ -5,4 +5,3 @@
$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 71e7263..52f7328 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_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 67f6885..6016681 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_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 8787f6d..c5f0601 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['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 df01680..6471ec0 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['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 0887164..d285512 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['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 6e4d911..de4045c 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['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 4698fe6..f2be022 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['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 a534a65..2238e2b 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['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 2905db0..9481cd3 100644
--- a/remoting_client/examples/sites_web_domain_add.php
+++ b/remoting_client/examples/sites_web_domain_add.php
@@ -18,8 +18,8 @@
$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 e0f185e..f3867d3 100644
--- a/server/conf/awstats_index.php.master
+++ b/server/conf/awstats_index.php.master
@@ -5,29 +5,36 @@
if ($handle = opendir('.'))
{
- while(false !== ($file = readdir($handle)))
- {
- if (substr($file,0,1) != "." && is_dir($file))
- {
- $orderkey = substr($file,0,4).substr($file,5,2);
- if (substr($file,5,2) < 10 ) $orderkey = substr($file,0,4)."0".substr($file,5,2);
- $awprev[$orderkey] = $file;
- }
- }
- $month = date("n");
- $year = date("Y");
- if (date("d") == 1)
- {
- $month = date("m")-1;
- if (date("m") == 1)
- {
- $year = date("Y")-1;
- $month = "12";
- }
- }
- $current = $year.$month;
- $awprev[$current] = $year."-".$month;
- closedir($handle);
+ while(false !== ($file = readdir($handle)))
+ {
+ if (substr($file,0,1) != "." && is_dir($file))
+ {
+ $orderkey = substr($file,0,4).substr($file,5,2);
+ if (substr($file,5,2) < 10 )
+ {
+ $orderkey = substr($file,0,4)."0".substr($file,5,2);
+ }
+ $awprev[$orderkey] = $file;
+ }
+ }
+
+ $month = date("n");
+ $year = date("Y");
+
+ if (date("d") == 1)
+ {
+ $month = date("m")-1;
+ if (date("m") == 1)
+ {
+ $year = date("Y")-1;
+ $month = "12";
+ }
+ }
+
+ $current = $year.$month;
+ $awprev[$current] = $year."-".$month;
+
+ closedir($handle);
}
arsort($awprev);
diff --git a/server/conf/bastille-firewall.cfg.master b/server/conf/bastille-firewall.cfg.master
index b9658c9..b2b6536 100644
--- a/server/conf/bastille-firewall.cfg.master
+++ b/server/conf/bastille-firewall.cfg.master
@@ -75,7 +75,7 @@
# 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/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 25e544d..d771eb1 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -75,6 +75,10 @@
auth_basic_user_file <tmpl_var name='stats_auth_passwd_file'>;
}
+ location /awstats-icon {
+ alias /usr/share/awstats/icon;
+ }
+
<tmpl_if name='php' op='==' value='fast-cgi'>
location ~ \.php$ {
try_files $uri =404;
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 65516b9..3f86a26 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -154,7 +154,7 @@
// Create awstats statistics
#######################################################################################################
-$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE stats_type = 'awstats' AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, document_root, system_user, system_group FROM web_domain WHERE stats_type = 'awstats' AND server_id = ".$conf['server_id'];
$records = $app->db->queryAllRecords($sql);
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
@@ -180,7 +180,7 @@
if(is_file($awstats_website_conf_file)) unlink($awstats_website_conf_file);
- $sql = "SELECT domain FROM web_domain WHERE (type = 'alias' OR AND type = 'subdomain') server_id = ".$conf['server_id'];
+ $sql = "SELECT domain FROM web_domain WHERE (type = 'alias' OR type = 'subdomain') server_id = ".$conf['server_id'];
$aliases = $app->db->queryAllRecords($sql);
$aliasdomain = '';
@@ -229,7 +229,7 @@
mkdir($statsdirold);
$files = scandir($statsdir);
foreach ($files as $file) {
- if (substr($file,0,1) != "." && !is_dir($file) && substr($file,0,1) != "w" && substr($file,0,1) != "i") copy("$statsdir"."/"."$file","$statsdirold"."$file");
+ if (substr($file,0,1) != "." && !is_dir("$statsdir"."/"."$file") && substr($file,0,1) != "w" && substr($file,0,1) != "i") copy("$statsdir"."/"."$file","$statsdirold"."$file");
}
}
@@ -243,6 +243,11 @@
$app->log('Created awstats statistics with command: '.$command,LOGLEVEL_DEBUG);
} else {
$app->log("No awstats statistics created. Either $awstats_pl or $awstats_buildstaticpages_pl is not owned by root user.",LOGLEVEL_WARN);
+ }
+
+ if(is_file($rec['document_root']."/web/stats/index.php")) {
+ chown($rec['document_root']."/web/stats/index.php",$rec['system_user']);
+ chgrp($rec['document_root']."/web/stats/index.php",$rec['system_group']);
}
}
@@ -406,7 +411,7 @@
$current_month = date('Y-m');
//* Check website traffic quota
- $sql = "SELECT sys_groupid,domain_id,domain,traffic_quota,traffic_quota_lock FROM web_domain WHERE traffic_quota > 0 and type = 'vhost'";
+ $sql = "SELECT sys_groupid,domain_id,domain,traffic_quota,traffic_quota_lock FROM web_domain WHERE (traffic_quota > 0 or traffic_quota_lock = 'y') and type = 'vhost'";
$records = $app->db->queryAllRecords($sql);
if(is_array($records)) {
foreach($records as $rec) {
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index e6ee074..5e39e55 100755
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -28,6 +28,9 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+//* Set timezone
+if(isset($conf['timezone']) && $conf['timezone'] != '') date_default_timezone_set($conf['timezone']);
+
class app {
var $loaded_modules = array();
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 47ee0d5..6269798 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -254,9 +254,23 @@
}
- //** Function to fill the datalog with a full differential record.
- public function datalogSave($db_table, $action, $primary_field, $primary_id, $record_old, $record_new) {
- global $app,$conf;
+ if($diff_num > 0) {
+ //print_r($diff_num);
+ //print_r($diffrec_full);
+ $diffstr = $app->db->quote(serialize($diffrec_full));
+ if(isset($_SESSION)) {
+ $username = $app->db->quote($_SESSION['s']['user']['username']);
+ } else {
+ $username = 'admin';
+ }
+ $dbidx = $primary_field.':'.$primary_id;
+
+ if($action == 'INSERT') $action = 'i';
+ if($action == 'UPDATE') $action = 'u';
+ if($action == 'DELETE') $action = 'd';
+ $sql = "INSERT INTO sys_datalog (dbtable,dbidx,server_id,action,tstamp,user,data) VALUES ('".$db_table."','$dbidx','$server_id','$action','".time()."','$username','$diffstr')";
+ $app->db->query($sql);
+ }
// Insert backticks only for incomplete table names.
if(stristr($db_table,'.')) {
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index f120bcb..00b9759 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -879,7 +879,7 @@
/*
* Fetch the output
*/
- $data['output'] = shell_exec('zypper --non-interactive up');
+ $data['output'] = shell_exec('zypper lu');
} else {
/*
* It is not Debian/Ubuntu, so there is no data and no state
@@ -1719,7 +1719,13 @@
* So we can do a deepter test and try to get data over this connection.
* (if apache hangs, we get a connection but a timeout by trying to GET the data!)
*/
- fwrite($fp, "GET / HTTP/1.0\r\n\r\n");
+ // fwrite($fp, "GET / HTTP/1.0\r\n\r\n");
+ $out = "GET / HTTP/1.1\r\n";
+ $out .= "Host: localhost\r\n";
+ $out .= "User-Agent: Mozilla/5.0 (ISPConfig monitor)\r\n";
+ $out .= "Accept: application/xml,application/xhtml+xml,text/html\r\n";
+ $out .= "Connection: Close\r\n\r\n";
+ fwrite($fp, $out);
stream_set_timeout($fp, 5); // Timeout after 5 seconds
$res = fread($fp, 10); // try to get 10 bytes (enough to test!)
$info = stream_get_meta_data($fp);
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 49bb90f..935fc9e 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -291,18 +291,42 @@
// Create group and user, if not exist
$app->uses('system');
+
+ if($web_config['connect_userid_to_webid'] == 'y') {
+ //* Calculate the uid and gid
+ $connect_userid_to_webid_start = ($web_config['connect_userid_to_webid_start'] < 1000)?1000:intval($web_config['connect_userid_to_webid_start']);
+ $fixed_uid_gid = intval($connect_userid_to_webid_start + $data['new']['domain_id']);
+ $fixed_uid_param = '--uid '.$fixed_uid_gid;
+ $fixed_gid_param = '--gid '.$fixed_uid_gid;
+
+ //* Check if a ispconfigend user and group exists and create them
+ if(!$app->system->is_group('ispconfigend')) {
+ exec('groupadd --gid '.($connect_userid_to_webid_start + 10000).' ispconfigend');
+ }
+ if(!$app->system->is_user('ispconfigend')) {
+ exec('useradd -g ispconfigend -d /usr/local/ispconfig --uid '.($connect_userid_to_webid_start + 10000).' ispconfigend');
+ }
+ } else {
+ $fixed_uid_param = '';
+ $fixed_gid_param = '';
+ }
$groupname = escapeshellcmd($data['new']['system_group']);
if($data['new']['system_group'] != '' && !$app->system->is_group($data['new']['system_group'])) {
- exec('groupadd '.$groupname);
+ exec('groupadd '.$fixed_gid_param.' '.$groupname);
if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' groupadd '.$groupname);
$app->log('Adding the group: '.$groupname,LOGLEVEL_DEBUG);
}
$username = escapeshellcmd($data['new']['system_user']);
if($data['new']['system_user'] != '' && !$app->system->is_user($data['new']['system_user'])) {
- exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname -G sshusers $username -s /bin/false");
- if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname -G sshusers $username -s /bin/false");
+ if($web_config['add_web_users_to_sshusers_group'] == 'y') {
+ exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param -G sshusers $username -s /bin/false");
+ if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param -G sshusers $username -s /bin/false");
+ } else {
+ exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param $username -s /bin/false");
+ if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param $username -s /bin/false");
+ }
$app->log('Adding the user: '.$username,LOGLEVEL_DEBUG);
}
@@ -553,7 +577,7 @@
//* If the security level is set to high
- if($this->action == 'insert' && $data['new']['type'] == 'vhost') {
+ if(($this->action == 'insert' && $data['new']['type'] == 'vhost') or ($web_config['set_folder_permissions_on_update'] == 'y' && $data['new']['type'] == 'vhost')) {
if($web_config['security_level'] == 20) {
$this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']));
@@ -565,11 +589,13 @@
// Set Log symlink to 755 to make the logs accessible by the FTP user
$this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"])."/log");
-
- $command = 'usermod';
- $command .= ' --groups sshusers';
- $command .= ' '.escapeshellcmd($data['new']['system_user']);
- $this->_exec($command);
+
+ if($web_config['add_web_users_to_sshusers_group'] == 'y') {
+ $command = 'usermod';
+ $command .= ' --groups sshusers';
+ $command .= ' '.escapeshellcmd($data['new']['system_user']);
+ $this->_exec($command);
+ }
//* if we have a chrooted Apache environment
if($apache_chrooted) {
@@ -585,8 +611,14 @@
//* add the Apache user to the client group
$app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
-
+
+ //* Chown all default directories
$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/log'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/ssl'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+ $this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/web'));
/*
* Workaround for jailkit: If jailkit is enabled for the site, the
@@ -605,11 +637,20 @@
} else {
$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
- $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/*'));
- $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
-
+ $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
+ $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/log'));
+ $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/ssl'));
+ $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/web'));
+
// make temp directory writable for Apache and the website users
$this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+
+ $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
+ $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root'].'/log'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/ssl'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/web'));
}
}
@@ -637,7 +678,7 @@
if($master_php_ini_path != '' && substr($master_php_ini_path,-7) == 'php.ini' && is_file($master_php_ini_path)) {
$php_ini_content .= file_get_contents($master_php_ini_path)."\n";
}
- $php_ini_content .= trim($data['new']['custom_php_ini']);
+ $php_ini_content .= str_replace("\r",'',trim($data['new']['custom_php_ini']));
file_put_contents($custom_php_ini_dir.'/php.ini',$php_ini_content);
} else {
$has_custom_php_ini = false;
@@ -730,7 +771,7 @@
'rewrite_target_ssl' => $rewrite_target_ssl);
break;
case '*':
- $rewrite_rules[] = array( 'rewrite_domain' => $data['new']['domain'],
+ $rewrite_rules[] = array( 'rewrite_domain' => '(^|\.)'.$data['new']['domain'],
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
'rewrite_target' => $rewrite_target,
'rewrite_target_ssl' => $rewrite_target_ssl);
@@ -796,7 +837,7 @@
'rewrite_target_ssl' => $rewrite_target_ssl);
break;
case '*':
- $rewrite_rules[] = array( 'rewrite_domain' => $alias['domain'],
+ $rewrite_rules[] = array( 'rewrite_domain' => '(^|\.)'.$alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
'rewrite_target' => $rewrite_target,
'rewrite_target_ssl' => $rewrite_target_ssl);
@@ -1051,6 +1092,11 @@
unlink($vhost_symlink);
$app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
}
+ $vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
+ if(is_link($vhost_symlink)) {
+ unlink($vhost_symlink);
+ $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
+ }
$vhost_file = escapeshellcmd($web_config['vhost_conf_dir'].'/'.$data['old']['domain'].'.vhost');
unlink($vhost_file);
$app->log('Removing file: '.$vhost_file,LOGLEVEL_DEBUG);
@@ -1095,7 +1141,13 @@
if($apache_online_status_before_restart && !$apache_online_status_after_restart) {
$app->log('Apache did not restart after the configuration change for website '.$data['new']['domain'].' Reverting the configuration. Saved non-working config as '.$vhost_file.'.err',LOGLEVEL_WARN);
copy($vhost_file,$vhost_file.'.err');
- copy($vhost_file.'~',$vhost_file);
+ if(is_file($vhost_file.'~')) {
+ //* Copy back the last backup file
+ copy($vhost_file.'~',$vhost_file);
+ } else {
+ //* There is no backup file, so we create a empty vhost file with a warning message inside
+ file_put_contents($vhost_file,"# Apache did not start after modifying this vhost file.\n# Please check file $vhost_file.err for syntax errors.");
+ }
$app->services->restartService('httpd','restart');
}
} else {
@@ -1315,12 +1367,18 @@
}
//* Create the folder path, if it does not exist
- if(!is_dir($folder_path)) exec('mkdir -p '.$folder_path);
+ if(!is_dir($folder_path)) {
+ exec('mkdir -p '.$folder_path);
+ chown($folder_path,$website['system_user']);
+ chgrp($folder_path,$website['system_group']);
+ }
//* Create empty .htpasswd file, if it does not exist
if(!is_file($folder_path.'.htpasswd')) {
touch($folder_path.'.htpasswd');
chmod($folder_path.'.htpasswd',0755);
+ chown($folder_path.'.htpasswd',$website['system_user']);
+ chgrp($folder_path.'.htpasswd',$website['system_group']);
$app->log('Created file '.$folder_path.'.htpasswd',LOGLEVEL_DEBUG);
}
@@ -1358,7 +1416,9 @@
//if(!is_file($folder_path.'.htaccess')) {
$ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user";
file_put_contents($folder_path.'.htaccess',$ht_file);
- chmod($folder_path.'.htpasswd',0755);
+ chmod($folder_path.'.htaccess',0755);
+ chown($folder_path.'.htaccess',$website['system_user']);
+ chgrp($folder_path.'.htaccess',$website['system_group']);
$app->log('Created file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
//}
@@ -1470,7 +1530,9 @@
$ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$new_folder_path.".htpasswd\nrequire valid-user";
file_put_contents($new_folder_path.'.htaccess',$ht_file);
chmod($new_folder_path.'.htpasswd',0755);
- $app->log('Created file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
+ chown($folder_path.'.htpasswd',$website['system_user']);
+ chgrp($folder_path.'.htpasswd',$website['system_group']);
+ $app->log('Created file '.$new_folder_path.'.htpasswd',LOGLEVEL_DEBUG);
}
//* Remove .htaccess file
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index 9d67eda..e5a7120 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -107,10 +107,10 @@
//TODO : change this when distribution information has been integrated into server record
if (file_exists('/etc/gentoo-release')) {
- $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri/'.substr($zone['origin'],0,-1));
+ $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1)));
}
else {
- $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.substr($zone['origin'],0,-1));
+ $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1)));
}
$app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG);
@@ -132,10 +132,10 @@
if($data['old']['origin'] != $data['new']['origin']) {
//TODO : change this when distribution information has been integrated into server record
if (file_exists('/etc/gentoo-release')) {
- $filename = $dns_config['bind_zonefiles_dir'].'/pri/'.substr($data['old']['origin'],0,-1);
+ $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1));
}
else {
- $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.substr($data['old']['origin'],0,-1);
+ $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1));
}
if(is_file($filename)) unset($filename);
@@ -159,10 +159,10 @@
//* Delete the domain file
//TODO : change this when distribution information has been integrated into server record
if (file_exists('/etc/gentoo-release')) {
- $zone_file_name = $dns_config['bind_zonefiles_dir'].'/pri/'.substr($data['old']['origin'],0,-1);
+ $zone_file_name = $dns_config['bind_zonefiles_dir'].'/pri/'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
}
else {
- $zone_file_name = $dns_config['bind_zonefiles_dir'].'/pri.'.substr($data['old']['origin'],0,-1);
+ $zone_file_name = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
}
if(is_file($zone_file_name)) unlink($zone_file_name);
@@ -199,10 +199,10 @@
if($data['old']['origin'] != $data['new']['origin']) {
//TODO : change this when distribution information has been integrated into server record
if (file_exists('/etc/gentoo-release')) {
- $filename = $dns_config['bind_zonefiles_dir'].'/sec/'.substr($data['old']['origin'],0,-1);
+ $filename = $dns_config['bind_zonefiles_dir'].'/sec/'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
}
else {
- $filename = $dns_config['bind_zonefiles_dir'].'/slave/sec.'.substr($data['old']['origin'],0,-1);
+ $filename = $dns_config['bind_zonefiles_dir'].'/slave/sec.'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
}
if(is_file($filename)) unset($filename);
@@ -227,10 +227,10 @@
//* Delete the domain file
//TODO : change this when distribution information has been integrated into server record
if (file_exists('/etc/gentoo-release')) {
- $zone_file_name = $dns_config['bind_zonefiles_dir'].'/sec/'.substr($data['old']['origin'],0,-1);
+ $zone_file_name = $dns_config['bind_zonefiles_dir'].'/sec/'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
}
else {
- $zone_file_name = $dns_config['bind_zonefiles_dir'].'/slave/sec.'.substr($data['old']['origin'],0,-1);
+ $zone_file_name = $dns_config['bind_zonefiles_dir'].'/slave/sec.'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
}
if(is_file($zone_file_name)) unlink($zone_file_name);
@@ -319,7 +319,7 @@
if($tmp['origin'] != $exclude_zone) {
$zones[] = array( 'zone' => substr($tmp['origin'],0,-1),
- 'zonefile_path' => $pri_zonefiles_path.substr($tmp['origin'],0,-1),
+ 'zonefile_path' => $pri_zonefiles_path.str_replace("/", "_",substr($tmp['origin'],0,-1)),
'options' => $options
);
}
@@ -344,7 +344,7 @@
$zones_sec[] = array( 'zone' => substr($tmp['origin'],0,-1),
- 'zonefile_path' => $sec_zonefiles_path.substr($tmp['origin'],0,-1),
+ 'zonefile_path' => $sec_zonefiles_path.str_replace("/", "_",substr($tmp['origin'],0,-1)),
'options' => $options
);
diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
index 5bcfbee..595e245 100644
--- a/server/plugins-available/mysql_clientdb_plugin.inc.php
+++ b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -100,7 +100,7 @@
if($valid == false) continue;
if($action == 'GRANT') {
- if(!$link->query("GRANT ALL ON ".$link->escape_string($database_name).".* TO '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY '".$link->escape_string($database_password)."';")) $success = false;
+ if(!mysql_query("GRANT ALL ON ".mysql_real_escape_string($database_name,$link).".* TO '".mysql_real_escape_string($database_user,$link)."'@'$db_host' IDENTIFIED BY PASSWORD '".mysql_real_escape_string($database_password,$link)."';",$link)) $success = false;
} elseif($action == 'REVOKE') {
//mysql_query("REVOKE ALL PRIVILEGES ON ".mysql_real_escape_string($database_name,$link).".* FROM '".mysql_real_escape_string($database_user,$link)."';",$link);
} elseif($action == 'DROP') {
@@ -108,7 +108,7 @@
} elseif($action == 'RENAME') {
if(!$link->query("RENAME USER '".$link->escape_string($database_user)."'@'$db_host' TO '".$link->escape_string($database_rename_user)."'@'$db_host'")) $success = false;
} elseif($action == 'PASSWORD') {
- if(!$link->query("SET PASSWORD FOR '".$link->escape_string($database_user)."'@'$db_host' = PASSWORD('".$link->escape_string($database_password)."');")) $success = false;
+ if(!mysql_query("SET PASSWORD FOR '".mysql_real_escape_string($database_user,$link)."'@'$db_host' = '".mysql_real_escape_string($database_password,$link)."';",$link)) $success = false;
}
}
@@ -158,7 +158,7 @@
}
$db_host = 'localhost';
- $link->query("GRANT ALL ON `".str_replace(array('_','%'),array('\\_','\\%'),$link->escape_string($data['new']['database_name']))."`.* TO '".$link->escape_string($data['new']['database_user'])."'@'$db_host' IDENTIFIED BY '".$link->escape_string($data['new']['database_password'])."';");
+ mysql_query("GRANT ALL ON `".str_replace(array('_','%'),array('\\_','\\%'),mysql_real_escape_string($data['new']['database_name'],$link))."`.* TO '".mysql_real_escape_string($data['new']['database_user'],$link)."'@'$db_host' IDENTIFIED BY PASSWORD '".mysql_real_escape_string($data['new']['database_password'],$link)."';",$link);
}
@@ -197,7 +197,7 @@
}
$db_host = 'localhost';
- $link->query("GRANT ALL ON `".str_replace(array('_','%'),array('\\_','\\%'),$link->escape_string($data['new']['database_name']))."`.* TO '".$link->escape_string($data['new']['database_user'])."'@'$db_host' IDENTIFIED BY '".$link->escape_string($data['new']['database_password'])."';");
+ mysql_query("GRANT ALL ON `".str_replace(array('_','%'),array('\\_','\\%'),mysql_real_escape_string($data['new']['database_name'],$link))."`.* TO '".mysql_real_escape_string($data['new']['database_user'],$link)."'@'$db_host' IDENTIFIED BY PASSWORD '".mysql_real_escape_string($data['new']['database_password'],$link)."';",$link);
// mysql_query("GRANT ALL ON ".mysql_real_escape_string($data["new"]["database_name"],$link).".* TO '".mysql_real_escape_string($data["new"]["database_user"],$link)."'@'$db_host' IDENTIFIED BY '".mysql_real_escape_string($data["new"]["database_password"],$link)."';",$link);
//echo "GRANT ALL ON ".mysql_real_escape_string($data["new"]["database_name"]).".* TO '".mysql_real_escape_string($data["new"]["database_user"])."'@'$db_host' IDENTIFIED BY '".mysql_real_escape_string($data["new"]["database_password"])."';";
@@ -247,10 +247,7 @@
//* Change password
if($data['new']['database_password'] != $data['old']['database_password']) {
$db_host = 'localhost';
- $link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = PASSWORD('".$link->escape_string($data['new']['database_password'])."');");
- if($link->error) {
- error_log($link->error);
- }
+ mysql_query("SET PASSWORD FOR '".mysql_real_escape_string($data['new']['database_user'],$link)."'@'$db_host' = '".mysql_real_escape_string($data['new']['database_password'],$link)."';",$link);
if($data['new']['remote_access'] == 'y') {
$this->process_host_list('PASSWORD', '', $data['new']['database_user'], $data['new']['database_password'], $data['new']['remote_ips']);
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index b4ba1b7..79fa68d 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -168,7 +168,7 @@
$app->log("Creating CA-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
if (filesize($crt_file)==0 || !file_exists($crt_file)) $app->log("CA-Certificate signing failed. openssl ca -out $crt_file -config ".$web_config['CA_path']."/openssl.cnf -passin pass:".$web_config['CA_pass']." -in $csr_file",LOGLEVEL_ERROR);
};
- if (filesize($crt_file)==0 || !file_exists($crt_file)){
+ if (@filesize($crt_file)==0 || !file_exists($crt_file)){
exec("openssl req -x509 -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -in $csr_file -out $crt_file -days $ssl_days -config $config_file ");
$app->log("Creating self-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
};
@@ -191,14 +191,24 @@
//* Save a SSL certificate to disk
if($data["new"]["ssl_action"] == 'save') {
$ssl_dir = $data["new"]["document_root"]."/ssl";
- $domain = $data["new"]["ssl_domain"];
+ $domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"];
$csr_file = $ssl_dir.'/'.$domain.".csr";
$crt_file = $ssl_dir.'/'.$domain.".crt";
//$bundle_file = $ssl_dir.'/'.$domain.".bundle";
if(trim($data["new"]["ssl_request"]) != '') file_put_contents($csr_file,$data["new"]["ssl_request"]);
if(trim($data["new"]["ssl_cert"]) != '') file_put_contents($crt_file,$data["new"]["ssl_cert"]);
// for nginx, bundle files have to be appended to the certificate file
- if(trim($data["new"]["ssl_bundle"]) != '') file_put_contents($crt_file,$data["new"]["ssl_bundle"], FILE_APPEND);
+ if(trim($data["new"]["ssl_bundle"]) != ''){
+ if(file_exists($crt_file)){
+ $crt_file_contents = trim(file_get_contents($crt_file));
+ } else {
+ $crt_file_contents = '';
+ }
+ if($crt_file_contents != '') $crt_file_contents .= "\n";
+ $crt_file_contents .= $data["new"]["ssl_bundle"];
+ file_put_contents($crt_file,$app->file->unix_nl($crt_file_contents));
+ unset($crt_file_contents);
+ }
/* Update the DB of the (local) Server */
$app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
/* Update also the master-DB of the Server-Farm */
@@ -209,7 +219,7 @@
//* Delete a SSL certificate
if($data['new']['ssl_action'] == 'del') {
$ssl_dir = $data['new']['document_root'].'/ssl';
- $domain = $data['new']['ssl_domain'];
+ $domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"];
$csr_file = $ssl_dir.'/'.$domain.'.csr';
$crt_file = $ssl_dir.'/'.$domain.'.crt';
//$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
@@ -229,7 +239,6 @@
$app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
$app->log('Deleting SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
}
-
}
@@ -503,18 +512,42 @@
// Create group and user, if not exist
$app->uses('system');
+
+ if($web_config['connect_userid_to_webid'] == 'y') {
+ //* Calculate the uid and gid
+ $connect_userid_to_webid_start = ($web_config['connect_userid_to_webid_start'] < 1000)?1000:intval($web_config['connect_userid_to_webid_start']);
+ $fixed_uid_gid = intval($connect_userid_to_webid_start + $data['new']['domain_id']);
+ $fixed_uid_param = '--uid '.$fixed_uid_gid;
+ $fixed_gid_param = '--gid '.$fixed_uid_gid;
+
+ //* Check if a ispconfigend user and group exists and create them
+ if(!$app->system->is_group('ispconfigend')) {
+ exec('groupadd --gid '.($connect_userid_to_webid_start + 10000).' ispconfigend');
+ }
+ if(!$app->system->is_user('ispconfigend')) {
+ exec('useradd -g ispconfigend -d /usr/local/ispconfig --uid '.($connect_userid_to_webid_start + 10000).' ispconfigend');
+ }
+ } else {
+ $fixed_uid_param = '';
+ $fixed_gid_param = '';
+ }
$groupname = escapeshellcmd($data['new']['system_group']);
if($data['new']['system_group'] != '' && !$app->system->is_group($data['new']['system_group'])) {
- exec('groupadd '.$groupname);
+ exec('groupadd '.$fixed_gid_param.' '.$groupname);
if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' groupadd '.$groupname);
$app->log('Adding the group: '.$groupname,LOGLEVEL_DEBUG);
}
$username = escapeshellcmd($data['new']['system_user']);
if($data['new']['system_user'] != '' && !$app->system->is_user($data['new']['system_user'])) {
- exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname -G sshusers $username -s /bin/false");
- if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname -G sshusers $username -s /bin/false");
+ if($web_config['add_web_users_to_sshusers_group'] == 'y') {
+ exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param -G sshusers $username -s /bin/false");
+ if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param -G sshusers $username -s /bin/false");
+ } else {
+ exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param $username -s /bin/false");
+ if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param $username -s /bin/false");
+ }
$app->log('Adding the user: '.$username,LOGLEVEL_DEBUG);
}
@@ -532,74 +565,91 @@
if($this->action == 'insert' || $data["new"]["system_user"] != $data["old"]["system_user"]) {
// Chown and chmod the directories below the document root
- $this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
+ $this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']).'/web');
// The document root itself has to be owned by root in normal level and by the web owner in security level 20
if($web_config['security_level'] == 20) {
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']).'/web');
} else {
- $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
+ $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']).'/web');
}
}
-
-
-
+
//* If the security level is set to high
- if($web_config['security_level'] == 20) {
+ if(($this->action == 'insert' && $data['new']['type'] == 'vhost') or ($web_config['set_folder_permissions_on_update'] == 'y' && $data['new']['type'] == 'vhost')) {
+ if($web_config['security_level'] == 20) {
- $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']));
- $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']).'/*');
- $this->_exec('chmod 710 '.escapeshellcmd($data['new']['document_root'].'/web'));
+ $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']));
+ $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']).'/*');
+ $this->_exec('chmod 710 '.escapeshellcmd($data['new']['document_root'].'/web'));
- // make tmp directory writable for nginx and the website users
- $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+ // make tmp directory writable for nginx and the website users
+ $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
- // Set Log symlink to 755 to make the logs accessible by the FTP user
- $this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"])."/log");
+ // Set Log symlink to 755 to make the logs accessible by the FTP user
+ $this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"])."/log");
- $command = 'usermod';
- $command .= ' --groups sshusers';
- $command .= ' '.escapeshellcmd($data['new']['system_user']);
- $this->_exec($command);
+ if($web_config['add_web_users_to_sshusers_group'] == 'y') {
+ $command = 'usermod';
+ $command .= ' --groups sshusers';
+ $command .= ' '.escapeshellcmd($data['new']['system_user']);
+ $this->_exec($command);
+ }
- //* if we have a chrooted nginx environment
- if($nginx_chrooted) {
- $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
+ //* if we have a chrooted nginx environment
+ if($nginx_chrooted) {
+ $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
- //* add the nginx user to the client group in the chroot environment
- $tmp_groupfile = $app->system->server_conf['group_datei'];
- $app->system->server_conf['group_datei'] = $web_config['website_basedir'].'/etc/group';
- $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
- $app->system->server_conf['group_datei'] = $tmp_groupfile;
- unset($tmp_groupfile);
- }
+ //* add the nginx user to the client group in the chroot environment
+ $tmp_groupfile = $app->system->server_conf['group_datei'];
+ $app->system->server_conf['group_datei'] = $web_config['website_basedir'].'/etc/group';
+ $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
+ $app->system->server_conf['group_datei'] = $tmp_groupfile;
+ unset($tmp_groupfile);
+ }
- //* add the nginx user to the client group
- $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['nginx_user']));
+ //* add the nginx user to the client group
+ $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['nginx_user']));
+
+ //* Chown all default directories
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/log'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/ssl'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+ $this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/web'));
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
+ /*
+ * Workaround for jailkit: If jailkit is enabled for the site, the
+ * website root has to be owned by the root user and we have to chmod it to 755 then
+ */
- /*
- * Workaround for jailkit: If jailkit is enabled for the site, the
- * website root has to be owned by the root user and we have to chmod it to 755 then
- */
+ //* Check if there is a jailkit user for this site
+ $tmp = $app->db->queryOneRecord('SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = '.$data['new']['domain_id']." AND chroot = 'jailkit'");
+ if($tmp['number'] > 0) {
+ $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
+ $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
+ }
+ unset($tmp);
- //* Check if there is a jailkit user for this site
- $tmp = $app->db->queryOneRecord('SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = '.$data['new']['domain_id']." AND chroot = 'jailkit'");
- if($tmp['number'] > 0) {
+ // If the security Level is set to medium
+ } else {
+
$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
+ $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
+ $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/log'));
+ $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/ssl'));
+ $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/web'));
+
+ // make temp directory writable for nginx and the website users
+ $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+
$this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
+ $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root'].'/log'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/ssl'));
+ $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/web'));
}
- unset($tmp);
-
- // If the security Level is set to medium
- } else {
-
- $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
- $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/*'));
- $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
-
- // make temp directory writable for nginx and the website users
- $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
}
// Change the ownership of the error log to the owner of the website
@@ -882,6 +932,11 @@
unlink($vhost_symlink);
$app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
}
+ $vhost_symlink = escapeshellcmd($web_config['nginx_vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
+ if(is_link($vhost_symlink)) {
+ unlink($vhost_symlink);
+ $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
+ }
$vhost_file = escapeshellcmd($web_config['nginx_vhost_conf_dir'].'/'.$data['old']['domain'].'.vhost');
unlink($vhost_file);
$app->log('Removing file: '.$vhost_file,LOGLEVEL_DEBUG);
@@ -920,7 +975,13 @@
if($nginx_online_status_before_restart && !$nginx_online_status_after_restart) {
$app->log('nginx did not restart after the configuration change for website '.$data['new']['domain'].' Reverting the configuration. Saved non-working config as '.$vhost_file.'.err',LOGLEVEL_WARN);
copy($vhost_file,$vhost_file.'.err');
- copy($vhost_file.'~',$vhost_file);
+ if(is_file($vhost_file.'~')) {
+ //* Copy back the last backup file
+ copy($vhost_file.'~',$vhost_file);
+ } else {
+ //* There is no backup file, so we create a empty vhost file with a warning message inside
+ file_put_contents($vhost_file,"# nginx did not start after modifying this vhost file.\n# Please check file $vhost_file.err for syntax errors.");
+ }
$app->services->restartService('httpd','restart');
}
} else {
@@ -1058,27 +1119,7 @@
//* This function is called when a IP on the server is inserted, updated or deleted
function server_ip($event_name,$data) {
- global $app, $conf;
-
- // load the server configuration options
- $app->uses('getconf');
- $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
-
- $app->load('tpl');
-
- $tpl = new tpl();
- $tpl->newTemplate('apache_ispconfig.conf.master');
- $records = $app->db->queryAllRecords('SELECT * FROM server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
-
- if(count($records) > 0) {
- $tpl->setLoop('ip_adresses',$records);
- }
-
- $vhost_file = escapeshellcmd($web_config['nginx_vhost_conf_dir'].'/ispconfig.conf');
- file_put_contents($vhost_file,$tpl->grab());
- $app->log('Writing the conf file: '.$vhost_file,LOGLEVEL_DEBUG);
- unset($tpl);
-
+ return;
}
//* Create or update the .htaccess folder protection
@@ -1114,12 +1155,18 @@
}
//* Create the folder path, if it does not exist
- if(!is_dir($folder_path)) exec('mkdir -p '.$folder_path);
+ if(!is_dir($folder_path)) {
+ exec('mkdir -p '.$folder_path);
+ chown($folder_path,$website['system_user']);
+ chgrp($folder_path,$website['system_group']);
+ }
//* Create empty .htpasswd file, if it does not exist
if(!is_file($folder_path.'.htpasswd')) {
touch($folder_path.'.htpasswd');
chmod($folder_path.'.htpasswd',0755);
+ chown($folder_path.'.htpasswd',$website['system_user']);
+ chgrp($folder_path.'.htpasswd',$website['system_group']);
$app->log('Created file'.$folder_path.'.htpasswd',LOGLEVEL_DEBUG);
}
@@ -1305,6 +1352,9 @@
file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf',$content);
$app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf',LOGLEVEL_DEBUG);
}
+
+ if(is_file($data['new']['document_root']."/web/stats/index.html")) unlink($data['new']['document_root']."/web/stats/index.html");
+ copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/web/stats/index.php");
}
//* Delete the awstats configuration file
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 7677778..f411251 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -234,13 +234,13 @@
if (!file_exists($sshkeys)){
// add root's key
- $app->file->mkdirs($sshdir, '0755');
+ $app->file->mkdirs($sshdir, '0700');
if(is_file('/root/.ssh/authorized_keys')) file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys'));
// Remove duplicate keys
- $existing_keys = file($sshkeys);
+ $existing_keys = @file($sshkeys);
$new_keys = explode("\n", $userkey);
- $final_keys_arr = array_merge($existing_keys, $new_keys);
+ $final_keys_arr = @array_merge($existing_keys, $new_keys);
$new_final_keys_arr = array();
if(is_array($final_keys_arr) && !empty($final_keys_arr)){
foreach($final_keys_arr as $key => $val){
@@ -254,26 +254,42 @@
$app->file->remove_blank_lines($sshkeys);
$this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys,LOGLEVEL_DEBUG);
}
- if ($sshrsa != ''){
- // Remove duplicate keys
- $existing_keys = file($sshkeys);
- $new_keys = explode("\n", $sshrsa);
- $final_keys_arr = array_merge($existing_keys, $new_keys);
- $new_final_keys_arr = array();
- if(is_array($final_keys_arr) && !empty($final_keys_arr)){
- foreach($final_keys_arr as $key => $val){
- $new_final_keys_arr[$key] = trim($val);
- }
- }
- $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
- // add the custom key
- file_put_contents($sshkeys, $final_keys);
- $app->file->remove_blank_lines($sshkeys);
- $this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
+ //* Get the keys
+ $existing_keys = file($sshkeys);
+ $new_keys = explode("\n", $sshrsa);
+ $old_keys = explode("\n",$this->data['old']['ssh_rsa']);
+
+ //* Remove all old keys
+ if(is_array($old_keys)) {
+ foreach($old_keys as $key => $val) {
+ $k = array_search(trim($val),$existing_keys);
+ unset($existing_keys[$k]);
+ }
}
+
+ //* merge the remaining keys and the ones fom the ispconfig database.
+ if(is_array($new_keys)) {
+ $final_keys_arr = array_merge($existing_keys, $new_keys);
+ } else {
+ $final_keys_arr = $existing_keys;
+ }
+
+ $new_final_keys_arr = array();
+ if(is_array($final_keys_arr) && !empty($final_keys_arr)){
+ foreach($final_keys_arr as $key => $val){
+ $new_final_keys_arr[$key] = trim($val);
+ }
+ }
+ $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
+
+ // add the custom key
+ file_put_contents($sshkeys, $final_keys);
+ $app->file->remove_blank_lines($sshkeys);
+ $this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
+
// set proper file permissions
- // exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
+ exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$sshdir);
exec("chmod 600 '$sshkeys'");
}
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 50d2b24..86e92f6 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -91,7 +91,7 @@
$this->_add_jailkit_user();
- // call the ssh-rsa update function
+ //* call the ssh-rsa update function
$this->_setup_ssh_rsa();
$command .= 'usermod -s /usr/sbin/jk_chrootsh -U '.escapeshellcmd($data['new']['username']);
@@ -132,7 +132,7 @@
$this->_setup_jailkit_chroot();
$this->_add_jailkit_user();
- // call the ssh-rsa update function
+ //* call the ssh-rsa update function
$this->_setup_ssh_rsa();
$this->_update_website_security_level();
@@ -166,7 +166,7 @@
//exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
- $command = 'userdel';
+ $command = 'userdel -f';
$command .= ' '.escapeshellcmd($data['old']['username']);
exec($command);
$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
@@ -245,6 +245,8 @@
function _add_jailkit_user()
{
+ global $app;
+
//add the user to the chroot
$jailkit_chroot_userhome = $this->_get_home_dir($this->data['new']['username']);
$jailkit_chroot_puserhome = $this->_get_home_dir($this->data['new']['puser']);
@@ -264,6 +266,28 @@
$command .= ' '.$this->data['new']['puser'];
$command .= ' '.$jailkit_chroot_puserhome;
exec($command);
+
+ //* Change the homedir of the shell user and parent user
+ //* We have to do this manually as the usermod command fails
+ //* when the user is logged in or a command is running under that user
+ $passwd_file_array = file('/etc/passwd');
+ $passwd_out = '';
+ if(is_array($passwd_file_array)) {
+ foreach($passwd_file_array as $line) {
+ $line = trim($line);
+ $parts = explode(':',$line);
+ if($parts[0] == $this->data['new']['username']) {
+ $parts[5] = escapeshellcmd($this->data['new']['dir'].'/.'.$jailkit_chroot_userhome);
+ $parts[6] = escapeshellcmd('/usr/sbin/jk_chrootsh');
+ $new_line = implode(':',$parts);
+ copy('/etc/passwd','/etc/passwd~');
+ chmod('/etc/passwd~',0600);
+ $app->uses('system');
+ $app->system->replaceLine('/etc/passwd',$line,$new_line,1,0);
+ }
+ }
+ }
+
$this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG);
@@ -277,64 +301,9 @@
chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['puser']);
chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['pgroup']);
- $this->app->log("Added created jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG);
+ $this->app->log("Added jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG);
- /*
- // ssh-rsa authentication variables
- $sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
- $usrdir = escapeshellcmd($this->data['new']['dir']).'/'.$jailkit_chroot_userhome;
- $sshdir = escapeshellcmd($this->data['new']['dir']).'/'.$jailkit_chroot_userhome.'/.ssh';
- $sshkeys= escapeshellcmd($this->data['new']['dir']).'/'.$jailkit_chroot_userhome.'/.ssh/authorized_keys';
- global $app;
-
- // determine the client id
- $id = $this->data['new']['sys_groupid'];
- if ($id>0) $id = $id -1;
-
- $user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE client_id = ".$id);
- $userkey = $user['ssh_rsa'];
- $username= $user['username'];
-
- // If this user has no key yet, generate a pair
- if ($userkey == '')
- {
- //Generate ssh-rsa-keys
- exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
-
- $privatekey = file_get_contents('/tmp/id_rsa');
- $publickey = file_get_contents('/tmp/id_rsa.pub');
-
- exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub');
-
- // Set the missing keypair
- $app->db->query("UPDATE sys_user SET id_rsa='$privatekey' ,ssh_rsa='$publickey' WHERE client_id = ".$id);
- $userkey = $publickey;
-
- $this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG);
-
- };
-
- if (!file_exists($sshkeys))
- {
- // add root's key
- exec("mkdir '$sshdir'");
- exec("cat /root/.ssh/authorized_keys > '$sshkeys'");
- exec("echo '' >> '$sshkeys'");
-
- // add the user's key
- exec("echo '$userkey' >> '$sshkeys'");
- exec("echo '' >> '$sshkeys'");
- }
- // add the custom key
- exec("echo '$sshrsa' >> '$sshkeys'");
- exec("echo '' >> '$sshkeys'");
-
- // set proper file permissions
- exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
- exec("chmod 600 '$sshkeys'");
-
- $this->app->log("ssh-rsa key added to ".$sshkeys,LOGLEVEL_DEBUG);
- */
+
}
//* Update the website root directory permissions depending on the security level
@@ -423,26 +392,42 @@
$app->file->remove_blank_lines($sshkeys);
$this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys,LOGLEVEL_DEBUG);
}
- if ($sshrsa != ''){
- // Remove duplicate keys
- $existing_keys = file($sshkeys);
- $new_keys = explode("\n", $sshrsa);
- $final_keys_arr = array_merge($existing_keys, $new_keys);
- $new_final_keys_arr = array();
- if(is_array($final_keys_arr) && !empty($final_keys_arr)){
- foreach($final_keys_arr as $key => $val){
- $new_final_keys_arr[$key] = trim($val);
- }
- }
- $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
+ //* Get the keys
+ $existing_keys = file($sshkeys);
+ $new_keys = explode("\n", $sshrsa);
+ $old_keys = explode("\n",$this->data['old']['ssh_rsa']);
- // add the custom key
- file_put_contents($sshkeys, $final_keys);
- $app->file->remove_blank_lines($sshkeys);
- $this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
+ //* Remove all old keys
+ if(is_array($old_keys)) {
+ foreach($old_keys as $key => $val) {
+ $k = array_search(trim($val),$existing_keys);
+ unset($existing_keys[$k]);
+ }
}
+
+ //* merge the remaining keys and the ones fom the ispconfig database.
+ if(is_array($new_keys)) {
+ $final_keys_arr = array_merge($existing_keys, $new_keys);
+ } else {
+ $final_keys_arr = $existing_keys;
+ }
+
+ $new_final_keys_arr = array();
+ if(is_array($final_keys_arr) && !empty($final_keys_arr)){
+ foreach($final_keys_arr as $key => $val){
+ $new_final_keys_arr[$key] = trim($val);
+ }
+ }
+ $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
+
+ // add the custom key
+ file_put_contents($sshkeys, $final_keys);
+ $app->file->remove_blank_lines($sshkeys);
+ $this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
+
// set proper file permissions
- // exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
+ exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$sshdir);
+ exec("chmod 700 ".$sshdir);
exec("chmod 600 '$sshkeys'");
}
diff --git a/server/scripts/create_daily_nginx_access_logs.sh b/server/scripts/create_daily_nginx_access_logs.sh
index 862c70f..ce4945f 100644
--- a/server/scripts/create_daily_nginx_access_logs.sh
+++ b/server/scripts/create_daily_nginx_access_logs.sh
@@ -3,7 +3,7 @@
FILES=/var/log/ispconfig/httpd/*
for f in $FILES
do
- mv $f/access.log $f/`date "+%Y%m%d"`-access.log &> /dev/null
+ mv $f/access.log $f/`date --date='yesterday' "+%Y%m%d"`-access.log &> /dev/null
touch $f/access.log &> /dev/null
done
pkill -USR1 -u root nginx &> /dev/null
\ No newline at end of file
--
Gitblit v1.9.1