From 02bf997271f4d09e91c8fcb9cecd08f06f2400c4 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 12 Apr 2012 16:04:52 +0000 Subject: [PATCH] Merged revisions 3028-3045 from stable branch. --- install/dist/conf/opensuse112.conf.php | 2 +- install/lib/installer_base.lib.php | 4 +- install/lib/update.lib.php | 26 +-- install/sql/ispconfig3.sql | 4 +- install/tpl/config.inc.php.master | 6 +- interface/lib/app.inc.php | 3 + interface/lib/classes/simplepie.inc.php | 2 +- interface/lib/config.inc.php | 2 +- interface/lib/lang/ar.lng | 1 + interface/lib/lang/bg.lng | 1 + interface/lib/lang/br.lng | 1 + interface/lib/lang/cz.lng | 1 + interface/lib/lang/de.lng | 2 +- interface/lib/lang/el.lng | 1 + interface/lib/lang/es.lng | 1 + interface/lib/lang/fi.lng | 1 + interface/lib/lang/fr.lng | 1 + interface/lib/lang/hr.lng | 11 +- interface/lib/lang/hu.lng | 1 + interface/lib/lang/id.lng | 1 + interface/lib/lang/it.lng | 1 + interface/lib/lang/ja.lng | 1 + interface/lib/lang/nl.lng | 1 + interface/lib/lang/pl.lng | 1 + interface/lib/lang/pt.lng | 1 + interface/lib/lang/ro.lng | 1 + interface/lib/lang/ru.lng | 1 + interface/lib/lang/se.lng | 1 + interface/lib/lang/sk.lng | 1 + interface/lib/lang/tr.lng | 1 + interface/web/admin/lib/lang/hr_firewall.lng | 4 +- interface/web/admin/lib/lang/hr_iptables.lng | 2 +- .../admin/lib/lang/hr_language_complete.lng | 2 +- .../web/admin/lib/lang/hr_remote_action.lng | 6 +- .../admin/lib/lang/hr_remote_user_list.lng | 2 +- .../web/admin/lib/lang/hr_server_config.lng | 216 +++++++++--------- .../web/admin/lib/lang/hr_server_list.lng | 2 +- .../web/admin/lib/lang/hr_software_repo.lng | 2 +- .../web/admin/lib/lang/hr_users_list.lng | 2 +- .../web/admin/software_package_install.php | 3 +- interface/web/client/lib/lang/hr.lng | 6 +- interface/web/client/lib/lang/hr_client.lng | 78 +++---- .../client/lib/lang/hr_client_template.lng | 76 +++--- .../lib/lang/hr_client_template_list.lng | 2 +- interface/web/client/lib/lang/hr_reseller.lng | 78 +++---- .../dashboard/lib/lang/hr_dashlet_limits.lng | 2 +- .../web/designer/lib/lang/hr_form_edit.lng | 38 +-- .../web/designer/lib/lang/hr_form_list.lng | 10 +- .../web/designer/lib/lang/hr_form_show.lng | 28 +-- .../web/designer/lib/lang/hr_module_edit.lng | 30 +-- .../web/designer/lib/lang/hr_module_list.lng | 6 +- .../designer/lib/lang/hr_module_nav_edit.lng | 8 +- .../lib/lang/hr_module_nav_item_edit.lng | 10 +- .../web/designer/lib/lang/hr_module_show.lng | 28 +-- interface/web/dns/dns_import.php | 137 +++++++++-- interface/web/dns/lib/lang/ar.lng | 3 - interface/web/dns/lib/lang/ar_dns_import.lng | 14 ++ interface/web/dns/lib/lang/bg.lng | 3 - interface/web/dns/lib/lang/bg_dns_import.lng | 14 ++ interface/web/dns/lib/lang/br.lng | 3 - interface/web/dns/lib/lang/br_dns_import.lng | 14 ++ interface/web/dns/lib/lang/cz.lng | 3 - interface/web/dns/lib/lang/cz_dns_import.lng | 14 ++ interface/web/dns/lib/lang/de.lng | 3 - interface/web/dns/lib/lang/de_dns_import.lng | 14 ++ interface/web/dns/lib/lang/el.lng | 3 - interface/web/dns/lib/lang/el_dns_import.lng | 14 ++ interface/web/dns/lib/lang/en.lng | 3 - interface/web/dns/lib/lang/en_dns_import.lng | 14 ++ interface/web/dns/lib/lang/es.lng | 3 - interface/web/dns/lib/lang/es_dns_import.lng | 14 ++ interface/web/dns/lib/lang/fi.lng | 3 - interface/web/dns/lib/lang/fi_dns_import.lng | 14 ++ interface/web/dns/lib/lang/fr.lng | 3 - interface/web/dns/lib/lang/fr_dns_import.lng | 14 ++ interface/web/dns/lib/lang/hr.lng | 7 +- interface/web/dns/lib/lang/hr_dns_a.lng | 12 +- interface/web/dns/lib/lang/hr_dns_a_list.lng | 2 +- interface/web/dns/lib/lang/hr_dns_aaaa.lng | 18 +- interface/web/dns/lib/lang/hr_dns_alias.lng | 16 +- interface/web/dns/lib/lang/hr_dns_cname.lng | 20 +- interface/web/dns/lib/lang/hr_dns_hinfo.lng | 12 +- interface/web/dns/lib/lang/hr_dns_import.lng | 14 ++ interface/web/dns/lib/lang/hr_dns_mx.lng | 16 +- interface/web/dns/lib/lang/hr_dns_ns.lng | 18 +- interface/web/dns/lib/lang/hr_dns_ptr.lng | 18 +- interface/web/dns/lib/lang/hr_dns_rp.lng | 10 +- interface/web/dns/lib/lang/hr_dns_slave.lng | 20 +- .../web/dns/lib/lang/hr_dns_slave_list.lng | 8 +- interface/web/dns/lib/lang/hr_dns_soa.lng | 40 ++-- .../web/dns/lib/lang/hr_dns_soa_list.lng | 6 +- interface/web/dns/lib/lang/hr_dns_srv.lng | 22 +- .../web/dns/lib/lang/hr_dns_template_list.lng | 8 +- interface/web/dns/lib/lang/hr_dns_txt.lng | 14 +- interface/web/dns/lib/lang/hu.lng | 3 - interface/web/dns/lib/lang/hu_dns_import.lng | 14 ++ interface/web/dns/lib/lang/id.lng | 3 - interface/web/dns/lib/lang/id_dns_import.lng | 14 ++ interface/web/dns/lib/lang/it.lng | 3 - interface/web/dns/lib/lang/it_dns_import.lng | 14 ++ interface/web/dns/lib/lang/ja.lng | 3 - interface/web/dns/lib/lang/ja_dns_import.lng | 14 ++ interface/web/dns/lib/lang/nl.lng | 3 - interface/web/dns/lib/lang/nl_dns_import.lng | 14 ++ interface/web/dns/lib/lang/pl.lng | 3 - interface/web/dns/lib/lang/pl_dns_import.lng | 14 ++ interface/web/dns/lib/lang/pt.lng | 3 - interface/web/dns/lib/lang/pt_dns_import.lng | 14 ++ interface/web/dns/lib/lang/ro.lng | 3 - interface/web/dns/lib/lang/ro_dns_import.lng | 14 ++ interface/web/dns/lib/lang/ru.lng | 3 - interface/web/dns/lib/lang/ru_dns_import.lng | 14 ++ interface/web/dns/lib/lang/se.lng | 3 - interface/web/dns/lib/lang/se_dns_import.lng | 14 ++ interface/web/dns/lib/lang/sk.lng | 3 - interface/web/dns/lib/lang/sk_dns_import.lng | 14 ++ interface/web/dns/lib/lang/tr.lng | 3 - interface/web/dns/lib/lang/tr_dns_import.lng | 14 ++ interface/web/dns/templates/dns_import.htm | 6 +- interface/web/help/lib/lang/hr.lng | 12 +- interface/web/help/lib/lang/hr_faq_form.lng | 8 +- .../lib/lang/hr_faq_manage_questions_list.lng | 14 +- .../help/lib/lang/hr_faq_sections_form.lng | 2 +- .../web/help/lib/lang/hr_help_faq_list.lng | 2 +- .../lib/lang/hr_help_faq_sections_list.lng | 12 +- .../web/help/lib/lang/hr_support_message.lng | 2 +- interface/web/login/lib/lang/hr.lng | 2 +- interface/web/mail/lib/lang/ar_mail_alias.lng | 1 + interface/web/mail/lib/lang/ar_mail_get.lng | 2 +- interface/web/mail/lib/lang/bg_mail_alias.lng | 1 + interface/web/mail/lib/lang/bg_mail_get.lng | 2 +- interface/web/mail/lib/lang/br_mail_alias.lng | 1 + interface/web/mail/lib/lang/br_mail_get.lng | 2 +- interface/web/mail/lib/lang/cz_mail_alias.lng | 1 + interface/web/mail/lib/lang/cz_mail_get.lng | 2 +- interface/web/mail/lib/lang/de_mail_alias.lng | 3 +- interface/web/mail/lib/lang/de_mail_get.lng | 2 +- interface/web/mail/lib/lang/el_mail_alias.lng | 1 + interface/web/mail/lib/lang/el_mail_get.lng | 2 +- interface/web/mail/lib/lang/en_mail_alias.lng | 3 +- interface/web/mail/lib/lang/es_mail_alias.lng | 1 + interface/web/mail/lib/lang/es_mail_get.lng | 2 +- interface/web/mail/lib/lang/fi_mail_alias.lng | 1 + interface/web/mail/lib/lang/fi_mail_get.lng | 2 +- interface/web/mail/lib/lang/fr_mail_alias.lng | 1 + interface/web/mail/lib/lang/fr_mail_get.lng | 2 +- interface/web/mail/lib/lang/hr.lng | 74 +++--- interface/web/mail/lib/lang/hr_mail_alias.lng | 15 +- .../web/mail/lib/lang/hr_mail_alias_list.lng | 8 +- .../web/mail/lib/lang/hr_mail_aliasdomain.lng | 16 +- .../lib/lang/hr_mail_aliasdomain_list.lng | 4 +- .../web/mail/lib/lang/hr_mail_blacklist.lng | 4 +- .../mail/lib/lang/hr_mail_blacklist_list.lng | 10 +- .../mail/lib/lang/hr_mail_content_filter.lng | 8 +- .../lib/lang/hr_mail_content_filter_list.lng | 2 +- .../web/mail/lib/lang/hr_mail_domain.lng | 12 +- .../lib/lang/hr_mail_domain_admin_list.lng | 6 +- .../mail/lib/lang/hr_mail_domain_catchall.lng | 10 +- .../lib/lang/hr_mail_domain_catchall_list.lng | 8 +- .../web/mail/lib/lang/hr_mail_domain_list.lng | 4 +- .../web/mail/lib/lang/hr_mail_forward.lng | 6 +- .../mail/lib/lang/hr_mail_forward_list.lng | 6 +- interface/web/mail/lib/lang/hr_mail_get.lng | 4 +- .../web/mail/lib/lang/hr_mail_get_list.lng | 8 +- .../web/mail/lib/lang/hr_mail_mailinglist.lng | 18 +- .../lib/lang/hr_mail_mailinglist_list.lng | 4 +- .../mail/lib/lang/hr_mail_relay_recipient.lng | 4 +- .../lib/lang/hr_mail_relay_recipient_list.lng | 4 +- .../web/mail/lib/lang/hr_mail_transport.lng | 8 +- interface/web/mail/lib/lang/hr_mail_user.lng | 4 +- .../web/mail/lib/lang/hr_mail_user_filter.lng | 14 +- .../lib/lang/hr_mail_user_filter_list.lng | 4 +- .../web/mail/lib/lang/hr_mail_user_list.lng | 8 +- .../web/mail/lib/lang/hr_mail_whitelist.lng | 4 +- .../mail/lib/lang/hr_mail_whitelist_list.lng | 10 +- .../mail/lib/lang/hr_spamfilter_blacklist.lng | 2 +- .../lib/lang/hr_spamfilter_blacklist_list.lng | 2 +- .../lib/lang/hr_spamfilter_config_list.lng | 2 +- .../lib/lang/hr_spamfilter_policy_list.lng | 14 +- .../web/mail/lib/lang/hr_spamfilter_users.lng | 4 +- .../lib/lang/hr_spamfilter_users_list.lng | 4 +- .../mail/lib/lang/hr_spamfilter_whitelist.lng | 2 +- .../lib/lang/hr_spamfilter_whitelist_list.lng | 10 +- .../lib/lang/hr_user_quota_stats_list.lng | 2 +- interface/web/mail/lib/lang/hu_mail_alias.lng | 1 + interface/web/mail/lib/lang/hu_mail_get.lng | 2 +- interface/web/mail/lib/lang/id_mail_alias.lng | 1 + interface/web/mail/lib/lang/id_mail_get.lng | 2 +- interface/web/mail/lib/lang/it_mail_alias.lng | 1 + interface/web/mail/lib/lang/it_mail_get.lng | 2 +- interface/web/mail/lib/lang/ja_mail_alias.lng | 1 + interface/web/mail/lib/lang/ja_mail_get.lng | 2 +- interface/web/mail/lib/lang/nl_mail_alias.lng | 1 + interface/web/mail/lib/lang/nl_mail_get.lng | 2 +- interface/web/mail/lib/lang/pl_mail_alias.lng | 1 + interface/web/mail/lib/lang/pl_mail_get.lng | 2 +- interface/web/mail/lib/lang/pt_mail_alias.lng | 1 + interface/web/mail/lib/lang/pt_mail_get.lng | 2 +- interface/web/mail/lib/lang/ro_mail_alias.lng | 1 + interface/web/mail/lib/lang/ro_mail_get.lng | 2 +- interface/web/mail/lib/lang/ru_mail_alias.lng | 1 + interface/web/mail/lib/lang/ru_mail_get.lng | 2 +- interface/web/mail/lib/lang/se_mail_alias.lng | 1 + interface/web/mail/lib/lang/se_mail_get.lng | 2 +- interface/web/mail/lib/lang/sk_mail_alias.lng | 1 + interface/web/mail/lib/lang/tr_mail_alias.lng | 1 + interface/web/mail/lib/lang/tr_mail_get.lng | 2 +- interface/web/mail/mail_alias_edit.php | 9 + interface/web/mail/mail_forward_edit.php | 3 +- interface/web/monitor/lib/lang/hr.lng | 2 +- interface/web/sites/lib/lang/ar_ftp_user.lng | 2 + .../web/sites/lib/lang/ar_shell_user.lng | 2 + .../web/sites/lib/lang/ar_web_domain.lng | 2 + .../web/sites/lib/lang/ar_webdav_user.lng | 2 + interface/web/sites/lib/lang/bg_ftp_user.lng | 2 + .../web/sites/lib/lang/bg_shell_user.lng | 2 + .../web/sites/lib/lang/bg_web_domain.lng | 2 + .../web/sites/lib/lang/bg_webdav_user.lng | 2 + interface/web/sites/lib/lang/br_ftp_user.lng | 2 + .../web/sites/lib/lang/br_shell_user.lng | 2 + .../web/sites/lib/lang/br_web_domain.lng | 2 + .../web/sites/lib/lang/br_webdav_user.lng | 2 + interface/web/sites/lib/lang/cz_ftp_user.lng | 2 + .../web/sites/lib/lang/cz_shell_user.lng | 2 + .../web/sites/lib/lang/cz_web_domain.lng | 2 + .../web/sites/lib/lang/cz_webdav_user.lng | 2 + interface/web/sites/lib/lang/de_ftp_user.lng | 2 + .../web/sites/lib/lang/de_shell_user.lng | 2 + .../web/sites/lib/lang/de_web_domain.lng | 2 + .../web/sites/lib/lang/de_webdav_user.lng | 2 + interface/web/sites/lib/lang/el_ftp_user.lng | 2 + .../web/sites/lib/lang/el_shell_user.lng | 2 + .../web/sites/lib/lang/el_web_domain.lng | 2 + .../web/sites/lib/lang/el_webdav_user.lng | 2 + .../web/sites/lib/lang/en_web_domain.lng | 2 + interface/web/sites/lib/lang/es_ftp_user.lng | 2 + .../web/sites/lib/lang/es_shell_user.lng | 2 + .../web/sites/lib/lang/es_web_domain.lng | 2 + .../web/sites/lib/lang/es_webdav_user.lng | 2 + interface/web/sites/lib/lang/fi_ftp_user.lng | 2 + .../web/sites/lib/lang/fi_shell_user.lng | 2 + .../web/sites/lib/lang/fi_web_domain.lng | 2 + .../web/sites/lib/lang/fi_webdav_user.lng | 2 + interface/web/sites/lib/lang/fr_ftp_user.lng | 2 + .../web/sites/lib/lang/fr_shell_user.lng | 2 + .../web/sites/lib/lang/fr_web_domain.lng | 2 + .../web/sites/lib/lang/fr_webdav_user.lng | 2 + interface/web/sites/lib/lang/hr.lng | 2 +- interface/web/sites/lib/lang/hr_cron.lng | 34 +-- interface/web/sites/lib/lang/hr_cron_list.lng | 14 +- interface/web/sites/lib/lang/hr_database.lng | 40 ++-- .../web/sites/lib/lang/hr_database_list.lng | 10 +- interface/web/sites/lib/lang/hr_ftp_user.lng | 32 +-- .../web/sites/lib/lang/hr_shell_user.lng | 34 +-- .../web/sites/lib/lang/hr_shell_user_list.lng | 6 +- .../lib/lang/hr_user_quota_stats_list.lng | 8 +- .../lib/lang/hr_web_aliasdomain_list.lng | 14 +- .../web/sites/lib/lang/hr_web_domain.lng | 146 ++++++------ .../lib/lang/hr_web_domain_admin_list.lng | 6 +- .../web/sites/lib/lang/hr_web_folder.lng | 4 +- .../web/sites/lib/lang/hr_web_folder_list.lng | 4 +- .../lib/lang/hr_web_folder_user_list.lng | 4 +- .../web/sites/lib/lang/hr_web_subdomain.lng | 58 ++--- .../web/sites/lib/lang/hr_webdav_user.lng | 18 +- .../sites/lib/lang/hr_webdav_user_list.lng | 4 +- interface/web/sites/lib/lang/hu_ftp_user.lng | 2 + .../web/sites/lib/lang/hu_shell_user.lng | 2 + .../web/sites/lib/lang/hu_web_domain.lng | 2 + .../web/sites/lib/lang/hu_webdav_user.lng | 2 + interface/web/sites/lib/lang/id_ftp_user.lng | 2 + .../web/sites/lib/lang/id_shell_user.lng | 2 + .../web/sites/lib/lang/id_web_domain.lng | 2 + .../web/sites/lib/lang/id_webdav_user.lng | 2 + interface/web/sites/lib/lang/it_ftp_user.lng | 2 + .../web/sites/lib/lang/it_shell_user.lng | 2 + .../web/sites/lib/lang/it_web_domain.lng | 2 + .../web/sites/lib/lang/it_webdav_user.lng | 2 + interface/web/sites/lib/lang/ja_ftp_user.lng | 2 + .../web/sites/lib/lang/ja_shell_user.lng | 2 + .../web/sites/lib/lang/ja_web_domain.lng | 2 + .../web/sites/lib/lang/ja_webdav_user.lng | 2 + interface/web/sites/lib/lang/nl_ftp_user.lng | 2 + .../web/sites/lib/lang/nl_shell_user.lng | 2 + .../web/sites/lib/lang/nl_web_domain.lng | 2 + .../web/sites/lib/lang/nl_webdav_user.lng | 2 + interface/web/sites/lib/lang/pl_ftp_user.lng | 2 + .../web/sites/lib/lang/pl_shell_user.lng | 2 + .../web/sites/lib/lang/pl_web_domain.lng | 2 + .../web/sites/lib/lang/pl_webdav_user.lng | 2 + interface/web/sites/lib/lang/pt_ftp_user.lng | 2 + .../web/sites/lib/lang/pt_shell_user.lng | 2 + .../web/sites/lib/lang/pt_web_domain.lng | 2 + .../web/sites/lib/lang/pt_webdav_user.lng | 2 + interface/web/sites/lib/lang/ro_ftp_user.lng | 2 + .../web/sites/lib/lang/ro_shell_user.lng | 2 + .../web/sites/lib/lang/ro_web_domain.lng | 2 + .../web/sites/lib/lang/ro_webdav_user.lng | 2 + interface/web/sites/lib/lang/ru_ftp_user.lng | 2 + .../web/sites/lib/lang/ru_shell_user.lng | 2 + .../web/sites/lib/lang/ru_web_domain.lng | 2 + .../web/sites/lib/lang/ru_webdav_user.lng | 2 + interface/web/sites/lib/lang/se_ftp_user.lng | 2 + .../web/sites/lib/lang/se_shell_user.lng | 2 + .../web/sites/lib/lang/se_web_domain.lng | 2 + .../web/sites/lib/lang/se_webdav_user.lng | 2 + interface/web/sites/lib/lang/sk_ftp_user.lng | 2 + .../web/sites/lib/lang/sk_shell_user.lng | 2 + .../web/sites/lib/lang/sk_web_domain.lng | 2 + .../web/sites/lib/lang/sk_webdav_user.lng | 2 + interface/web/sites/lib/lang/tr_ftp_user.lng | 2 + .../web/sites/lib/lang/tr_shell_user.lng | 2 + .../web/sites/lib/lang/tr_web_domain.lng | 2 + .../web/sites/lib/lang/tr_webdav_user.lng | 2 + .../web/sites/templates/web_domain_ssl.htm | 2 +- .../web/themes/default/templates/main.tpl.htm | 2 +- .../default_64_navimg/templates/main.tpl.htm | 2 +- .../default_combobox/templates/main.tpl.htm | 2 +- .../default_no_navimg/templates/main.tpl.htm | 2 +- interface/web/tools/lib/lang/hr.lng | 4 +- .../web/vm/lib/lang/hr_openvz_action.lng | 16 +- .../web/vm/lib/lang/hr_openvz_ostemplate.lng | 14 +- .../web/vm/lib/lang/hr_openvz_template.lng | 50 ++-- interface/web/vm/lib/lang/hr_openvz_vm.lng | 54 ++--- .../plugins-available/apache2_plugin.inc.php | 9 +- .../plugins-available/mailman_plugin.inc.php | 2 +- server/plugins-available/nginx_plugin.inc.php | 4 +- 326 files changed, 1672 insertions(+), 1083 deletions(-) create mode 100644 interface/web/dns/lib/lang/ar_dns_import.lng create mode 100644 interface/web/dns/lib/lang/bg_dns_import.lng create mode 100644 interface/web/dns/lib/lang/br_dns_import.lng create mode 100644 interface/web/dns/lib/lang/cz_dns_import.lng create mode 100644 interface/web/dns/lib/lang/de_dns_import.lng create mode 100644 interface/web/dns/lib/lang/el_dns_import.lng create mode 100644 interface/web/dns/lib/lang/en_dns_import.lng create mode 100644 interface/web/dns/lib/lang/es_dns_import.lng create mode 100644 interface/web/dns/lib/lang/fi_dns_import.lng create mode 100644 interface/web/dns/lib/lang/fr_dns_import.lng create mode 100644 interface/web/dns/lib/lang/hr_dns_import.lng create mode 100644 interface/web/dns/lib/lang/hu_dns_import.lng create mode 100644 interface/web/dns/lib/lang/id_dns_import.lng create mode 100644 interface/web/dns/lib/lang/it_dns_import.lng create mode 100644 interface/web/dns/lib/lang/ja_dns_import.lng create mode 100644 interface/web/dns/lib/lang/nl_dns_import.lng create mode 100644 interface/web/dns/lib/lang/pl_dns_import.lng create mode 100644 interface/web/dns/lib/lang/pt_dns_import.lng create mode 100644 interface/web/dns/lib/lang/ro_dns_import.lng create mode 100644 interface/web/dns/lib/lang/ru_dns_import.lng create mode 100644 interface/web/dns/lib/lang/se_dns_import.lng create mode 100644 interface/web/dns/lib/lang/sk_dns_import.lng create mode 100644 interface/web/dns/lib/lang/tr_dns_import.lng diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php index 7663e015c4..8e4a1fac40 100644 --- a/install/dist/conf/opensuse112.conf.php +++ b/install/dist/conf/opensuse112.conf.php @@ -97,7 +97,7 @@ $conf['web']['apps_vhost_user'] = 'ispapps'; $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 4e6ff40589..bb88780558 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -158,10 +158,10 @@ class installer_base { $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 5a3c9bbaf3..9feffa335b 100644 --- a/install/lib/update.lib.php +++ b/install/lib/update.lib.php @@ -33,20 +33,20 @@ function prepareDBDump() { //** 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 @@ function prepareDBDump() { 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 @@ function checkDbHealth() { $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; $ilng('Loading SQL patch file').': '.$patch_filename); $current_db_version = $next_db_version; @@ -193,9 +193,9 @@ function updateDbAndIni() { //** 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 @@ function updateDbAndIni() { //** 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 2612d7e886..779cbf70e7 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 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, -- Dumping data for table `sys_config` -- -INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.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 28339e7c2a..7fa30bfe61 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -1,6 +1,6 @@ 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', ''); } 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 697270f9e1..564fad5427 100644 --- a/interface/lib/classes/simplepie.inc.php +++ b/interface/lib/classes/simplepie.inc.php @@ -12151,7 +12151,7 @@ class SimplePie_IRI } 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 40de432590..3cd1723c2e 100644 --- a/interface/lib/config.inc.php +++ b/interface/lib/config.inc.php @@ -131,7 +131,7 @@ $conf['software_updates_enabled'] = false; //** 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 3e4d57e349..430cb2e321 100644 --- a/interface/lib/lang/ar.lng +++ b/interface/lib/lang/ar.lng @@ -69,4 +69,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $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 cde99944e2..19897e4163 100644 --- a/interface/lib/lang/bg.lng +++ b/interface/lib/lang/bg.lng @@ -69,4 +69,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $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 df463c2577..c912859a66 100644 --- a/interface/lib/lang/br.lng +++ b/interface/lib/lang/br.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 8f632074dc..f471f32686 100644 --- a/interface/lib/lang/cz.lng +++ b/interface/lib/lang/cz.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 f9d1968a4d..fddee77fc9 100644 --- a/interface/lib/lang/de.lng +++ b/interface/lib/lang/de.lng @@ -69,5 +69,5 @@ $wb['monthnamesshort_dec'] = 'Dez'; $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 5234e54064..e609330306 100644 --- a/interface/lib/lang/el.lng +++ b/interface/lib/lang/el.lng @@ -69,4 +69,5 @@ $wb['monthnamesshort_nov'] = 'Νοε'; $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 569799327f..3461b2a56d 100644 --- a/interface/lib/lang/es.lng +++ b/interface/lib/lang/es.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 f3d6d4339f..2dbaec7ea9 100755 --- a/interface/lib/lang/fi.lng +++ b/interface/lib/lang/fi.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 b744202aff..9e2da967f6 100644 --- a/interface/lib/lang/fr.lng +++ b/interface/lib/lang/fr.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Suivant'; $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 7299e68cd1..315c85b620 100644 --- a/interface/lib/lang/hr.lng +++ b/interface/lib/lang/hr.lng @@ -7,9 +7,9 @@ $wb['conf_format_datetime'] = 'd.m.Y. H:i'; $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['add_new_record_txt'] = 'Dodaj'; $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_nov'] = 'Stu'; $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 71a9a4c421..399acb487a 100644 --- a/interface/lib/lang/hu.lng +++ b/interface/lib/lang/hu.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 222b68d2af..f2455e0f94 100644 --- a/interface/lib/lang/id.lng +++ b/interface/lib/lang/id.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 dc8928a7e3..f92f5578cf 100644 --- a/interface/lib/lang/it.lng +++ b/interface/lib/lang/it.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 59c7ef0f97..f305ed4a8a 100644 --- a/interface/lib/lang/ja.lng +++ b/interface/lib/lang/ja.lng @@ -69,4 +69,5 @@ $wb['monthnamesshort_nov'] = 'Nov'; $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 671c1529f7..6245c23ebc 100644 --- a/interface/lib/lang/nl.lng +++ b/interface/lib/lang/nl.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 36145430e8..f582331e63 100644 --- a/interface/lib/lang/pl.lng +++ b/interface/lib/lang/pl.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Nast'; $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 35731dc38e..f22754c046 100644 --- a/interface/lib/lang/pt.lng +++ b/interface/lib/lang/pt.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 90878669bd..0442688f24 100644 --- a/interface/lib/lang/ro.lng +++ b/interface/lib/lang/ro.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 684b007a3c..97a16779c4 100644 --- a/interface/lib/lang/ru.lng +++ b/interface/lib/lang/ru.lng @@ -69,4 +69,5 @@ $wb['monthnamesshort_nov'] = 'Ноя'; $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 2decd71bfa..2817a5ec06 100644 --- a/interface/lib/lang/se.lng +++ b/interface/lib/lang/se.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 44ecaa0469..dc872850dd 100644 --- a/interface/lib/lang/sk.lng +++ b/interface/lib/lang/sk.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 8aa1c3c7b4..20664915b6 100644 --- a/interface/lib/lang/tr.lng +++ b/interface/lib/lang/tr.lng @@ -69,4 +69,5 @@ $wb['datepicker_nextText'] = 'Next'; $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 7b5b63d868..7e28a3aaf1 100644 --- a/interface/web/admin/lib/lang/hr_firewall.lng +++ b/interface/web/admin/lib/lang/hr_firewall.lng @@ -6,6 +6,6 @@ $wb['tcp_port_help_txt'] = 'Odvojeno zarezom'; $wb['udp_port_help_txt'] = 'Odvojeno zarezom'; $wb['active_txt'] = 'Aktivno'; $wb['firewall_error_unique'] = 'Već postoji firewall zapis za ovaj server.'; -$wb['tcp_ports_error_regex'] = 'Nedozvoljeni znak pri definiciji tcp porta. Dozvoljeni znakovi su znamenke, : i ,.'; -$wb['udp_ports_error_regex'] = 'Nedozvoljeni znak pri definiciji udp porta. Dozvoljeni znakovi su znamenke, : i ,.'; +$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 5a6cef9e93..e7eaaff828 100644 --- a/interface/web/admin/lib/lang/hr_iptables.lng +++ b/interface/web/admin/lib/lang/hr_iptables.lng @@ -4,7 +4,7 @@ $wb['multiport_txt'] = 'Više portova'; $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 8562ced8a9..e9ce1e5909 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.
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 0ebb53dae2..fd1444fbdd 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.

KORISTITE NA VLASTITU ODGOVORNOST!'; +$wb['do_osupdate_desc'] = 'Ovime pokrećete \'aptitude -y upgrade\' na izabranom serveru.

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

KORISTITE NA VLASTITU ODGOVORNOST!'; $wb['action_scheduled'] = 'Nadogradnja je dodana u planer poslova'; $wb['select_all_server'] = 'Svi serveri'; -$wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; +$wb['ispconfig_update_title'] = 'Upute za ISPConfig nadogradnju'; +$wb['ispconfig_update_text'] = 'Logiraj se kao root korisnik na server (SSH) i pokreni:

ispconfig_update.sh

Pogledaj detaljne upute ovdje'; ?> 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 2da20fc617..13afd0bde1 100644 --- a/interface/web/admin/lib/lang/hr_remote_user_list.lng +++ b/interface/web/admin/lib/lang/hr_remote_user_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index b0c445e734..2b36f58bd1 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_home_txt'] = 'Jailkit chroot direktorij'; $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sekcije'; $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrootane aplikacije'; $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrootane aplikacije'; -$wb['website_path_txt'] = 'Put do Internet stranice'; -$wb['website_symlinks_txt'] = 'Symlinkovi Internet stranice'; -$wb['website_basedir_txt'] = 'Bazni direktorij Internet stranice'; +$wb['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['relayhost_password_txt'] = 'Relayhost šifra'; $wb['mailbox_size_limit_txt'] = 'Dozvoljena veličina mailboxa'; $wb['message_size_limit_txt'] = 'Dozvoljena veličina emaila'; $wb['ip_address_txt'] = 'IP adresa'; -$wb['netmask_txt'] = 'Netmask'; +$wb['netmask_txt'] = 'Netmaska'; $wb['gateway_txt'] = 'Gateway'; $wb['hostname_txt'] = 'Hostname'; $wb['nameservers_txt'] = 'Nameserveri'; @@ -39,118 +39,118 @@ $wb['netmask_error_wrong'] = 'Neispravni format netmask-a.'; $wb['gateway_error_wrong'] = 'Neispravan format gateway-a.'; $wb['hostname_error_empty'] = 'Hostname polje je prazno.'; $wb['nameservers_error_empty'] = 'Nameserver polje je prazno.'; -$wb['config_dir_txt'] = 'Config direktorij'; -$wb['init_script_txt'] = 'Cron init script name'; -$wb['crontab_dir_txt'] = 'Path for individual crontabs'; -$wb['wget_txt'] = 'Path to wget program'; -$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'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; +$wb['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'] = 'Informacija: Ako želite ugasiti mysql morate izabrati Isključi MySQL monitoring kvačicu i tada pričekati 2-3 minute.
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 320b45f77e..f14477058f 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 @@ UPOZORENJE: Ovdje nemojte mijenjati podatke klijenta. Koristite Klijent i Preprodavač postavke u Klijent modulu. Mijenjanjem postavki klijenata ili grupa može doći do gubitka podataka!'; +$wb['warning_txt'] = 'UPOZORENJE: Ovdje nemojte mijenjati podatke klijenta. Koristite \\"Klijent\\" i \\"Preprodavač\\" postavke u Klijent modulu. Mijenjanjem postavki klijenata ili grupa može doći do gubitka podataka!'; ?> diff --git a/interface/web/admin/software_package_install.php b/interface/web/admin/software_package_install.php index 97bf1bf402..eb7a72ab16 100644 --- a/interface/web/admin/software_package_install.php +++ b/interface/web/admin/software_package_install.php @@ -114,10 +114,11 @@ if($install_server_id > 0 && $package_name != '' && ($package['package_installab $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 c314f46929..73850f43a3 100644 --- a/interface/web/client/lib/lang/hr.lng +++ b/interface/web/client/lib/lang/hr.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index 0637b904a6..a635281957 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -1,17 +1,17 @@ diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng index 535a19132d..8a69d30872 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 @@ diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng index 37c350b829..3f932b16a9 100644 --- a/interface/web/client/lib/lang/hr_reseller.lng +++ b/interface/web/client/lib/lang/hr_reseller.lng @@ -1,17 +1,17 @@ diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng index cc5b32257b..095afc4080 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['unlimited_txt'] = 'neograničeno'; $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 54fe173eca..6396ece152 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 @@ diff --git a/interface/web/designer/lib/lang/hr_form_list.lng b/interface/web/designer/lib/lang/hr_form_list.lng index 47432257fd..9efdf782c9 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 @@ diff --git a/interface/web/designer/lib/lang/hr_form_show.lng b/interface/web/designer/lib/lang/hr_form_show.lng index 18a1624535..e83272a30a 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 @@ diff --git a/interface/web/designer/lib/lang/hr_module_edit.lng b/interface/web/designer/lib/lang/hr_module_edit.lng index 592ccd76bc..b4aa48af57 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 @@ Description -

-Modulename: Name of the module directory. Only numbers, chars and underscore allowed.
-Moduletitle: Will be shown in the (upper) main navigation.
-Template file: Template file of the module. Currently available: module.tpl.htm and module_tree.tpl.htm. Default is module.tpl.htm.
-NaviFrame: If module_tree.tpl.htm selected as template file, enter here the path to the script file for the left frame.
-Default page: These page will be shown when the module is opened.
-Tab width: 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%).
-Hint: 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'] = 'Opis

