From 02bf997271f4d09e91c8fcb9cecd08f06f2400c4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Apr 2012 12:04:52 -0400
Subject: [PATCH] Merged revisions 3028-3045 from stable branch.
---
interface/web/mail/lib/lang/es_mail_get.lng | 2
interface/web/dns/lib/lang/hr_dns_mx.lng | 16
interface/web/sites/lib/lang/hr_cron.lng | 34
interface/web/sites/lib/lang/se_ftp_user.lng | 2
interface/web/sites/lib/lang/fr_shell_user.lng | 2
interface/web/sites/lib/lang/se_web_domain.lng | 2
interface/lib/lang/id.lng | 1
interface/web/dns/lib/lang/hr_dns_cname.lng | 20
interface/web/dns/lib/lang/tr.lng | 3
interface/web/mail/lib/lang/hr_mail_whitelist_list.lng | 10
interface/web/mail/lib/lang/pl_mail_get.lng | 2
interface/web/mail/lib/lang/pl_mail_alias.lng | 1
interface/web/sites/lib/lang/hu_web_domain.lng | 2
interface/web/sites/lib/lang/pt_shell_user.lng | 2
interface/web/admin/lib/lang/hr_firewall.lng | 4
interface/web/dns/lib/lang/el_dns_import.lng | 14
interface/web/sites/lib/lang/de_ftp_user.lng | 2
interface/web/dns/lib/lang/nl_dns_import.lng | 14
interface/web/dns/lib/lang/tr_dns_import.lng | 14
interface/web/vm/lib/lang/hr_openvz_vm.lng | 54
interface/web/themes/default_no_navimg/templates/main.tpl.htm | 2
interface/web/sites/lib/lang/de_web_domain.lng | 2
interface/web/mail/lib/lang/en_mail_alias.lng | 3
interface/web/mail/lib/lang/ro_mail_get.lng | 2
interface/lib/lang/bg.lng | 1
interface/web/sites/lib/lang/en_web_domain.lng | 2
interface/web/sites/lib/lang/hr.lng | 2
interface/web/designer/lib/lang/hr_module_show.lng | 28
interface/web/dns/lib/lang/es_dns_import.lng | 14
interface/lib/lang/pl.lng | 1
interface/web/sites/lib/lang/ja_shell_user.lng | 2
interface/web/client/lib/lang/hr_client.lng | 78
interface/web/dns/lib/lang/fi.lng | 3
interface/web/dns/lib/lang/hr_dns_import.lng | 14
interface/web/dns/lib/lang/ru_dns_import.lng | 14
interface/web/mail/lib/lang/hr_mail_alias_list.lng | 8
interface/web/dns/lib/lang/cz.lng | 3
interface/web/help/lib/lang/hr_faq_sections_form.lng | 2
interface/web/sites/lib/lang/pl_web_domain.lng | 2
interface/web/mail/lib/lang/hu_mail_alias.lng | 1
interface/web/sites/lib/lang/hu_ftp_user.lng | 2
interface/web/admin/lib/lang/hr_remote_user_list.lng | 2
install/lib/update.lib.php | 26
interface/web/mail/lib/lang/id_mail_alias.lng | 1
interface/web/help/lib/lang/hr_help_faq_sections_list.lng | 12
interface/web/mail/lib/lang/hr_mail_relay_recipient_list.lng | 4
interface/web/sites/lib/lang/de_webdav_user.lng | 2
interface/web/sites/lib/lang/bg_web_domain.lng | 2
interface/web/dns/lib/lang/id.lng | 3
interface/web/dns/lib/lang/it_dns_import.lng | 14
interface/web/mail/lib/lang/fi_mail_alias.lng | 1
interface/lib/lang/hu.lng | 1
interface/web/mail/lib/lang/hr_mail_content_filter_list.lng | 2
interface/web/sites/lib/lang/ar_ftp_user.lng | 2
interface/web/sites/lib/lang/id_shell_user.lng | 2
interface/lib/lang/nl.lng | 1
interface/web/mail/lib/lang/hr_user_quota_stats_list.lng | 2
interface/web/sites/lib/lang/hr_web_domain_admin_list.lng | 6
interface/lib/lang/ro.lng | 1
interface/web/dns/lib/lang/ro.lng | 3
interface/lib/lang/el.lng | 1
interface/web/dns/lib/lang/fi_dns_import.lng | 14
interface/web/dns/lib/lang/nl.lng | 3
interface/web/dns/lib/lang/hr_dns_slave.lng | 20
interface/web/themes/default_combobox/templates/main.tpl.htm | 2
interface/web/dns/lib/lang/el.lng | 3
interface/web/sites/lib/lang/fi_ftp_user.lng | 2
interface/web/help/lib/lang/hr_faq_manage_questions_list.lng | 14
interface/web/sites/lib/lang/id_ftp_user.lng | 2
interface/web/sites/lib/lang/hr_cron_list.lng | 14
interface/web/mail/lib/lang/se_mail_alias.lng | 1
interface/web/mail/lib/lang/tr_mail_get.lng | 2
interface/web/vm/lib/lang/hr_openvz_template.lng | 50
interface/web/sites/lib/lang/pl_webdav_user.lng | 2
interface/web/designer/lib/lang/hr_form_list.lng | 10
interface/web/mail/lib/lang/de_mail_alias.lng | 3
interface/web/sites/lib/lang/br_ftp_user.lng | 2
interface/lib/lang/es.lng | 1
interface/web/sites/lib/lang/hr_web_subdomain.lng | 58
interface/web/dns/lib/lang/es.lng | 3
interface/web/mail/lib/lang/hr_mail_get_list.lng | 8
interface/web/sites/lib/lang/bg_webdav_user.lng | 2
interface/web/mail/lib/lang/hr_mail_blacklist_list.lng | 10
interface/web/dns/lib/lang/cz_dns_import.lng | 14
interface/web/mail/lib/lang/cz_mail_get.lng | 2
interface/web/dns/lib/lang/hr_dns_hinfo.lng | 12
interface/web/sites/lib/lang/se_webdav_user.lng | 2
interface/lib/lang/ja.lng | 1
interface/web/dns/lib/lang/hr_dns_slave_list.lng | 8
interface/web/sites/lib/lang/es_webdav_user.lng | 2
interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng | 14
interface/lib/lang/pt.lng | 1
interface/web/client/lib/lang/hr_client_template_list.lng | 2
interface/web/dns/lib/lang/bg_dns_import.lng | 14
interface/web/mail/lib/lang/fr_mail_alias.lng | 1
install/sql/ispconfig3.sql | 4
interface/web/mail/lib/lang/ru_mail_alias.lng | 1
server/plugins-available/apache2_plugin.inc.php | 9
interface/web/sites/lib/lang/ja_ftp_user.lng | 2
interface/web/sites/lib/lang/sk_webdav_user.lng | 2
interface/web/mail/lib/lang/es_mail_alias.lng | 1
interface/web/dns/lib/lang/de_dns_import.lng | 14
interface/web/dns/lib/lang/ru.lng | 3
interface/web/dns/lib/lang/se_dns_import.lng | 14
interface/web/admin/lib/lang/hr_iptables.lng | 2
interface/web/sites/lib/lang/br_shell_user.lng | 2
interface/web/mail/lib/lang/hr_mail_mailinglist.lng | 18
interface/web/designer/lib/lang/hr_form_edit.lng | 38
interface/web/mail/lib/lang/it_mail_get.lng | 2
interface/web/dns/lib/lang/de.lng | 3
interface/web/mail/lib/lang/nl_mail_alias.lng | 1
interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng | 4
interface/web/sites/lib/lang/id_webdav_user.lng | 2
interface/lib/classes/simplepie.inc.php | 2
interface/lib/config.inc.php | 2
interface/web/sites/lib/lang/hr_web_folder_user_list.lng | 4
interface/web/sites/lib/lang/hu_shell_user.lng | 2
interface/web/mail/lib/lang/hr_spamfilter_users_list.lng | 4
interface/web/sites/lib/lang/fr_web_domain.lng | 2
interface/web/sites/lib/lang/pt_web_domain.lng | 2
interface/web/mail/lib/lang/el_mail_alias.lng | 1
interface/web/mail/lib/lang/hr_mail_forward.lng | 6
interface/web/mail/lib/lang/ja_mail_alias.lng | 1
interface/web/sites/lib/lang/it_ftp_user.lng | 2
interface/web/sites/lib/lang/hr_webdav_user_list.lng | 4
interface/web/mail/lib/lang/ar_mail_alias.lng | 1
interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng | 2
interface/web/designer/lib/lang/hr_form_show.lng | 28
interface/web/dns/lib/lang/br_dns_import.lng | 14
interface/web/mail/lib/lang/sk_mail_alias.lng | 1
interface/web/sites/lib/lang/id_web_domain.lng | 2
interface/web/mail/lib/lang/hr_spamfilter_policy_list.lng | 14
interface/web/sites/templates/web_domain_ssl.htm | 2
interface/web/mail/lib/lang/bg_mail_get.lng | 2
interface/web/sites/lib/lang/el_ftp_user.lng | 2
interface/web/dns/lib/lang/hr_dns_template_list.lng | 8
server/plugins-available/mailman_plugin.inc.php | 2
interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng | 10
interface/web/mail/lib/lang/hr.lng | 74
interface/web/vm/lib/lang/hr_openvz_ostemplate.lng | 14
interface/web/dns/lib/lang/ja.lng | 3
interface/web/mail/lib/lang/hr_mail_domain_admin_list.lng | 6
interface/lib/lang/ru.lng | 1
interface/web/dns/lib/lang/hu_dns_import.lng | 14
interface/web/sites/lib/lang/ro_webdav_user.lng | 2
interface/web/sites/lib/lang/tr_shell_user.lng | 2
server/plugins-available/nginx_plugin.inc.php | 4
interface/web/admin/lib/lang/hr_server_config.lng | 216 ++--
interface/web/dns/lib/lang/ro_dns_import.lng | 14
interface/lib/lang/tr.lng | 1
interface/web/mail/lib/lang/el_mail_get.lng | 2
interface/web/sites/lib/lang/hr_shell_user.lng | 34
interface/web/dns/lib/lang/hr_dns_srv.lng | 22
interface/web/sites/lib/lang/bg_ftp_user.lng | 2
interface/web/dns/lib/lang/hr_dns_ptr.lng | 18
interface/web/dns/lib/lang/pt_dns_import.lng | 14
interface/web/sites/lib/lang/ru_webdav_user.lng | 2
interface/web/sites/lib/lang/ro_web_domain.lng | 2
interface/web/themes/default/templates/main.tpl.htm | 2
interface/web/mail/lib/lang/ja_mail_get.lng | 2
interface/web/dns/lib/lang/br.lng | 3
interface/web/dns/lib/lang/hr.lng | 7
interface/web/mail/lib/lang/hr_mail_user_list.lng | 8
interface/web/mail/lib/lang/hr_mail_domain_catchall.lng | 10
interface/web/sites/lib/lang/cz_shell_user.lng | 2
interface/web/mail/lib/lang/hr_mail_relay_recipient.lng | 4
interface/lib/lang/hr.lng | 11
interface/web/sites/lib/lang/sk_ftp_user.lng | 2
interface/web/mail/lib/lang/hr_mail_forward_list.lng | 6
interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng | 2
interface/web/dns/lib/lang/hr_dns_soa_list.lng | 6
install/dist/conf/opensuse112.conf.php | 2
interface/web/sites/lib/lang/bg_shell_user.lng | 2
interface/lib/lang/br.lng | 1
interface/web/help/lib/lang/hr_faq_form.lng | 8
interface/web/dns/lib/lang/en_dns_import.lng | 14
interface/web/vm/lib/lang/hr_openvz_action.lng | 16
interface/web/client/lib/lang/hr_reseller.lng | 78
interface/web/mail/lib/lang/se_mail_get.lng | 2
interface/web/dns/lib/lang/hr_dns_rp.lng | 10
interface/web/sites/lib/lang/ar_webdav_user.lng | 2
interface/web/sites/lib/lang/hr_web_folder.lng | 4
interface/web/dns/lib/lang/sk.lng | 3
interface/web/dns/lib/lang/hr_dns_soa.lng | 40
interface/web/mail/lib/lang/hr_mail_domain_list.lng | 4
interface/web/designer/lib/lang/hr_module_edit.lng | 30
interface/web/mail/lib/lang/hr_mail_content_filter.lng | 8
interface/web/sites/lib/lang/es_ftp_user.lng | 2
interface/web/client/lib/lang/hr_client_template.lng | 76
interface/lib/lang/ar.lng | 1
interface/web/mail/lib/lang/br_mail_alias.lng | 1
interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng | 4
interface/web/sites/lib/lang/it_web_domain.lng | 2
interface/web/mail/lib/lang/de_mail_get.lng | 2
interface/web/mail/mail_forward_edit.php | 3
interface/web/mail/lib/lang/hr_mail_transport.lng | 8
interface/web/sites/lib/lang/pt_webdav_user.lng | 2
interface/web/dns/lib/lang/hr_dns_txt.lng | 14
interface/web/sites/lib/lang/hr_database_list.lng | 10
interface/web/dns/lib/lang/it.lng | 3
interface/web/sites/lib/lang/hr_web_folder_list.lng | 4
interface/web/mail/lib/lang/hr_mail_aliasdomain.lng | 16
interface/web/sites/lib/lang/ru_shell_user.lng | 2
interface/web/designer/lib/lang/hr_module_nav_item_edit.lng | 10
interface/web/sites/lib/lang/nl_webdav_user.lng | 2
interface/web/sites/lib/lang/nl_shell_user.lng | 2
interface/web/client/lib/lang/hr.lng | 6
interface/web/dashboard/lib/lang/hr_dashlet_limits.lng | 2
interface/web/admin/lib/lang/hr_software_repo.lng | 2
interface/web/designer/lib/lang/hr_module_nav_edit.lng | 8
interface/web/help/lib/lang/hr.lng | 12
interface/web/sites/lib/lang/es_shell_user.lng | 2
interface/web/dns/dns_import.php | 137 ++
interface/web/sites/lib/lang/ro_ftp_user.lng | 2
interface/web/mail/lib/lang/hr_spamfilter_config_list.lng | 2
interface/web/sites/lib/lang/el_shell_user.lng | 2
interface/web/mail/lib/lang/hr_spamfilter_users.lng | 4
interface/web/dns/lib/lang/id_dns_import.lng | 14
interface/web/mail/lib/lang/hr_mail_blacklist.lng | 4
interface/web/sites/lib/lang/ro_shell_user.lng | 2
interface/web/admin/lib/lang/hr_server_list.lng | 2
interface/web/sites/lib/lang/cz_web_domain.lng | 2
interface/lib/lang/sk.lng | 1
interface/web/sites/lib/lang/fr_webdav_user.lng | 2
interface/web/dns/lib/lang/hr_dns_alias.lng | 16
interface/web/dns/lib/lang/fr.lng | 3
interface/web/sites/lib/lang/fi_shell_user.lng | 2
interface/web/sites/lib/lang/tr_ftp_user.lng | 2
interface/web/admin/lib/lang/hr_remote_action.lng | 6
interface/web/dns/lib/lang/hr_dns_a.lng | 12
interface/web/sites/lib/lang/tr_web_domain.lng | 2
interface/web/mail/lib/lang/id_mail_get.lng | 2
interface/web/admin/software_package_install.php | 3
interface/web/help/lib/lang/hr_help_faq_list.lng | 2
interface/web/dns/lib/lang/ar.lng | 3
interface/web/sites/lib/lang/fi_webdav_user.lng | 2
interface/web/sites/lib/lang/ja_web_domain.lng | 2
interface/web/designer/lib/lang/hr_module_list.lng | 6
interface/web/dns/lib/lang/pt.lng | 3
interface/web/mail/lib/lang/hu_mail_get.lng | 2
interface/lib/lang/de.lng | 2
interface/web/dns/lib/lang/ja_dns_import.lng | 14
interface/web/mail/lib/lang/ar_mail_get.lng | 2
interface/lib/lang/it.lng | 1
interface/web/monitor/lib/lang/hr.lng | 2
interface/web/dns/templates/dns_import.htm | 6
interface/web/sites/lib/lang/de_shell_user.lng | 2
interface/web/mail/lib/lang/fi_mail_get.lng | 2
interface/web/sites/lib/lang/br_web_domain.lng | 2
interface/web/sites/lib/lang/it_shell_user.lng | 2
interface/web/admin/lib/lang/hr_users_list.lng | 2
interface/web/dns/lib/lang/fr_dns_import.lng | 14
interface/web/sites/lib/lang/hr_web_domain.lng | 146 +-
interface/web/sites/lib/lang/ru_web_domain.lng | 2
interface/web/mail/mail_alias_edit.php | 9
interface/web/dns/lib/lang/pl_dns_import.lng | 14
interface/web/mail/lib/lang/br_mail_get.lng | 2
interface/web/mail/lib/lang/it_mail_alias.lng | 1
interface/web/login/lib/lang/hr.lng | 2
interface/web/sites/lib/lang/se_shell_user.lng | 2
interface/lib/app.inc.php | 3
interface/web/mail/lib/lang/hr_mail_user.lng | 4
interface/web/sites/lib/lang/cz_ftp_user.lng | 2
interface/lib/lang/fr.lng | 1
install/tpl/config.inc.php.master | 6
interface/web/sites/lib/lang/hr_ftp_user.lng | 32
interface/web/admin/lib/lang/hr_language_complete.lng | 2
interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng | 2
interface/web/dns/lib/lang/hu.lng | 3
interface/web/mail/lib/lang/pt_mail_alias.lng | 1
interface/web/sites/lib/lang/pl_shell_user.lng | 2
install/lib/installer_base.lib.php | 4
interface/web/mail/lib/lang/hr_mail_domain.lng | 12
interface/web/mail/lib/lang/hr_mail_get.lng | 4
interface/web/sites/lib/lang/br_webdav_user.lng | 2
interface/web/sites/lib/lang/hr_user_quota_stats_list.lng | 8
interface/web/dns/lib/lang/ar_dns_import.lng | 14
interface/web/mail/lib/lang/hr_mail_domain_catchall_list.lng | 8
interface/web/mail/lib/lang/ro_mail_alias.lng | 1
interface/web/sites/lib/lang/hr_shell_user_list.lng | 6
interface/web/sites/lib/lang/hr_database.lng | 40
interface/web/themes/default_64_navimg/templates/main.tpl.htm | 2
interface/web/dns/lib/lang/bg.lng | 3
interface/lib/lang/se.lng | 1
interface/web/dns/lib/lang/se.lng | 3
interface/web/mail/lib/lang/ru_mail_get.lng | 2
interface/web/dns/lib/lang/en.lng | 3
interface/web/help/lib/lang/hr_support_message.lng | 2
interface/web/mail/lib/lang/hr_mail_whitelist.lng | 4
interface/web/sites/lib/lang/tr_webdav_user.lng | 2
interface/lib/lang/cz.lng | 1
interface/web/sites/lib/lang/ru_ftp_user.lng | 2
interface/web/sites/lib/lang/fi_web_domain.lng | 2
interface/lib/lang/fi.lng | 1
interface/web/sites/lib/lang/ar_web_domain.lng | 2
interface/web/sites/lib/lang/ar_shell_user.lng | 2
interface/web/sites/lib/lang/sk_web_domain.lng | 2
interface/web/mail/lib/lang/tr_mail_alias.lng | 1
interface/web/mail/lib/lang/bg_mail_alias.lng | 1
interface/web/dns/lib/lang/pl.lng | 3
interface/web/sites/lib/lang/fr_ftp_user.lng | 2
interface/web/sites/lib/lang/cz_webdav_user.lng | 2
interface/web/mail/lib/lang/cz_mail_alias.lng | 1
interface/web/sites/lib/lang/el_web_domain.lng | 2
interface/web/sites/lib/lang/el_webdav_user.lng | 2
interface/web/sites/lib/lang/sk_shell_user.lng | 2
interface/web/sites/lib/lang/nl_ftp_user.lng | 2
interface/web/mail/lib/lang/hr_mail_user_filter.lng | 14
interface/web/dns/lib/lang/hr_dns_ns.lng | 18
interface/web/mail/lib/lang/nl_mail_get.lng | 2
interface/web/sites/lib/lang/hu_webdav_user.lng | 2
interface/web/sites/lib/lang/pl_ftp_user.lng | 2
interface/web/sites/lib/lang/nl_web_domain.lng | 2
interface/web/dns/lib/lang/hr_dns_a_list.lng | 2
interface/web/mail/lib/lang/hr_mail_alias.lng | 15
interface/web/mail/lib/lang/fr_mail_get.lng | 2
interface/web/tools/lib/lang/hr.lng | 4
interface/web/dns/lib/lang/sk_dns_import.lng | 14
interface/web/sites/lib/lang/hr_webdav_user.lng | 18
interface/web/sites/lib/lang/ja_webdav_user.lng | 2
interface/web/sites/lib/lang/pt_ftp_user.lng | 2
interface/web/dns/lib/lang/hr_dns_aaaa.lng | 18
interface/web/mail/lib/lang/hr_mail_user_filter_list.lng | 4
interface/web/mail/lib/lang/pt_mail_get.lng | 2
interface/web/sites/lib/lang/it_webdav_user.lng | 2
interface/web/sites/lib/lang/es_web_domain.lng | 2
326 files changed, 1,672 insertions(+), 1,083 deletions(-)
diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php
index 7663e01..8e4a1fa 100644
--- a/install/dist/conf/opensuse112.conf.php
+++ b/install/dist/conf/opensuse112.conf.php
@@ -97,7 +97,7 @@
$conf['web']['apps_vhost_group'] = 'ispapps';
//* Fastcgi
-$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/';
+$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/fastcgi/';
$conf['fastcgi']['fastcgi_starter_path'] = '/srv/www/php-fcgi-scripts/[system_user]/';
//* Postfix
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 4e6ff40..bb88780 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -158,10 +158,10 @@
$this->error('Stopped: Database already contains some tables.');
} else {
if($conf['mysql']['admin_password'] == '') {
- caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
+ caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
} else {
- caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
+ caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
}
$db_tables = $this->db->getTables();
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index 5a3c9bb..9feffa3 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -33,20 +33,20 @@
//** load the pre update sql script do perform modifications on the database before the database is dumped
if(is_file(ISPC_INSTALL_ROOT."/install/sql/pre_update.sql")) {
if($conf['mysql']['admin_password'] == '') {
- caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
+ caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
} else {
- caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
+ caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
}
}
//** export the current database data
if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
+ system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
}
else {
- system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
+ system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
}
/*
@@ -69,9 +69,9 @@
if ($conf['powerdns']['installed']) {
//** export the current PowerDNS database data
if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
+ system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
} else {
- system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
+ system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
}
// create a backup copy of the PowerDNS database in the root folder
@@ -90,7 +90,7 @@
$notok = array();
echo "Checking ISPConfig database .. ";
- exec("mysqlcheck -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -r ".$conf["mysql"]["database"], $result);
+ exec("mysqlcheck -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -r ".escapeshellarg($conf["mysql"]["database"]), $result);
for( $i=0; $i<sizeof($result);$i++) {
if ( substr($result[$i], -2) != "OK" ) {
$notok[] = $result[$i];
@@ -155,9 +155,9 @@
if(is_file($patch_filename)) {
//* Load patch file into database
if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < ".$patch_filename);
+ system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$patch_filename);
} else {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < ".$patch_filename);
+ system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$patch_filename);
}
swriteln($inst->lng('Loading SQL patch file').': '.$patch_filename);
$current_db_version = $next_db_version;
@@ -193,9 +193,9 @@
//** load old data back into database
if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < existing_db.sql");
+ system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < existing_db.sql");
} else {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
+ system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < existing_db.sql");
}
//** Get the database version number based on the patchfile
@@ -228,9 +228,9 @@
//** load old data back into the PowerDNS database
if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
+ system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['powerdns']['database'])." < existing_powerdns_db.sql");
} else {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
+ system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['powerdns']['database'])." < existing_powerdns_db.sql");
}
}
}
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 2612d7e..779cbf7 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2007-2011, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007-2012, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -1970,6 +1970,6 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.3');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.4');
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 28339e7..7fa30bf 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,6 +1,6 @@
<?php
/*
-Copyright (c) 2007 - 2010, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2012, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -56,7 +56,7 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.4.3');
+define('ISPC_APP_VERSION', '3.0.4.4');
define('DEVSYSTEM', 0);
@@ -146,7 +146,7 @@
//** Themes
$conf['theme'] = 'default';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
-$conf['logo'] = 'themes/default/images/ispc_logo.png';
+$conf['logo'] = 'themes/default/images/header_logo.png';
//** Default Language and Timezone
$conf['language'] = '{language}';
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 7fa8c03..432fdab 100755
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -216,11 +216,14 @@
$this->tpl->setVar('app_version', '');
}
$this->tpl->setVar('app_link', $this->_conf['app_link']);
+ /*
if(isset($this->_conf['app_logo']) && $this->_conf['app_logo'] != '' && @is_file($this->_conf['app_logo'])) {
$this->tpl->setVar('app_logo', '<img src="'.$this->_conf['app_logo'].'">');
} else {
$this->tpl->setVar('app_logo', ' ');
}
+ */
+ $this->tpl->setVar('app_logo', $this->_conf['logo']);
$this->tpl->setVar('phpsessid', session_id());
diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php
index 697270f..564fad5 100644
--- a/interface/lib/classes/simplepie.inc.php
+++ b/interface/lib/classes/simplepie.inc.php
@@ -12151,7 +12151,7 @@
}
else
{
- $this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$\'()*+,;:@/?');
+ $this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$\'()*+,;:@/?&=');
}
$this->valid[__FUNCTION__] = true;
return true;
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 40de432..3cd1723 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -131,7 +131,7 @@
//** Themes
$conf['theme'] = 'default';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
-$conf['logo'] = 'themes/default/images/ispc_logo.png';
+$conf['logo'] = 'themes/default/images/header_logo.png';
//** Templates
$conf['templates'] = '/usr/local/ispconfig/server/conf';
diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng
index 3e4d57e..430cb2e 100644
--- a/interface/lib/lang/ar.lng
+++ b/interface/lib/lang/ar.lng
@@ -69,4 +69,5 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
index cde9994..19897e4 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -69,4 +69,5 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng
index df463c2..c912859 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 8f63207..f471f32 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index f9d1968..fddee77 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -69,5 +69,5 @@
$wb['datepicker_nextText'] = 'Vor';
$wb['datepicker_prevText'] = 'Zurück';
$wb['logout_txt'] = 'LOGOUT';
-$wb['submit_confirmation'] = "Wollen Sie diese Aktion wirlich ausführen?";
+$wb['submit_confirmation'] = 'Wollen Sie diese Aktion wirlich ausführen?';
?>
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index 5234e54..e609330 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -69,4 +69,5 @@
$wb['monthnamesshort_dec'] = 'Δεκ';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['logout_txt'] = 'LOGOUT';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
index 5697993..3461b2a 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index f3d6d43..2dbaec7 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
index b744202..9e2da96 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Précédent';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng
index 7299e68..315c85b 100644
--- a/interface/lib/lang/hr.lng
+++ b/interface/lib/lang/hr.lng
@@ -7,9 +7,9 @@
$wb['number_format_decimals'] = '2';
$wb['number_format_dec_point'] = ',';
$wb['number_format_thousands_sep'] = '.';
-$wb['delete_confirmation'] = 'Da li želite obrisati ovaj zapis?';
-$wb['error_no_view_permission'] = 'Nemate dozvolu za pregled zapisa ili zapis ne postoji!';
-$wb['error_no_delete_permission'] = 'Nemate dozvolu za brisanje zapisa!';
+$wb['delete_confirmation'] = 'Da li želite obrisati ovaj DNS zapis?';
+$wb['error_no_view_permission'] = 'Nemate dozvolu za pregled DNS zapisa ili zapis ne postoji!';
+$wb['error_no_delete_permission'] = 'Nemate dozvolu za brisanje DNS zapisa!';
$wb['page_txt'] = 'Stranica';
$wb['page_of_txt'] = 'od';
$wb['page_and_txt'] = 'i';
@@ -21,7 +21,7 @@
$wb['btn_save_txt'] = 'Spremi';
$wb['btn_cancel_txt'] = 'Natrag';
$wb['top_menu_system'] = 'Sistem';
-$wb['top_menu_client'] = 'Klijent';
+$wb['top_menu_client'] = 'Klijenti';
$wb['top_menu_email'] = 'Email';
$wb['top_menu_monitor'] = 'Monitoring';
$wb['top_menu_sites'] = 'Stranice';
@@ -67,6 +67,7 @@
$wb['monthnamesshort_dec'] = 'Pro';
$wb['datepicker_nextText'] = 'Naprijed';
$wb['datepicker_prevText'] = 'Natrag';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Odjavi';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng
index 71a9a4c..399acb4 100644
--- a/interface/lib/lang/hu.lng
+++ b/interface/lib/lang/hu.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng
index 222b68d..f2455e0 100644
--- a/interface/lib/lang/id.lng
+++ b/interface/lib/lang/id.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
index dc8928a..f92f557 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng
index 59c7ef0..f305ed4 100644
--- a/interface/lib/lang/ja.lng
+++ b/interface/lib/lang/ja.lng
@@ -69,4 +69,5 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index 671c152..6245c23 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index 3614543..f582331 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Poprz';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng
index 35731dc..f22754c 100644
--- a/interface/lib/lang/pt.lng
+++ b/interface/lib/lang/pt.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng
index 9087866..0442688 100644
--- a/interface/lib/lang/ro.lng
+++ b/interface/lib/lang/ro.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index 684b007..97a1677 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -69,4 +69,5 @@
$wb['monthnamesshort_dec'] = 'Дек';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['logout_txt'] = 'LOGOUT';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index 2decd71..2817a5e 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng
index 44ecaa0..dc87285 100644
--- a/interface/lib/lang/sk.lng
+++ b/interface/lib/lang/sk.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng
index 8aa1c3c..2066491 100644
--- a/interface/lib/lang/tr.lng
+++ b/interface/lib/lang/tr.lng
@@ -69,4 +69,5 @@
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/web/admin/lib/lang/hr_firewall.lng b/interface/web/admin/lib/lang/hr_firewall.lng
index 7b5b63d..7e28a3a 100644
--- a/interface/web/admin/lib/lang/hr_firewall.lng
+++ b/interface/web/admin/lib/lang/hr_firewall.lng
@@ -6,6 +6,6 @@
$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 ,.';
+$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_iptables.lng b/interface/web/admin/lib/lang/hr_iptables.lng
index 5a6cef9..e7eaaff 100644
--- a/interface/web/admin/lib/lang/hr_iptables.lng
+++ b/interface/web/admin/lib/lang/hr_iptables.lng
@@ -4,7 +4,7 @@
$wb['singleport_txt'] = 'Jedan port';
$wb['protocol_txt'] = 'Protokol';
$wb['table_txt'] = 'Tablica';
-$wb['target_txt'] = 'Meta';
+$wb['target_txt'] = 'Destinacija';
$wb['state_txt'] = 'Stanje';
$wb['destination_ip_txt'] = 'Adresa destinacije';
$wb['source_ip_txt'] = 'Adresa izvora';
diff --git a/interface/web/admin/lib/lang/hr_language_complete.lng b/interface/web/admin/lib/lang/hr_language_complete.lng
index 8562ced..e9ce1e5 100644
--- a/interface/web/admin/lib/lang/hr_language_complete.lng
+++ b/interface/web/admin/lib/lang/hr_language_complete.lng
@@ -2,6 +2,6 @@
$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_save_txt'] = 'Spoji jezike';
$wb['btn_cancel_txt'] = 'Natrag';
?>
diff --git a/interface/web/admin/lib/lang/hr_remote_action.lng b/interface/web/admin/lib/lang/hr_remote_action.lng
index 0ebb53d..fd1444f 100644
--- a/interface/web/admin/lib/lang/hr_remote_action.lng
+++ b/interface/web/admin/lib/lang/hr_remote_action.lng
@@ -2,11 +2,11 @@
$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_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>';
+$wb['ispconfig_update_title'] = 'Upute za ISPConfig nadogradnju';
+$wb['ispconfig_update_text'] = 'Logiraj se kao root korisnik na server (SSH) i pokreni:<br /><br /><strong>ispconfig_update.sh</strong><br /><br /><a href=\'http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/\' target=\'_blank\'>Pogledaj detaljne upute ovdje</a>';
?>
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 2da20fc..13afd0b 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'] = 'Udaljeni klijenti';
$wb['list_desc_txt'] = 'Udaljeni klijenti';
-$wb['add_new_record_txt'] = 'Dodaj';
+$wb['add_new_record_txt'] = 'Dodaj udaljenog klijenta';
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Korisničko ime';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index b0c445e..2b36f58 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -3,9 +3,9 @@
$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['website_path_txt'] = 'Put do Web stranice';
+$wb['website_symlinks_txt'] = 'Symlinkovi Web stranice';
+$wb['website_basedir_txt'] = 'Bazni direktorij Web stranice';
$wb['vhost_conf_dir_txt'] = 'Vhost konfiguracijski direktorij';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost dozvoljeni konfiguracijski direktorij';
$wb['getmail_config_dir_txt'] = 'Getmail konfiguracijski direktorij';
@@ -29,7 +29,7 @@
$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['netmask_txt'] = 'Netmaska';
$wb['gateway_txt'] = 'Gateway';
$wb['hostname_txt'] = 'Hostname';
$wb['nameservers_txt'] = 'Nameserveri';
@@ -39,118 +39,118 @@
$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';
-$wb['web_user_txt'] = 'Apache user';
-$wb['web_group_txt'] = 'Apache group';
-$wb['security_level_txt'] = 'Security level';
-$wb['loglevel_txt'] = 'Loglevel';
+$wb['config_dir_txt'] = 'Konfiguracijski direktorij';
+$wb['init_script_txt'] = 'Inicijalizacijski naziv cron skripte';
+$wb['crontab_dir_txt'] = 'Putanja do individualnih crontabs-a';
+$wb['wget_txt'] = 'Putanja do wget programa';
+$wb['web_user_txt'] = 'Apache korisnik';
+$wb['web_group_txt'] = 'Apache grupa';
+$wb['security_level_txt'] = 'Stupanj zaštite';
+$wb['loglevel_txt'] = 'Stupanj logiranja';
$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
-$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
-$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
-$wb['bind_user_txt'] = 'BIND User';
-$wb['bind_group_txt'] = 'BIND Group';
-$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
-$wb['named_conf_path_txt'] = 'BIND named.conf path';
-$wb['bind_user_error_empty'] = 'BIND user is empty.';
-$wb['bind_group_error_empty'] = 'BIND group is empty.';
-$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
-$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
-$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
-$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
+$wb['apps_vhost_ip_txt'] = 'Apps-vhost IP adresa';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost domena';
+$wb['bind_user_txt'] = 'BIND korisnik';
+$wb['bind_group_txt'] = 'BIND grupa';
+$wb['bind_zonefiles_dir_txt'] = 'BIND direktorij sa zonskim datotekama';
+$wb['named_conf_path_txt'] = 'BIND named.conf putanja';
+$wb['bind_user_error_empty'] = 'BIND korisnik nije upisan..';
+$wb['bind_group_error_empty'] = 'BIND grupa nije upisana.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND direktorij sa zonama nije upisan.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf putanja nije upisana.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local putanja nije upisana.';
+$wb['mail_filter_syntax_txt'] = 'Mailfilter sintaksa';
$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir nije upisan.';
$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
-$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
-$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
-$wb['awstats_data_dir_txt'] = 'awstats data folder';
-$wb['awstats_pl_txt'] = 'awstats.pl script';
-$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride nije upisan.';
+$wb['awstats_conf_dir_txt'] = 'awstats konfiguracijski direktorij';
+$wb['awstats_data_dir_txt'] = 'awstats podatkovni direktorij';
+$wb['awstats_pl_txt'] = 'awstats.pl skripta';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl skripta';
$wb['backup_dir_txt'] = 'Backup direktorij';
-$wb['named_conf_local_path_txt'] = 'BIND named.conf.local 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['named_conf_local_path_txt'] = 'BIND named.conf.local putanja';
+$wb['php_ini_path_cgi_txt'] = 'Putanja do CGI php.ini';
+$wb['php_ini_path_apache_txt'] = 'Putanja do Apache php.ini';
+$wb['check_apache_config_txt'] = 'Testiraj Apache konfiguraciju prilikom restarta';
$wb['ufw_enable_txt'] = 'Omogući';
-$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_manage_builtins_txt'] = 'Upravljaj standardnim pravilima';
$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';
-$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
-$wb['ufw_log_level_txt'] = 'Log Level';
-$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
-$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
-$wb['CA_path_txt'] = 'CA Path';
-$wb['CA_pass_txt'] = 'CA passphrase';
-$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
-$wb['backup_dir_ftpread_txt'] = 'Backup dir. readable for website FTP users.';
+$wb['ufw_default_input_policy_txt'] = 'Standardna ulazna pravila';
+$wb['ufw_default_output_policy_txt'] = 'Standardna izlazna pravila';
+$wb['ufw_default_forward_policy_txt'] = 'Standardna pravila proslijeđivanja';
+$wb['ufw_default_application_policy_txt'] = 'Standardna pravila aplikacija';
+$wb['ufw_log_level_txt'] = 'Stupanj logiranja';
+$wb['website_symlinks_rel_txt'] = 'Napravi relativne symlinks-e';
+$wb['network_config_warning_txt'] = 'Konfiguracija mreže je dostupna samo za Debian i Ubuntu servere. Nemojte uključivati ovu opciju ako vaš mrežni adapter nije eth0.';
+$wb['CA_path_txt'] = 'CA putanja';
+$wb['CA_pass_txt'] = 'CA šifra';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI konfiguracijska sintaksa';
+$wb['backup_dir_ftpread_txt'] = 'Omogući pristup backup direktoriju FTP korisnicima.';
$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';
-$wb['nginx_group_txt'] = 'Nginx group';
-$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
-$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
-$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
-$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
-$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
-$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
-$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
-$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
-$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
-$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
-$wb['website_path_error_empty'] = 'Website path is empty.';
-$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
-$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
-$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
-$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
-$wb['apache_user_error_empty'] = 'Apache user is empty.';
-$wb['apache_group_error_empty'] = 'Apache group is empty.';
-$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
-$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
-$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
-$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
-$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
-$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
-$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
-$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
-$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
-$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
-$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
-$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
-$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
-$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
-$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
-$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
-$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
-$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
-$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
-$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
-$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
-$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
-$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
-$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
-$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
-$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
-$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
-$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
-$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
-$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
-$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
-$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
-$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
-$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
-$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost konfiguracijski direktorij';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost omogućeni konfiguracijski direktorij';
+$wb['nginx_user_txt'] = 'Nginx korisnik';
+$wb['nginx_group_txt'] = 'Nginx grupa';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI socket';
+$wb['backup_dir_error_empty'] = 'Backup direktorij nije upisan.';
+$wb['maildir_path_error_empty'] = 'Maildir direktorij nije upisan.';
+$wb['homedir_path_error_empty'] = 'Homedir direktorij nije upisan.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID nije upisan.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID nije upisan.';
+$wb['mailuser_name_error_empty'] = 'Mailuser ime nije upisano.';
+$wb['mailuser_group_error_empty'] = 'Mailuser grupa nije upisana.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail konfiguracijski direktorij je prazan.';
+$wb['website_basedir_error_empty'] = 'Website basedir je prazan.';
+$wb['website_path_error_empty'] = 'Website putanja nije upisana.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks je prazan.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost konfiguracijski direktorij je prazan.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost omogućeni konfiguracijski direktorij je prazan.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost konfiguracijski direktorij je prazan.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost omogućeni konfiguracijski direktorij je prazan.';
+$wb['apache_user_error_empty'] = 'Apache korisnik nije upisan.';
+$wb['apache_group_error_empty'] = 'Apache grupa nije upisana.';
+$wb['nginx_user_error_empty'] = 'Nginx korisnik nije upisan.';
+$wb['nginx_group_error_empty'] = 'Nginx grupa nije upisana.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini putanja nije upisana.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini putanja nije upisana.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI socket nije upisan.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port nije upisan.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP adresa nije upisana.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter putanja nije upisana.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter skripta nije upisana.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI alias nije upisan.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini putanja nije upisana.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children nije upisan.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI maksimalan broj zahtjeva nije upisan.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin nije upisan.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home je prazan.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot aplikacijska sekcija nije upisana.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted aplikacije nisu upisane.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted aplikacije nisu upisane.';
+$wb['vlogger_config_dir_error_empty'] = 'Konfiguracijski direktorij je prazan.';
+$wb['cron_init_script_error_empty'] = 'Naziv Cron inicijalizacijske skripte je prazan.';
+$wb['crontab_dir_error_empty'] = 'Nije upisana putanja za pojedinačni crontab.';
+$wb['cron_wget_error_empty'] = 'Nije upisana putanja za wget.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM inicijalizacijska skripta';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM inicijalizacijska skripta nije upisana.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini putanja';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini putanja nije upisana.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool direktorij';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool direktorij nije upisan.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM početni port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM početni port nije upisan.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket direktorij';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket direktorij nije upisan.';
+$wb['try_rescue_txt'] = 'Uključi monitoring servisa i restartaj ukoliko ne radi';
+$wb['do_not_try_rescue_mysql_txt'] = 'Isključi MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Isključi Email monitoring';
+$wb['rescue_description_txt'] = '<b>Informacija:</b> Ako želite ugasiti mysql morate izabrati Isključi MySQL monitoring kvačicu i tada pričekati 2-3 minute.<br>Ukoliko ne pričekate, automatski će se restartati MySQL!';
$wb['enable_sni_txt'] = 'Omogući SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Isključi HTTPD monitoriranje';
-$wb['set_folder_permissions_on_update_txt'] = '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['set_folder_permissions_on_update_txt'] = 'Postavi dozvole pri svakoj nadogradnji ISPConfiga';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Dodaj web korisnikeu -sshusers- grupu';
+$wb['connect_userid_to_webid_txt'] = 'Spoji Linux userid u webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Početni ID za spajanje userid/webid-a';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_list.lng b/interface/web/admin/lib/lang/hr_server_list.lng
index 320b45f..f144770 100644
--- a/interface/web/admin/lib/lang/hr_server_list.lng
+++ b/interface/web/admin/lib/lang/hr_server_list.lng
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Server';
-$wb['server_name_txt'] = 'Ime';
+$wb['server_name_txt'] = 'Naziv';
$wb['mail_server_txt'] = 'Mail';
$wb['web_server_txt'] = 'Web';
$wb['dns_server_txt'] = 'DNS';
diff --git a/interface/web/admin/lib/lang/hr_software_repo.lng b/interface/web/admin/lib/lang/hr_software_repo.lng
index 181c797..42064a1 100644
--- a/interface/web/admin/lib/lang/hr_software_repo.lng
+++ b/interface/web/admin/lib/lang/hr_software_repo.lng
@@ -1,5 +1,5 @@
<?php
-$wb['repo_name_txt'] = 'Repozitorij';
+$wb['repo_name_txt'] = 'Repozitoriji';
$wb['repo_url_txt'] = 'URL';
$wb['repo_username_txt'] = 'Korisničko ime (opcionalno)';
$wb['repo_password_txt'] = 'Šifra (opcionalno)';
diff --git a/interface/web/admin/lib/lang/hr_users_list.lng b/interface/web/admin/lib/lang/hr_users_list.lng
index 81a844c..b522eb3 100644
--- a/interface/web/admin/lib/lang/hr_users_list.lng
+++ b/interface/web/admin/lib/lang/hr_users_list.lng
@@ -4,5 +4,5 @@
$wb["client_id_txt"] = 'Client ID';
$wb["active_txt"] = 'Active';
$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!';
+$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/software_package_install.php b/interface/web/admin/software_package_install.php
index 97bf1bf..eb7a72a 100644
--- a/interface/web/admin/software_package_install.php
+++ b/interface/web/admin/software_package_install.php
@@ -114,10 +114,11 @@
$package_config_str = $app->ini_parser->get_ini_string($package_config_array);
$package['package_config'] = $package_config_str;
+ $remote_password_md5 = md5($remote_password);
$app->db->datalogUpdate('software_package', "package_config = '".$app->db->quote($package_config_str)."'", 'package_id',$package['package_id']);
$sql = "INSERT INTO `remote_user` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `remote_username`, `remote_password`, `remote_functions`) VALUES
- (1, 1, 'riud', 'riud', '', '$remote_user', '$remote_password', '$remote_functions');";
+ (1, 1, 'riud', 'riud', '', '$remote_user', '$remote_password_md5', '$remote_functions');";
$app->db->query($sql);
diff --git a/interface/web/client/lib/lang/hr.lng b/interface/web/client/lib/lang/hr.lng
index c314f46..73850f4 100644
--- a/interface/web/client/lib/lang/hr.lng
+++ b/interface/web/client/lib/lang/hr.lng
@@ -1,5 +1,5 @@
<?php
-$wb['Client'] = 'Klijent';
+$wb['Client'] = 'Klijenti';
$wb['Address'] = 'Adresa';
$wb['Limits'] = 'Limiti';
$wb['Add Client'] = 'Dodaj klijenta';
@@ -10,6 +10,6 @@
$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';
+$wb['add_additional_template_txt'] = 'Dodaj dodatni predložak';
+$wb['delete_additional_template_txt'] = 'Obriši dodatni predložak';
?>
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index 0637b90..a635281 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -1,17 +1,17 @@
<?php
-$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_maildomain_txt'] = 'Maksimalan broj email domena';
+$wb['limit_mailbox_txt'] = 'Maksimalan broj mailboxa';
+$wb['limit_mailalias_txt'] = 'Maksimalan broj email aliasa';
+$wb['limit_mailaliasdomain_txt'] = 'Maksimalan broj aliasa email domena';
+$wb['limit_mailforward_txt'] = 'Maksimalan broj email forwardera';
+$wb['limit_mailcatchall_txt'] = 'Maksimalan broj email catchall računa';
+$wb['limit_mailrouting_txt'] = 'Maksimalan broj email ruta';
+$wb['limit_mailfilter_txt'] = 'Maksimalan broj email filtera';
+$wb['limit_fetchmail_txt'] = 'Maksimalan 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_spamfilter_wblist_txt'] = 'Maksimalan broj spamfilter white / blacklist filtera';
+$wb['limit_spamfilter_user_txt'] = 'Maksimalan broj spamfilter korisnika';
+$wb['limit_spamfilter_policy_txt'] = 'Maksimalan broj spamfilter pravila';
$wb['default_mailserver_txt'] = 'Izaberi email server';
$wb['company_name_txt'] = 'Poduzeće';
$wb['contact_name_txt'] = 'Kontakt osoba';
@@ -39,32 +39,32 @@
$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_database_txt'] = 'Maksimalan broj baza';
+$wb['limit_cron_txt'] = 'Maksimalan 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_cron_frequency_txt'] = 'Minimalna 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['limit_web_domain_txt'] = 'Maksimalan broj domena';
+$wb['limit_web_aliasdomain_txt'] = 'Maksimalan broj alias domena';
+$wb['limit_web_subdomain_txt'] = 'Maksimalan broj poddomena';
+$wb['limit_ftp_user_txt'] = 'Maksimalan 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['limit_dns_zone_txt'] = 'Maksimalan broj DNS zona';
+$wb['limit_dns_slave_zone_txt'] = 'Maksimalan broj sekundarnih DNS zona';
+$wb['limit_dns_record_txt'] = 'Maksimalan broj DNS zapisa';
+$wb['limit_shell_user_txt'] = 'Maksimalan broj Shell računa';
+$wb['limit_webdav_user_txt'] = 'Maksimalan broj Webdav računa';
+$wb['limit_client_txt'] = 'Maksimalan 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_mailalias_error_notint'] = 'Maksimalan broj email aliasa mora biti znamenka.';
+$wb['limit_mailaliasdomain_error_notint'] = 'Maksimalan 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.';
@@ -76,15 +76,15 @@
$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_web_subdomain_error_notint'] = 'Maksimalan broj poddomena web stranice mora biti znamenka.';
+$wb['limit_ftp_user_error_notint'] = 'Maksimalan broj FTP računa mora biti znamenka.';
+$wb['limit_shell_user_error_notint'] = 'Maksimalan broj Shell računa mora biti znamenka.';
+$wb['limit_webdav_user_error_notint'] = 'Maksimalan broj Webdav računa mora biti znamenka.';
+$wb['limit_dns_zone_error_notint'] = 'Maksimalan broj DNS zapisa mora biti znamenka.';
+$wb['limit_dns_slave_zone_error_notint'] = 'Maksimalan 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_database_error_notint'] = 'Maksimalan broj baza mora biti znamenka.';
+$wb['limit_cron_error_notint'] = 'Maksimalan 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';
@@ -98,12 +98,12 @@
$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_txt'] = 'Maksimalan 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_txt'] = 'Maksimalan 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.';
+$wb['web_php_options_notempty'] = 'Nisu izabrane PHP opcije. Izaberite jednu PHP opciju.';
+$wb['ssh_chroot_notempty'] = 'Nisu izabrane SSH opcije. Izaberite jednu SSH opciju.';
?>
diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng
index 535a191..8a69d30 100644
--- a/interface/web/client/lib/lang/hr_client_template.lng
+++ b/interface/web/client/lib/lang/hr_client_template.lng
@@ -1,39 +1,39 @@
<?php
$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_maildomain_txt'] = 'Maksimalan broj email domena';
+$wb['limit_mailbox_txt'] = 'Maksimalan broj mailboxa';
+$wb['limit_mailalias_txt'] = 'Maksimalan broj email aliasa';
+$wb['limit_mailaliasdomain_txt'] = 'Maksimalan broj aliasa email domena';
+$wb['limit_mailforward_txt'] = 'Maksimalan broj email forwardera';
+$wb['limit_mailcatchall_txt'] = 'Maksimalan broj email catchall računa';
+$wb['limit_mailrouting_txt'] = 'Maksimalan broj email ruta';
+$wb['limit_mailfilter_txt'] = 'Maksimalan broj email filtera';
+$wb['limit_fetchmail_txt'] = 'Maksimalan 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_spamfilter_wblist_txt'] = 'Maksimalan broj spamfilter white / blacklist filtera';
+$wb['limit_spamfilter_user_txt'] = 'Maksimalan broj spamfilter korisnika';
+$wb['limit_spamfilter_policy_txt'] = 'Maksimalan 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_database_txt'] = 'Maksimalan broj baza';
+$wb['limit_cron_txt'] = 'Maksimalan 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_cron_frequency_txt'] = 'Minimalna pauza između izvršavanja';
+$wb['limit_web_domain_txt'] = 'Maksimalan broj domena';
+$wb['limit_web_aliasdomain_txt'] = 'Maksimalan broj alias domena';
+$wb['limit_web_subdomain_txt'] = 'Maksimalan broj poddomena';
+$wb['limit_ftp_user_txt'] = 'Maksimalan broj FTP računa';
+$wb['limit_dns_zone_txt'] = 'Maksimalan broj DNS zona';
+$wb['limit_dns_slave_zone_txt'] = 'Maksimalan broj sekundarnih DNS zona';
+$wb['limit_dns_record_txt'] = 'Maksimalan broj DNS zapisa';
+$wb['limit_shell_user_txt'] = 'Maksimalan broj Shell računa';
+$wb['limit_webdav_user_txt'] = 'Maksimalan broj Webdav računa';
+$wb['limit_client_txt'] = 'Maksimalan 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_mailalias_error_notint'] = 'Maksimalan broj email aliasa mora biti znamenka.';
+$wb['limit_mailaliasdomain_error_notint'] = 'Maksimalan 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.';
@@ -45,15 +45,15 @@
$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_web_subdomain_error_notint'] = 'Maksimalan broj poddomena web stranice mora biti znamenka.';
+$wb['limit_ftp_user_error_notint'] = 'Maksimalan broj FTP računa mora biti znamenka.';
+$wb['limit_shell_user_error_notint'] = 'Maksimalan broj Shell računa mora biti znamenka.';
+$wb['limit_webdav_user_error_notint'] = 'Maksimalan broj Webdav računa mora biti znamenka.';
+$wb['limit_dns_zone_error_notint'] = 'Maksimalan broj DNS zapisa mora biti znamenka.';
+$wb['limit_dns_slave_zone_error_notint'] = 'Maksimalan broj sekundarnih DNS zona mora biti znamenka.';
+$wb['limit_dns_record_error_notint'] = 'Maksimalan broj DNS zapisa mora biti znamenka.';
+$wb['limit_database_error_notint'] = 'Maksimalan broj baza mora biti znamenka.';
+$wb['limit_cron_error_notint'] = 'Maksimalan 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';
@@ -62,9 +62,9 @@
$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_txt'] = 'Maksimalan 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_txt'] = 'Maksimalan 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';
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 fa00990..d2c9518 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'] = 'Predlošci za klijente';
$wb['template_type_txt'] = 'Vrsta';
-$wb['template_name_txt'] = 'Ime predloška';
+$wb['template_name_txt'] = 'Naziv predloška';
?>
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index 37c350b..3f932b1 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -1,17 +1,17 @@
<?php
-$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_maildomain_txt'] = 'Maksimalan broj email domena';
+$wb['limit_mailbox_txt'] = 'Maksimalan broj mailboxa';
+$wb['limit_mailalias_txt'] = 'Maksimalan broj email aliasa';
+$wb['limit_mailaliasdomain_txt'] = 'Maksimalan broj aliasa email domena';
+$wb['limit_mailforward_txt'] = 'Maksimalan broj email forwardera';
+$wb['limit_mailcatchall_txt'] = 'Maksimalan broj email catchall računa';
+$wb['limit_mailrouting_txt'] = 'Maksimalan broj email ruta';
+$wb['limit_mailfilter_txt'] = 'Maksimalan broj email filtera';
+$wb['limit_fetchmail_txt'] = 'Maksimalan 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_spamfilter_wblist_txt'] = 'Maksimalan broj spamfilter white / blacklist filtera';
+$wb['limit_spamfilter_user_txt'] = 'Maksimalan broj spamfilter korisnika';
+$wb['limit_spamfilter_policy_txt'] = 'Maksimalan broj spamfilter pravila';
$wb['default_mailserver_txt'] = 'Izaberi email server';
$wb['company_name_txt'] = 'Poduzeće';
$wb['contact_name_txt'] = 'Kontakt osoba';
@@ -39,31 +39,31 @@
$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_database_txt'] = 'Maksimalan broj baza';
+$wb['limit_cron_txt'] = 'Maksimalan 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_cron_frequency_txt'] = 'Minimalna 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['limit_web_domain_txt'] = 'Maksimalan broj domena';
+$wb['limit_web_aliasdomain_txt'] = 'Maksimalan broj alias domena';
+$wb['limit_web_subdomain_txt'] = 'Maksimalan broj poddomena';
+$wb['limit_ftp_user_txt'] = 'Maksimalan 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['limit_dns_zone_txt'] = 'Maksimalan broj DNS zona';
+$wb['limit_dns_slave_zone_txt'] = 'Maksimalan broj sekundarnih DNS zona';
+$wb['limit_dns_record_txt'] = 'Maksimalan broj DNS zapisa';
+$wb['limit_shell_user_txt'] = 'Maksimalan broj Shell računa';
+$wb['limit_webdav_user_txt'] = 'Maksimalan broj Webdav računa';
+$wb['limit_client_txt'] = 'Maksimalan 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_mailalias_error_notint'] = 'Maksimalan 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.';
@@ -75,16 +75,16 @@
$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['limit_web_subdomain_error_notint'] = 'Maksimalan broj poddomena web stranice mora biti znamenka.';
+$wb['limit_ftp_user_error_notint'] = 'Maksimalan broj FTP računa mora biti znamenka.';
+$wb['limit_webdav_user_error_notint'] = 'Maksimalan broj Webdav računa mora biti znamenka.';
+$wb['limit_shell_user_error_notint'] = 'Maksimalan broj Shell računa mora biti znamenka.';
+$wb['limit_dns_zone_error_notint'] = 'Maksimalan broj DNS zapisa mora biti znamenka.';
+$wb['limit_dns_slave_zone_error_notint'] = 'Maksimalan broj sekundarnih DNS zona mora biti znamenka.';
+$wb['limit_dns_record_error_notint'] = 'Maksimalan 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_database_error_notint'] = 'Maksimalan broj baza mora biti znamenka.';
+$wb['limit_cron_error_notint'] = 'Maksimalan 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';
@@ -99,11 +99,11 @@
$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_txt'] = 'Maksimalan 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_txt'] = 'Maksimalan 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.';
+$wb['web_php_options_notempty'] = 'Nisu izabrane PHP opcije. Izaberite jednu PHP opciju.';
+$wb['ssh_chroot_notempty'] = 'Nisu izabrane SSH opcije. Izaberite jednu SSH opciju.';
?>
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
index cc5b322..095afc4 100644
--- a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
@@ -5,7 +5,7 @@
$wb['limit_maildomain_txt'] = 'Mail domene';
$wb['limit_mailbox_txt'] = 'Mailboxi';
$wb['limit_mailalias_txt'] = 'Mail aliasi';
-$wb['limit_mailaliasdomain_txt'] = 'Aliasi domene';
+$wb['limit_mailaliasdomain_txt'] = 'Alias mail domene';
$wb['limit_mailforward_txt'] = 'Mail forwarderi';
$wb['limit_mailcatchall_txt'] = 'Mail catchall računi';
$wb['limit_mailrouting_txt'] = 'Mail rute';
diff --git a/interface/web/designer/lib/lang/hr_form_edit.lng b/interface/web/designer/lib/lang/hr_form_edit.lng
index 54fe173..6396ece 100644
--- a/interface/web/designer/lib/lang/hr_form_edit.lng
+++ b/interface/web/designer/lib/lang/hr_form_edit.lng
@@ -1,24 +1,24 @@
<?php
-$wb['name_txt'] = 'Formname';
-$wb['title_txt'] = 'Formutitle';
-$wb['template_txt'] = 'Template';
+$wb['name_txt'] = 'Naziv forme';
+$wb['title_txt'] = 'Naslov forme';
+$wb['template_txt'] = 'Predložak';
$wb['navframe_txt'] = 'NaviFrame';
-$wb['startpage_txt'] = 'Startpage';
-$wb['tab_width_txt'] = 'Tab width';
-$wb['save_txt'] = 'Save';
-$wb['cancel_txt'] = 'Cancel';
-$wb['header_txt'] = 'Form properties';
-$wb['description_txt'] = 'Description';
-$wb['action_txt'] = 'Action (script)';
-$wb['db_table_txt'] = 'DB Table';
-$wb['db_table_idx_txt'] = 'DB Table Index';
-$wb['db_history_txt'] = 'Undo Log';
-$wb['tab_default_txt'] = 'Default Tab';
-$wb['list_default_txt'] = 'Default Liste';
-$wb['auth_txt'] = 'Permissions';
+$wb['startpage_txt'] = 'Početna';
+$wb['tab_width_txt'] = 'Širina taba';
+$wb['save_txt'] = 'Spremi';
+$wb['cancel_txt'] = 'Odustani';
+$wb['header_txt'] = 'Postavke forme';
+$wb['description_txt'] = 'Opis';
+$wb['action_txt'] = 'Akcija (skripte)';
+$wb['db_table_txt'] = 'Tablica u bazi';
+$wb['db_table_idx_txt'] = 'Index tablice u bazi';
+$wb['db_history_txt'] = 'Vrati Log';
+$wb['tab_default_txt'] = 'Standardni tab';
+$wb['list_default_txt'] = 'Standardne liste';
+$wb['auth_txt'] = 'Dozvole';
$wb['auth_preset_userid_txt'] = 'UserID';
$wb['auth_preset_groupid_txt'] = 'GroupID';
-$wb['auth_preset_perm_user_txt'] = 'Perm. User';
-$wb['auth_preset_perm_group_txt'] = 'Perm. Group';
-$wb['auth_preset_perm_other_txt'] = 'Perm. Other';
+$wb['auth_preset_perm_user_txt'] = 'Dozvole klijenta';
+$wb['auth_preset_perm_group_txt'] = 'Dozvole grupe';
+$wb['auth_preset_perm_other_txt'] = 'Dozvole ostalo';
?>
diff --git a/interface/web/designer/lib/lang/hr_form_list.lng b/interface/web/designer/lib/lang/hr_form_list.lng
index 4743225..9efdf78 100644
--- a/interface/web/designer/lib/lang/hr_form_list.lng
+++ b/interface/web/designer/lib/lang/hr_form_list.lng
@@ -1,7 +1,7 @@
<?php
-$wb['list_head_txt'] = 'Backend Form';
-$wb['form_txt'] = 'Form';
-$wb['module_txt'] = 'Module';
-$wb['title_txt'] = 'Title';
-$wb['description_txt'] = 'Description';
+$wb['list_head_txt'] = 'Pozadinska forma';
+$wb['form_txt'] = 'Forma';
+$wb['module_txt'] = 'Modul';
+$wb['title_txt'] = 'Naslov';
+$wb['description_txt'] = 'Opis';
?>
diff --git a/interface/web/designer/lib/lang/hr_form_show.lng b/interface/web/designer/lib/lang/hr_form_show.lng
index 18a1624..e83272a 100644
--- a/interface/web/designer/lib/lang/hr_form_show.lng
+++ b/interface/web/designer/lib/lang/hr_form_show.lng
@@ -1,18 +1,18 @@
<?php
-$wb['header_txt'] = 'Formeditor';
-$wb['title_txt'] = 'Formtitle';
-$wb['name_txt'] = 'Formname';
-$wb['delete_txt'] = 'Delete';
-$wb['properties_txt'] = 'Properties';
-$wb['new_tab_txt'] = 'Tab new';
-$wb['edit_txt'] = 'Edit';
-$wb['new_txt'] = 'New';
+$wb['header_txt'] = 'Editor forme';
+$wb['title_txt'] = 'Naslov forme';
+$wb['name_txt'] = 'Naziv forme';
+$wb['delete_txt'] = 'Obriši';
+$wb['properties_txt'] = 'Postavke';
+$wb['new_tab_txt'] = 'Novi tab';
+$wb['edit_txt'] = 'Promijeni';
+$wb['new_txt'] = 'Novo';
$wb['up_txt'] = '^';
$wb['down_txt'] = 'v';
-$wb['module_txt'] = 'Module';
-$wb['form_txt'] = 'Form';
-$wb['description_txt'] = 'Description';
-$wb['module_del_txt'] = 'Delete the module and all subdirectories?';
-$wb['menu_del_txt'] = 'Delete menu with all menuitems?';
-$wb['item_del_txt'] = 'Delete menuitem?';
+$wb['module_txt'] = 'Modul';
+$wb['form_txt'] = 'Forma';
+$wb['description_txt'] = 'Opis';
+$wb['module_del_txt'] = 'Obrisati modul i sve poddirektorije?';
+$wb['menu_del_txt'] = 'Obrisati meni i sve izbornike menia?';
+$wb['item_del_txt'] = 'Obrisati izbornik menia?';
?>
diff --git a/interface/web/designer/lib/lang/hr_module_edit.lng b/interface/web/designer/lib/lang/hr_module_edit.lng
index 592ccd7..b4aa48a 100644
--- a/interface/web/designer/lib/lang/hr_module_edit.lng
+++ b/interface/web/designer/lib/lang/hr_module_edit.lng
@@ -1,22 +1,12 @@
<?php
-$wb['name_txt'] = 'Modulename';
-$wb['title_txt'] = 'Moduletitle';
-$wb['template_txt'] = 'Template file';
-$wb['navframe_txt'] = 'NaviFrame';
-$wb['startpage_txt'] = 'Default page';
-$wb['tab_width_txt'] = 'Tab width';
-$wb['save_txt'] = 'Save';
-$wb['cancel_txt'] = 'Cancel';
-$wb['header_txt'] = 'Module properties';
-$wb['description_txt'] = '
-<b>Description</b>
-<br><br>
-<b>Modulename:</b> Name of the module directory. Only numbers, chars and underscore allowed.<br>
-<b>Moduletitle:</b> Will be shown in the (upper) main navigation.<br>
-<b>Template file:</b> Template file of the module. Currently available: module.tpl.htm and module_tree.tpl.htm. Default is module.tpl.htm.<br>
-<b>NaviFrame:</b> If module_tree.tpl.htm selected as template file, enter here the path to the script file for the left frame.<br>
-<b>Default page:</b> These page will be shown when the module is opened.<br>
-<b>Tab width:</b> Width of the Tabs in the main navigation. The field is empty by default. You can enter values absolute in pixel (e.g 20) or relative (e.g 20%).<br>
-<b>Hint:</b> All paths are relative to the directory web.
-';
+$wb['name_txt'] = 'Naziv modula';
+$wb['title_txt'] = 'Naslov modula';
+$wb['template_txt'] = 'Predložak';
+$wb['navframe_txt'] = 'Navi frame';
+$wb['startpage_txt'] = 'Standardna stranica';
+$wb['tab_width_txt'] = 'Širina taba';
+$wb['save_txt'] = 'Spremi';
+$wb['cancel_txt'] = 'Odustani';
+$wb['header_txt'] = 'Postavke modula';
+$wb['description_txt'] = '<b>Opis</b><br><br><b>Naziv modula:</b> Naziv direktorija sa modulima. Dozvoljeni samo brojevi, znakovi i podcrta.<br><b>Moduletitle:</b> Will be shown in the (upper) main navigation.<br><b>Template file:</b> Template file of the module. Currently available: module.tpl.htm and module_tree.tpl.htm. Default is module.tpl.htm.<br><b>NaviFrame:</b> If module_tree.tpl.htm selected as template file, enter here the path to the script file for the left frame.<br><b>Default page:</b> These page will be shown when the module is opened.<br><b>Tab width:</b> Width of the Tabs in the main navigation. The field is empty by default. You can enter values absolute in pixel (e.g 20) or relative (e.g 20%).<br><b>Hint:</b> All paths are relative to the directory web.';
?>
diff --git a/interface/web/designer/lib/lang/hr_module_list.lng b/interface/web/designer/lib/lang/hr_module_list.lng
index bc9ebed..3528a6d 100644
--- a/interface/web/designer/lib/lang/hr_module_list.lng
+++ b/interface/web/designer/lib/lang/hr_module_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'Backend Module';
-$wb['module_txt'] = 'Module';
-$wb['title_txt'] = 'Title';
+$wb['list_head_txt'] = 'Pozadinski modul';
+$wb['module_txt'] = 'Modul';
+$wb['title_txt'] = 'Naslov';
?>
diff --git a/interface/web/designer/lib/lang/hr_module_nav_edit.lng b/interface/web/designer/lib/lang/hr_module_nav_edit.lng
index fa5f15a..42c8e14 100644
--- a/interface/web/designer/lib/lang/hr_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/hr_module_nav_edit.lng
@@ -1,6 +1,6 @@
<?php
-$wb['title_txt'] = 'Title';
-$wb['header_txt'] = 'Navi properties';
-$wb['save_txt'] = 'Save';
-$wb['cancel_txt'] = 'Cancel';
+$wb['title_txt'] = 'Naslov';
+$wb['header_txt'] = 'Navi postavke';
+$wb['save_txt'] = 'Spremi';
+$wb['cancel_txt'] = 'Odustani';
?>
diff --git a/interface/web/designer/lib/lang/hr_module_nav_item_edit.lng b/interface/web/designer/lib/lang/hr_module_nav_item_edit.lng
index 23f7d15..ee9208f 100644
--- a/interface/web/designer/lib/lang/hr_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/hr_module_nav_item_edit.lng
@@ -1,8 +1,8 @@
<?php
-$wb['title_txt'] = 'Title';
-$wb['target_txt'] = 'Target';
+$wb['title_txt'] = 'Naziv';
+$wb['target_txt'] = 'Destinacija';
$wb['link_txt'] = 'Link';
-$wb['header_txt'] = 'Navi properties';
-$wb['save_txt'] = 'Save';
-$wb['cancel_txt'] = 'Cancel';
+$wb['header_txt'] = 'Navi postavke';
+$wb['save_txt'] = 'Spremi';
+$wb['cancel_txt'] = 'Odustani';
?>
diff --git a/interface/web/designer/lib/lang/hr_module_show.lng b/interface/web/designer/lib/lang/hr_module_show.lng
index 2a54c4d..98c6144 100644
--- a/interface/web/designer/lib/lang/hr_module_show.lng
+++ b/interface/web/designer/lib/lang/hr_module_show.lng
@@ -1,16 +1,16 @@
<?php
-$wb['header_txt'] = 'Menu editor';
-$wb['title_txt'] = 'Title';
-$wb['name_txt'] = 'Module';
-$wb['delete_txt'] = 'Delete';
-$wb['properties_txt'] = 'Properties';
-$wb['new_menu_txt'] = 'Menu new';
-$wb['edit_txt'] = 'Edit';
-$wb['new_txt'] = 'New';
-$wb['up_txt'] = 'Up';
-$wb['down_txt'] = 'Down';
-$wb['module_txt'] = 'Module';
-$wb['module_del_txt'] = 'Do you really want to delete the module and all its subdirectories?';
-$wb['menu_del_txt'] = 'Do you really want to delete the menu with all sub entries?';
-$wb['item_del_txt'] = 'Delete the menu entry?';
+$wb['header_txt'] = 'Editor menia';
+$wb['title_txt'] = 'Naziv';
+$wb['name_txt'] = 'Modul';
+$wb['delete_txt'] = 'Obriši';
+$wb['properties_txt'] = 'Postavke';
+$wb['new_menu_txt'] = 'Novi meni';
+$wb['edit_txt'] = 'Editiraj';
+$wb['new_txt'] = 'Novo';
+$wb['up_txt'] = 'Gore';
+$wb['down_txt'] = 'Dolje';
+$wb['module_txt'] = 'Modul';
+$wb['module_del_txt'] = 'Da li stvarno želite obrisati modul i sve poddirektorije?';
+$wb['menu_del_txt'] = 'Da li stvarno želite obrisati meni i sve podmenije?';
+$wb['item_del_txt'] = 'Obrisati meni?';
?>
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index 3aaaf3f..d6f948c 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -120,6 +120,10 @@
$app->tpl->setVar("client_group_id",$client_select);
}
+$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dns_import.lng';
+include($lng_file);
+$app->tpl->setVar($wb);
+
// Import the zone-file
//if(1=="1")
if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'])){
@@ -195,7 +199,27 @@
}
// TTL
if($parts[0] == '$ttl'){
- $soa['ttl'] = intval($parts[1]);
+ $time_format = strtolower(substr($parts[1],-1));
+ switch ($time_format) {
+ case 's':
+ $soa['ttl'] = intval(substr($parts[1],0,-1));
+ break;
+ case 'm':
+ $soa['ttl'] = intval(substr($parts[1],0,-1)) * 60;
+ break;
+ case 'h':
+ $soa['ttl'] = intval(substr($parts[1],0,-1)) * 3600;
+ break;
+ case 'd':
+ $soa['ttl'] = intval(substr($parts[1],0,-1)) * 86400;
+ break;
+ case 'w':
+ $soa['ttl'] = intval(substr($parts[1],0,-1)) * 604800;
+ break;
+ default:
+ $soa['ttl'] = intval($parts[1]);
+ }
+ unset($time_format);
}
// SOA
if(in_array("soa", $parts)){
@@ -212,13 +236,101 @@
// SERIAL
if($i == ($soa_array_key + 1)) $soa['serial'] = intval($parts[0]);
// REFRESH
- if($i == ($soa_array_key + 2)) $soa['refresh'] = intval($parts[0]);
+ if($i == ($soa_array_key + 2)){
+ $time_format = strtolower(substr($parts[0],-1));
+ switch ($time_format) {
+ case 's':
+ $soa['refresh'] = intval(substr($parts[0],0,-1));
+ break;
+ case 'm':
+ $soa['refresh'] = intval(substr($parts[0],0,-1)) * 60;
+ break;
+ case 'h':
+ $soa['refresh'] = intval(substr($parts[0],0,-1)) * 3600;
+ break;
+ case 'd':
+ $soa['refresh'] = intval(substr($parts[0],0,-1)) * 86400;
+ break;
+ case 'w':
+ $soa['refresh'] = intval(substr($parts[0],0,-1)) * 604800;
+ break;
+ default:
+ $soa['refresh'] = intval($parts[0]);
+ }
+ unset($time_format);
+ }
// RETRY
- if($i == ($soa_array_key + 3)) $soa['retry'] = intval($parts[0]);
+ if($i == ($soa_array_key + 3)){
+ $time_format = strtolower(substr($parts[0],-1));
+ switch ($time_format) {
+ case 's':
+ $soa['retry'] = intval(substr($parts[0],0,-1));
+ break;
+ case 'm':
+ $soa['retry'] = intval(substr($parts[0],0,-1)) * 60;
+ break;
+ case 'h':
+ $soa['retry'] = intval(substr($parts[0],0,-1)) * 3600;
+ break;
+ case 'd':
+ $soa['retry'] = intval(substr($parts[0],0,-1)) * 86400;
+ break;
+ case 'w':
+ $soa['retry'] = intval(substr($parts[0],0,-1)) * 604800;
+ break;
+ default:
+ $soa['retry'] = intval($parts[0]);
+ }
+ unset($time_format);
+ }
// EXPIRE
- if($i == ($soa_array_key + 4)) $soa['expire'] = intval($parts[0]);
+ if($i == ($soa_array_key + 4)){
+ $time_format = strtolower(substr($parts[0],-1));
+ switch ($time_format) {
+ case 's':
+ $soa['expire'] = intval(substr($parts[0],0,-1));
+ break;
+ case 'm':
+ $soa['expire'] = intval(substr($parts[0],0,-1)) * 60;
+ break;
+ case 'h':
+ $soa['expire'] = intval(substr($parts[0],0,-1)) * 3600;
+ break;
+ case 'd':
+ $soa['expire'] = intval(substr($parts[0],0,-1)) * 86400;
+ break;
+ case 'w':
+ $soa['expire'] = intval(substr($parts[0],0,-1)) * 604800;
+ break;
+ default:
+ $soa['expire'] = intval($parts[0]);
+ }
+ unset($time_format);
+ }
// MINIMUM
- if($i == ($soa_array_key + 5)) $soa['minimum'] = intval($parts[0]);
+ if($i == ($soa_array_key + 5)){
+ $time_format = strtolower(substr($parts[0],-1));
+ switch ($time_format) {
+ case 's':
+ $soa['minimum'] = intval(substr($parts[0],0,-1));
+ break;
+ case 'm':
+ $soa['minimum'] = intval(substr($parts[0],0,-1)) * 60;
+ break;
+ case 'h':
+ $soa['minimum'] = intval(substr($parts[0],0,-1)) * 3600;
+ break;
+ case 'd':
+ $soa['minimum'] = intval(substr($parts[0],0,-1)) * 86400;
+ break;
+ case 'w':
+ $soa['minimum'] = intval(substr($parts[0],0,-1)) * 604800;
+ break;
+ default:
+ $soa['minimum'] = intval($parts[0]);
+ }
+ unset($time_format);
+ }
// RESOURCE RECORDS
if($i > ($soa_array_key + 5)){
if(substr($parts[0],-1) == '.' || $parts[0] == '@' || ($parts[0] != 'a' && $parts[0] != 'aaaa' && $parts[0] != 'ns' && $parts[0] != 'cname' && $parts[0] != 'hinfo' && $parts[0] != 'mx' && $parts[0] != 'naptr' && $parts[0] != 'ptr' && $parts[0] != 'rp' && $parts[0] != 'srv' && $parts[0] != 'txt')){
@@ -540,23 +652,20 @@
$dns_rr_id = $app->db->datalogInsert('dns_rr', $insert_data, 'id');
}
}
- $msg .= $app->lng('zone_file_successfully_imported_txt');
+ $msg .= $wb['zone_file_successfully_imported_txt'];
} else {
- $error .= $app->lng('error_no_valid_zone_file_txt');
+ $error .= $wb['error_no_valid_zone_file_txt'];
}
//header('Location: /dns/dns_soa_edit.php?id='.$dns_soa_id);
+} else {
+ if(isset($_FILES['file']['name'])) {
+ $error = $wb['no_file_uploaded_error'];
+ }
}
$app->tpl->setVar('msg',$msg);
$app->tpl->setVar('error',$error);
-
-$app->tpl->setVar("title",'Import Zone Files');
-$app->tpl->setVar("zonefile_to_import_txt",$app->lng('zonefile_to_import_txt'));
-
-$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dns_wizard.lng';
-include($lng_file);
-$app->tpl->setVar($wb);
$app->tpl_defaults();
$app->tpl->pparse();
diff --git a/interface/web/dns/lib/lang/ar.lng b/interface/web/dns/lib/lang/ar.lng
index 8b25f73..d01b6b3 100644
--- a/interface/web/dns/lib/lang/ar.lng
+++ b/interface/web/dns/lib/lang/ar.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'Add DNS Zone';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/ar_dns_import.lng b/interface/web/dns/lib/lang/ar_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/ar_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/bg.lng b/interface/web/dns/lib/lang/bg.lng
index 8b25f73..d01b6b3 100644
--- a/interface/web/dns/lib/lang/bg.lng
+++ b/interface/web/dns/lib/lang/bg.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'Add DNS Zone';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/bg_dns_import.lng b/interface/web/dns/lib/lang/bg_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/bg_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/br.lng b/interface/web/dns/lib/lang/br.lng
index fd2eb37..6eebf3b 100644
--- a/interface/web/dns/lib/lang/br.lng
+++ b/interface/web/dns/lib/lang/br.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'Assistente de DNS';
$wb['Add DNS Zone'] = 'Adcionar Zona DNS';
$wb['Templates'] = 'Gabaritos';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/br_dns_import.lng b/interface/web/dns/lib/lang/br_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/br_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng
index 6a93827..2ba4af4 100644
--- a/interface/web/dns/lib/lang/cz.lng
+++ b/interface/web/dns/lib/lang/cz.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS průvodce';
$wb['Add DNS Zone'] = 'Přidat DNS zónu';
$wb['Templates'] = 'Šablony';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/cz_dns_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/cz_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng
index 8200e56..f5d7a00 100644
--- a/interface/web/dns/lib/lang/de.lng
+++ b/interface/web/dns/lib/lang/de.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'DNS-Zone hinzufügen';
$wb['Templates'] = 'Vorlagen';
-$wb['zone_file_successfully_imported_txt'] = 'Die Zone-Datei ist erfolgreich importiert worden!';
-$wb['error_no_valid_zone_file_txt'] = 'Es scheint, als ob dies keine gültige Zone-Datei ist!';
-$wb['zonefile_to_import_txt'] = 'Zone-Datei';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/de_dns_import.lng b/interface/web/dns/lib/lang/de_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/de_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/el.lng b/interface/web/dns/lib/lang/el.lng
index cf2e062..f76afed 100644
--- a/interface/web/dns/lib/lang/el.lng
+++ b/interface/web/dns/lib/lang/el.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'Οδηγός DNS';
$wb['Add DNS Zone'] = 'Νέα ζώνη DNS';
$wb['Templates'] = 'Πρότυπα';
-$wb['zone_file_successfully_imported_txt'] = 'Το αρχείο ζώνης εισήχθηκε επιτυχώς!';
-$wb['error_no_valid_zone_file_txt'] = 'Το αρχείο ζώνης φαίνεται να μην είναι έγκυρο!';
-$wb['zonefile_to_import_txt'] = 'Αρχείο Ζώνης';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_import.lng b/interface/web/dns/lib/lang/el_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/el_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/en.lng b/interface/web/dns/lib/lang/en.lng
index 565d92a..e4636a4 100644
--- a/interface/web/dns/lib/lang/en.lng
+++ b/interface/web/dns/lib/lang/en.lng
@@ -18,9 +18,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'Add DNS Zone';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/en_dns_import.lng b/interface/web/dns/lib/lang/en_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/en_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ 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 80cbbfd..889f129 100644
--- a/interface/web/dns/lib/lang/es.lng
+++ b/interface/web/dns/lib/lang/es.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'Asistente DNS';
$wb['Add DNS Zone'] = 'Agregar Zona DNS';
$wb['Templates'] = 'Plantillas';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/es_dns_import.lng b/interface/web/dns/lib/lang/es_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/es_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/fi.lng b/interface/web/dns/lib/lang/fi.lng
index 1c628f8..9ba76a5 100755
--- a/interface/web/dns/lib/lang/fi.lng
+++ b/interface/web/dns/lib/lang/fi.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS-Velho';
$wb['Add DNS Zone'] = 'Lisää DNS-alue';
$wb['Templates'] = 'Mallit';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/fi_dns_import.lng b/interface/web/dns/lib/lang/fi_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/fi_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/fr.lng b/interface/web/dns/lib/lang/fr.lng
index d7e7901..6ec30d3 100644
--- a/interface/web/dns/lib/lang/fr.lng
+++ b/interface/web/dns/lib/lang/fr.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'Assistant DNS';
$wb['Add DNS Zone'] = 'Ajout zone DNS';
$wb['Templates'] = 'Modèles';
-$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_import.lng b/interface/web/dns/lib/lang/fr_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/fr_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/hr.lng b/interface/web/dns/lib/lang/hr.lng
index 39d393f..1495b3e 100644
--- a/interface/web/dns/lib/lang/hr.lng
+++ b/interface/web/dns/lib/lang/hr.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS čarobnjak';
$wb['Add DNS Zone'] = 'Dodaj';
$wb['Templates'] = 'Predlošci';
-$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';
+$wb['Secondary Zones'] = 'Sekundarne zone';
+$wb['Import Zone File'] = 'Importiraj zonsku datoteku';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_a.lng b/interface/web/dns/lib/lang/hr_dns_a.lng
index 19ff54a..71e0f3b 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'] = 'Zona';
-$wb['name_txt'] = 'Hostname';
+$wb['name_txt'] = 'Naziv hosta';
$wb['type_txt'] = 'vrsta';
$wb['data_txt'] = 'IP adresa';
$wb['ttl_txt'] = 'TTL';
$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['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv hosta nije upisan.';
+$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
$wb['data_error_empty'] = 'Polje IP adresa je prazno';
-$wb['data_error_regex'] = 'Neispravan format polja IP adresa';
+$wb['data_error_regex'] = 'Neispravan format A zapisa';
$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 808e4a8..a9ec1a5 100644
--- a/interface/web/dns/lib/lang/hr_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/hr_dns_a_list.lng
@@ -10,5 +10,5 @@
$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?';
+$wb['delete_confirmation'] = 'Sigurno želite obrisati ovaj zapis?';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_aaaa.lng b/interface/web/dns/lib/lang/hr_dns_aaaa.lng
index 705c723..687f9b6 100644
--- a/interface/web/dns/lib/lang/hr_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/hr_dns_aaaa.lng
@@ -1,15 +1,15 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Naziv hosta';
$wb['type_txt'] = 'Vrsta';
-$wb['data_txt'] = 'IPv6-Address';
+$wb['data_txt'] = 'IPv6 adresa';
$wb['ttl_txt'] = 'TTL';
$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.';
-$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['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv hosta nije upisan.';
+$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
+$wb['data_error_empty'] = 'Polje IPv6 adresa je prazno';
+$wb['data_error_regex'] = 'Neispravan format IPv6 adrese';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_alias.lng b/interface/web/dns/lib/lang/hr_dns_alias.lng
index 5842cd1..bece686 100644
--- a/interface/web/dns/lib/lang/hr_dns_alias.lng
+++ b/interface/web/dns/lib/lang/hr_dns_alias.lng
@@ -1,15 +1,15 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
+$wb['name_txt'] = 'Naziv hosta';
$wb['type_txt'] = 'Vrsta';
-$wb['data_txt'] = 'Target Hostname';
+$wb['data_txt'] = 'Odredišni host';
$wb['ttl_txt'] = 'TTL';
$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.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'Target hostname empty';
-$wb['data_error_regex'] = 'Target hostname format invalid';
+$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv hosta nije upisan.';
+$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
+$wb['data_error_empty'] = 'Polje odredišni host je prazno';
+$wb['data_error_regex'] = 'Neispravan format odredišnog hosta';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_cname.lng b/interface/web/dns/lib/lang/hr_dns_cname.lng
index 9474a15..40293da 100644
--- a/interface/web/dns/lib/lang/hr_dns_cname.lng
+++ b/interface/web/dns/lib/lang/hr_dns_cname.lng
@@ -1,16 +1,16 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Naziv hosta';
$wb['type_txt'] = 'Vrsta';
-$wb['data_txt'] = 'Target Hostname';
+$wb['data_txt'] = 'Odredišni host';
$wb['ttl_txt'] = 'TTL';
$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.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'Target hostname empty';
-$wb['data_error_regex'] = 'Target hostname format invalid';
-$wb['data_error_duplicate'] = 'Duplicate A-Record or CNAME-Record';
+$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv hosta nije upisan.';
+$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
+$wb['data_error_empty'] = 'Polje odredišni host je prazno';
+$wb['data_error_regex'] = 'Neispravan format odredišnog host zapisa';
+$wb['data_error_duplicate'] = 'Duplicirani A zapis ili CNAME zapis';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_hinfo.lng b/interface/web/dns/lib/lang/hr_dns_hinfo.lng
index e8d7eee..4b7ac5a 100644
--- a/interface/web/dns/lib/lang/hr_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/hr_dns_hinfo.lng
@@ -1,15 +1,15 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['zone_txt'] = 'Zona';
-$wb['name_txt'] = 'Hostname';
+$wb['name_txt'] = 'Naziv hosta';
$wb['type_txt'] = 'vrsta';
$wb['data_txt'] = 'Informacije o hostu';
$wb['ttl_txt'] = 'TTL';
$wb['active_txt'] = 'Aktivna';
-$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa.';
-$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanje zapisa ovoj DNS zonu.';
-$wb['name_error_empty'] = 'Hostname nije upisan.';
-$wb['name_error_regex'] = 'Hostname je u krivom formatu.';
+$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv hosta nije upisan.';
+$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
$wb['data_error_empty'] = 'Nedostaju informacije o hostu';
-$wb['data_error_regex'] = 'Informacije o hostu su u krivom formatu';
+$wb['data_error_regex'] = 'Informacije o hostu su u neispravanom formatu';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_import.lng b/interface/web/dns/lib/lang/hr_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/hr_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/hr_dns_mx.lng b/interface/web/dns/lib/lang/hr_dns_mx.lng
index 97e801a..8375fe8 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'] = 'Zona';
-$wb['name_txt'] = 'Hostname';
+$wb['name_txt'] = 'Naziv hosta';
$wb['type_txt'] = 'vrsta';
-$wb['data_txt'] = 'Naziv mail hostname-a';
+$wb['data_txt'] = 'Naziv mail hosta';
$wb['aux_txt'] = 'Prioritet';
$wb['ttl_txt'] = 'TTL';
$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';
+$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv hosta nije upisan.';
+$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
+$wb['data_error_empty'] = 'Naziv mail hosta polje je prazno';
+$wb['data_error_regex'] = 'Neispravan format naziva mail host zapisa';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_ns.lng b/interface/web/dns/lib/lang/hr_dns_ns.lng
index 6a7ad8a..631df4b 100644
--- a/interface/web/dns/lib/lang/hr_dns_ns.lng
+++ b/interface/web/dns/lib/lang/hr_dns_ns.lng
@@ -1,15 +1,15 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Zone';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Zona';
$wb['type_txt'] = 'Vrsta';
-$wb['data_txt'] = 'Nameserver Hostname';
+$wb['data_txt'] = 'Naziv NS hosta';
$wb['ttl_txt'] = 'TTL';
$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.';
-$wb['name_error_regex'] = 'The zone has the wrong format.';
-$wb['data_error_empty'] = 'Nameserver empty';
-$wb['data_error_regex'] = 'Nameserver format invalid';
+$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv zone nije upisan.';
+$wb['name_error_regex'] = 'Naziv zone je u pogrešnom formatu.';
+$wb['data_error_empty'] = 'Nameserver nije upisan';
+$wb['data_error_regex'] = 'Nameserver je u pogrešnom formatu';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_ptr.lng b/interface/web/dns/lib/lang/hr_dns_ptr.lng
index 08d6b34..c495196 100644
--- a/interface/web/dns/lib/lang/hr_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/hr_dns_ptr.lng
@@ -1,15 +1,15 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Name';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Naziv';
$wb['type_txt'] = 'Vrsta';
-$wb['data_txt'] = 'Canonical Hostname';
+$wb['data_txt'] = 'Canonical naziv hosta';
$wb['ttl_txt'] = 'TTL';
$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.';
-$wb['name_error_regex'] = 'The name has the wrong format.';
-$wb['data_error_empty'] = 'Canonical hostname empty';
-$wb['data_error_regex'] = 'Canonical hostname format invalid';
+$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv hosta nije upisan.';
+$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
+$wb['data_error_empty'] = 'Polje Canonical naziv hosta je prazno';
+$wb['data_error_regex'] = 'Neispravan format Canonical host zapisa';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_rp.lng b/interface/web/dns/lib/lang/hr_dns_rp.lng
index 2989cfd..6150258 100644
--- a/interface/web/dns/lib/lang/hr_dns_rp.lng
+++ b/interface/web/dns/lib/lang/hr_dns_rp.lng
@@ -1,15 +1,15 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['zone_txt'] = 'Zona';
-$wb['name_txt'] = 'Hostname';
+$wb['name_txt'] = 'Naziv hosta';
$wb['type_txt'] = 'vrsta';
$wb['data_txt'] = 'Odgovorna osoba';
$wb['ttl_txt'] = 'TTL';
$wb['active_txt'] = 'Aktivna';
-$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa.';
-$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanje zapisa ovoj DNS zonu.';
-$wb['name_error_empty'] = 'Hostname nije upisan.';
-$wb['name_error_regex'] = 'Hostname je u krivom formatu.';
+$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv hosta nije upisan.';
+$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
$wb['data_error_empty'] = 'Polje za odgovornu osobu je prazno';
$wb['data_error_regex'] = 'Polje za odgovornu osobu je neispravno';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_slave.lng b/interface/web/dns/lib/lang/hr_dns_slave.lng
index b77fda5..eff47df 100644
--- a/interface/web/dns/lib/lang/hr_dns_slave.lng
+++ b/interface/web/dns/lib/lang/hr_dns_slave.lng
@@ -1,16 +1,16 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'DNS Zone';
+$wb['origin_txt'] = 'DNS Zona';
$wb['ns_txt'] = 'NS';
$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['limit_dns_slave_zone_txt'] = 'Iskorišten je maksimalan broj sekundarnih DNS zona za vaš račun.';
+$wb['client_txt'] = 'Klijent';
$wb['xfer_txt'] = 'Allow zone transfers to <br />these IPs (comma separated list)';
-$wb['server_id_error_empty'] = 'No server selected';
-$wb['origin_error_empty'] = 'Zone empty.';
-$wb['origin_error_unique'] = 'There is already a record for this zone.';
-$wb['origin_error_regex'] = 'Zone has a invalid format.';
-$wb['ns_error_regex'] = 'NS has a invalid format.';
-$wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['server_id_error_empty'] = 'Nije izabran server.';
+$wb['origin_error_empty'] = 'Zona je prazna.';
+$wb['origin_error_unique'] = 'Već postoji zapis za ovu zonu.';
+$wb['origin_error_regex'] = 'Zona je u pogrešnom formatu.';
+$wb['ns_error_regex'] = 'NS je u pogrešnom formatu.';
+$wb['eg_domain_tld'] = 'npr. domena.tld.';
+$wb['ipv4_form_txt'] = 'IPv4 forma - npr. 1.2.3.4';
?>
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 3d3b9bc..02fafc5 100644
--- a/interface/web/dns/lib/lang/hr_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/hr_dns_slave_list.lng
@@ -1,9 +1,9 @@
<?php
-$wb['list_head_txt'] = 'DNS Secondary Zones';
+$wb['list_head_txt'] = 'Sekundarne DNS zone';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'Zone';
+$wb['origin_txt'] = 'Zona';
$wb['ns_txt'] = 'NS';
-$wb['add_new_record_txt'] = 'Add new secondary DNS Zone';
-$wb['eg_domain_tld'] = 'e.g. domain.tld.';
+$wb['add_new_record_txt'] = 'Dodaj sekundarnu DNS zonu';
+$wb['eg_domain_tld'] = 'npr. domena.tld.';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_soa.lng b/interface/web/dns/lib/lang/hr_dns_soa.lng
index 8c0627b..62e9a09 100644
--- a/interface/web/dns/lib/lang/hr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/hr_dns_soa.lng
@@ -7,26 +7,26 @@
$wb['refresh_txt'] = 'Refresh';
$wb['retry_txt'] = 'Retry';
$wb['expire_txt'] = 'Expire';
-$wb['minimum_txt'] = 'Minimum';
+$wb['minimum_txt'] = 'Minimalno';
$wb['ttl_txt'] = 'TTL';
-$wb['xfer_txt'] = 'Allow zone transfers to <br />these IPs (comma separated list)';
+$wb['xfer_txt'] = 'Dozvoli transfer zona <br />ovim IP-ovima (odvojeni zarezom)';
$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.';
-$wb['server_id_error_empty'] = 'No server selected';
-$wb['origin_error_empty'] = 'Zone empty.';
-$wb['origin_error_unique'] = 'There is already a record for this zone.';
-$wb['origin_error_regex'] = 'Zone has a invalid format.';
-$wb['ns_error_regex'] = 'NS has a invalid format.';
-$wb['mbox_error_empty'] = 'Email is empty.';
-$wb['mbox_error_regex'] = 'Email format invalid.';
-$wb['also_notify_txt'] = 'Also Notify';
-$wb['update_acl_txt'] = 'Update ACL';
-$wb['also_notify_error_regex'] = 'Please use an IP address.';
-$wb['seconds_txt'] = 'Seconds';
-$wb['eg_domain_tld'] = 'e.g. domain.tld';
-$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
-$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
-$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
+$wb['limit_dns_zone_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['client_txt'] = 'Klijent';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['server_id_error_empty'] = 'Nije izabran server';
+$wb['origin_error_empty'] = 'Zona je prazna.';
+$wb['origin_error_unique'] = 'Već postoji zapis za ovu zonu.';
+$wb['origin_error_regex'] = 'Zona je u pogrešnom formatu.';
+$wb['ns_error_regex'] = 'NS je u pogrešnom formatu.';
+$wb['mbox_error_empty'] = 'Email polje je prazno.';
+$wb['mbox_error_regex'] = 'Neispravan format Emaila.';
+$wb['also_notify_txt'] = 'Također obavijesti';
+$wb['update_acl_txt'] = 'Obavijesti ACL';
+$wb['also_notify_error_regex'] = 'Unesite IP adresu';
+$wb['seconds_txt'] = 'Sekunde';
+$wb['eg_domain_tld'] = 'npr. domena.tld';
+$wb['eg_ns1_domain_tld'] = 'npr. ns1.domena.tld';
+$wb['eg_webmaster_domain_tld'] = 'npr. webmaster@domena.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Ova domena ne može biti promijenjena. Pošaljite zahtjev administratoru ako želite promijeniti naziv domene.';
?>
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 2007397..cb9cbe0 100644
--- a/interface/web/dns/lib/lang/hr_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/hr_dns_soa_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb['list_head_txt'] = 'DNS Zones';
+$wb['list_head_txt'] = 'DNS zone';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['origin_txt'] = 'Zone';
$wb['ns_txt'] = 'NS';
$wb['mbox_txt'] = 'Email';
-$wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
-$wb['add_new_record_txt'] = 'Add new DNS Zone manually';
+$wb['add_new_record_wizard_txt'] = 'Dodaj novu DNS zonu sa čarobnjakom';
+$wb['add_new_record_txt'] = 'Dodaj novu DNS zonu ručno';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_srv.lng b/interface/web/dns/lib/lang/hr_dns_srv.lng
index 2826f01..964bfe9 100644
--- a/interface/web/dns/lib/lang/hr_dns_srv.lng
+++ b/interface/web/dns/lib/lang/hr_dns_srv.lng
@@ -1,17 +1,17 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Naziv hosta';
$wb['type_txt'] = 'Vrsta';
-$wb['data_txt'] = 'Server Record';
+$wb['data_txt'] = 'Server zapis';
$wb['ttl_txt'] = 'TTL';
$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.';
-$wb['name_error_empty'] = 'The hostname is empty.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'Server record empty';
-$wb['data_error_regex'] = 'Server record format invalid';
-$wb['srv_error_regex'] = 'Invalid server record format. The server record must contain 3 text strings separated by spaces.';
+$wb['aux_txt'] = 'Prioritet';
+$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv hosta nije upisan.';
+$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
+$wb['data_error_empty'] = 'Polje serverski zapis je prazno';
+$wb['data_error_regex'] = 'Neispravan format serverskog zapisa';
+$wb['srv_error_regex'] = 'Neispravan format serverskog zapisa. Mora sadržavati barem 3 tekstualne riječi odvojene razmakom.';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_template_list.lng b/interface/web/dns/lib/lang/hr_dns_template_list.lng
index 8d9d730..22d83c6 100644
--- a/interface/web/dns/lib/lang/hr_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/hr_dns_template_list.lng
@@ -1,6 +1,6 @@
<?php
-$wb['list_head_txt'] = 'DNS Wizard Template';
-$wb['visible_txt'] = 'Visible';
-$wb['name_txt'] = 'Name';
-$wb['add_new_record_txt'] = 'Add new record';
+$wb['list_head_txt'] = 'DNS čarobnjak predložaka';
+$wb['visible_txt'] = 'Vidljivo';
+$wb['name_txt'] = 'Naziv';
+$wb['add_new_record_txt'] = 'Dodaj novi';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_txt.lng b/interface/web/dns/lib/lang/hr_dns_txt.lng
index 4dcc136..9a13463 100644
--- a/interface/web/dns/lib/lang/hr_dns_txt.lng
+++ b/interface/web/dns/lib/lang/hr_dns_txt.lng
@@ -1,15 +1,15 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['zone_txt'] = 'Zona';
-$wb['name_txt'] = 'Ime hosta';
+$wb['name_txt'] = 'Naziv hosta';
$wb['type_txt'] = 'vrsta';
-$wb['data_txt'] = 'Tekst';
+$wb['data_txt'] = 'TXT';
$wb['ttl_txt'] = 'TTL';
$wb['active_txt'] = 'Aktivno';
$wb['limit_dns_record_txt'] = 'Iskorišten je maksimalan broj DNS zapisa za vaš račun.';
-$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domenu.';
-$wb['name_error_empty'] = 'Ime hosta je prazno.';
-$wb['name_error_regex'] = 'Ime hosta je u pogrešnom formatu.';
-$wb['data_error_empty'] = 'Prazan tekst';
-$wb['data_error_regex'] = 'Neispravan tekst format';
+$wb['no_zone_perm'] = 'Nemate dozvolu za dodavanja zapisa ovoj domeni.';
+$wb['name_error_empty'] = 'Naziv hosta nije upisan.';
+$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
+$wb['data_error_empty'] = 'TXT polje je prazno';
+$wb['data_error_regex'] = 'Neispravan format TXT zapisa';
?>
diff --git a/interface/web/dns/lib/lang/hu.lng b/interface/web/dns/lib/lang/hu.lng
index 5882a28..a59eba7 100644
--- a/interface/web/dns/lib/lang/hu.lng
+++ b/interface/web/dns/lib/lang/hu.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Varázsló';
$wb['Add DNS Zone'] = 'Új DNS Zóna';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/hu_dns_import.lng b/interface/web/dns/lib/lang/hu_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/id.lng b/interface/web/dns/lib/lang/id.lng
index b47b55c..53b4111 100644
--- a/interface/web/dns/lib/lang/id.lng
+++ b/interface/web/dns/lib/lang/id.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'Tambah Zona DNS';
$wb['Templates'] = 'Template';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/id_dns_import.lng b/interface/web/dns/lib/lang/id_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/id_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/it.lng b/interface/web/dns/lib/lang/it.lng
index 8b25f73..d01b6b3 100644
--- a/interface/web/dns/lib/lang/it.lng
+++ b/interface/web/dns/lib/lang/it.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'Add DNS Zone';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/it_dns_import.lng b/interface/web/dns/lib/lang/it_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/it_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/ja.lng b/interface/web/dns/lib/lang/ja.lng
index 06608e6..de5c4b8 100644
--- a/interface/web/dns/lib/lang/ja.lng
+++ b/interface/web/dns/lib/lang/ja.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'Add DNS Zone';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/ja_dns_import.lng b/interface/web/dns/lib/lang/ja_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/ja_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/nl.lng b/interface/web/dns/lib/lang/nl.lng
index 8b25f73..d01b6b3 100644
--- a/interface/web/dns/lib/lang/nl.lng
+++ b/interface/web/dns/lib/lang/nl.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'Add DNS Zone';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/nl_dns_import.lng b/interface/web/dns/lib/lang/nl_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/nl_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng
index 2c8e152..29a4a9b 100644
--- a/interface/web/dns/lib/lang/pl.lng
+++ b/interface/web/dns/lib/lang/pl.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'Kreator DNS';
$wb['Add DNS Zone'] = 'Dodaj strefę DNS';
$wb['Templates'] = 'Szablony';
-$wb['zone_file_successfully_imported_txt'] = 'Plik strefy został zaimportowany poprawnie!';
-$wb['error_no_valid_zone_file_txt'] = 'Przepraszamy ale nie jest to poprawny plik strefy!';
-$wb['zonefile_to_import_txt'] = 'Plik strefy';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/pl_dns_import.lng b/interface/web/dns/lib/lang/pl_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/pt.lng b/interface/web/dns/lib/lang/pt.lng
index 6619a86..0fc83af 100644
--- a/interface/web/dns/lib/lang/pt.lng
+++ b/interface/web/dns/lib/lang/pt.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'Assistente de DNS';
$wb['Add DNS Zone'] = 'Adicionar Zona DNS';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/pt_dns_import.lng b/interface/web/dns/lib/lang/pt_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/pt_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/ro.lng b/interface/web/dns/lib/lang/ro.lng
index 5707dfc..aa151ae 100644
--- a/interface/web/dns/lib/lang/ro.lng
+++ b/interface/web/dns/lib/lang/ro.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'Add DNS Zone';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/ro_dns_import.lng b/interface/web/dns/lib/lang/ro_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/ro_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/ru.lng b/interface/web/dns/lib/lang/ru.lng
index edc717e..89ac998 100644
--- a/interface/web/dns/lib/lang/ru.lng
+++ b/interface/web/dns/lib/lang/ru.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'Помощник DNS';
$wb['Add DNS Zone'] = 'Добавить зону DNS';
$wb['Templates'] = 'Шаблоны';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/ru_dns_import.lng b/interface/web/dns/lib/lang/ru_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/ru_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/se.lng b/interface/web/dns/lib/lang/se.lng
index 8b25f73..d01b6b3 100644
--- a/interface/web/dns/lib/lang/se.lng
+++ b/interface/web/dns/lib/lang/se.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'Add DNS Zone';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/se_dns_import.lng b/interface/web/dns/lib/lang/se_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/se_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/sk.lng b/interface/web/dns/lib/lang/sk.lng
index 70b57d6..b03931f 100644
--- a/interface/web/dns/lib/lang/sk.lng
+++ b/interface/web/dns/lib/lang/sk.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Wizard';
$wb['Add DNS Zone'] = 'Add DNS Zone';
$wb['Templates'] = 'Templates';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/sk_dns_import.lng b/interface/web/dns/lib/lang/sk_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/sk_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/tr.lng b/interface/web/dns/lib/lang/tr.lng
index 37fb8b1..56ec2f9 100644
--- a/interface/web/dns/lib/lang/tr.lng
+++ b/interface/web/dns/lib/lang/tr.lng
@@ -17,9 +17,6 @@
$wb['DNS Wizard'] = 'DNS Sihirbazı';
$wb['Add DNS Zone'] = 'DNS Zone Ekle';
$wb['Templates'] = 'Şablonlar';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
$wb['Secondary Zones'] = 'Secondary Zones';
$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/tr_dns_import.lng b/interface/web/dns/lib/lang/tr_dns_import.lng
new file mode 100644
index 0000000..536c62f
--- /dev/null
+++ b/interface/web/dns/lib/lang/tr_dns_import.lng
@@ -0,0 +1,14 @@
+<?php
+
+$wb['server_id_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb["btn_save_txt"] = 'Import Zonefile';
+$wb["btn_cancel_txt"] = 'Cancel';
+$wb['domain_txt'] = 'Domain';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_import.htm b/interface/web/dns/templates/dns_import.htm
index 90fd78f..cdaa164 100644
--- a/interface/web/dns/templates/dns_import.htm
+++ b/interface/web/dns/templates/dns_import.htm
@@ -1,10 +1,6 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
-<tmpl_if name="error">
- <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
-</tmpl_if>
-
<div class="panel panel_dns_wizard">
<div class="pnl_formsarea">
@@ -24,7 +20,7 @@
</div>
</tmpl_if>
<div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}. Can be left empty if domain name is in the filename or the zone-file content.</label>
+ <label for="domain">{tmpl_var name='domain_txt'}. {tmpl_var name='domain_field_desc_txt'}</label>
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" onkeydown="keydown(event.which);" />
</div>
diff --git a/interface/web/help/lib/lang/hr.lng b/interface/web/help/lib/lang/hr.lng
index 2ac8971..fd9153f 100644
--- a/interface/web/help/lib/lang/hr.lng
+++ b/interface/web/help/lib/lang/hr.lng
@@ -4,11 +4,11 @@
$wb['Send message'] = 'Pošalji poruku';
$wb['View messages'] = 'Pogledaj poruke';
$wb['Support'] = 'Podrška';
-$wb['About ISPConfig'] = 'O control panelu';
+$wb['About ISPConfig'] = 'O ISPConfig-u';
$wb['Version'] = 'Verzija';
-$wb['Frequently Asked Questions'] = 'Frequently Asked Questions';
-$wb['FAQ Sections'] = 'FAQ Sections';
-$wb['Manage Sections'] = 'Manage Sections';
-$wb['Add a Question & Answer Pair'] = 'Add a Question & Answer Pair';
-$wb['Manage Questions'] = 'Manage Questions';
+$wb['Frequently Asked Questions'] = 'Često postavljana pitanja (FAQ)';
+$wb['FAQ Sections'] = 'FAQ rubrike';
+$wb['Manage Sections'] = 'Upravljaj rubrikama';
+$wb['Add a Question & Answer Pair'] = 'Dodaj pitanje i odgovor';
+$wb['Manage Questions'] = 'Upravljaj pitanjima';
?>
diff --git a/interface/web/help/lib/lang/hr_faq_form.lng b/interface/web/help/lib/lang/hr_faq_form.lng
index dfc4e87..ca798d7 100644
--- a/interface/web/help/lib/lang/hr_faq_form.lng
+++ b/interface/web/help/lib/lang/hr_faq_form.lng
@@ -1,6 +1,6 @@
<?php
-$wb['faq_faq_txt'] = 'Frequently Asked Questions';
-$wb['faq_question_txt'] = 'Question';
-$wb['faq_answer_txt'] = 'Answer';
-$wb['faq_section_txt'] = 'Section';
+$wb['faq_faq_txt'] = 'Često postavljana pitanja (FAQ)';
+$wb['faq_question_txt'] = 'Pitanje';
+$wb['faq_answer_txt'] = 'Odgovor';
+$wb['faq_section_txt'] = 'Rubrika';
?>
diff --git a/interface/web/help/lib/lang/hr_faq_manage_questions_list.lng b/interface/web/help/lib/lang/hr_faq_manage_questions_list.lng
index 54e727d..54f46e2 100644
--- a/interface/web/help/lib/lang/hr_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/hr_faq_manage_questions_list.lng
@@ -1,9 +1,9 @@
<?php
-$wb['faq_question_txt'] = 'Question';
-$wb['faq_section_name_txt'] = 'Section';
-$wb['faq_delete_txt'] = 'Delete';
-$wb['faq_edit_txt'] = 'Edit';
-$wb['faq_sections_txt'] = 'Section';
-$wb['faq_faq_questions_txt'] = 'Frequently Asked Questions';
-$wb['faq_new_question_txt'] = 'Add a new question & answer pair';
+$wb['faq_question_txt'] = 'Pitanja';
+$wb['faq_section_name_txt'] = 'Rubrike';
+$wb['faq_delete_txt'] = 'Obriši';
+$wb['faq_edit_txt'] = 'Izmjeni';
+$wb['faq_sections_txt'] = 'Rubrika';
+$wb['faq_faq_questions_txt'] = 'Često postavljana pitanja (FAQ)';
+$wb['faq_new_question_txt'] = 'Dodaj novo pitanje i odgovor';
?>
diff --git a/interface/web/help/lib/lang/hr_faq_sections_form.lng b/interface/web/help/lib/lang/hr_faq_sections_form.lng
index dab0863..5eba900 100644
--- a/interface/web/help/lib/lang/hr_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/hr_faq_sections_form.lng
@@ -1,3 +1,3 @@
<?php
-$wb['faq_section_name_txt'] = 'Section Name';
+$wb['faq_section_name_txt'] = 'Naziv rubrike';
?>
diff --git a/interface/web/help/lib/lang/hr_help_faq_list.lng b/interface/web/help/lib/lang/hr_help_faq_list.lng
index b6c7b46..9d910dc 100644
--- a/interface/web/help/lib/lang/hr_help_faq_list.lng
+++ b/interface/web/help/lib/lang/hr_help_faq_list.lng
@@ -1,3 +1,3 @@
<?php
-$wb['edit_txt'] = 'Edit';
+$wb['edit_txt'] = 'Izmjeni';
?>
diff --git a/interface/web/help/lib/lang/hr_help_faq_sections_list.lng b/interface/web/help/lib/lang/hr_help_faq_sections_list.lng
index cb6ce84..91c78e4 100644
--- a/interface/web/help/lib/lang/hr_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/hr_help_faq_sections_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb['faq_section_name_txt'] = 'Section Name';
-$wb['faq_delete_txt'] = 'Delete';
-$wb['faq_edit_txt'] = 'Edit';
-$wb['faq_sections_txt'] = 'Sections';
-$wb['faq_faq_sections_txt'] = 'FAQ Sections';
-$wb['faq_new_section_txt'] = 'Add a new section';
+$wb['faq_section_name_txt'] = 'Naziv rubrike';
+$wb['faq_delete_txt'] = 'Obriši';
+$wb['faq_edit_txt'] = 'Izmjeni';
+$wb['faq_sections_txt'] = 'Rubrike';
+$wb['faq_faq_sections_txt'] = 'FAQ rubrike';
+$wb['faq_new_section_txt'] = 'Dodaj novu rubriku';
?>
diff --git a/interface/web/help/lib/lang/hr_support_message.lng b/interface/web/help/lib/lang/hr_support_message.lng
index b2f02c3..2576d18 100644
--- a/interface/web/help/lib/lang/hr_support_message.lng
+++ b/interface/web/help/lib/lang/hr_support_message.lng
@@ -4,5 +4,5 @@
$wb['subject_txt'] = 'Naslov poruke';
$wb['message_txt'] = 'Poruka';
$wb['tstamp_txt'] = 'Vrijeme';
-$wb['reply_txt'] = 'Reply';
+$wb['reply_txt'] = 'Odgovori';
?>
diff --git a/interface/web/login/lib/lang/hr.lng b/interface/web/login/lib/lang/hr.lng
index a77b975..49803cd 100644
--- a/interface/web/login/lib/lang/hr.lng
+++ b/interface/web/login/lib/lang/hr.lng
@@ -13,5 +13,5 @@
$wb['pw_error_length'] = 'Duljina šifre je > 64 znakova.';
$wb['username_txt'] = 'Korisničko ime';
$wb['password_txt'] = 'Šifra';
-$wb['login_button_txt'] = 'Login';
+$wb['login_button_txt'] = 'Prijava';
?>
diff --git a/interface/web/mail/lib/lang/ar_mail_alias.lng b/interface/web/mail/lib/lang/ar_mail_alias.lng
index 7f149eb..6189fa1 100644
--- a/interface/web/mail/lib/lang/ar_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ar_mail_alias.lng
@@ -9,4 +9,5 @@
$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['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/ar_mail_get.lng b/interface/web/mail/lib/lang/ar_mail_get.lng
index 2ed52d2..09ef84e 100644
--- a/interface/web/mail/lib/lang/ar_mail_get.lng
+++ b/interface/web/mail/lib/lang/ar_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'No destination selected.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/bg_mail_alias.lng b/interface/web/mail/lib/lang/bg_mail_alias.lng
index 7f149eb..6189fa1 100644
--- a/interface/web/mail/lib/lang/bg_mail_alias.lng
+++ b/interface/web/mail/lib/lang/bg_mail_alias.lng
@@ -9,4 +9,5 @@
$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['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/bg_mail_get.lng b/interface/web/mail/lib/lang/bg_mail_get.lng
index 2ed52d2..09ef84e 100644
--- a/interface/web/mail/lib/lang/bg_mail_get.lng
+++ b/interface/web/mail/lib/lang/bg_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'No destination selected.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/br_mail_alias.lng b/interface/web/mail/lib/lang/br_mail_alias.lng
index 0d1a5fa..30084c0 100644
--- a/interface/web/mail/lib/lang/br_mail_alias.lng
+++ b/interface/web/mail/lib/lang/br_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'O número máximo de aliases para sua conta foi atingido.';
$wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endereço.';
$wb['domain_txt'] = 'Domínio';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/br_mail_get.lng b/interface/web/mail/lib/lang/br_mail_get.lng
index 7e69772..0593b10 100644
--- a/interface/web/mail/lib/lang/br_mail_get.lng
+++ b/interface/web/mail/lib/lang/br_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Destino não selecionado.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng
index 32ab671..38e43a3 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Dosažen maximální počet email aliasů pro Váš účet.';
$wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
$wb['domain_txt'] = 'Doména';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng
index d23f529..8c928d4 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Nevybrán žádný cíl.';
$wb['source_server_error_regex'] = 'POP3/IMAP server není validní doménový název.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/de_mail_alias.lng b/interface/web/mail/lib/lang/de_mail_alias.lng
index acb0366..45a564a 100644
--- a/interface/web/mail/lib/lang/de_mail_alias.lng
+++ b/interface/web/mail/lib/lang/de_mail_alias.lng
@@ -7,6 +7,7 @@
$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
$wb['destination_error_isemail'] = 'Zieladresse ist ungültig.';
$wb['limit_mailalias_txt'] = 'Die maximale Anzahl an E-Mail-Aliassen für ihr Konto wurde erreicht.';
-$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eine Mailbox mit dieser E-Mail-Adresse';
+$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eine Mailbox mit dieser E-Mail-Adresse.';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'Dieser E-Mail-Alias existiert bereits.';
?>
diff --git a/interface/web/mail/lib/lang/de_mail_get.lng b/interface/web/mail/lib/lang/de_mail_get.lng
index 706af98..86b7ba7 100644
--- a/interface/web/mail/lib/lang/de_mail_get.lng
+++ b/interface/web/mail/lib/lang/de_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Kein Ziel gewählt.';
$wb['source_server_error_regex'] = 'POP3/IMAP Server ist kein gültiger Domainname.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_alias.lng b/interface/web/mail/lib/lang/el_mail_alias.lng
index 767b35a..61e1acd 100644
--- a/interface/web/mail/lib/lang/el_mail_alias.lng
+++ b/interface/web/mail/lib/lang/el_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των ψευδωνύμων email για τον λογαριασμό σας.';
$wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_get.lng b/interface/web/mail/lib/lang/el_mail_get.lng
index b4a7784..500b16a 100644
--- a/interface/web/mail/lib/lang/el_mail_get.lng
+++ b/interface/web/mail/lib/lang/el_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Δεν επιλέχθηκε προορισμός.';
$wb['source_server_error_regex'] = 'Το όνομα του Pop3/Imap Server δεν είναι έγκυρο.';
$wb['source_read_all_txt'] = 'Ανάκτηση όλων των emails (συμπερ. αναγνωσμένων mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/en_mail_alias.lng b/interface/web/mail/lib/lang/en_mail_alias.lng
index f1c715a..02f753c 100644
--- a/interface/web/mail/lib/lang/en_mail_alias.lng
+++ b/interface/web/mail/lib/lang/en_mail_alias.lng
@@ -7,6 +7,7 @@
$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["duplicate_mailbox_txt"] = 'There is already a mailbox with this email address.';
$wb['domain_txt'] = 'Domain';
+$wb["duplicate_email_alias_txt"] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/es_mail_alias.lng b/interface/web/mail/lib/lang/es_mail_alias.lng
index 8de440f..ac79ff0 100644
--- a/interface/web/mail/lib/lang/es_mail_alias.lng
+++ b/interface/web/mail/lib/lang/es_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Ha alcanzado el número máximo de alias de correo para esta cuenta';
$wb['duplicate_mailbox_txt'] = 'Ya existe un buzón de correo con esta dirección';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/es_mail_get.lng b/interface/web/mail/lib/lang/es_mail_get.lng
index 6f9035b..a6f04d8 100644
--- a/interface/web/mail/lib/lang/es_mail_get.lng
+++ b/interface/web/mail/lib/lang/es_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'No se ha seleccionado el destino.';
$wb['source_server_error_regex'] = 'Servidor POP3/IMAP no es un nombre de dominio válido.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/fi_mail_alias.lng b/interface/web/mail/lib/lang/fi_mail_alias.lng
index 8c56f51..cdd1143 100755
--- a/interface/web/mail/lib/lang/fi_mail_alias.lng
+++ b/interface/web/mail/lib/lang/fi_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä aliasosoitteita.';
$wb['duplicate_mailbox_txt'] = 'Aliastunnus on jo olemassa tälle osoitteelle.';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/fi_mail_get.lng b/interface/web/mail/lib/lang/fi_mail_get.lng
index 3e58cc1..065d149 100755
--- a/interface/web/mail/lib/lang/fi_mail_get.lng
+++ b/interface/web/mail/lib/lang/fi_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Ei kohdetta valittuna.';
$wb['source_server_error_regex'] = 'Pop3/Imap-palvelin ei ole kelvollinen osoite.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/fr_mail_alias.lng b/interface/web/mail/lib/lang/fr_mail_alias.lng
index 55450d4..7b2653d 100644
--- a/interface/web/mail/lib/lang/fr_mail_alias.lng
+++ b/interface/web/mail/lib/lang/fr_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Le nombre maximal d\'alias d\'email pour votre compte a été atteint.';
$wb['duplicate_mailbox_txt'] = 'Il y a déja une boîte mail avec cette adresse email';
$wb['domain_txt'] = 'Domaine';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/fr_mail_get.lng b/interface/web/mail/lib/lang/fr_mail_get.lng
index 700f673..b009745 100644
--- a/interface/web/mail/lib/lang/fr_mail_get.lng
+++ b/interface/web/mail/lib/lang/fr_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Pas de destination sélectionnée.';
$wb['source_server_error_regex'] = 'Le serveur POP3 / IMAP n\'est pas un nom de domaine valide.';
$wb['source_read_all_txt'] = 'Récupérer tous les emails (incl. les emails lus)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/hr.lng b/interface/web/mail/lib/lang/hr.lng
index 1563955..9ed8c6e 100644
--- a/interface/web/mail/lib/lang/hr.lng
+++ b/interface/web/mail/lib/lang/hr.lng
@@ -1,47 +1,47 @@
<?php
-$wb['Email Alias'] = 'Email Alias';
-$wb['Email Blacklist'] = 'Email Blacklist';
-$wb['Blacklist'] = 'Blacklist';
-$wb['Mail Content Filter'] = 'Mail Content Filter';
+$wb['Email Alias'] = 'Email alias';
+$wb['Email Blacklist'] = 'Email blacklista';
+$wb['Blacklist'] = 'Blacklista';
+$wb['Mail Content Filter'] = 'Sadržaj mail filtera';
$wb['Filter'] = 'Filter';
-$wb['Mail Domain'] = 'Mail Domain';
+$wb['Mail Domain'] = 'Mail domena';
$wb['Domain'] = 'Domena';
-$wb['Email Catchall'] = 'Email Catchall';
-$wb['Email Forward'] = 'Email Forward';
-$wb['Get Email'] = 'Get Email';
+$wb['Email Catchall'] = 'Email catchall';
+$wb['Email Forward'] = 'Email proslijeđivanje';
+$wb['Get Email'] = 'Primi poštu';
$wb['Spamfilter'] = 'Spamfilter';
-$wb['Email Routing'] = 'Email Routing';
+$wb['Email Routing'] = 'Email ruta';
$wb['Email transport'] = 'Email transport';
-$wb['Mailbox'] = 'Mailbox';
-$wb['Autoresponder'] = 'Autoresponder';
-$wb['Mail Filter'] = 'Mail Filter';
-$wb['Custom Rules'] = 'Custom Rules';
+$wb['Mailbox'] = 'Sandučić';
+$wb['Autoresponder'] = 'Automatski odgovor';
+$wb['Mail Filter'] = 'Mail filter';
+$wb['Custom Rules'] = 'Vlastita pravila';
$wb['Email filter'] = 'Email filter';
-$wb['Email Whitelist'] = 'Email Whitelist';
-$wb['Whitelist'] = 'Whitelist';
-$wb['Spamfilter blacklist'] = 'Spamfilter blacklist';
-$wb['Spamfilter Config'] = 'Spamfilter Config';
+$wb['Email Whitelist'] = 'Email whitelista';
+$wb['Whitelist'] = 'Whitelista';
+$wb['Spamfilter blacklist'] = 'Spamfilter blacklista';
+$wb['Spamfilter Config'] = 'Spamfilter postavke';
$wb['Server'] = 'Server';
-$wb['Spamfilter policy'] = 'Spamfilter policy';
-$wb['Policy'] = 'Policy';
-$wb['Quarantine'] = 'Quarantine';
-$wb['Tag-Level'] = 'Tag-Level';
-$wb['Other'] = 'Other';
-$wb['Spamfilter users'] = 'Spamfilter users';
-$wb['Users'] = 'Users';
-$wb['Spamfilter Whitelist'] = 'Spamfilter Whitelist';
+$wb['Spamfilter policy'] = 'Spamfilter pravila';
+$wb['Policy'] = 'Pravila';
+$wb['Quarantine'] = 'Karantena';
+$wb['Tag-Level'] = 'Nivo označavanja';
+$wb['Other'] = 'Ostalo';
+$wb['Spamfilter users'] = 'Spamfilter korisnici';
+$wb['Users'] = 'Korisnici';
+$wb['Spamfilter Whitelist'] = 'Spamfilter whitelista';
$wb['Email'] = 'Email';
-$wb['Email Mailbox'] = 'Email Mailbox';
-$wb['Email Accounts'] = 'Email Accounts';
-$wb['User / Domain'] = 'User / Domain';
-$wb['Server Settings'] = 'Server Settings';
+$wb['Email Mailbox'] = 'Email sandučić';
+$wb['Email Accounts'] = 'Email računi';
+$wb['User / Domain'] = 'Korisnik / Domena';
+$wb['Server Settings'] = 'Postavke servera';
$wb['Fetchmail'] = 'Fetchmail';
-$wb['Mailbox traffic'] = 'Mailbox traffic';
-$wb['Statistics'] = 'Statistics';
-$wb['Postfix Whitelist'] = 'Postfix Whitelist';
-$wb['Postfix Blacklist'] = 'Postfix Blacklist';
-$wb['Content Filter'] = 'Content Filter';
-$wb['Global Filters'] = 'Global Filters';
-$wb['Domain Alias'] = 'Domain Alias';
-$wb['Relay Recipients'] = 'Relay Recipients';
+$wb['Mailbox traffic'] = 'Promet sandučića';
+$wb['Statistics'] = 'Statistike';
+$wb['Postfix Whitelist'] = 'Postfix whitelista';
+$wb['Postfix Blacklist'] = 'Postfix blacklista';
+$wb['Content Filter'] = 'Filter sadržaja';
+$wb['Global Filters'] = 'Globalni filter';
+$wb['Domain Alias'] = 'Alias domena';
+$wb['Relay Recipients'] = 'Relay primatelji';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_alias.lng b/interface/web/mail/lib/lang/hr_mail_alias.lng
index f78f29d..210f114 100644
--- a/interface/web/mail/lib/lang/hr_mail_alias.lng
+++ b/interface/web/mail/lib/lang/hr_mail_alias.lng
@@ -1,12 +1,13 @@
<?php
$wb['email_txt'] = 'Email';
-$wb['destination_txt'] = 'Destination';
+$wb['destination_txt'] = 'Destinacija';
$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['email_error_isemail'] = 'Email adresa je neispravna.';
+$wb['email_error_unique'] = 'Duplicirane email adrese.';
+$wb['no_domain_perm'] = 'Nemate dozvole za ovu domenu.';
+$wb['destination_error_isemail'] = 'Destinacija email adrese je neispravna.';
+$wb['limit_mailalias_txt'] = 'Iskorišten je maksimalan broj email aliasa.';
+$wb['duplicate_mailbox_txt'] = 'Već postoji mailbox sa ovom email adresom';
$wb['domain_txt'] = 'Domena';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
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 de017ff..2790cb3 100644
--- a/interface/web/mail/lib/lang/hr_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_alias_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Email Alias';
+$wb['list_head_txt'] = 'Email alias';
$wb['active_txt'] = 'Aktivno';
-$wb['source_txt'] = 'source';
-$wb['destination_txt'] = 'Destination';
+$wb['source_txt'] = 'izvor';
+$wb['destination_txt'] = 'Odredište';
$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Add new Email alias';
+$wb['add_new_record_txt'] = 'Dodaj email alias';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng b/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng
index ed78dab..fc77f6c 100644
--- a/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng
@@ -1,11 +1,11 @@
<?php
-$wb['source_txt'] = 'Source';
-$wb['destination_txt'] = 'Destination';
+$wb['source_txt'] = 'Izvor';
+$wb['destination_txt'] = 'Destinacija';
$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.';
-$wb['source_error_empty'] = 'Source Domain is empty.';
-$wb['source_error_unique'] = 'Duplicate source Domain.';
-$wb['source_error_regex'] = 'Invalid source domain name.';
+$wb['no_domain_perm'] = 'Nemate dozvoljen pristup za ovu domenu.';
+$wb['limit_mailaliasdomain_txt'] = 'Iskorišten je maksimalan broj email alias domena.';
+$wb['source_destination_identical_txt'] = 'Izvorna i ciljana domena su iste.';
+$wb['source_error_empty'] = 'Izvorna domena je prazna.';
+$wb['source_error_unique'] = 'Duplicirana izvorna domena.';
+$wb['source_error_regex'] = 'Neispravan naziv izvorne domene.';
?>
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 e7bfeb0..3aa5514 100644
--- a/interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng
@@ -1,7 +1,7 @@
<?php
$wb['list_head_txt'] = 'Domain alias';
$wb['active_txt'] = 'Aktivno';
-$wb['source_txt'] = 'Source';
-$wb['destination_txt'] = 'Destination';
+$wb['source_txt'] = 'Izvor';
+$wb['destination_txt'] = 'Destinacija';
$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 3f0269c..dbce8de 100644
--- a/interface/web/mail/lib/lang/hr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
@@ -1,9 +1,9 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Blacklist Address';
-$wb['recipient_txt'] = 'Recipient';
+$wb['recipient_txt'] = 'Pimatelj';
$wb['active_txt'] = 'Aktivno';
-$wb['source_error_notempty'] = 'Address is empty.';
+$wb['source_error_notempty'] = 'Adresa je prazna';
$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 0d1231f..8cbb63a 100644
--- a/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb['list_head_txt'] = 'Email Blacklist';
+$wb['list_head_txt'] = 'Email blacklista';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['source_txt'] = 'Blacklisted address';
+$wb['source_txt'] = 'Blacklistana adresa';
$wb['type_txt'] = 'Vrsta';
-$wb['recipient_txt'] = 'Recipient';
-$wb['add_new_record_txt'] = 'Add new Blacklist record';
-$wb['access_txt'] = 'access';
+$wb['recipient_txt'] = 'Primatelj';
+$wb['add_new_record_txt'] = 'Dodaj novi zapis na blacklistu';
+$wb['access_txt'] = 'pristup';
?>
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 2b02a00..f012957 100644
--- a/interface/web/mail/lib/lang/hr_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/hr_mail_content_filter.lng
@@ -1,9 +1,9 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['type_txt'] = 'Filter';
-$wb['pattern_txt'] = 'Regexp. Pattern';
-$wb['data_txt'] = 'Data';
-$wb['action_txt'] = 'Action';
+$wb['pattern_txt'] = 'Regexp. postupak';
+$wb['data_txt'] = 'Podaci';
+$wb['action_txt'] = 'Akcija';
$wb['active_txt'] = 'Aktivno';
-$wb['pattern_error_empty'] = 'Pattern is empty.';
+$wb['pattern_error_empty'] = 'Postupak je prazan.';
?>
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 d3c273e..2657227 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
@@ -3,6 +3,6 @@
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['pattern_txt'] = 'Pattern';
-$wb['action_txt'] = 'Action';
+$wb['action_txt'] = 'Akcija';
$wb['add_new_record_txt'] = 'Add new Content Filter';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_domain.lng b/interface/web/mail/lib/lang/hr_mail_domain.lng
index 2a3127f..6dae122 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain.lng
@@ -3,11 +3,11 @@
$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.';
-$wb['client_txt'] = 'Client';
-$wb['limit_maildomain_txt'] = 'The max. number of email domains for your account is reached.';
+$wb['domain_error_empty'] = 'Domena je prazno.';
+$wb['domain_error_unique'] = 'Već postoji ova domena.';
+$wb['domain_error_regex'] = 'Neispravan naziv domene.';
+$wb['client_txt'] = 'Klijent';
+$wb['limit_maildomain_txt'] = 'Iskorišten je maksimalan broj email domena.';
$wb['policy_txt'] = 'Spamfilter';
-$wb['no_policy'] = '- not enabled -';
+$wb['no_policy'] = '- nema pravila -';
?>
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 6566459..4d13ef3 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['list_head_txt'] = 'Email domena';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domena';
-$wb['add_new_record_txt'] = 'Add new Domain';
+$wb['add_new_record_txt'] = 'Dodaj domenu';
$wb['active_txt'] = 'Aktivno';
-$wb['sys_groupid_txt'] = 'Client';
+$wb['sys_groupid_txt'] = 'Klijent';
?>
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 e154524..798ee13 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng
@@ -1,9 +1,9 @@
<?php
$wb['domain_txt'] = 'Domena';
-$wb['destination_txt'] = 'Destination';
+$wb['destination_txt'] = 'Odredište';
$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.';
-$wb['limit_mailcatchall_txt'] = 'The max. number of email catchall accounts for your account is reached.';
+$wb['domain_error_unique'] = 'Već postoji catchall zapis za ovu domenu.';
+$wb['no_domain_perm'] = 'Nemate dozvole za ovu domenu.';
+$wb['domain_error_regex'] = 'Neispravan naziv domene ili naziv sadrži nedozvoljene znakove.';
+$wb['limit_mailcatchall_txt'] = 'Iskorišten ja maksimalan broj email catchall računa.';
?>
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 ae11977..81108fa 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['list_head_txt'] = 'Email catchall';
$wb['active_txt'] = 'Aktivno';
-$wb['source_txt'] = 'source';
-$wb['destination_txt'] = 'Destination email address';
+$wb['source_txt'] = 'izvor';
+$wb['destination_txt'] = 'Odredišna email adresa';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domena';
-$wb['add_new_record_txt'] = 'Add new Catchall';
+$wb['add_new_record_txt'] = 'Dodaj 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 8b80909..e078c28 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['list_head_txt'] = 'Email domena';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domena';
-$wb['add_new_record_txt'] = 'Add new Domain';
+$wb['add_new_record_txt'] = 'Dodaj domenu';
$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 328a685..187a244 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['destination_txt'] = 'Proslijedi na';
$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['limit_mailforward_txt'] = 'Iskorišten je maksimalan broj email forwardera.';
+$wb['duplicate_mailbox_txt'] = 'Već postoji mailbox sa tom email adresom';
$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 3312f63..895fafb 100644
--- a/interface/web/mail/lib/lang/hr_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_forward_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Mail Forward';
+$wb['list_head_txt'] = 'Proslijeđivanje emaila';
$wb['active_txt'] = 'Aktivno';
-$wb['source_txt'] = 'source';
-$wb['destination_txt'] = 'Destination';
+$wb['source_txt'] = 'izvor';
+$wb['destination_txt'] = 'Destinacija';
$wb['email_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Add new Email forward';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_get.lng b/interface/web/mail/lib/lang/hr_mail_get.lng
index 00ed647..6d14eab 100644
--- a/interface/web/mail/lib/lang/hr_mail_get.lng
+++ b/interface/web/mail/lib/lang/hr_mail_get.lng
@@ -5,7 +5,7 @@
$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['destination_txt'] = 'Destinacija';
$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.';
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'No destination selected.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_get_list.lng b/interface/web/mail/lib/lang/hr_mail_get_list.lng
index 624d587..9cd92dd 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['list_head_txt'] = 'Prikupljanje emailova sa vanjskog POP3 / IMAP servera';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['source_server_txt'] = 'External Server';
+$wb['source_server_txt'] = 'Eksterni server';
$wb['source_username_txt'] = 'Korisničko ime';
-$wb['destination_txt'] = 'Destination';
-$wb['add_new_record_txt'] = 'Add new Account';
+$wb['destination_txt'] = 'Destinacija';
+$wb['add_new_record_txt'] = 'Dodaj novi račun';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_mailinglist.lng b/interface/web/mail/lib/lang/hr_mail_mailinglist.lng
index 3209ff1..0840162 100644
--- a/interface/web/mail/lib/lang/hr_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_mailinglist.lng
@@ -1,15 +1,15 @@
<?php
-$wb['limit_mailmailinglist_txt'] = 'Limit reached';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['listname_error_empty'] = 'Listname is empty.';
-$wb['domain_error_regex'] = 'Invalid domain name.';
-$wb['email_in_use_txt'] = 'Email is in use';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['password_strength_txt'] = 'Password strength';
+$wb['limit_mailmailinglist_txt'] = 'Iskorišten je maksimalan broj email lista.';
+$wb['domain_error_empty'] = 'Domena je prazna.';
+$wb['listname_error_empty'] = 'Naziv liste je prazan.';
+$wb['domain_error_regex'] = 'Neispravan naziv domene.';
+$wb['email_in_use_txt'] = 'Email je u upotrebi';
+$wb['no_domain_perm'] = 'Nemate dozvole za ovu domenu.';
+$wb['password_strength_txt'] = 'Jačina šifre';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domena';
-$wb['listname_txt'] = 'Listname';
-$wb['client_txt'] = 'Client';
+$wb['listname_txt'] = 'Naziv liste';
+$wb['client_txt'] = 'Klijent';
$wb['email_txt'] = 'Email';
$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 8eebde9..48b8c8b 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['list_head_txt'] = 'Mailing lista';
$wb['domain_txt'] = 'Domena';
-$wb['listname_txt'] = 'Listname';
+$wb['listname_txt'] = 'Naziv liste';
?>
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 5d28478..3555ed2 100644
--- a/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng
@@ -1,9 +1,9 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Relay recipient';
-$wb['recipient_txt'] = 'Recipient';
+$wb['recipient_txt'] = 'Pimatelj';
$wb['active_txt'] = 'Aktivno';
-$wb['source_error_notempty'] = 'Address is empty.';
+$wb['source_error_notempty'] = 'Adresa je prazna';
$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 3b4586b..ad15e00 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
@@ -3,7 +3,7 @@
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Recipient address';
-$wb['recipient_txt'] = 'Recipient';
+$wb['recipient_txt'] = 'Pimatelj';
$wb['add_new_record_txt'] = 'Add new relay recipient';
-$wb['access_txt'] = 'access';
+$wb['access_txt'] = 'pristup';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_transport.lng b/interface/web/mail/lib/lang/hr_mail_transport.lng
index d0a7b40..1749499 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'] = 'Domena';
-$wb['destination_txt'] = 'Destination';
+$wb['destination_txt'] = 'Odredište';
$wb['type_txt'] = 'Vrsta';
-$wb['mx_txt'] = 'No MX lookup';
-$wb['sort_order_txt'] = 'Sort by';
+$wb['mx_txt'] = 'Nema MX lookup-a';
+$wb['sort_order_txt'] = 'Sortiraj';
$wb['active_txt'] = 'Aktivno';
-$wb['limit_mailrouting_txt'] = 'The max. number of routes for your account is reached.';
+$wb['limit_mailrouting_txt'] = 'Iskorišten je maksimalan broj ruta.';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng
index 9845fa3..7796423 100644
--- a/interface/web/mail/lib/lang/hr_mail_user.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user.lng
@@ -9,13 +9,12 @@
$wb['autoresponder_text_txt'] = 'Text';
$wb['autoresponder_txt'] = 'Aktivno';
$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
$wb['error_no_pwd'] = 'Password is empty.';
$wb['quota_error_isint'] = 'Mailbox size must be a number.';
-$wb['quota_txt'] = 'Quota';
+$wb['quota_txt'] = 'Kvota';
$wb['server_id_txt'] = 'Aerver_id';
$wb['password_txt'] = 'Šifra';
$wb['maildir_txt'] = 'Maildir';
@@ -41,4 +40,5 @@
$wb['login_error_regex'] = 'Valid characters are A-Z, a-z, 0-9, ., _ and -.';
$wb['login_txt'] = 'Login (optional)';
$wb['error_login_email_txt'] = 'This login is not allowed. Please enter a different login or use the mail address as login.';
+$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
?>
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 a4952c7..dc90099 100644
--- a/interface/web/mail/lib/lang/hr_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user_filter.lng
@@ -1,20 +1,20 @@
<?php
$wb['rulename_txt'] = 'Name';
-$wb['action_txt'] = 'Action';
+$wb['action_txt'] = 'Akcija';
$wb['target_txt'] = 'Folder';
$wb['active_txt'] = 'Aktivno';
$wb['rulename_error_empty'] = 'Name is empty.';
$wb['searchterm_is_empty'] = 'Search term is empty.';
-$wb['source_txt'] = 'Source';
+$wb['source_txt'] = 'Izvor';
$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
-$wb['subject_txt'] = 'Subject';
-$wb['from_txt'] = 'From';
-$wb['to_txt'] = 'To';
-$wb['contains_txt'] = 'Contains';
+$wb['subject_txt'] = 'Naslov';
+$wb['from_txt'] = 'Pošiljatelj';
+$wb['to_txt'] = 'Primatelj';
+$wb['contains_txt'] = 'Sadrži';
$wb['is_txt'] = 'Is';
$wb['begins_with_txt'] = 'Begins with';
$wb['ends_with_txt'] = 'Ends with';
$wb['move_to_txt'] = 'Move to';
-$wb['delete_txt'] = 'Delete';
+$wb['delete_txt'] = 'Obriši';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_user_filter_list.lng b/interface/web/mail/lib/lang/hr_mail_user_filter_list.lng
index 2754259..d101a72 100644
--- a/interface/web/mail/lib/lang/hr_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user_filter_list.lng
@@ -1,7 +1,7 @@
<?php
$wb['rulename_txt'] = 'Name';
$wb['add_new_record_txt'] = 'Add new Filter';
-$wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
+$wb['page_txt'] = 'Stranica';
+$wb['page_of_txt'] = 'od';
$wb['delete_confirmation'] = 'Do you really want to Delete the mailfilter?';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_user_list.lng b/interface/web/mail/lib/lang/hr_mail_user_list.lng
index 3417eaa..762aea1 100644
--- a/interface/web/mail/lib/lang/hr_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user_list.lng
@@ -1,8 +1,8 @@
<?php
$wb['list_head_txt'] = 'Mailbox';
$wb['email_txt'] = 'Email';
-$wb['autoresponder_txt'] = 'Autoresponder';
-$wb['add_new_record_txt'] = 'Add new Mailbox';
-$wb['name_txt'] = 'Realname';
-$wb['login_txt'] = 'Login';
+$wb['autoresponder_txt'] = 'Automatski odgovor';
+$wb['add_new_record_txt'] = 'Dodaj mailbox';
+$wb['name_txt'] = 'Ime';
+$wb['login_txt'] = 'Prijava';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_whitelist.lng b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
index ce50ba9..a43e8ee 100644
--- a/interface/web/mail/lib/lang/hr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
@@ -1,9 +1,9 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Whitelist Address';
-$wb['recipient_txt'] = 'Recipient';
+$wb['recipient_txt'] = 'Pimatelj';
$wb['active_txt'] = 'Aktivno';
-$wb['source_error_notempty'] = 'Address is empty.';
+$wb['source_error_notempty'] = 'Adresa je prazna';
$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 4459061..7b65efa 100644
--- a/interface/web/mail/lib/lang/hr_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_whitelist_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb['list_head_txt'] = 'Email Whitelist';
+$wb['list_head_txt'] = 'Email whitelista';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['source_txt'] = 'Whitelisted address';
+$wb['source_txt'] = 'Whitelistana adresa';
$wb['type_txt'] = 'Vrsta';
-$wb['recipient_txt'] = 'Recipient';
-$wb['add_new_record_txt'] = 'Add new Whitelist record';
-$wb['access_txt'] = 'access';
+$wb['recipient_txt'] = 'Primatelj';
+$wb['add_new_record_txt'] = 'Dodaj novu whitelistu';
+$wb['access_txt'] = 'pristup';
?>
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng
index 394bfc6..8c018ac 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng
@@ -3,7 +3,7 @@
$wb['wb_txt'] = 'wb';
$wb['rid_txt'] = 'User';
$wb['email_txt'] = 'Email';
-$wb['priority_txt'] = 'Priority';
+$wb['priority_txt'] = 'Prioritet';
$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 b63b9f5..8a21dd6 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng
@@ -2,7 +2,7 @@
$wb['list_head_txt'] = 'Spamfilter Blacklist';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priority';
+$wb['priority_txt'] = 'Prioritet';
$wb['rid_txt'] = 'User';
$wb['email_txt'] = 'Blacklisted Email';
$wb['add_new_record_txt'] = 'Add Blacklist record';
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_config_list.lng b/interface/web/mail/lib/lang/hr_spamfilter_config_list.lng
index 70e49e2..ac925e4 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_config_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'Server Configuration';
+$wb['list_head_txt'] = 'Konfiguracija servera';
$wb['server_name_txt'] = 'Server';
$wb['server_id_txt'] = 'server_id';
?>
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/hr_spamfilter_policy_list.lng
index 04491ae..84381b2 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_policy_list.lng
@@ -1,9 +1,9 @@
<?php
-$wb['list_head_txt'] = 'Spamfilter Policy';
-$wb['policy_name_txt'] = 'Name';
-$wb['virus_lover_txt'] = 'Virus lover';
-$wb['spam_lover_txt'] = 'Spam lover';
-$wb['banned_files_lover_txt'] = 'Banned Files lover';
-$wb['bad_header_lover_txt'] = 'Bad Header lover';
-$wb['add_new_record_txt'] = 'Add Policy record';
+$wb['list_head_txt'] = 'Spamfilter pravilo';
+$wb['policy_name_txt'] = 'Naziv';
+$wb['virus_lover_txt'] = 'Zaraženi';
+$wb['spam_lover_txt'] = 'Spammer';
+$wb['banned_files_lover_txt'] = 'Zabranjene datoteke';
+$wb['bad_header_lover_txt'] = 'Neispravan header';
+$wb['add_new_record_txt'] = 'Dodaj pravilo';
?>
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_users.lng b/interface/web/mail/lib/lang/hr_spamfilter_users.lng
index a93d94d..ff988f5 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_users.lng
@@ -1,7 +1,7 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priority';
-$wb['policy_id_txt'] = 'Policy';
+$wb['priority_txt'] = 'Prioritet';
+$wb['policy_id_txt'] = 'Pravilo';
$wb['email_txt'] = 'Email (Pattern)';
$wb['fullname_txt'] = 'Name';
$wb['local_txt'] = 'Local';
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_users_list.lng b/interface/web/mail/lib/lang/hr_spamfilter_users_list.lng
index ed3d7a3..99e4636 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_users_list.lng
@@ -2,8 +2,8 @@
$wb['list_head_txt'] = 'Spamfilter Users';
$wb['local_txt'] = 'Local';
$wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priority';
-$wb['policy_id_txt'] = 'Policy';
+$wb['priority_txt'] = 'Prioritet';
+$wb['policy_id_txt'] = 'Pravilo';
$wb['fullname_txt'] = 'Name';
$wb['email_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Add Spamfilter User';
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng
index 394bfc6..8c018ac 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng
@@ -3,7 +3,7 @@
$wb['wb_txt'] = 'wb';
$wb['rid_txt'] = 'User';
$wb['email_txt'] = 'Email';
-$wb['priority_txt'] = 'Priority';
+$wb['priority_txt'] = 'Prioritet';
$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 2f39adf..7dd21f1 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng
@@ -1,9 +1,9 @@
<?php
-$wb['list_head_txt'] = 'Spamfilter Whitelist';
+$wb['list_head_txt'] = 'Spamfilter whitelista';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priority';
-$wb['rid_txt'] = 'User';
-$wb['email_txt'] = 'Whitelisted Email';
-$wb['add_new_record_txt'] = 'Add Whitelist record';
+$wb['priority_txt'] = 'Prioritet';
+$wb['rid_txt'] = 'Korisnik';
+$wb['email_txt'] = 'Whitelistani email';
+$wb['add_new_record_txt'] = 'Dodaj whitelistu';
?>
diff --git a/interface/web/mail/lib/lang/hr_user_quota_stats_list.lng b/interface/web/mail/lib/lang/hr_user_quota_stats_list.lng
index 95fff21..15cd7d1 100644
--- a/interface/web/mail/lib/lang/hr_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/hr_user_quota_stats_list.lng
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Mailbox quota';
-$wb['quota_txt'] = 'Quota';
+$wb['quota_txt'] = 'Kvota';
$wb['name_txt'] = 'Name';
$wb['email_txt'] = 'Email Address';
$wb['used_txt'] = 'Used space';
diff --git a/interface/web/mail/lib/lang/hu_mail_alias.lng b/interface/web/mail/lib/lang/hu_mail_alias.lng
index 2474082..c0066a6 100644
--- a/interface/web/mail/lib/lang/hu_mail_alias.lng
+++ b/interface/web/mail/lib/lang/hu_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Nincs több alias lehetőség.';
$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/hu_mail_get.lng b/interface/web/mail/lib/lang/hu_mail_get.lng
index b094544..d3b2a12 100644
--- a/interface/web/mail/lib/lang/hu_mail_get.lng
+++ b/interface/web/mail/lib/lang/hu_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Nem választott címzettet.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/id_mail_alias.lng b/interface/web/mail/lib/lang/id_mail_alias.lng
index 65ea128..0464b46 100644
--- a/interface/web/mail/lib/lang/id_mail_alias.lng
+++ b/interface/web/mail/lib/lang/id_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Jumlah maks alias email untuk akun Anda telah tercapai.';
$wb['duplicate_mailbox_txt'] = 'Sudah ada mailbox untuk alamat email ini';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/id_mail_get.lng b/interface/web/mail/lib/lang/id_mail_get.lng
index 4518e25..1d191c0 100644
--- a/interface/web/mail/lib/lang/id_mail_get.lng
+++ b/interface/web/mail/lib/lang/id_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Tidak ada tujuan yang dipilih.';
$wb['source_server_error_regex'] = 'Server Pop3/Imap bukan merupakan nama domain yang valid.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/it_mail_alias.lng b/interface/web/mail/lib/lang/it_mail_alias.lng
index 4449468..de4c92e 100644
--- a/interface/web/mail/lib/lang/it_mail_alias.lng
+++ b/interface/web/mail/lib/lang/it_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Raggiunto numero massimo di alias email per questo account.';
$wb['duplicate_mailbox_txt'] = 'Cé già una casella di posta con questo indirizzo email.';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/it_mail_get.lng b/interface/web/mail/lib/lang/it_mail_get.lng
index 2ed52d2..09ef84e 100644
--- a/interface/web/mail/lib/lang/it_mail_get.lng
+++ b/interface/web/mail/lib/lang/it_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'No destination selected.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/ja_mail_alias.lng b/interface/web/mail/lib/lang/ja_mail_alias.lng
index b5225e3..613bf57 100644
--- a/interface/web/mail/lib/lang/ja_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ja_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'メールエイリアスが最大数に達したため、これ以上追加できません。';
$wb['duplicate_mailbox_txt'] = 'このメールアドレス向けのメールボックスが既に存在します。';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/ja_mail_get.lng b/interface/web/mail/lib/lang/ja_mail_get.lng
index 87f5410..d5f5c5c 100644
--- a/interface/web/mail/lib/lang/ja_mail_get.lng
+++ b/interface/web/mail/lib/lang/ja_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = '宛先を選択してください。';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/nl_mail_alias.lng b/interface/web/mail/lib/lang/nl_mail_alias.lng
index 04d7cba..03325fe 100644
--- a/interface/web/mail/lib/lang/nl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/nl_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Het max. aantal e-mail aliassen voor uw account is bereikt.';
$wb['duplicate_mailbox_txt'] = 'Er is al een mailbox met dit e-mail adres';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/nl_mail_get.lng b/interface/web/mail/lib/lang/nl_mail_get.lng
index a840c3f..e62b547 100644
--- a/interface/web/mail/lib/lang/nl_mail_get.lng
+++ b/interface/web/mail/lib/lang/nl_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Geen bestemming geselecteerd.';
$wb['source_server_error_regex'] = 'Pop3/Imap server is geen geldige domeinnaam.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng
index 0a3d047..a01e846 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Maksymalna ilość aliasów e-mail dla Twojego konta została przekroczona.';
$wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa z e-mailem o takiej nazwie.';
$wb['domain_txt'] = 'Domena';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng
index 1c241f4..4d7c7f9 100644
--- a/interface/web/mail/lib/lang/pl_mail_get.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Nie wybrano elementu docelowego.';
$wb['source_server_error_regex'] = 'Serwer Pop3/Imap nie jest poprawną nazwą domenową.';
$wb['source_read_all_txt'] = 'Pobierz wszystkie maile (razem z przeczytanymi)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/pt_mail_alias.lng b/interface/web/mail/lib/lang/pt_mail_alias.lng
index cd062a3..1225801 100644
--- a/interface/web/mail/lib/lang/pt_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pt_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'O número máximo de aliases para a conta foi atingido.';
$wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endereço.';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/pt_mail_get.lng b/interface/web/mail/lib/lang/pt_mail_get.lng
index cbd31f0..c52ed1b 100644
--- a/interface/web/mail/lib/lang/pt_mail_get.lng
+++ b/interface/web/mail/lib/lang/pt_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Destino não seleccionado.';
$wb['source_server_error_regex'] = 'Servidor Pop3/Imap não é um nome de domínio válido.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/ro_mail_alias.lng b/interface/web/mail/lib/lang/ro_mail_alias.lng
index d0caa8c..04e0c0f 100644
--- a/interface/web/mail/lib/lang/ro_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ro_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Ati atins numarul maxim de alias-uri pentru contul dumneavoastra ';
$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/ro_mail_get.lng b/interface/web/mail/lib/lang/ro_mail_get.lng
index 3d084a5..fe58991 100644
--- a/interface/web/mail/lib/lang/ro_mail_get.lng
+++ b/interface/web/mail/lib/lang/ro_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Nici o destinatie nu e selectata';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/ru_mail_alias.lng b/interface/web/mail/lib/lang/ru_mail_alias.lng
index eea6689..a10d2d7 100644
--- a/interface/web/mail/lib/lang/ru_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ru_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Максимальное число алиасов достигнуто.';
$wb['duplicate_mailbox_txt'] = 'Ящик с таким e-mail уже существует';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/ru_mail_get.lng b/interface/web/mail/lib/lang/ru_mail_get.lng
index 847a8b1..f805f11 100644
--- a/interface/web/mail/lib/lang/ru_mail_get.lng
+++ b/interface/web/mail/lib/lang/ru_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Не выбран получатель.';
$wb['source_server_error_regex'] = 'Неверное доменное имя для сервера Pop3/Imap.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/se_mail_alias.lng b/interface/web/mail/lib/lang/se_mail_alias.lng
index 78b217d..c9a5993 100644
--- a/interface/web/mail/lib/lang/se_mail_alias.lng
+++ b/interface/web/mail/lib/lang/se_mail_alias.lng
@@ -9,4 +9,5 @@
$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['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/se_mail_get.lng b/interface/web/mail/lib/lang/se_mail_get.lng
index 2ed52d2..09ef84e 100644
--- a/interface/web/mail/lib/lang/se_mail_get.lng
+++ b/interface/web/mail/lib/lang/se_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'No destination selected.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/sk_mail_alias.lng b/interface/web/mail/lib/lang/sk_mail_alias.lng
index f68e6cd..55310c1 100644
--- a/interface/web/mail/lib/lang/sk_mail_alias.lng
+++ b/interface/web/mail/lib/lang/sk_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Max. počet e-mailových aliasov na váš účet je dosiahnutý.';
$wb['duplicate_mailbox_txt'] = 'Existuje už schránka s touto e-mailovú adresu';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/tr_mail_alias.lng b/interface/web/mail/lib/lang/tr_mail_alias.lng
index 5dc3e65..9e51e50 100644
--- a/interface/web/mail/lib/lang/tr_mail_alias.lng
+++ b/interface/web/mail/lib/lang/tr_mail_alias.lng
@@ -9,4 +9,5 @@
$wb['limit_mailalias_txt'] = 'Hesabınızdaki max. email alias sayısına ulaştınız.';
$wb['duplicate_mailbox_txt'] = 'Bu email adresiyle bir mail kutusu zaten bulunmakta';
$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
?>
diff --git a/interface/web/mail/lib/lang/tr_mail_get.lng b/interface/web/mail/lib/lang/tr_mail_get.lng
index 3d18fac..18748af 100644
--- a/interface/web/mail/lib/lang/tr_mail_get.lng
+++ b/interface/web/mail/lib/lang/tr_mail_get.lng
@@ -14,5 +14,5 @@
$wb['destination_error_isemail'] = 'Hedef seçilmedi.';
$wb['source_server_error_regex'] = 'Pop3/Imap Sunucu geçerli bir domaine sahip değil.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/mail_alias_edit.php b/interface/web/mail/mail_alias_edit.php
index b7140b0..ebc3a87 100644
--- a/interface/web/mail/mail_alias_edit.php
+++ b/interface/web/mail/mail_alias_edit.php
@@ -126,6 +126,15 @@
if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_mailbox_txt")."<br>";
unset($tmp);
+ //* Check if email alias exists
+ if($this->id > 0) {
+ $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE source = '".$app->db->quote($this->dataRecord["source"])."' AND destination = '".$app->db->quote($this->dataRecord["destination"])."' AND forwarding_id != ".$this->id);
+ } else {
+ $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE source = '".$app->db->quote($this->dataRecord["source"])."' AND destination = '".$app->db->quote($this->dataRecord["destination"])."'");
+ }
+ if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_email_alias_txt")."<br>";
+ unset($tmp);
+
parent::onSubmit();
}
diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
index 33f86f5..b8c8d92 100644
--- a/interface/web/mail/mail_forward_edit.php
+++ b/interface/web/mail/mail_forward_edit.php
@@ -74,7 +74,8 @@
$app->tpl->setVar("email_local_part",$email_parts[0]);
// Getting Domains of the user
- $sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
+ //$sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
+ $sql = "SELECT domain 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 = '';
foreach( $domains as $domain) {
diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng
index d5e1470..b141292 100644
--- a/interface/web/monitor/lib/lang/hr.lng
+++ b/interface/web/monitor/lib/lang/hr.lng
@@ -18,7 +18,7 @@
$wb['no_data_mailq_txt'] = 'Nema podataka o procesiranju mailova . Pokušajte ponovno kasnije.';
$wb['no_logdata_txt'] = 'Nema log-ova. Pokušajte ponovno kasnije.';
$wb['Monitoring'] = 'Nadzor';
-$wb['Server to Monitor'] = 'Server za nadzor';
+$wb['Server to Monitor'] = 'Nadzor servera';
$wb['Logfiles'] = 'Log datoteke';
$wb['Status of services'] = 'Status servisa';
$wb['No Refresh'] = 'Ne osvježuj';
diff --git a/interface/web/sites/lib/lang/ar_ftp_user.lng b/interface/web/sites/lib/lang/ar_ftp_user.lng
index efa2d95..f0f2a6e 100644
--- a/interface/web/sites/lib/lang/ar_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ar_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ar_shell_user.lng b/interface/web/sites/lib/lang/ar_shell_user.lng
index 2e9bdbd..825de79 100644
--- a/interface/web/sites/lib/lang/ar_shell_user.lng
+++ b/interface/web/sites/lib/lang/ar_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ar_web_domain.lng b/interface/web/sites/lib/lang/ar_web_domain.lng
index 0df6947..dbf18d9 100644
--- a/interface/web/sites/lib/lang/ar_web_domain.lng
+++ b/interface/web/sites/lib/lang/ar_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/ar_webdav_user.lng b/interface/web/sites/lib/lang/ar_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/ar_webdav_user.lng
+++ b/interface/web/sites/lib/lang/ar_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/bg_ftp_user.lng b/interface/web/sites/lib/lang/bg_ftp_user.lng
index a2edac4..63b1ae8 100644
--- a/interface/web/sites/lib/lang/bg_ftp_user.lng
+++ b/interface/web/sites/lib/lang/bg_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/bg_shell_user.lng b/interface/web/sites/lib/lang/bg_shell_user.lng
index 741a7b3..e06a9f4 100644
--- a/interface/web/sites/lib/lang/bg_shell_user.lng
+++ b/interface/web/sites/lib/lang/bg_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/bg_web_domain.lng b/interface/web/sites/lib/lang/bg_web_domain.lng
index 69afc8d..892b6fa 100644
--- a/interface/web/sites/lib/lang/bg_web_domain.lng
+++ b/interface/web/sites/lib/lang/bg_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/bg_webdav_user.lng b/interface/web/sites/lib/lang/bg_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/bg_webdav_user.lng
+++ b/interface/web/sites/lib/lang/bg_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/br_ftp_user.lng b/interface/web/sites/lib/lang/br_ftp_user.lng
index 369e415..22042a9 100644
--- a/interface/web/sites/lib/lang/br_ftp_user.lng
+++ b/interface/web/sites/lib/lang/br_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'O diretório não esta dentro do diretório web principal.';
$wb['parent_domain_id_error_empty'] = 'Nenhum website selecionado.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/br_shell_user.lng b/interface/web/sites/lib/lang/br_shell_user.lng
index ea77c5d..4959f36 100644
--- a/interface/web/sites/lib/lang/br_shell_user.lng
+++ b/interface/web/sites/lib/lang/br_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng
index f62f829..08ff842 100644
--- a/interface/web/sites/lib/lang/br_web_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/br_webdav_user.lng b/interface/web/sites/lib/lang/br_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/br_webdav_user.lng
+++ b/interface/web/sites/lib/lang/br_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/cz_ftp_user.lng b/interface/web/sites/lib/lang/cz_ftp_user.lng
index 8877a7d..50e4648 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Adresář není uvnitř webového kořenového adresáře.';
$wb['parent_domain_id_error_empty'] = 'Nevybrána žádná webová stránka.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/cz_shell_user.lng b/interface/web/sites/lib/lang/cz_shell_user.lng
index 67d13e4..869be16 100644
--- a/interface/web/sites/lib/lang/cz_shell_user.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web: Uživatelské jméno';
$wb['pgroup_txt'] = 'Web: Skupina';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng
index fe9df29..4cb2aa4 100644
--- a/interface/web/sites/lib/lang/cz_web_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng
index f3903c5..458cf38 100644
--- a/interface/web/sites/lib/lang/de_ftp_user.lng
+++ b/interface/web/sites/lib/lang/de_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Das Verzeichnis befindet sich nicht innerhalb des Verzeichnisses der Website.';
$wb['parent_domain_id_error_empty'] = 'Keine Domain ausgewählt.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/de_shell_user.lng b/interface/web/sites/lib/lang/de_shell_user.lng
index c2373ad..ebd5cfe 100644
--- a/interface/web/sites/lib/lang/de_shell_user.lng
+++ b/interface/web/sites/lib/lang/de_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (für key-basierte Logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
index 27a74ba..a15b5d4 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -89,5 +89,7 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.';
+$wb['hd_quota_error_regex'] = 'Harddisk Quota ist ungültig.';
+$wb['traffic_quota_error_regex'] = 'Traffic Quota ist ungültig.';
$wb["fastcgi_php_version_txt"] = 'FastCGI-PHP-Version';
?>
diff --git a/interface/web/sites/lib/lang/de_webdav_user.lng b/interface/web/sites/lib/lang/de_webdav_user.lng
index 8d8025b..ec4f26b 100644
--- a/interface/web/sites/lib/lang/de_webdav_user.lng
+++ b/interface/web/sites/lib/lang/de_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.';
$wb['directory_error_empty'] = 'Verzeichnis ist leer.';
$wb['parent_domain_id_error_empty'] = 'Keine Website ausgewählt.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/el_ftp_user.lng b/interface/web/sites/lib/lang/el_ftp_user.lng
index d90d4f6..7580313 100644
--- a/interface/web/sites/lib/lang/el_ftp_user.lng
+++ b/interface/web/sites/lib/lang/el_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Ο φάκελος δεν βρίσκεται μέσα στον ριζικό φάκελο web.';
$wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.';
$wb['quota_size_error_regex'] = 'Όριο: εισάγετε -1 για απεριόριστα ή έναν αριθμό > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/el_shell_user.lng b/interface/web/sites/lib/lang/el_shell_user.lng
index 10125e2..2cf302a 100644
--- a/interface/web/sites/lib/lang/el_shell_user.lng
+++ b/interface/web/sites/lib/lang/el_shell_user.lng
@@ -20,4 +20,6 @@
$wb['limit_shell_user_txt'] = 'Φτάσατε το μέγιστο πλήθος τον λογαριασμών Shell';
$wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website';
$wb['ssh_rsa_txt'] = 'Δημόσιο Κλειδί SSH-RSA (για key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng
index 379ac33..33a93da 100644
--- a/interface/web/sites/lib/lang/el_web_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/el_webdav_user.lng b/interface/web/sites/lib/lang/el_webdav_user.lng
index 423bad5..b213a4c 100644
--- a/interface/web/sites/lib/lang/el_webdav_user.lng
+++ b/interface/web/sites/lib/lang/el_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'Το Όνομα Χρήστη περιέχει μη επιτρεπόμενους χαρακτήρες.';
$wb['directory_error_empty'] = 'Ο φάκελος δεν έχει οριστεί.';
$wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
index bd6becf..c02c4b6 100644
--- a/interface/web/sites/lib/lang/en_web_domain.lng
+++ b/interface/web/sites/lib/lang/en_web_domain.lng
@@ -89,5 +89,7 @@
$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
$wb["fastcgi_php_version_txt"] = 'FastCGI PHP Version';
?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_ftp_user.lng b/interface/web/sites/lib/lang/es_ftp_user.lng
index 7754d7b..1220783 100644
--- a/interface/web/sites/lib/lang/es_ftp_user.lng
+++ b/interface/web/sites/lib/lang/es_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'El directorio no está dentro del directorio web raíz.';
$wb['parent_domain_id_error_empty'] = 'No se ha seleccionado un sitio web.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/es_shell_user.lng b/interface/web/sites/lib/lang/es_shell_user.lng
index 251c783..6950243 100644
--- a/interface/web/sites/lib/lang/es_shell_user.lng
+++ b/interface/web/sites/lib/lang/es_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/es_web_domain.lng b/interface/web/sites/lib/lang/es_web_domain.lng
index 5381c2b..3c9c8a7 100644
--- a/interface/web/sites/lib/lang/es_web_domain.lng
+++ b/interface/web/sites/lib/lang/es_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/es_webdav_user.lng b/interface/web/sites/lib/lang/es_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/es_webdav_user.lng
+++ b/interface/web/sites/lib/lang/es_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/fi_ftp_user.lng b/interface/web/sites/lib/lang/fi_ftp_user.lng
index 5fb2985..2d95d24 100755
--- a/interface/web/sites/lib/lang/fi_ftp_user.lng
+++ b/interface/web/sites/lib/lang/fi_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Kansio ei ole www-juurikansion sisällä.';
$wb['parent_domain_id_error_empty'] = 'Ei www-sivua valittuna.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/fi_shell_user.lng b/interface/web/sites/lib/lang/fi_shell_user.lng
index 769c0dd..09315db 100755
--- a/interface/web/sites/lib/lang/fi_shell_user.lng
+++ b/interface/web/sites/lib/lang/fi_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_domain.lng
index 33fd699..f10221b 100755
--- a/interface/web/sites/lib/lang/fi_web_domain.lng
+++ b/interface/web/sites/lib/lang/fi_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/fi_webdav_user.lng b/interface/web/sites/lib/lang/fi_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/fi_webdav_user.lng
+++ b/interface/web/sites/lib/lang/fi_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/fr_ftp_user.lng b/interface/web/sites/lib/lang/fr_ftp_user.lng
index 3e5b099..de5ed66 100644
--- a/interface/web/sites/lib/lang/fr_ftp_user.lng
+++ b/interface/web/sites/lib/lang/fr_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Le répertoire nest pas dans la racine web.';
$wb['parent_domain_id_error_empty'] = 'Pas de site web sélectionné.';
$wb['quota_size_error_regex'] = 'Quota: entrez -1 pour illimité ou un nombre > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/fr_shell_user.lng b/interface/web/sites/lib/lang/fr_shell_user.lng
index 5712dcb..607375d 100644
--- a/interface/web/sites/lib/lang/fr_shell_user.lng
+++ b/interface/web/sites/lib/lang/fr_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Utilisateur web';
$wb['pgroup_txt'] = 'Groupe web';
$wb['ssh_rsa_txt'] = 'Clé publique SSH-RSA (pour les authentifications par clé)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/fr_web_domain.lng b/interface/web/sites/lib/lang/fr_web_domain.lng
index a14e6a8..ecd8e83 100644
--- a/interface/web/sites/lib/lang/fr_web_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/fr_webdav_user.lng b/interface/web/sites/lib/lang/fr_webdav_user.lng
index 81a59b1..fbeab35 100644
--- a/interface/web/sites/lib/lang/fr_webdav_user.lng
+++ b/interface/web/sites/lib/lang/fr_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères non autorisés.';
$wb['directory_error_empty'] = 'Dossier vide.';
$wb['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/hr.lng b/interface/web/sites/lib/lang/hr.lng
index 553cc45..396accd 100644
--- a/interface/web/sites/lib/lang/hr.lng
+++ b/interface/web/sites/lib/lang/hr.lng
@@ -6,7 +6,7 @@
$wb['Website'] = 'Web stranica';
$wb['Redirect'] = 'Preusmjeravanje';
$wb['SSL'] = 'SSL';
-$wb['Subdomain'] = 'Pod domena';
+$wb['Subdomain'] = 'Poddomena';
$wb['Sites'] = 'Web stranice';
$wb['Aliasdomain'] = 'Alias za web stranicu';
$wb['FTP-User'] = 'FTP korisnik';
diff --git a/interface/web/sites/lib/lang/hr_cron.lng b/interface/web/sites/lib/lang/hr_cron.lng
index 9380846..65605ae 100644
--- a/interface/web/sites/lib/lang/hr_cron.lng
+++ b/interface/web/sites/lib/lang/hr_cron.lng
@@ -1,21 +1,21 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Parent website';
+$wb['parent_domain_id_txt'] = 'Početna web stranica';
$wb['active_txt'] = 'Aktivno';
-$wb['client_txt'] = 'Client';
-$wb['run_min_txt'] = 'Minutes';
-$wb['run_hour_txt'] = 'Hours';
-$wb['run_mday_txt'] = 'Days of month';
-$wb['run_month_txt'] = 'Months';
-$wb['run_wday_txt'] = 'Days of week';
-$wb['command_txt'] = 'Command to run (commands are executed via sh, urls via wget)';
-$wb['limit_cron_txt'] = 'The maximum number of allowed cron jobs was reached.';
-$wb['limit_cron_frequency_txt'] = 'The cron job frequency exceeds the allowed limit.';
-$wb['run_min_error_format'] = 'Invalid format for minutes.';
-$wb['run_hour_error_format'] = 'Invalid format for hours.';
-$wb['run_mday_error_format'] = 'Invalid format for days of month.';
-$wb['run_month_error_format'] = 'Invalid format for months.';
-$wb['run_wday_error_format'] = 'Invalid format for days of the week.';
-$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
-$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
+$wb['client_txt'] = 'Klijent';
+$wb['run_min_txt'] = 'Minute';
+$wb['run_hour_txt'] = 'Sati';
+$wb['run_mday_txt'] = 'Dani u mjesecu';
+$wb['run_month_txt'] = 'Mjeseci';
+$wb['run_wday_txt'] = 'Dani u tjednu';
+$wb['command_txt'] = 'Komanda za pokretanje (komande se pokreću sa sh, URL-ovi sa wget)';
+$wb['limit_cron_txt'] = 'Iskorišten je maksimalan broj cron zadataka.';
+$wb['limit_cron_frequency_txt'] = 'Brzina izvršavanja cron zadataka prelazi dozvoljeni limit.';
+$wb['run_min_error_format'] = 'Pogrešan format za minute.';
+$wb['run_hour_error_format'] = 'Pogrešan format za sate.';
+$wb['run_mday_error_format'] = 'Pogrešan format za dane u mjesecu.';
+$wb['run_month_error_format'] = 'Pogrešan format za mjesece.';
+$wb['run_wday_error_format'] = 'Pogrešan format za dane u tjednu.';
+$wb['command_error_format'] = 'Pogrešan format komande. U slučaju pozivanja URL-a koristite samo http/https.';
+$wb['unknown_fieldtype_error'] = 'Koristi se nepoznata vrsta polja.';
?>
diff --git a/interface/web/sites/lib/lang/hr_cron_list.lng b/interface/web/sites/lib/lang/hr_cron_list.lng
index b7084f1..c0107df 100644
--- a/interface/web/sites/lib/lang/hr_cron_list.lng
+++ b/interface/web/sites/lib/lang/hr_cron_list.lng
@@ -1,13 +1,13 @@
<?php
-$wb['list_head_txt'] = 'Cron Jobs';
+$wb['list_head_txt'] = 'Cron zadaci';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['run_min_txt'] = 'Minute';
-$wb['run_hour_txt'] = 'Hour';
-$wb['run_mday_txt'] = 'Day of month';
-$wb['run_month_txt'] = 'Month';
-$wb['run_wday_txt'] = 'Day of week';
-$wb['command_txt'] = 'Command';
-$wb['add_new_cron_txt'] = 'Add new Cron job';
+$wb['run_hour_txt'] = 'Sati';
+$wb['run_mday_txt'] = 'Dan u mjesecu';
+$wb['run_month_txt'] = 'Mjesec';
+$wb['run_wday_txt'] = 'Dan u tjednu';
+$wb['command_txt'] = 'Komanda';
+$wb['add_new_cron_txt'] = 'Dodaj novi cron zadatak';
$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 7c473b6..433823b 100644
--- a/interface/web/sites/lib/lang/hr_database.lng
+++ b/interface/web/sites/lib/lang/hr_database.lng
@@ -1,25 +1,25 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['type_txt'] = 'Vrsta';
-$wb['database_name_txt'] = 'Database name';
-$wb['database_user_txt'] = 'Database user';
-$wb['database_password_txt'] = 'Database password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['database_charset_txt'] = 'Database charset';
-$wb['remote_access_txt'] = 'Remote Access';
-$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['database_name_txt'] = 'Naziv baze';
+$wb['database_user_txt'] = 'Korisničko ime';
+$wb['database_password_txt'] = 'Šifra';
+$wb['password_strength_txt'] = 'Jačina šifre';
+$wb['database_charset_txt'] = 'Skup znakova baze';
+$wb['remote_access_txt'] = 'Udaljeni pristup';
+$wb['remote_ips_txt'] = 'IP adrese za udaljeni pristup (odvojene , ostaviti prazno za<i>sve adrese</i>)';
+$wb['database_remote_error_ips'] = 'Barem jedna unesena IP adresa nije ispravna.';
+$wb['client_txt'] = 'Klijent';
$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.';
-$wb['database_user_error_empty'] = 'Database user is empty.';
-$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
-$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['limit_database_txt'] = 'The max. number of databases is reached.';
-$wb['database_name_change_txt'] = 'The database name can not be changed';
-$wb['database_charset_change_txt'] = 'The database charset can not be changed';
-$wb['database_name_error_len'] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.';
-$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_name_error_empty'] = 'Naziv baze je prazan.';
+$wb['database_name_error_unique'] = 'Izabrani naziv baze već postoji. Da biste imali unikatno ime, npr. dodajte naziv svoje domene u naziv baze.';
+$wb['database_name_error_regex'] = 'Neispravan naziv baze. Naziv baze smije sadržavati slijedeće znakove: a-z, A-Z, 0-9 i podcrtu (_). Duljina naziva: 2 - 64 znakova.';
+$wb['database_user_error_empty'] = 'Naziv korisnika baze je prazan.';
+$wb['database_user_error_unique'] = 'Izabrani naziv korisnika baze već postoji. Da biste imali unikatno ime, npr. dodajte naziv svoje domene u naziv korisnika baze.';
+$wb['database_user_error_regex'] = 'Neispravan naziv korisnika baze. Naziv korisnika baze smije sadržavati slijedeće znakove: a-z, A-Z, 0-9 i podcrtu (_). Duljina naziva: 2 - 64 znakova.';
+$wb['limit_database_txt'] = 'Iskoristili ste maksimalan broj baza.';
+$wb['database_name_change_txt'] = 'Naziv baze ne može biti promijenjen';
+$wb['database_charset_change_txt'] = 'Skup znakova baze ne može biti promijenjen';
+$wb['database_name_error_len'] = 'Naziv baze - {db} - je predugačak. Maksimalna duljina naziva baze uključujući prefix je 64 znakova.';
+$wb['database_user_error_len'] = 'Naziv korisnika baze - {user}- je predugačak. Maksimalna duljina naziva korisnika baze uključujući prefix je 16 znakova.';
?>
diff --git a/interface/web/sites/lib/lang/hr_database_list.lng b/interface/web/sites/lib/lang/hr_database_list.lng
index e023467..dcfe205 100644
--- a/interface/web/sites/lib/lang/hr_database_list.lng
+++ b/interface/web/sites/lib/lang/hr_database_list.lng
@@ -1,9 +1,9 @@
<?php
-$wb['list_head_txt'] = 'Database';
+$wb['list_head_txt'] = 'Baza';
$wb['active_txt'] = 'Aktivno';
-$wb['remote_access_txt'] = 'Remote Access';
+$wb['remote_access_txt'] = 'Udaljeni pristup';
$wb['server_id_txt'] = 'Server';
-$wb['database_user_txt'] = 'Database user';
-$wb['database_name_txt'] = 'Database name';
-$wb['add_new_record_txt'] = 'Add new Database';
+$wb['database_user_txt'] = 'Korisnik baze';
+$wb['database_name_txt'] = 'Naziv baze';
+$wb['add_new_record_txt'] = 'Dodaj bazu';
?>
diff --git a/interface/web/sites/lib/lang/hr_ftp_user.lng b/interface/web/sites/lib/lang/hr_ftp_user.lng
index 3cd81ba..88e5d71 100644
--- a/interface/web/sites/lib/lang/hr_ftp_user.lng
+++ b/interface/web/sites/lib/lang/hr_ftp_user.lng
@@ -1,9 +1,9 @@
<?php
$wb['uid_txt'] = 'UID';
$wb['gid_txt'] = 'GID';
-$wb['dir_txt'] = 'Directory';
-$wb['quota_files_txt'] = 'Filequota';
-$wb['quota_files_unity_txt'] = 'Files';
+$wb['dir_txt'] = 'Direktorij';
+$wb['quota_files_txt'] = 'Kvota datoteka';
+$wb['quota_files_unity_txt'] = 'Datoteke';
$wb['ul_ratio_txt'] = 'Uploadratio';
$wb['dl_ratio_txt'] = 'Downloadratio';
$wb['ul_bandwidth_txt'] = 'Uploadbandwidth';
@@ -12,17 +12,19 @@
$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['password_strength_txt'] = 'Jačina šifre';
+$wb['quota_size_txt'] = 'Kvota web stranice';
$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.';
-$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
-$wb['quota_size_error_empty'] = 'Quota is empty.';
-$wb['uid_error_empty'] = 'GID empty.';
-$wb['directory_error_empty'] = 'Directory empty.';
-$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
-$wb['parent_domain_id_error_empty'] = 'No website selected.';
-$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['limit_ftp_user_txt'] = 'Iskoristili ste maksimalan broj FTP računa. ';
+$wb['username_error_empty'] = 'Nije upisano korisničko ime.';
+$wb['username_error_unique'] = 'Izabrano korisničko ime već postoji.';
+$wb['username_error_regex'] = 'Korisničko ime sadrži znakove koji nisu dopušteni.';
+$wb['quota_size_error_empty'] = 'Nije upisana kvota web stranice.';
+$wb['uid_error_empty'] = 'Prazan GID.';
+$wb['directory_error_empty'] = 'Prazan direktorij.';
+$wb['directory_error_notinweb'] = 'Direktorij nije unutar početne web stranice.';
+$wb['parent_domain_id_error_empty'] = 'Nije izabrana web stranica.';
+$wb['quota_size_error_regex'] = 'Kvota: unesi -1 za neograničeno ili broj > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/hr_shell_user.lng b/interface/web/sites/lib/lang/hr_shell_user.lng
index d5ed7e9..0165853 100644
--- a/interface/web/sites/lib/lang/hr_shell_user.lng
+++ b/interface/web/sites/lib/lang/hr_shell_user.lng
@@ -1,23 +1,25 @@
<?php
-$wb['puser_txt'] = 'Web Username';
-$wb['pgroup_txt'] = 'Web Group';
+$wb['puser_txt'] = 'Web korisničko ime';
+$wb['pgroup_txt'] = 'Web grupa';
$wb['shell_txt'] = 'Shell';
-$wb['dir_txt'] = 'Dir';
+$wb['dir_txt'] = 'Direktorij';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Site';
+$wb['parent_domain_id_txt'] = 'Web stranica';
$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['password_strength_txt'] = 'Jačina šifre';
+$wb['chroot_txt'] = 'Chroot shell';
+$wb['quota_size_txt'] = 'Kvota';
$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.';
-$wb['quota_size_error_empty'] = 'Quota is empty.';
-$wb['uid_error_empty'] = 'GID empty.';
-$wb['directory_error_empty'] = 'Directory empty.';
-$wb['limit_shell_user_txt'] = 'The max number of shell users is reached.';
-$wb['parent_domain_id_error_empty'] = 'No website selected.';
-$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['username_error_empty'] = 'Korisničko ime je prazno.';
+$wb['username_error_unique'] = 'Izabrano korisničko ime već postoji na serveru.';
+$wb['username_error_regex'] = 'Korisničko ime sadrži nedozvoljene znakove.';
+$wb['quota_size_error_empty'] = 'Kvota je prazna.';
+$wb['uid_error_empty'] = 'GID je prazan.';
+$wb['directory_error_empty'] = 'Direktorij je prazan.';
+$wb['limit_shell_user_txt'] = 'Iskorišten je maksimalan broj shell korisnika.';
+$wb['parent_domain_id_error_empty'] = 'Nije izabrana web stranica.';
+$wb['ssh_rsa_txt'] = 'SSH-RSA javni ključ (za logiranje ključevima)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path 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 9212ee4..16fc32c 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['list_head_txt'] = 'Shell korisnik';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Site';
+$wb['parent_domain_id_txt'] = 'Web stranica';
$wb['username_txt'] = 'Korisničko ime';
-$wb['add_new_record_txt'] = 'Add new Shell-User';
+$wb['add_new_record_txt'] = 'Dodaj novog Shell korisnika';
?>
diff --git a/interface/web/sites/lib/lang/hr_user_quota_stats_list.lng b/interface/web/sites/lib/lang/hr_user_quota_stats_list.lng
index 716760b..809e09e 100644
--- a/interface/web/sites/lib/lang/hr_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/hr_user_quota_stats_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Website harddisk quota';
-$wb['domain_txt'] = 'Domain / Website';
-$wb['system_user_txt'] = 'Linux user';
-$wb['used_txt'] = 'Used space';
+$wb['list_head_txt'] = 'Kvota (prostor)';
+$wb['domain_txt'] = 'Domena / Web stranica';
+$wb['system_user_txt'] = 'Linux korisnik';
+$wb['used_txt'] = 'Prostor';
$wb['hard_txt'] = 'Hard limit';
$wb['soft_txt'] = 'Soft limit';
?>
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 39bc1df..0b45aff 100644
--- a/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng
@@ -4,11 +4,11 @@
$wb['server_id_txt'] = 'Server';
$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.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['none_txt'] = 'None';
+$wb['add_new_record_txt'] = 'Dodaj novu alias domenu';
+$wb['domain_error_empty'] = 'Domena nije upisana.';
+$wb['domain_error_unique'] = 'Domena mora biti unikatna.';
+$wb['domain_error_regex'] = 'Nazive domene nije ispravan.';
+$wb['no_redirect_txt'] = 'Bez redirekcije';
+$wb['no_flag_txt'] = 'Bez označavanja';
+$wb['none_txt'] = 'Ništa';
?>
diff --git a/interface/web/sites/lib/lang/hr_web_domain.lng b/interface/web/sites/lib/lang/hr_web_domain.lng
index 0e93022..accb66f 100644
--- a/interface/web/sites/lib/lang/hr_web_domain.lng
+++ b/interface/web/sites/lib/lang/hr_web_domain.lng
@@ -1,92 +1,94 @@
<?php
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['backup_interval_txt'] = 'Interval backupa';
+$wb['backup_copies_txt'] = 'Broj backup kopija';
+$wb['ssl_state_txt'] = 'Stanje';
+$wb['ssl_locality_txt'] = 'Lokacija';
+$wb['ssl_organisation_txt'] = 'Organizacija';
+$wb['ssl_organisation_unit_txt'] = 'Organizacijski dio';
+$wb['ssl_country_txt'] = 'Država';
+$wb['ssl_request_txt'] = 'SSL zahtjev';
+$wb['ssl_cert_txt'] = 'SSL certifikat';
+$wb['ssl_bundle_txt'] = 'SSL paket';
+$wb['ssl_action_txt'] = 'SSL akcija';
+$wb['ssl_domain_txt'] = 'SSL domena';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domena';
$wb['type_txt'] = 'Vrsta';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['parent_domain_id_txt'] = 'Glavna web stranica';
+$wb['redirect_type_txt'] = 'Vrsta redirekcije';
$wb['redirect_path_txt'] = 'Redirect Path';
$wb['active_txt'] = 'Aktivno';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IP-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['document_root_txt'] = 'Početni direktorij';
+$wb['system_user_txt'] = 'Linux korisnik';
+$wb['system_group_txt'] = 'Linux grupa';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['vhost_type_txt'] = 'Vrsta VHosta';
+$wb['hd_quota_txt'] = 'Limit kvote (prostor)';
+$wb['traffic_quota_txt'] = 'Limit prometa';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['errordocs_txt'] = 'Vlastite error stranice';
+$wb['subdomain_txt'] = 'Automatska poddomena';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['client_txt'] = 'Klijent';
+$wb['limit_web_domain_txt'] = 'Iskorišten je maksimalan broj domena.';
+$wb['limit_web_aliasdomain_txt'] = 'Iskorišten je maksimalan broj alias domena.';
+$wb['limit_web_subdomain_txt'] = 'Iskorišten je maksimalan broj poddomena.';
+$wb['apache_directives_txt'] = 'Apache direktive';
+$wb['domain_error_empty'] = 'Naziv domene je prazan.';
+$wb['domain_error_unique'] = 'Već postoji web stranica ili poddomena / alias sa nazivom te domene.';
+$wb['domain_error_regex'] = 'Naziv domene nije ispravan.';
+$wb['hd_quota_error_empty'] = 'Limit kvote (prostor) je 0 ili je prazno.';
+$wb['traffic_quota_error_empty'] = 'Limit prometa je prazan.';
+$wb['error_ssl_state_empty'] = 'SSL županija je prazno.';
+$wb['error_ssl_locality_empty'] = 'SSL lokacija je prazna.';
+$wb['error_ssl_organisation_empty'] = 'SSL organizacija je prazna.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL organizacijski dio je prazan.';
+$wb['error_ssl_country_empty'] = 'SSL država je prazna.';
+$wb['error_ssl_cert_empty'] = 'Polje SSL certifikata je prazno';
+$wb['client_group_id_txt'] = 'Klijent';
+$wb['stats_password_txt'] = 'Šifra za statistiku';
$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['limit_web_quota_free_txt'] = 'Maksimalan limit kvote (prostor)';
+$wb['ssl_state_error_regex'] = 'Neispravan unos SSL županije. Dozvoljeni znakovi: a-z, 0-9 i .,-_';
+$wb['ssl_locality_error_regex'] = 'Neispravan unos SSL lokacije. Dozvoljeni znakovi: a-z, 0-9 i .,-_';
+$wb['ssl_organisation_error_regex'] = 'Neispravan unos SSL organizacije. Dozvoljeni znakovi: a-z, 0-9 i .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Neispravan unos SSL organizacijskog dijela. Dozvoljeni znakovi: a-z, 0-9 i .,-_';
+$wb['ssl_country_error_regex'] = 'Neispravan unos SSL države. Dozvoljeni znakovi: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Maksimalan limit prometa web stranice';
+$wb['redirect_error_regex'] = 'Neispravna putanja redirekcije. Ispravne redirekcije su npr.: /test/ ili http://www.domena.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['traffic_quota_exceeded_txt'] = 'Iskoristili ste limit prometa web stranice.';
$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['stats_user_txt'] = 'Korisničko ime za statistiku';
+$wb['stats_type_txt'] = 'Program za statistiku';
+$wb['custom_php_ini_txt'] = 'Vlastite php.ini postavke';
+$wb['ipv6_address_txt'] = 'IPv6 adresa';
+$wb['none_txt'] = 'Ništa';
+$wb['disabled_txt'] = 'Onemogućeno';
+$wb['no_redirect_txt'] = 'Bez redirekcije';
+$wb['no_flag_txt'] = 'Bez markiranja';
+$wb['save_certificate_txt'] = 'Spremi certifikat';
+$wb['create_certificate_txt'] = 'Kreiraj certifikat';
+$wb['delete_certificate_txt'] = 'Obriši certifikat';
+$wb['nginx_directives_txt'] = 'nginx direktive';
+$wb['seo_redirect_txt'] = 'SEO redirekcija';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Koristi socket za PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI za SSL nije aktiviran na ovom serveru. Možete omogućiti samo jedan SSL certifikat na svakoj IP adresi.';
$wb['python_txt'] = 'Python';
$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['error_php_fpm_pm_settings_txt'] = 'Vrijednosti PHP-FPM pm postavki moraju biti slijedeće: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children mora biti pozitivan broj.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers mora biti pozitivan broj.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers mora biti pozitivan broj.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers mora biti pozitivan broj.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
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 62ee05f..b5e5d2b 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
@@ -1,9 +1,9 @@
<?php
-$wb['sys_groupid_txt'] = 'Client';
-$wb['list_head_txt'] = 'Websites';
+$wb['sys_groupid_txt'] = 'Klijent';
+$wb['list_head_txt'] = 'Web stranice';
$wb['domain_id_txt'] = 'ID';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domena';
-$wb['add_new_record_txt'] = 'Add new website';
+$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 f624334..5368119 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'] = 'Web stranica';
-$wb['path_txt'] = 'Path';
+$wb['path_txt'] = 'Putanja';
$wb['active_txt'] = 'Aktivno';
-$wb['path_error_regex'] = 'Invalid folder path.';
+$wb['path_error_regex'] = 'Neispravna putanja direktorija.';
?>
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 1777440..5696589 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['list_head_txt'] = 'Web direktorij';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Web stranica';
-$wb['path_txt'] = 'Path';
+$wb['path_txt'] = 'Putanja';
?>
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 9a1e187..af7792f 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['list_head_txt'] = 'Web direktorij korisnik';
$wb['active_txt'] = 'Aktivno';
-$wb['web_folder_id_txt'] = 'Folder';
+$wb['web_folder_id_txt'] = 'Web direkotrij';
$wb['username_txt'] = 'Korisničko ime';
?>
diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng
index 1d1bd89..adc3ecb 100644
--- a/interface/web/sites/lib/lang/hr_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/hr_web_subdomain.lng
@@ -1,42 +1,42 @@
<?php
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_state_txt'] = 'Županija';
+$wb['ssl_locality_txt'] = 'Lokacija';
+$wb['ssl_organisation_txt'] = 'Organizacija';
+$wb['ssl_organisation_unit_txt'] = 'Organizacijski dio';
+$wb['ssl_country_txt'] = 'Država';
+$wb['ssl_request_txt'] = 'SSL zahtjev';
+$wb['ssl_cert_txt'] = 'SSL certifikat';
+$wb['ssl_bundle_txt'] = 'SSL paket';
+$wb['ssl_action_txt'] = 'SSL akcija';
$wb['server_id_txt'] = 'Server';
$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['parent_domain_id_txt'] = 'Početna web stranica';
+$wb['redirect_type_txt'] = 'Vrsta redirekcije';
+$wb['redirect_path_txt'] = 'Redirekcijska putanja';
$wb['active_txt'] = 'Aktivno';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IP-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quaota';
+$wb['system_user_txt'] = 'Linux korisnik';
+$wb['system_group_txt'] = 'Linux grupa';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['vhost_type_txt'] = 'Vrsta VHosta';
+$wb['hd_quota_txt'] = 'Kvota diska';
+$wb['traffic_quota_txt'] = 'Promet web stranice';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Klijent';
+$wb['limit_web_domain_txt'] = 'Iskorišten je maksimalan broj domena.';
+$wb['limit_web_aliasdomain_txt'] = 'Iskorišten je maksimalan broj alias domena.';
+$wb['limit_web_subdomain_txt'] = 'Iskorišten je maksimalan broj poddomena.';
+$wb['apache_directives_txt'] = 'Apache direktive';
+$wb['domain_error_empty'] = 'Naziv domene je prazan.';
+$wb['domain_error_unique'] = 'Već postoji web stranica ili poddomena / alias sa nazivom te domene.';
+$wb['domain_error_regex'] = 'Naziv domene je neispravan.';
$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
+$wb['redirect_error_regex'] = 'Neispravna putanja redirekcije. Ispravne redirekcije su npr.: /test/ ili http://www.domena.tld/test/';
+$wb['no_redirect_txt'] = 'Bez redirekcije';
+$wb['no_flag_txt'] = 'Bez markiranja';
?>
diff --git a/interface/web/sites/lib/lang/hr_webdav_user.lng b/interface/web/sites/lib/lang/hr_webdav_user.lng
index 06bcd59..13a7d80 100644
--- a/interface/web/sites/lib/lang/hr_webdav_user.lng
+++ b/interface/web/sites/lib/lang/hr_webdav_user.lng
@@ -1,15 +1,17 @@
<?php
-$wb['dir_txt'] = 'Directory';
+$wb['dir_txt'] = 'Direktorij';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Web stranica';
$wb['username_txt'] = 'Korisničko ime';
$wb['password_txt'] = 'Šifra';
-$wb['password_strength_txt'] = 'Password strength';
+$wb['password_strength_txt'] = 'Jačina šifre';
$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.';
-$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
-$wb['directory_error_empty'] = 'Directory empty.';
-$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['limit_webdav_user_txt'] = 'Iskoristili ste maksimalan broj webdav korisnika za ovaj račun.';
+$wb['username_error_empty'] = 'Nije upisano korisničko ime.';
+$wb['username_error_unique'] = 'Izabrano korisničko ime već postoji.';
+$wb['username_error_regex'] = 'Korisničko ime sadrži znakove koji nisu dopušteni.';
+$wb['directory_error_empty'] = 'Direktorij je prazan.';
+$wb['parent_domain_id_error_empty'] = 'Nije izabrana web stranica.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
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 ca1b7b8..f19b8da 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['list_head_txt'] = 'Webdav korisnik';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Web stranica';
$wb['username_txt'] = 'Korisničko ime';
-$wb['add_new_record_txt'] = 'Add new Webdav-User';
+$wb['add_new_record_txt'] = 'Dodaj Webdav korisnika';
?>
diff --git a/interface/web/sites/lib/lang/hu_ftp_user.lng b/interface/web/sites/lib/lang/hu_ftp_user.lng
index ddf1d7c..437999a 100644
--- a/interface/web/sites/lib/lang/hu_ftp_user.lng
+++ b/interface/web/sites/lib/lang/hu_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
$wb['parent_domain_id_error_empty'] = 'Nincs webhely kiválasztva.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/hu_shell_user.lng b/interface/web/sites/lib/lang/hu_shell_user.lng
index 4b09074..de0c737 100644
--- a/interface/web/sites/lib/lang/hu_shell_user.lng
+++ b/interface/web/sites/lib/lang/hu_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Felhasználónév';
$wb['pgroup_txt'] = 'Web Csoportnév';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/hu_web_domain.lng b/interface/web/sites/lib/lang/hu_web_domain.lng
index 5a07fc6..a4cd7fe 100644
--- a/interface/web/sites/lib/lang/hu_web_domain.lng
+++ b/interface/web/sites/lib/lang/hu_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/hu_webdav_user.lng b/interface/web/sites/lib/lang/hu_webdav_user.lng
index 3e24e3d..f1538a1 100644
--- a/interface/web/sites/lib/lang/hu_webdav_user.lng
+++ b/interface/web/sites/lib/lang/hu_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/id_ftp_user.lng b/interface/web/sites/lib/lang/id_ftp_user.lng
index 648582a..600fac5 100644
--- a/interface/web/sites/lib/lang/id_ftp_user.lng
+++ b/interface/web/sites/lib/lang/id_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Direktori tidak berada dalam direktori root web.';
$wb['parent_domain_id_error_empty'] = 'Tak ada situs web yang dipilih.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/id_shell_user.lng b/interface/web/sites/lib/lang/id_shell_user.lng
index 8f34b63..b5141ff 100644
--- a/interface/web/sites/lib/lang/id_shell_user.lng
+++ b/interface/web/sites/lib/lang/id_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Nama Pengguna Web';
$wb['pgroup_txt'] = 'Grup Web';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/id_web_domain.lng b/interface/web/sites/lib/lang/id_web_domain.lng
index 279778d..d119fab 100644
--- a/interface/web/sites/lib/lang/id_web_domain.lng
+++ b/interface/web/sites/lib/lang/id_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/id_webdav_user.lng b/interface/web/sites/lib/lang/id_webdav_user.lng
index 0befac5..84e750c 100644
--- a/interface/web/sites/lib/lang/id_webdav_user.lng
+++ b/interface/web/sites/lib/lang/id_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'Nama Pengguna mengandung karakter yang tidak diperbolehkan.';
$wb['directory_error_empty'] = 'Direktori kosong.';
$wb['parent_domain_id_error_empty'] = 'Tak ada situs web yang dipilih.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/it_ftp_user.lng b/interface/web/sites/lib/lang/it_ftp_user.lng
index 4cb5ff7..9ef19c7 100644
--- a/interface/web/sites/lib/lang/it_ftp_user.lng
+++ b/interface/web/sites/lib/lang/it_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/it_shell_user.lng b/interface/web/sites/lib/lang/it_shell_user.lng
index 2e9bdbd..825de79 100644
--- a/interface/web/sites/lib/lang/it_shell_user.lng
+++ b/interface/web/sites/lib/lang/it_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_domain.lng
index c6e68ac..cd40e19 100644
--- a/interface/web/sites/lib/lang/it_web_domain.lng
+++ b/interface/web/sites/lib/lang/it_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/it_webdav_user.lng b/interface/web/sites/lib/lang/it_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/it_webdav_user.lng
+++ b/interface/web/sites/lib/lang/it_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ja_ftp_user.lng b/interface/web/sites/lib/lang/ja_ftp_user.lng
index 06998c2..bd1dbac 100644
--- a/interface/web/sites/lib/lang/ja_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ja_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'ディレクトリはウェブのルートディレクトリ以下にしてください。';
$wb['parent_domain_id_error_empty'] = 'ウェブサイトを選択してください。';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ja_shell_user.lng b/interface/web/sites/lib/lang/ja_shell_user.lng
index 61ccb10..963ed34 100644
--- a/interface/web/sites/lib/lang/ja_shell_user.lng
+++ b/interface/web/sites/lib/lang/ja_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ja_web_domain.lng b/interface/web/sites/lib/lang/ja_web_domain.lng
index d655be2..95e16b4 100644
--- a/interface/web/sites/lib/lang/ja_web_domain.lng
+++ b/interface/web/sites/lib/lang/ja_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/ja_webdav_user.lng b/interface/web/sites/lib/lang/ja_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/ja_webdav_user.lng
+++ b/interface/web/sites/lib/lang/ja_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/nl_ftp_user.lng b/interface/web/sites/lib/lang/nl_ftp_user.lng
index 41773ab..574879f 100644
--- a/interface/web/sites/lib/lang/nl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/nl_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Directory niet binnen de web root directory.';
$wb['parent_domain_id_error_empty'] = 'Geen website geselecteerd.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/nl_shell_user.lng b/interface/web/sites/lib/lang/nl_shell_user.lng
index 8aef665..289bec1 100644
--- a/interface/web/sites/lib/lang/nl_shell_user.lng
+++ b/interface/web/sites/lib/lang/nl_shell_user.lng
@@ -20,4 +20,6 @@
$wb['limit_shell_user_txt'] = 'Het max. aantal shell-gebruikers is bereikt.';
$wb['parent_domain_id_error_empty'] = 'Geen website geselecteerd.';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng
index 49c662f..d408f37 100644
--- a/interface/web/sites/lib/lang/nl_web_domain.lng
+++ b/interface/web/sites/lib/lang/nl_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/nl_webdav_user.lng b/interface/web/sites/lib/lang/nl_webdav_user.lng
index 7be73c4..dd7c5bc 100644
--- a/interface/web/sites/lib/lang/nl_webdav_user.lng
+++ b/interface/web/sites/lib/lang/nl_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'De gebruikersnaam bevat karakters die niet zijn toegestaan.';
$wb['directory_error_empty'] = 'Directory is niet ingvuld.';
$wb['parent_domain_id_error_empty'] = 'Geen website geselecteerd.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/pl_ftp_user.lng b/interface/web/sites/lib/lang/pl_ftp_user.lng
index 0c6bf62..d6525a7 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Katalog nie jest wewnątrz katalogu root www.';
$wb['parent_domain_id_error_empty'] = 'Nie wybrano żadnej strony www.';
$wb['quota_size_error_regex'] = 'Quota: wpisz -1 dla wartości bez limitu lub liczbę > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/pl_shell_user.lng b/interface/web/sites/lib/lang/pl_shell_user.lng
index 26dda70..d656152 100644
--- a/interface/web/sites/lib/lang/pl_shell_user.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Nazwa użytkownika strony www';
$wb['pgroup_txt'] = 'Nazwa grupy strony www';
$wb['ssh_rsa_txt'] = 'Klucz publiczny SSH-RSA (dla logowania po kluczu)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng
index d55c5b4..6d4f560 100644
--- a/interface/web/sites/lib/lang/pl_web_domain.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/pl_webdav_user.lng b/interface/web/sites/lib/lang/pl_webdav_user.lng
index 4ec7974..c244c5d 100644
--- a/interface/web/sites/lib/lang/pl_webdav_user.lng
+++ b/interface/web/sites/lib/lang/pl_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'Nazwa użytkownika zawiera niedozwolone znaki.';
$wb['directory_error_empty'] = 'Pusty katalog.';
$wb['parent_domain_id_error_empty'] = 'Nie wybrano strony www.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/pt_ftp_user.lng b/interface/web/sites/lib/lang/pt_ftp_user.lng
index 6d3ae11..d7c44d3 100644
--- a/interface/web/sites/lib/lang/pt_ftp_user.lng
+++ b/interface/web/sites/lib/lang/pt_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'A pasta não esta dentro da pasta web principal.';
$wb['parent_domain_id_error_empty'] = 'Nenhum website seleccionado.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/pt_shell_user.lng b/interface/web/sites/lib/lang/pt_shell_user.lng
index 223f65a..87929c2 100644
--- a/interface/web/sites/lib/lang/pt_shell_user.lng
+++ b/interface/web/sites/lib/lang/pt_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/pt_web_domain.lng b/interface/web/sites/lib/lang/pt_web_domain.lng
index b4e7b18..53b6728 100644
--- a/interface/web/sites/lib/lang/pt_web_domain.lng
+++ b/interface/web/sites/lib/lang/pt_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/pt_webdav_user.lng b/interface/web/sites/lib/lang/pt_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/pt_webdav_user.lng
+++ b/interface/web/sites/lib/lang/pt_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ro_ftp_user.lng b/interface/web/sites/lib/lang/ro_ftp_user.lng
index fe569dd..1a31a26 100644
--- a/interface/web/sites/lib/lang/ro_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ro_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ro_shell_user.lng b/interface/web/sites/lib/lang/ro_shell_user.lng
index 20c9a04..6bd7f1b 100644
--- a/interface/web/sites/lib/lang/ro_shell_user.lng
+++ b/interface/web/sites/lib/lang/ro_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain.lng b/interface/web/sites/lib/lang/ro_web_domain.lng
index 579ed8e..a1fd7e9 100644
--- a/interface/web/sites/lib/lang/ro_web_domain.lng
+++ b/interface/web/sites/lib/lang/ro_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/ro_webdav_user.lng b/interface/web/sites/lib/lang/ro_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/ro_webdav_user.lng
+++ b/interface/web/sites/lib/lang/ro_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ru_ftp_user.lng b/interface/web/sites/lib/lang/ru_ftp_user.lng
index b858b73..c5375ee 100644
--- a/interface/web/sites/lib/lang/ru_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ru_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Директория снаружи web-root папки.';
$wb['parent_domain_id_error_empty'] = 'Web-сайт не выбран.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ru_shell_user.lng b/interface/web/sites/lib/lang/ru_shell_user.lng
index 586d9ba..9b1542f 100644
--- a/interface/web/sites/lib/lang/ru_shell_user.lng
+++ b/interface/web/sites/lib/lang/ru_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_domain.lng
index a6295eb..a133e77 100644
--- a/interface/web/sites/lib/lang/ru_web_domain.lng
+++ b/interface/web/sites/lib/lang/ru_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/ru_webdav_user.lng b/interface/web/sites/lib/lang/ru_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/ru_webdav_user.lng
+++ b/interface/web/sites/lib/lang/ru_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/se_ftp_user.lng b/interface/web/sites/lib/lang/se_ftp_user.lng
index b5a5f2e..2d56398 100644
--- a/interface/web/sites/lib/lang/se_ftp_user.lng
+++ b/interface/web/sites/lib/lang/se_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/se_shell_user.lng b/interface/web/sites/lib/lang/se_shell_user.lng
index 2e9bdbd..825de79 100644
--- a/interface/web/sites/lib/lang/se_shell_user.lng
+++ b/interface/web/sites/lib/lang/se_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng
index 53befe2..61ec442 100644
--- a/interface/web/sites/lib/lang/se_web_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/se_webdav_user.lng b/interface/web/sites/lib/lang/se_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/se_webdav_user.lng
+++ b/interface/web/sites/lib/lang/se_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/sk_ftp_user.lng b/interface/web/sites/lib/lang/sk_ftp_user.lng
index 6f0cbad..c11755a 100644
--- a/interface/web/sites/lib/lang/sk_ftp_user.lng
+++ b/interface/web/sites/lib/lang/sk_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Adresár nie je vnútri koreňového adresára webu.';
$wb['parent_domain_id_error_empty'] = 'Žiadna webstránka zvolená';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/sk_shell_user.lng b/interface/web/sites/lib/lang/sk_shell_user.lng
index 7c56b7e..7e69cda 100644
--- a/interface/web/sites/lib/lang/sk_shell_user.lng
+++ b/interface/web/sites/lib/lang/sk_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/sk_web_domain.lng b/interface/web/sites/lib/lang/sk_web_domain.lng
index ef3e872..bf20516 100644
--- a/interface/web/sites/lib/lang/sk_web_domain.lng
+++ b/interface/web/sites/lib/lang/sk_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/sk_webdav_user.lng b/interface/web/sites/lib/lang/sk_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/sk_webdav_user.lng
+++ b/interface/web/sites/lib/lang/sk_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/tr_ftp_user.lng b/interface/web/sites/lib/lang/tr_ftp_user.lng
index 768ed23..c90f92a 100644
--- a/interface/web/sites/lib/lang/tr_ftp_user.lng
+++ b/interface/web/sites/lib/lang/tr_ftp_user.lng
@@ -25,4 +25,6 @@
$wb['directory_error_notinweb'] = 'Dizin, web kök dizini içerisinde değil.';
$wb['parent_domain_id_error_empty'] = 'Seçili websitesi yok.';
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/tr_shell_user.lng b/interface/web/sites/lib/lang/tr_shell_user.lng
index 50d98fd..f476515 100644
--- a/interface/web/sites/lib/lang/tr_shell_user.lng
+++ b/interface/web/sites/lib/lang/tr_shell_user.lng
@@ -20,4 +20,6 @@
$wb['puser_txt'] = 'Web Username';
$wb['pgroup_txt'] = 'Web Group';
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/tr_web_domain.lng b/interface/web/sites/lib/lang/tr_web_domain.lng
index 7a132db..dae2158 100644
--- a/interface/web/sites/lib/lang/tr_web_domain.lng
+++ b/interface/web/sites/lib/lang/tr_web_domain.lng
@@ -89,4 +89,6 @@
$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
?>
diff --git a/interface/web/sites/lib/lang/tr_webdav_user.lng b/interface/web/sites/lib/lang/tr_webdav_user.lng
index 05c9892..137c388 100644
--- a/interface/web/sites/lib/lang/tr_webdav_user.lng
+++ b/interface/web/sites/lib/lang/tr_webdav_user.lng
@@ -12,4 +12,6 @@
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/templates/web_domain_ssl.htm b/interface/web/sites/templates/web_domain_ssl.htm
index 0e5f6a6..ffa5762 100644
--- a/interface/web/sites/templates/web_domain_ssl.htm
+++ b/interface/web/sites/templates/web_domain_ssl.htm
@@ -35,7 +35,7 @@
</div>
<div class="ctrlHolder">
<label for="ssl_request">{tmpl_var name='ssl_request_txt'}</label>
- <textarea name="ssl_request" id="ssl_request" readonly rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea>
+ <textarea name="ssl_request" id="ssl_request" rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea>
</div>
<div class="ctrlHolder">
<label for="ssl_cert">{tmpl_var name='ssl_cert_txt'}</label>
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 0152727..aa4ec17 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -108,7 +108,7 @@
<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>
+ <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
<span>hosting control panel</span>
</div>
<!-- begin: main navigation #nav -->
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index 35e23db..c90c9f2 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -107,7 +107,7 @@
<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>
</tmpl_if>
</div>
- <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+ <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
<span>hosting control panel</span>
</div>
<!-- begin: main navigation #nav -->
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index 9795b86..5b73fba 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -262,7 +262,7 @@
<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>
</tmpl_if>
</div>
- <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+ <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
<span>hosting control panel</span>
</div>
<!-- begin: main navigation #nav -->
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index 93f096e..ff939af 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -108,7 +108,7 @@
<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>
</tmpl_if>
</div>
- <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+ <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
<span>hosting control panel</span>
</div>
<!-- begin: main navigation #nav -->
diff --git a/interface/web/tools/lib/lang/hr.lng b/interface/web/tools/lib/lang/hr.lng
index 3a9c3c3..817d63e 100644
--- a/interface/web/tools/lib/lang/hr.lng
+++ b/interface/web/tools/lib/lang/hr.lng
@@ -4,6 +4,6 @@
$wb['ISPConfig Tools'] = 'Control panel alati';
$wb['Password and Language'] = 'Šifra i jezik';
$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';
+$wb['Dns Tools'] = 'DNS alati';
+$wb['Resync'] = 'Sinkroniziraj DNS zapise';
?>
diff --git a/interface/web/vm/lib/lang/hr_openvz_action.lng b/interface/web/vm/lib/lang/hr_openvz_action.lng
index f7f199b..712685f 100644
--- a/interface/web/vm/lib/lang/hr_openvz_action.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_action.lng
@@ -1,16 +1,16 @@
<?php
-$wb['head_txt'] = 'Virtual server actions for VM:';
+$wb['head_txt'] = 'Akcije Virtualnog servera za VM:';
$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_save_txt'] = 'Pokreni selektiranu akciju';
$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.';
-$wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characters.';
-$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.';
+$wb['start_exec_txt'] = 'Komanda za pokretanje je poslana VM host serveru. Treba pričekati minutu, dvije dok se VM ne pokrene.';
+$wb['stop_exec_txt'] = 'Komanda za zaustavljanje je poslana VM host serveru. Treba pričekati minutu, dvije dok se VM ne zaustavi.';
+$wb['restart_exec_txt'] = 'Komanda za restartanje je poslana VM host serveru. Treba pričekati minutu, dvije dok se VM ne restarta.';
+$wb['ostemplate_name_error'] = 'OS predložak sadrži nedozvoljene znakove.';
+$wb['ostemplate_name_unique_error'] = 'Već postoji OS predložak sa tim nazivom.';
+$wb['ostemplate_exec_txt'] = 'Komanda za kreiranje OS predloška je poslana host serveru. Treba pričekati minutu, dvije dok se OS predložak ne kreira';
?>
diff --git a/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng b/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng
index 73e64ff..df88ca9 100644
--- a/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng
@@ -1,11 +1,11 @@
<?php
-$wb['template_name_txt'] = 'Template name';
-$wb['template_file_txt'] = 'Template filename';
+$wb['template_name_txt'] = 'Predložak';
+$wb['template_file_txt'] = 'Datoteka predloška';
$wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
+$wb['allservers_txt'] = 'Postoji na svim serverima';
$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.';
-$wb['Template'] = 'Template';
+$wb['description_txt'] = 'Opis';
+$wb['template_name_error_empty'] = 'Nije upisan naziv predloška.';
+$wb['template_file_error_empty'] = 'Nije upisan naziv datoteke predloška.';
+$wb['Template'] = 'Predložak';
?>
diff --git a/interface/web/vm/lib/lang/hr_openvz_template.lng b/interface/web/vm/lib/lang/hr_openvz_template.lng
index 62e9dca..eb7a49a 100644
--- a/interface/web/vm/lib/lang/hr_openvz_template.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_template.lng
@@ -34,7 +34,7 @@
$wb['cpu_limit_txt'] = 'CPU limit %';
$wb['io_priority_txt'] = 'I/O priority';
$wb['active_txt'] = 'Aktivno';
-$wb['description_txt'] = 'Description';
+$wb['description_txt'] = 'Opis';
$wb['numproc_desc_txt'] = 'Number of processes and threads.';
$wb['numtcpsock_desc_txt'] = 'Number of TCP sockets.';
$wb['numothersock_desc_txt'] = 'Number of sockets other than TCP.';
@@ -66,28 +66,28 @@
$wb['cpu_limit_error_empty'] = 'CPU limit % is empty.';
$wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
-$wb['numproc_error_empty'] = 'Numproc is empty.';
-$wb['numtcpsock_error_empty'] = 'Numtcpsock is empty.';
-$wb['numothersock_error_empty'] = 'Numothersock is empty.';
-$wb['vmguarpages_error_empty'] = 'Vmguarpages is empty.';
-$wb['kmemsize_error_empty'] = 'Kmemsize is empty.';
-$wb['tcpsndbuf_error_empty'] = 'Tcpsndbuf is empty.';
-$wb['tcprcvbuf_error_empty'] = 'Tcprcvbuf is empty.';
-$wb['othersockbuf_error_empty'] = 'Othersockbuf is empty.';
-$wb['dgramrcvbuf_error_empty'] = 'Dgramrcvbuf is empty.';
-$wb['oomguarpages_error_empty'] = 'Oomguarpages is empty.';
-$wb['privvmpages_error_empty'] = 'Privvmpages is empty.';
-$wb['lockedpages_error_empty'] = 'Lockedpages is empty.';
-$wb['shmpages_error_empty'] = 'Shmpages is empty.';
-$wb['physpages_error_empty'] = 'Physpages is empty.';
-$wb['numfile_error_empty'] = 'Numfile is empty.';
-$wb['avnumproc_error_empty'] = 'Avnumproc is empty.';
-$wb['numflock_error_empty'] = 'Numflock is empty.';
-$wb['numpty_error_empty'] = 'Numpty is empty.';
-$wb['numsiginfo_error_empty'] = 'Numsiginfo is empty.';
-$wb['dcachesize_error_empty'] = 'Dcachesize is empty.';
-$wb['numiptent_error_empty'] = 'Numiptent is empty.';
-$wb['swappages_error_empty'] = 'Swappages is empty.';
-$wb['Template'] = 'Template';
-$wb['Advanced'] = 'Advanced';
+$wb['numproc_error_empty'] = 'Numproc polje je prazno.';
+$wb['numtcpsock_error_empty'] = 'Numtcpsock polje je prazno.';
+$wb['numothersock_error_empty'] = 'Numothersock polje je prazno.';
+$wb['vmguarpages_error_empty'] = 'Vmguarpages polje je prazno.';
+$wb['kmemsize_error_empty'] = 'Kmemsize polje je prazno.';
+$wb['tcpsndbuf_error_empty'] = 'Tcpsndbuf polje je prazno.';
+$wb['tcprcvbuf_error_empty'] = 'Tcprcvbuf polje je prazno.';
+$wb['othersockbuf_error_empty'] = 'Othersockbuf polje je prazno.';
+$wb['dgramrcvbuf_error_empty'] = 'Dgramrcvbuf polje je prazno.';
+$wb['oomguarpages_error_empty'] = 'Oomguarpages polje je prazno.';
+$wb['privvmpages_error_empty'] = 'Privvmpages polje je prazno.';
+$wb['lockedpages_error_empty'] = 'Lockedpages polje je prazno.';
+$wb['shmpages_error_empty'] = 'Shmpages polje je prazno.';
+$wb['physpages_error_empty'] = 'Physpages polje je prazno.';
+$wb['numfile_error_empty'] = 'Numfile polje je prazno.';
+$wb['avnumproc_error_empty'] = 'Avnumproc polje je prazno.';
+$wb['numflock_error_empty'] = 'Numflock polje je prazno.';
+$wb['numpty_error_empty'] = 'Numpty polje je prazno.';
+$wb['numsiginfo_error_empty'] = 'Numsiginfo polje je prazno.';
+$wb['dcachesize_error_empty'] = 'Dcachesize polje je prazno.';
+$wb['numiptent_error_empty'] = 'Numiptent polje je prazno.';
+$wb['swappages_error_empty'] = 'Swappages polje je prazno.';
+$wb['Template'] = 'Predložak';
+$wb['Advanced'] = 'Napredno';
?>
diff --git a/interface/web/vm/lib/lang/hr_openvz_vm.lng b/interface/web/vm/lib/lang/hr_openvz_vm.lng
index af3fd11..206fe3a 100644
--- a/interface/web/vm/lib/lang/hr_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_vm.lng
@@ -1,40 +1,40 @@
<?php
-$wb['diskspace_txt'] = 'Diskspace';
-$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['diskspace_txt'] = 'Diskovni prostor';
+$wb['ram_txt'] = 'RAM (garantirano)';
$wb['ram_burst_txt'] = 'RAM (burst)';
$wb['cpu_units_txt'] = 'CPU units';
$wb['cpu_num_txt'] = 'CPU number';
$wb['cpu_limit_txt'] = 'CPU limit';
$wb['io_priority_txt'] = 'I/O priority';
$wb['nameserver_txt'] = 'Nameserver(s)';
-$wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Capability';
+$wb['nameserver_desc_txt'] = '(odvojeno razmakom)';
+$wb['capability_txt'] = 'Mogućnosti';
$wb['server_id_txt'] = 'Hostserver';
-$wb['ostemplate_id_txt'] = 'OSTemplate';
-$wb['template_id_txt'] = 'Template';
-$wb['ip_address_txt'] = 'IP address';
+$wb['ostemplate_id_txt'] = 'OS predložak';
+$wb['template_id_txt'] = 'Predložak';
+$wb['ip_address_txt'] = 'IP adresa';
$wb['hostname_txt'] = 'Hostname';
-$wb['vm_password_txt'] = 'VM Password';
-$wb['start_boot_txt'] = 'Start at boot';
+$wb['vm_password_txt'] = 'VM šifra';
+$wb['start_boot_txt'] = 'Pokreni pri bootanju';
$wb['active_txt'] = 'Aktivno';
-$wb['description_txt'] = 'Description';
-$wb['client_group_id_txt'] = 'Client';
+$wb['description_txt'] = 'Opis';
+$wb['client_group_id_txt'] = 'Klijent';
$wb['veid_txt'] = 'VEID';
-$wb['create_dns_txt'] = 'Create DNS for hostname';
-$wb['active_until_date_txt'] = 'Active until date';
-$wb['ip_address_error_empty'] = 'IP address is empty.';
-$wb['hostname_error_empty'] = 'Hostname is empty.';
-$wb['vm_password_error_empty'] = 'VM Password is empty.';
-$wb['veid_error_empty'] = 'VEID is empty.';
+$wb['create_dns_txt'] = 'Kreira DNS za hostname';
+$wb['active_until_date_txt'] = 'Aktivno do';
+$wb['ip_address_error_empty'] = 'IP adresa polje je prazno.';
+$wb['hostname_error_empty'] = 'Hostname polje je prazno.';
+$wb['vm_password_error_empty'] = 'VM šifra polje je prazno.';
+$wb['veid_error_empty'] = 'VEID polje je prazno.';
$wb['veid_error_unique'] = 'VEID does already exist.';
-$wb['diskspace_error_empty'] = 'Diskspace is empty.';
-$wb['ram_error_empty'] = 'RAM (guaranteed) is empty.';
-$wb['ram_burst_error_empty'] = 'RAM (burst) is empty.';
-$wb['cpu_units_error_empty'] = 'CPU units is empty.';
-$wb['cpu_num_error_empty'] = 'CPU number is empty.';
-$wb['cpu_limit_error_empty'] = 'CPU limit is empty.';
-$wb['io_priority_error_empty'] = 'I/O priority is empty.';
-$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
-$wb['Virtual server'] = 'Virtual server';
-$wb['Advanced'] = 'Advanced';
+$wb['diskspace_error_empty'] = 'Diskspace polje je prazno.';
+$wb['ram_error_empty'] = 'RAM (guaranteed) polje je prazno.';
+$wb['ram_burst_error_empty'] = 'RAM (burst) polje je prazno.';
+$wb['cpu_units_error_empty'] = 'CPU units polje je prazno.';
+$wb['cpu_num_error_empty'] = 'CPU number polje je prazno.';
+$wb['cpu_limit_error_empty'] = 'CPU limit polje je prazno.';
+$wb['io_priority_error_empty'] = 'I/O priority polje je prazno.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s) polje je prazno.';
+$wb['Virtual server'] = 'Virtualni server';
+$wb['Advanced'] = 'Napredno';
?>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 69c0f3b..f620b57 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -709,6 +709,11 @@
$vhost_data['ssl_domain'] = $data['new']['ssl_domain'];
$vhost_data['has_custom_php_ini'] = $has_custom_php_ini;
$vhost_data['custom_php_ini_dir'] = escapeshellcmd($custom_php_ini_dir);
+
+ // Custom Apache directives
+ // Make sure we only have Unix linebreaks
+ $vhost_data['apache_directives'] = str_replace("\r\n", "\n", $vhost_data['apache_directives']);
+ $vhost_data['apache_directives'] = str_replace("\r", "\n", $vhost_data['apache_directives']);
// Check if a SSL cert exists
$ssl_dir = $data['new']['document_root'].'/ssl';
@@ -750,7 +755,7 @@
// Rewrite rules
$rewrite_rules = array();
- if($data['new']['redirect_type'] != '') {
+ if($data['new']['redirect_type'] != '' && $data['new']['redirect_path'] != '') {
if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
if(substr($data['new']['redirect_path'],0,8) == '[scheme]'){
$rewrite_target = 'http'.substr($data['new']['redirect_path'],8);
@@ -816,7 +821,7 @@
}
$app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
// Rewriting
- if($alias['redirect_type'] != '') {
+ if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
if(substr($alias['redirect_path'],0,8) == '[scheme]'){
$rewrite_target = 'http'.substr($alias['redirect_path'],8);
diff --git a/server/plugins-available/mailman_plugin.inc.php b/server/plugins-available/mailman_plugin.inc.php
index ac36070..5a4593a 100644
--- a/server/plugins-available/mailman_plugin.inc.php
+++ b/server/plugins-available/mailman_plugin.inc.php
@@ -113,7 +113,7 @@
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
// load files
- if(file_exists($conf["rootpath"]."/conf/mm_cfg.py.master")) {
+ if(file_exists($conf["rootpath"]."/conf-custom/mm_cfg.py.master")) {
$content = file_get_contents($conf["rootpath"]."/conf-custom/mm_cfg.py.master");
} else {
$content = file_get_contents($conf["rootpath"]."/conf/mm_cfg.py.master");
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index bdf4f15..7352903 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -791,7 +791,7 @@
// Rewrite rules
$rewrite_rules = array();
- if($data['new']['redirect_type'] != '') {
+ if($data['new']['redirect_type'] != '' && $data['new']['redirect_path'] != '') {
if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
if(substr($data['new']['redirect_path'],0,8) == '[scheme]') $data['new']['redirect_path'] = '$scheme'.substr($data['new']['redirect_path'],8);
@@ -917,7 +917,7 @@
}
$app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
// Rewriting
- if($alias['redirect_type'] != '') {
+ if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
if(substr($alias['redirect_path'],0,8) == '[scheme]') $alias['redirect_path'] = '$scheme'.substr($alias['redirect_path'],8);
--
Gitblit v1.9.1