Naziv modula: Naziv direktorija sa modulima. Dozvoljeni samo brojevi, znakovi i podcrta.
Moduletitle: Will be shown in the (upper) main navigation.
Template file: Template file of the module. Currently available: module.tpl.htm and module_tree.tpl.htm. Default is module.tpl.htm.
NaviFrame: If module_tree.tpl.htm selected as template file, enter here the path to the script file for the left frame.
Default page: These page will be shown when the module is opened.
Tab width: 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%).
Hint: 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 bc9ebed580..3528a6de3b 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 @@ 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 fa5f15aa9e..42c8e14a81 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 @@ 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 23f7d1592a..ee9208fcfd 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 @@ diff --git a/interface/web/designer/lib/lang/hr_module_show.lng b/interface/web/designer/lib/lang/hr_module_show.lng index 2a54c4d856..98c6144f9b 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 @@ diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php index 3aaaf3f872..d6f948ce83 100644 --- a/interface/web/dns/dns_import.php +++ b/interface/web/dns/dns_import.php @@ -120,6 +120,10 @@ if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSIO $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 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' } // 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 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' // 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,24 +652,21 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' $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 8b25f73566..d01b6b31b9 100644 --- a/interface/web/dns/lib/lang/ar.lng +++ b/interface/web/dns/lib/lang/ar.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/ar_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 8b25f73566..d01b6b31b9 100644 --- a/interface/web/dns/lib/lang/bg.lng +++ b/interface/web/dns/lib/lang/bg.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/bg_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 fd2eb370cf..6eebf3b47b 100644 --- a/interface/web/dns/lib/lang/br.lng +++ b/interface/web/dns/lib/lang/br.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'TXT DNS'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/br_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 6a938278cf..2ba4af4140 100644 --- a/interface/web/dns/lib/lang/cz.lng +++ b/interface/web/dns/lib/lang/cz.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/cz_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 8200e568eb..f5d7a002b3 100644 --- a/interface/web/dns/lib/lang/de.lng +++ b/interface/web/dns/lib/lang/de.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/de_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 cf2e062d6b..f76afed784 100644 --- a/interface/web/dns/lib/lang/el.lng +++ b/interface/web/dns/lib/lang/el.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/el_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 565d92aac4..e4636a4970 100644 --- a/interface/web/dns/lib/lang/en.lng +++ b/interface/web/dns/lib/lang/en.lng @@ -18,9 +18,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/en_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 80cbbfda22..889f129dc8 100644 --- a/interface/web/dns/lib/lang/es.lng +++ b/interface/web/dns/lib/lang/es.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/es_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 1c628f8b55..9ba76a50ee 100755 --- a/interface/web/dns/lib/lang/fi.lng +++ b/interface/web/dns/lib/lang/fi.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT-tietue'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/fi_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 d7e7901d12..6ec30d3616 100644 --- a/interface/web/dns/lib/lang/fr.lng +++ b/interface/web/dns/lib/lang/fr.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/fr_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 39d393f2f2..1495b3e6d3 100644 --- a/interface/web/dns/lib/lang/hr.lng +++ b/interface/web/dns/lib/lang/hr.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 19ff54a571..71e0f3be23 100644 --- a/interface/web/dns/lib/lang/hr_dns_a.lng +++ b/interface/web/dns/lib/lang/hr_dns_a.lng @@ -1,16 +1,16 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_a_list.lng b/interface/web/dns/lib/lang/hr_dns_a_list.lng index 808e4a8155..a9ec1a5bcd 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['type_txt'] = 'Vrsta'; $wb['add_new_record_txt'] = 'Dodaj novi A zapis'; $wb['page_txt'] = 'Stranica'; $wb['page_of_txt'] = 'od'; -$wb['delete_confirmation'] = 'Sigurno želite obrisati obaj zapis?'; +$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 705c72323c..687f9b6d9c 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 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_alias.lng b/interface/web/dns/lib/lang/hr_dns_alias.lng index 5842cd176a..bece686897 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 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_cname.lng b/interface/web/dns/lib/lang/hr_dns_cname.lng index 9474a15ebb..40293dacd5 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 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_hinfo.lng b/interface/web/dns/lib/lang/hr_dns_hinfo.lng index e8d7eee9a3..4b7ac5a73a 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 @@ 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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/hr_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 97e801acb0..8375fe82a1 100644 --- a/interface/web/dns/lib/lang/hr_dns_mx.lng +++ b/interface/web/dns/lib/lang/hr_dns_mx.lng @@ -1,16 +1,16 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_ns.lng b/interface/web/dns/lib/lang/hr_dns_ns.lng index 6a7ad8a828..631df4bd8e 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 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_ptr.lng b/interface/web/dns/lib/lang/hr_dns_ptr.lng index 08d6b34986..c495196b89 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 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_rp.lng b/interface/web/dns/lib/lang/hr_dns_rp.lng index 2989cfd357..6150258788 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 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_slave.lng b/interface/web/dns/lib/lang/hr_dns_slave.lng index b77fda588b..eff47df717 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 @@ 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 3d3b9bcefb..02fafc529d 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 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_soa.lng b/interface/web/dns/lib/lang/hr_dns_soa.lng index 8c0627be53..62e9a09622 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['serial_txt'] = 'Serial'; $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
these IPs (comma separated list)'; +$wb['xfer_txt'] = 'Dozvoli transfer zona
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 2007397f2f..cb9cbe07cd 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 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_srv.lng b/interface/web/dns/lib/lang/hr_dns_srv.lng index 2826f019ce..964bfe9188 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 @@ 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 8d9d730e50..22d83c62e0 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 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_txt.lng b/interface/web/dns/lib/lang/hr_dns_txt.lng index 4dcc1367ef..9a134634b1 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 @@ diff --git a/interface/web/dns/lib/lang/hu.lng b/interface/web/dns/lib/lang/hu.lng index 5882a281af..a59eba705d 100644 --- a/interface/web/dns/lib/lang/hu.lng +++ b/interface/web/dns/lib/lang/hu.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/hu_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 b47b55c5d5..53b41113dc 100644 --- a/interface/web/dns/lib/lang/id.lng +++ b/interface/web/dns/lib/lang/id.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 8b25f73566..d01b6b31b9 100644 --- a/interface/web/dns/lib/lang/it.lng +++ b/interface/web/dns/lib/lang/it.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/it_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 06608e6f85..de5c4b89ca 100644 --- a/interface/web/dns/lib/lang/ja.lng +++ b/interface/web/dns/lib/lang/ja.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/ja_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 8b25f73566..d01b6b31b9 100644 --- a/interface/web/dns/lib/lang/nl.lng +++ b/interface/web/dns/lib/lang/nl.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/nl_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 2c8e1523f9..29a4a9b4b9 100644 --- a/interface/web/dns/lib/lang/pl.lng +++ b/interface/web/dns/lib/lang/pl.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/pl_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 6619a86c57..0fc83af1af 100644 --- a/interface/web/dns/lib/lang/pt.lng +++ b/interface/web/dns/lib/lang/pt.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'TXT DNS'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/pt_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 5707dfca37..aa151ae273 100644 --- a/interface/web/dns/lib/lang/ro.lng +++ b/interface/web/dns/lib/lang/ro.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/ro_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 edc717efde..89ac9986d8 100644 --- a/interface/web/dns/lib/lang/ru.lng +++ b/interface/web/dns/lib/lang/ru.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/ru_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 8b25f73566..d01b6b31b9 100644 --- a/interface/web/dns/lib/lang/se.lng +++ b/interface/web/dns/lib/lang/se.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/se_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 70b57d6e4d..b03931fe08 100644 --- a/interface/web/dns/lib/lang/sk.lng +++ b/interface/web/dns/lib/lang/sk.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/sk_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 37fb8b162a..56ec2f92dd 100644 --- a/interface/web/dns/lib/lang/tr.lng +++ b/interface/web/dns/lib/lang/tr.lng @@ -17,9 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $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 0000000000..536c62f781 --- /dev/null +++ b/interface/web/dns/lib/lang/tr_dns_import.lng @@ -0,0 +1,14 @@ + \ 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 90fd78f1af..cdaa164cfc 100644 --- a/interface/web/dns/templates/dns_import.htm +++ b/interface/web/dns/templates/dns_import.htm @@ -1,10 +1,6 @@

- -

ERROR

- -
@@ -24,7 +20,7 @@
- +
diff --git a/interface/web/help/lib/lang/hr.lng b/interface/web/help/lib/lang/hr.lng index 2ac8971686..fd9153f239 100644 --- a/interface/web/help/lib/lang/hr.lng +++ b/interface/web/help/lib/lang/hr.lng @@ -4,11 +4,11 @@ $wb['Message'] = 'Poruka'; $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 dfc4e8799c..ca798d79e0 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 @@ 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 54e727dead..54f46e270e 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 @@ 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 dab0863b81..5eba900af4 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 @@ 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 b6c7b460b9..9d910dc0d3 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 @@ 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 cb6ce84c05..91c78e4485 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 @@ diff --git a/interface/web/help/lib/lang/hr_support_message.lng b/interface/web/help/lib/lang/hr_support_message.lng index b2f02c3c24..2576d18346 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['sender_id_txt'] = 'ID pošiljatelja'; $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 a77b975964..49803cd8cf 100644 --- a/interface/web/login/lib/lang/hr.lng +++ b/interface/web/login/lib/lang/hr.lng @@ -13,5 +13,5 @@ $wb['user_regex_error'] = 'Korisničko ime sadrži nedozvoljene znakove ili je d $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 7f149eb964..6189fa162f 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['destination_error_isemail'] = 'Destination Emailaddress is invalid.'; $wb['limit_mailalias_txt'] = 'The max. number of email aliases for your account is reached.'; $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address'; $wb['domain_txt'] = 'Domain'; +$wb['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 2ed52d2cb3..09ef84edf8 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['source_password_error_isempty'] = 'Password is empty.'; $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 7f149eb964..6189fa162f 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['destination_error_isemail'] = 'Destination Emailaddress is invalid.'; $wb['limit_mailalias_txt'] = 'The max. number of email aliases for your account is reached.'; $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address'; $wb['domain_txt'] = 'Domain'; +$wb['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 2ed52d2cb3..09ef84edf8 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['source_password_error_isempty'] = 'Password is empty.'; $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 0d1a5fac2e..30084c032d 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['destination_error_isemail'] = 'Endereço de destino inválido'; $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 7e69772040..0593b1046c 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['source_password_error_isempty'] = 'Senha em branco.'; $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 32ab671f7e..38e43a33c8 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['destination_error_isemail'] = 'Cílová email adresa je chybná.'; $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 d23f5290ec..8c928d4df0 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['source_password_error_isempty'] = 'Heslo je prázdné.'; $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 acb0366264..45a564a2d1 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['email_error_unique'] = 'Doppelte E-Mail-Adresse.'; $wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.'; $wb['destination_error_isemail'] = 'Zieladresse ist ungültig.'; $wb['limit_mailalias_txt'] = 'Die maximale Anzahl an E-Mail-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 706af98b72..86b7ba7262 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['source_password_error_isempty'] = 'Passwort ist leer.'; $wb['destination_error_isemail'] = 'Kein Ziel gewählt.'; $wb['source_server_error_regex'] = 'POP3/IMAP Server ist kein gültiger Domainname.'; $wb['source_read_all_txt'] = '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 767b35a859..61e1acd6aa 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['destination_error_isemail'] = 'Η διεύθυνση Email παραλήπτ $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 b4a7784f5e..500b16aba8 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['source_password_error_isempty'] = 'Το Συνθηματικό δεν έχ $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 f1c715a05d..02f753c492 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["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["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 8de440f6f2..ac79ff0de4 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['destination_error_isemail'] = 'La dirección de correo de destino no es vá $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 6f9035b3c3..a6f04d8ab0 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['source_password_error_isempty'] = 'La contraseña está vacía.'; $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 8c56f51cfa..cdd1143fa2 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['destination_error_isemail'] = 'Kohteena oleva sähköpostiosoite on väär $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 3e58cc13e8..065d149b95 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['source_password_error_isempty'] = 'Salasana-kenttä on tyhjä.'; $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 55450d475e..7b2653dabb 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['destination_error_isemail'] = 'L\'adresse email de destination est invalide $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 700f6738a9..b009745867 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['source_password_error_isempty'] = 'Le mot de passe est vide.'; $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 1563955caa..9ed8c6eef0 100644 --- a/interface/web/mail/lib/lang/hr.lng +++ b/interface/web/mail/lib/lang/hr.lng @@ -1,47 +1,47 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_alias.lng b/interface/web/mail/lib/lang/hr_mail_alias.lng index f78f29dc86..210f114217 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 @@ 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 de017ff9b0..2790cb345d 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 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng b/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng index ed78dab978..fc77f6c739 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 @@ 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 e7bfeb084a..3aa5514916 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 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_blacklist.lng b/interface/web/mail/lib/lang/hr_mail_blacklist.lng index 3f0269c84a..dbce8de10d 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 @@ 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 0d1231f273..8cbb63a3bd 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 @@ 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 2b02a0023f..f012957a76 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 @@ 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 d3c273e9d0..2657227009 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['list_head_txt'] = 'Postfix Header and Body Checks'; $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 2a3127f07d..6dae122b59 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['server_id_txt'] = 'Server'; $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 656645918b..4d13ef314f 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 @@ 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 e154524ae1..798ee13678 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 @@ 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 ae11977169..81108fa9e0 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 @@ 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 8b80909438..e078c283cb 100644 --- a/interface/web/mail/lib/lang/hr_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_domain_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_forward.lng b/interface/web/mail/lib/lang/hr_mail_forward.lng index 328a685ad5..187a2444c1 100644 --- a/interface/web/mail/lib/lang/hr_mail_forward.lng +++ b/interface/web/mail/lib/lang/hr_mail_forward.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_forward_list.lng b/interface/web/mail/lib/lang/hr_mail_forward_list.lng index 3312f6355f..895fafb6db 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 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_get.lng b/interface/web/mail/lib/lang/hr_mail_get.lng index 00ed647757..6d14eabcc1 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_server_txt'] = 'Pop3/Imap Server'; $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['source_password_error_isempty'] = 'Password is empty.'; $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 624d587bb4..9cd92dd970 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 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_mailinglist.lng b/interface/web/mail/lib/lang/hr_mail_mailinglist.lng index 3209ff1920..0840162010 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 @@ 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 8eebde9035..48b8c8b323 100644 --- a/interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng b/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng index 5d284784d0..3555ed250c 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 @@ 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 3b4586b49f..ad15e008b1 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['list_head_txt'] = 'Relay recipients'; $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 d0a7b40d55..174949933d 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 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng index 9845fa3905..7796423543 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['email_error_unique'] = 'Duplicate Email address.'; $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_unique'] = 'Login is already taken.'; $wb['login_error_regex'] = 'Valid characters are A-Z, a-z, 0-9, ., _ and -.'; $wb['login_txt'] = 'Login (optional)'; $wb['error_login_email_txt'] = 'This login is not allowed. Please enter a different login or use the mail address as login.'; +$wb['autoresponder_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 a4952c7010..dc90099436 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 @@ 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 2754259f47..d101a72177 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 @@ 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 3417eaacfd..762aea1d42 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 @@ diff --git a/interface/web/mail/lib/lang/hr_mail_whitelist.lng b/interface/web/mail/lib/lang/hr_mail_whitelist.lng index ce50ba9c1a..a43e8eef46 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 @@ 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 4459061722..7b65efadbf 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 @@ diff --git a/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng index 394bfc696a..8c018ac0fc 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['server_id_txt'] = 'Server'; $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 b63b9f5e12..8a21dd6689 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 70e49e22b8..ac925e4ee9 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 @@ 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 04491ae4cd..84381b241e 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 @@ diff --git a/interface/web/mail/lib/lang/hr_spamfilter_users.lng b/interface/web/mail/lib/lang/hr_spamfilter_users.lng index a93d94dbae..ff988f5d7a 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 @@ 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 2f39adf9da..7dd21f10a6 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 @@ 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 95fff21aba..15cd7d1d3b 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 @@ diff --git a/interface/web/mail/lib/lang/hu_mail_get.lng b/interface/web/mail/lib/lang/hu_mail_get.lng index b094544320..d3b2a12efd 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['source_password_error_isempty'] = 'Jelszó üres.'; $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 65ea128ed9..0464b461e5 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['destination_error_isemail'] = 'Alamat Email Tujuan tidak valid.'; $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 4518e25c32..1d191c08d4 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['source_password_error_isempty'] = 'Kata Sandi kosong.'; $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 444946849d..de4c92ef70 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['destination_error_isemail'] = 'Email destinatario non valida.'; $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 2ed52d2cb3..09ef84edf8 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['source_password_error_isempty'] = 'Password is empty.'; $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 b5225e36ac..613bf57b1d 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['destination_error_isemail'] = '転送先メールアドレスが不正で $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 87f541076c..d5f5c5c912 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['source_password_error_isempty'] = 'パスワードを指定してくださ $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 04d7cba5a5..03325fe891 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['destination_error_isemail'] = 'Bestemming Emailaddres is ongeldig.'; $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 a840c3f935..e62b547ef4 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['source_password_error_isempty'] = 'Wachtwoord is niet ingvuld.'; $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 0a3d047d98..a01e846372 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['destination_error_isemail'] = 'Element docelowy adresów e-mail jest niepop $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 1c241f4d9e..4d7c7f9a3d 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['source_password_error_isempty'] = 'Hasło jest puste.'; $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 cd062a3877..1225801f68 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['destination_error_isemail'] = 'Endereço de destino inválido'; $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 cbd31f04d2..c52ed1b715 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['source_password_error_isempty'] = 'Senha em branco.'; $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 d0caa8ce6c..04e0c0f215 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['destination_error_isemail'] = 'Destinatie Emailaddress invalida.'; $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 3d084a51a6..fe58991ef5 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['source_password_error_isempty'] = 'Password este necompletat'; $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 eea6689cf3..a10d2d7d68 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['destination_error_isemail'] = 'Email получателя неправил $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 847a8b1e03..f805f11bf7 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['source_password_error_isempty'] = 'Пустой пароль.'; $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 78b217dca8..c9a599350e 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['destination_error_isemail'] = 'Destination Emailaddress is invalid.'; $wb['limit_mailalias_txt'] = 'The max. number of email aliases for your account is reached.'; $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address'; $wb['domain_txt'] = 'Domain'; +$wb['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 2ed52d2cb3..09ef84edf8 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['source_password_error_isempty'] = 'Password is empty.'; $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 f68e6cd556..55310c1daf 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['destination_error_isemail'] = 'Cieľová E-mailová adresa je neplatná.'; $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 5dc3e6540a..9e51e5025c 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['destination_error_isemail'] = 'Hedef Email adresi geçersiz.'; $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 3d18fac6d1..18748afeb9 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['source_password_error_isempty'] = 'Şifre boş.'; $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 b7140b03d8..ebc3a87625 100644 --- a/interface/web/mail/mail_alias_edit.php +++ b/interface/web/mail/mail_alias_edit.php @@ -126,6 +126,15 @@ class page_action extends tform_actions { if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_mailbox_txt")."
"; 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")."
"; + unset($tmp); + parent::onSubmit(); } diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php index 33f86f5d6e..b8c8d9283d 100644 --- a/interface/web/mail/mail_forward_edit.php +++ b/interface/web/mail/mail_forward_edit.php @@ -74,7 +74,8 @@ class page_action extends tform_actions { $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 d5e1470094..b14129258a 100644 --- a/interface/web/monitor/lib/lang/hr.lng +++ b/interface/web/monitor/lib/lang/hr.lng @@ -18,7 +18,7 @@ $wb['no_data_rkhunter_txt'] = 'Nema podataka o RKHunter-u. Pokušajte ponovno ka $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 efa2d95034..f0f2a6e647 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_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['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 2e9bdbd401..825de799b2 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['parent_domain_id_error_empty'] = 'No website selected.'; $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 0df6947c0d..dbf18d9005 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 a2edac4530..63b1ae8014 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['quota_files_unity_txt'] = 'Files'; $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 741a7b3d79..e06a9f4e55 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['parent_domain_id_error_empty'] = 'No website selected.'; $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 69afc8da97..892b6fa749 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 369e415120..22042a9b1e 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_empty'] = 'Diretório vazio.'; $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 ea77c5d6da..4959f3677b 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['parent_domain_id_error_empty'] = 'Nenhum website selecionado.'; $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 f62f82955f..08ff842638 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 8877a7d4a1..50e4648757 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_empty'] = 'Adresář je prázdný.'; $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 67d13e4a83..869be16d1e 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['parent_domain_id_error_empty'] = 'Nevybrána žádná webová stránka.'; $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 fe9df29785..4cb2aa4096 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 f3903c5ff7..458cf382ab 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['password_strength_txt'] = 'Passwortkomplexität'; $wb['directory_error_notinweb'] = 'Das Verzeichnis befindet sich nicht innerhalb des Verzeichnisses der Website.'; $wb['parent_domain_id_error_empty'] = 'Keine Domain ausgewählt.'; $wb['quota_size_error_regex'] = '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 c2373ad83e..ebd5cfe66b 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['parent_domain_id_error_empty'] = 'Keine Website ausgewählt.'; $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 27a74ba9b3..a15b5d48d9 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_max_children_error_regex'] = 'PHP-FPM pm.max_children muß eine pos $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 8d8025b48d..ec4f26b21e 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_unique'] = 'Der Benutzername muss einzigartig sein.'; $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 d90d4f6098..7580313e0f 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_empty'] = 'Ο Φάκελος δεν έχει οριστεί $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 10125e2fc2..2cf302aeee 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['directory_error_empty'] = 'Ο φάκελος δεν έχει οριστεί $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 379ac33016..33a93dacfd 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 423bad5219..b213a4cc30 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_unique'] = 'Το Όνομα Χρήστη πρέπει να $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 bd6becf7b9..c02c4b60ac 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_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive $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 7754d7bfb3..1220783411 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['quota_files_unity_txt'] = 'Ficheros'; $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 251c783ac0..6950243936 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['parent_domain_id_error_empty'] = 'No se ha seleccionado un sitio web.'; $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 5381c2ba20..3c9c8a7c62 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 5fb29855e0..2d95d24b21 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['quota_files_unity_txt'] = 'Tiedostot'; $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 769c0dd605..09315dbc8e 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['parent_domain_id_error_empty'] = 'Ei www-sivua valittuna.'; $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 33fd699202..f10221b414 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 3e5b099c5e..de5ed66d17 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['quota_files_unity_txt'] = 'Fichiers'; $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 5712dcbc4a..607375dd2c 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['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.'; $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 a14e6a8ee8..ecd8e83c44 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 81a59b1333..fbeab3568b 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_unique'] = 'Le nom d\'utilisateur doit être unique'; $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 553cc45dc3..396accda74 100644 --- a/interface/web/sites/lib/lang/hr.lng +++ b/interface/web/sites/lib/lang/hr.lng @@ -6,7 +6,7 @@ $wb['Domain'] = 'Domena'; $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 93808464f3..65605aec32 100644 --- a/interface/web/sites/lib/lang/hr_cron.lng +++ b/interface/web/sites/lib/lang/hr_cron.lng @@ -1,21 +1,21 @@ diff --git a/interface/web/sites/lib/lang/hr_cron_list.lng b/interface/web/sites/lib/lang/hr_cron_list.lng index b7084f1b18..c0107df637 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 @@ diff --git a/interface/web/sites/lib/lang/hr_database.lng b/interface/web/sites/lib/lang/hr_database.lng index 7c473b6243..433823b66c 100644 --- a/interface/web/sites/lib/lang/hr_database.lng +++ b/interface/web/sites/lib/lang/hr_database.lng @@ -1,25 +1,25 @@ any)'; -$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 zasve adrese)'; +$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 e02346707d..dcfe205ff2 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 @@ diff --git a/interface/web/sites/lib/lang/hr_ftp_user.lng b/interface/web/sites/lib/lang/hr_ftp_user.lng index 3cd81baa85..88e5d71b8c 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 @@ 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 d5ed7e97aa..0165853751 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 @@ 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 9212ee4b7d..16fc32cfd9 100644 --- a/interface/web/sites/lib/lang/hr_shell_user_list.lng +++ b/interface/web/sites/lib/lang/hr_shell_user_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/hr_user_quota_stats_list.lng b/interface/web/sites/lib/lang/hr_user_quota_stats_list.lng index 716760b172..809e09e48a 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 @@ 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 39bc1df0b8..0b45aff791 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['active_txt'] = 'Aktivno'; $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 0e9302203a..accb66f950 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 @@ 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 62ee05f52f..b5e5d2b467 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 @@ diff --git a/interface/web/sites/lib/lang/hr_web_folder.lng b/interface/web/sites/lib/lang/hr_web_folder.lng index f6243344c8..5368119c97 100644 --- a/interface/web/sites/lib/lang/hr_web_folder.lng +++ b/interface/web/sites/lib/lang/hr_web_folder.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/sites/lib/lang/hr_web_folder_list.lng b/interface/web/sites/lib/lang/hr_web_folder_list.lng index 17774408b3..56965897a8 100644 --- a/interface/web/sites/lib/lang/hr_web_folder_list.lng +++ b/interface/web/sites/lib/lang/hr_web_folder_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/sites/lib/lang/hr_web_folder_user_list.lng b/interface/web/sites/lib/lang/hr_web_folder_user_list.lng index 9a1e187ed8..af7792fb6c 100644 --- a/interface/web/sites/lib/lang/hr_web_folder_user_list.lng +++ b/interface/web/sites/lib/lang/hr_web_folder_user_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng index 1d1bd891ab..adc3ecb920 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 @@ diff --git a/interface/web/sites/lib/lang/hr_webdav_user.lng b/interface/web/sites/lib/lang/hr_webdav_user.lng index 06bcd59aae..13a7d80886 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 @@ 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 ca1b7b87cf..f19b8dafbc 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 @@ diff --git a/interface/web/sites/lib/lang/hu_ftp_user.lng b/interface/web/sites/lib/lang/hu_ftp_user.lng index ddf1d7c818..437999aa8d 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['password_strength_txt'] = 'Jelszó erősségee'; $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 4b09074b44..de0c737ab2 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['parent_domain_id_error_empty'] = 'Nincs webhely kiválasztva.'; $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 5a07fc6533..a4cd7fea1a 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 3e24e3d269..f1538a1f7a 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_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['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 648582a343..600fac56a5 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_empty'] = 'Direktori kosong.'; $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 8f34b63737..b5141ff6ea 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['parent_domain_id_error_empty'] = 'Tak ada situs web yang dipilih.'; $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 279778db86..d119fabc18 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 0befac5e4a..84e750c830 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_unique'] = 'Nama Pengguna harus unik.'; $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 4cb5ff7f42..9ef19c7176 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['quota_files_unity_txt'] = 'Files'; $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 2e9bdbd401..825de799b2 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['parent_domain_id_error_empty'] = 'No website selected.'; $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 c6e68ace89..cd40e1914f 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 06998c2edf..bd1dbac52b 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_empty'] = 'ディレクトリを指定してください。 $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 61ccb10b51..963ed3465d 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['parent_domain_id_error_empty'] = 'ウェブサイトを選択してくだ $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 d655be2982..95e16b4b6b 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 41773ab78a..574879faf3 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_empty'] = 'Directory is niet ingvuld.'; $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 8aef6655dd..289bec1397 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['directory_error_empty'] = 'Directory is niet ingvuld.'; $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 49c662f6de..d408f37d28 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 7be73c4e00..dd7c5bc37a 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_unique'] = 'De gebruikersnaam moet uniek zijn.'; $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 0c6bf62e49..d6525a7aae 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_empty'] = 'Element docelowy jest pusty.'; $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 26dda704a7..d656152700 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['parent_domain_id_error_empty'] = 'Nie wybrano żadnej strony www.'; $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 d55c5b4d6e..6d4f5608e1 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 4ec79743a4..c244c5dfc5 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_unique'] = 'Nazwa użytkownika musi być unikalna.'; $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 6d3ae11e58..d7c44d3334 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_empty'] = 'Pasta vazia.'; $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 223f65ad16..87929c26b4 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['parent_domain_id_error_empty'] = 'Nenhum website seleccionado.'; $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 b4e7b1824c..53b6728cab 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 fe569ddff6..1a31a261be 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_empty'] = 'Directory necompletat'; $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 20c9a04672..6bd7f1b06d 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['parent_domain_id_error_empty'] = 'No website selected.'; $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 579ed8e32e..a1fd7e9c74 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 b858b73f39..c5375eefe7 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['quota_files_unity_txt'] = 'Файлы'; $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 586d9babbf..9b1542f530 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['parent_domain_id_error_empty'] = 'Web-сайт не выбран'; $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 a6295eba3e..a133e77c4a 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 b5a5f2ec74..2d56398516 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['quota_files_unity_txt'] = 'Files'; $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 2e9bdbd401..825de799b2 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['parent_domain_id_error_empty'] = 'No website selected.'; $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 53befe25fa..61ec442646 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 6f0cbad58c..c11755a6b0 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_empty'] = 'Adresár je prázdny.'; $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 7c56b7e00e..7e69cda135 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['parent_domain_id_error_empty'] = 'Žiadna zvolená webstránka.'; $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 ef3e87231f..bf20516d2a 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 768ed231de..c90f92a663 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_empty'] = 'Dizin boş.'; $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 50d98fd62d..f476515812 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['parent_domain_id_error_empty'] = 'Seçili websitesi yok.'; $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 7a132dbe0d..dae215879a 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_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $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 05c9892a7a..137c388b1d 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_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['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 0e5f6a6c2b..ffa5762d41 100644 --- a/interface/web/sites/templates/web_domain_ssl.htm +++ b/interface/web/sites/templates/web_domain_ssl.htm @@ -35,7 +35,7 @@
- +
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm index 0152727a49..aa4ec17009 100644 --- a/interface/web/themes/default/templates/main.tpl.htm +++ b/interface/web/themes/default/templates/main.tpl.htm @@ -108,7 +108,7 @@
-

ISPConfig 3

+

ISPConfig 3

hosting control panel 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 35e23db027..c90c9f225a 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 @@ LOGOUT -

ISPConfig 3

+

ISPConfig 3

hosting control panel diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm index 9795b860ef..5b73fbacbd 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 @@ LOGOUT -

ISPConfig 3

+

ISPConfig 3

hosting control panel 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 93f096ee74..ff939af3fe 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 @@ LOGOUT -

ISPConfig 3

+

ISPConfig 3

hosting control panel diff --git a/interface/web/tools/lib/lang/hr.lng b/interface/web/tools/lib/lang/hr.lng index 3a9c3c33a8..817d63e44e 100644 --- a/interface/web/tools/lib/lang/hr.lng +++ b/interface/web/tools/lib/lang/hr.lng @@ -4,6 +4,6 @@ $wb['Settings'] = 'Postavke'; $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 f7f199bc14..712685f050 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 @@ diff --git a/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng b/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng index 73e64ff27d..df88ca9f7b 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 @@ diff --git a/interface/web/vm/lib/lang/hr_openvz_template.lng b/interface/web/vm/lib/lang/hr_openvz_template.lng index 62e9dcab7c..eb7a49a729 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_num_txt'] = 'CPU cores'; $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_num_error_empty'] = 'CPU cores 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['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 af3fd1188c..206fe3a712 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 @@ diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 69c0f3b87c..f620b57f08 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -709,6 +709,11 @@ class apache2_plugin { $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 @@ class apache2_plugin { // 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 @@ class apache2_plugin { } $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 ac360700d8..5a4593a135 100644 --- a/server/plugins-available/mailman_plugin.inc.php +++ b/server/plugins-available/mailman_plugin.inc.php @@ -113,7 +113,7 @@ class mailman_plugin { $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 bdf4f15c5c..7352903a65 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -791,7 +791,7 @@ class nginx_plugin { // 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 @@ class nginx_plugin { } $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); -- GitLab