From 43b345cabb3e8743a91c39e8d6367c1aa594ebd2 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 17 Jan 2013 10:33:59 -0500
Subject: [PATCH] Merged revisions from 3.0.5 stable branch: 3758-3768, 3769 shall not be merged to trunk.
---
interface/web/vm/lib/lang/cz_openvz_ip.lng | 16
interface/web/admin/lib/lang/cz_language_edit.lng | 2
interface/web/designer/lib/lang/cz_module_nav_item_edit.lng | 8
interface/web/admin/lib/lang/cz_firewall.lng | 2
interface/web/help/lib/lang/cz_faq_manage_questions_list.lng | 2
interface/web/admin/lib/lang/cz_language_add.lng | 2
interface/web/vm/lib/lang/cz_openvz_ip_list.lng | 2
interface/web/admin/lib/lang/cz.lng | 6
interface/web/mail/lib/lang/cz_mail_whitelist.lng | 6
server/plugins-available/mysql_clientdb_plugin.inc.php | 2
interface/web/help/lib/lang/cz_faq_form.lng | 2
interface/web/admin/lib/lang/cz_language_import.lng | 2
interface/web/help/lib/lang/cz.lng | 2
interface/web/mailuser/lib/lang/cz_index.lng | 2
interface/web/monitor/lib/lang/cz_syslog_list.lng | 2
interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng | 4
interface/web/dashboard/lib/lang/cz_dashlet_modules.lng | 2
interface/web/mail/lib/lang/cz_mail_forward_list.lng | 2
interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng | 8
interface/web/admin/lib/lang/cz_software_repo.lng | 2
interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng | 2
interface/web/client/lib/lang/cz_domain_list.lng | 6
interface/web/admin/lib/lang/cz_software_package_install.lng | 4
interface/web/dns/lib/lang/cz_dns_slave_list.lng | 2
interface/web/designer/lib/lang/cz_form_list.lng | 2
interface/web/client/lib/lang/cz_domain.lng | 8
interface/web/designer/lib/lang/cz_module_list.lng | 2
interface/web/admin/lib/lang/cz_software_repo_list.lng | 2
interface/web/dns/lib/lang/cz_dns_template.lng | 2
interface/web/dns/lib/lang/cz.lng | 2
interface/web/mail/lib/lang/cz_mail_mailinglist.lng | 12
interface/web/sites/lib/lang/cz_web_domain_list.lng | 2
interface/web/sites/templates/web_domain_edit.htm | 13
interface/web/client/lib/lang/cz_client_template.lng | 40
interface/web/dns/lib/lang/cz_dns_cname.lng | 2
interface/web/monitor/lib/lang/cz.lng | 16
interface/web/mail/lib/lang/cz_spamfilter_users.lng | 4
interface/web/sites/lib/lang/cz_web_folder_list.lng | 2
interface/web/designer/lib/lang/cz.lng | 2
interface/web/designer/lib/lang/cz_module_nav_edit.lng | 2
interface/web/dns/lib/lang/cz_dns_aaaa.lng | 2
interface/web/help/lib/lang/cz_help_faq_list.lng | 4
interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng | 2
interface/web/admin/lib/lang/cz_server_list.lng | 2
interface/web/admin/lib/lang/cz_language_list.lng | 2
interface/web/sites/form/web_vhost_subdomain.tform.php | 4
interface/web/dns/lib/lang/cz_dns_soa_list.lng | 2
server/plugins-available/cron_jailkit_plugin.inc.php | 4
interface/web/client/lib/lang/cz_clients_list.lng | 4
interface/web/admin/lib/lang/cz_server_php_list.lng | 6
interface/web/sites/lib/lang/cz_user_quota_stats_list.lng | 4
interface/web/tools/lib/lang/cz_interface.lng | 2
interface/web/client/lib/lang/cz.lng | 26
interface/web/mail/lib/lang/cz_mail_whitelist_list.lng | 6
interface/web/vm/lib/lang/cz_openvz_vm.lng | 56 +
interface/web/dns/lib/lang/cz_dns_import.lng | 2
interface/web/mail/lib/lang/cz_mail_domain_list.lng | 2
interface/web/mail/lib/lang/cz_mail_get.lng | 6
interface/web/admin/lib/lang/cz_directive_snippets_list.lng | 4
interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng | 2
interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng | 4
interface/web/dns/lib/lang/cz_dns_mx.lng | 14
interface/web/mail/lib/lang/cz_mail_get_list.lng | 4
interface/web/help/lib/lang/cz_support_message.lng | 2
interface/web/mail/lib/lang/cz_mail_transport.lng | 4
interface/web/admin/lib/lang/cz_firewall_list.lng | 2
interface/web/login/lib/lang/cz.lng | 4
interface/web/admin/lib/lang/cz_software_package_list.lng | 2
interface/web/sites/lib/lang/cz_web_folder_user_list.lng | 2
interface/lib/classes/listform_tpl_generator.inc.php | 2
interface/web/mail/lib/lang/cz_mail_alias_list.lng | 2
server/plugins-available/apache2_plugin.inc.php | 31
interface/web/sites/lib/lang/cz_web_subdomain_list.lng | 2
interface/web/dns/lib/lang/cz_dns_alias.lng | 2
interface/web/sites/lib/lang/cz_database_admin_list.lng | 2
interface/web/sites/lib/lang/de.lng | 1
interface/web/client/lib/lang/cz_client_template_list.lng | 2
interface/web/client/lib/lang/cz_resellers_list.lng | 4
interface/web/vm/lib/lang/cz_openvz_template.lng | 18
interface/web/mail/lib/lang/cz_mail_content_filter_list.lng | 2
server/lib/classes/db_mysql.inc.php | 130 ++-
interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng | 4
interface/web/designer/lib/lang/cz_form_show.lng | 6
interface/web/sites/lib/lang/en_web_subdomain.lng | 1
interface/web/mail/lib/lang/cz_mail_forward.lng | 6
interface/web/sites/lib/lang/cz_shell_user_list.lng | 2
interface/web/mail/lib/lang/cz_mail_blacklist_list.lng | 6
interface/web/mail/lib/lang/cz_spamfilter_config_list.lng | 2
interface/web/sites/form/web_aliasdomain.tform.php | 2
interface/web/dashboard/lib/lang/cz_dashlet_limits.lng | 2
interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng | 2
interface/web/mail/lib/lang/cz_mail_blacklist.lng | 6
interface/web/vm/lib/lang/cz_openvz_template_list.lng | 2
interface/web/admin/lib/lang/cz_tpl_default_admin.lng | 20
interface/web/dns/lib/lang/cz_dns_a.lng | 2
interface/web/admin/lib/lang/cz_server_php.lng | 20
interface/web/tools/lib/lang/cz_usersettings.lng | 2
interface/web/mailuser/lib/lang/cz.lng | 4
interface/web/dns/lib/lang/cz_dns_txt.lng | 2
interface/web/admin/lib/lang/cz_server_ip.lng | 2
interface/web/admin/lib/lang/cz_system_config.lng | 12
interface/web/designer/lib/lang/cz_form_edit.lng | 2
interface/web/vm/lib/lang/cz_openvz_vm_list.lng | 14
server/plugins-available/nginx_plugin.inc.php | 211 ++++--
interface/lib/classes/db_mysql.inc.php | 35
interface/web/admin/lib/lang/cz_language_complete.lng | 4
interface/web/tools/lib/lang/cz.lng | 2
interface/web/admin/lib/lang/cz_directive_snippets.lng | 4
interface/web/themes/default/templates/main.tpl.htm | 6
interface/web/sites/lib/lang/cz.lng | 13
interface/web/sites/lib/lang/cz_web_domain_admin_list.lng | 2
interface/web/client/lib/lang/cz_client_del.lng | 2
interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng | 4
interface/web/sites/lib/lang/cz_shell_user.lng | 2
interface/web/admin/lib/lang/cz_groups_list.lng | 2
interface/web/sites/lib/lang/cz_ftp_user_list.lng | 2
interface/web/admin/lib/lang/cz_server_ip_list.lng | 4
interface/web/sites/lib/lang/cz_web_aliasdomain.lng | 4
interface/web/sites/lib/lang/en.lng | 1
interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng | 2
interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng | 2
interface/web/sites/lib/lang/cz_webdav_user_list.lng | 2
interface/web/sites/lib/lang/cz_web_subdomain.lng | 2
interface/web/sites/web_aliasdomain_edit.php | 5
interface/web/mail/lib/lang/cz_mail_user_list.lng | 2
interface/web/mail/lib/lang/cz_mail_user.lng | 4
interface/web/tools/lib/lang/cz_import_ispconfig.lng | 2
interface/web/client/lib/lang/cz_reseller.lng | 46
interface/web/mail/lib/lang/cz_mail_user_filter_list.lng | 4
interface/web/mail/lib/lang/cz_spamfilter_users_list.lng | 6
interface/lib/classes/remoting_lib.inc.php | 8
interface/web/tools/lib/lang/cz_resync.lng | 2
interface/web/sites/lib/lang/cz_database_user_admin_list.lng | 2
interface/web/mail/lib/lang/cz_mail_user_stats_list.lng | 2
interface/web/dns/lib/lang/cz_dns_hinfo.lng | 2
interface/web/client/lib/lang/cz_client_circle_list.lng | 16
interface/web/client/lib/lang/cz_client_message.lng | 18
interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng | 2
interface/web/client/lib/lang/cz_client_circle.lng | 14
interface/web/sites/lib/lang/cz_aps.lng | 2
interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng | 2
interface/web/designer/lib/lang/cz_module_show.lng | 4
interface/web/admin/lib/lang/cz_iptables_list.lng | 4
interface/web/mail/lib/lang/cz.lng | 31
interface/web/sites/lib/lang/cz_web_domain.lng | 2
interface/web/admin/lib/lang/cz_remote_user_list.lng | 2
server/conf/nginx_vhost.conf.master | 13
interface/web/mail/lib/lang/cz_spamfilter_config.lng | 4
interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng | 2
interface/web/mail/lib/lang/cz_mail_content_filter.lng | 2
interface/web/sites/lib/lang/cz_database_user.lng | 14
interface/web/sites/lib/lang/cz_database_user_list.lng | 2
interface/web/vm/lib/lang/cz_openvz_action.lng | 4
interface/web/sites/templates/web_vhost_subdomain_edit.htm | 34
interface/web/help/lib/lang/cz_support_message_list.lng | 2
interface/web/sites/lib/lang/cz_database.lng | 10
interface/lib/classes/tform.inc.php | 8
interface/web/mail/lib/lang/cz_mail_domain_catchall.lng | 10
interface/web/mail/lib/lang/cz_mail_transport_list.lng | 2
interface/web/sites/web_domain_edit.php | 5
interface/web/admin/lib/lang/cz_users.lng | 6
interface/web/dns/lib/lang/cz_dns_ns.lng | 2
interface/web/admin/lib/lang/cz_language_export.lng | 2
interface/web/mail/lib/lang/cz_mail_relay_recipient.lng | 6
interface/web/admin/lib/lang/cz_server_config.lng | 66 +-
interface/web/sites/form/web_subdomain.tform.php | 2
interface/web/sites/lib/lang/cz_ftp_user.lng | 2
interface/web/dashboard/lib/lang/cz.lng | 2
interface/web/sites/lib/lang/cz_web_backup_list.lng | 4
interface/web/sites/lib/lang/cz_web_folder_user.lng | 2
interface/web/mailuser/lib/lang/cz_mail_user_password.lng | 2
interface/web/mail/lib/lang/cz_mail_domain.lng | 8
interface/web/dns/lib/lang/cz_dns_rp.lng | 2
interface/web/admin/lib/lang/cz_software_update_list.lng | 2
interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng | 2
interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng | 6
interface/web/mailuser/lib/lang/cz_mail_user_filter.lng | 4
interface/web/sites/lib/lang/cz_web_sites_stats_list.lng | 2
interface/web/admin/lib/lang/cz_groups.lng | 2
interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng | 2
interface/web/sites/form/web_domain.tform.php | 2
interface/web/admin/lib/lang/cz_users_list.lng | 4
interface/web/client/lib/lang/cz_client.lng | 62 +-
interface/web/tools/lib/lang/cz_tpl_default.lng | 12
interface/web/sites/lib/lang/cz_cron_list.lng | 4
interface/web/dns/lib/lang/cz_dns_a_list.lng | 16
interface/web/sites/lib/lang/cz_cron.lng | 2
interface/web/dns/lib/lang/cz_dns_template_list.lng | 2
interface/web/admin/lib/lang/cz_iptables.lng | 4
interface/web/sites/web_subdomain_edit.php | 5
interface/lib/lang/cz.lng | 2
interface/web/dns/lib/lang/cz_dns_ptr.lng | 4
interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng | 2
interface/web/admin/lib/lang/cz_server_config_list.lng | 2
interface/web/mail/lib/lang/cz_mail_spamfilter.lng | 12
interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng | 2
interface/web/mail/lib/lang/cz_spamfilter_policy.lng | 2
interface/web/sites/lib/lang/cz_web_folder.lng | 2
interface/web/tools/lib/lang/cz_index.lng | 2
interface/web/dns/lib/lang/cz_dns_srv.lng | 4
interface/web/sites/lib/lang/cz_webdav_user.lng | 2
interface/web/vm/lib/lang/cz.lng | 10
interface/web/mail/lib/lang/cz_mail_alias.lng | 8
interface/web/help/lib/lang/cz_help_faq_sections_list.lng | 2
interface/web/dns/lib/lang/cz_dns_slave.lng | 2
interface/web/mail/lib/lang/cz_mail_user_filter.lng | 4
interface/web/sites/lib/lang/de_web_subdomain.lng | 1
interface/web/vm/lib/lang/cz_openvz_ostemplate.lng | 4
interface/web/admin/lib/lang/cz_package_install.lng | 8
interface/web/mail/lib/lang/cz_user_quota_stats_list.lng | 6
interface/web/dns/lib/lang/cz_dns_soa.lng | 6
interface/web/sites/lib/lang/cz_aps_instances_list.lng | 18
interface/web/designer/lib/lang/cz_module_edit.lng | 2
interface/web/mail/lib/lang/cz_mail_aliasdomain.lng | 4
interface/web/monitor/lib/lang/cz_datalog_list.lng | 2
interface/web/admin/lib/lang/cz_server.lng | 10
interface/web/admin/lib/lang/cz_remote_user.lng | 4
interface/web/sites/lib/lang/cz_aps_packages_list.lng | 12
interface/web/mailuser/lib/lang/cz_mail_user_cc.lng | 2
interface/web/sites/lib/lang/cz_database_list.lng | 2
interface/web/admin/lib/lang/cz_remote_action.lng | 6
interface/web/dns/lib/lang/cz_dns_wizard.lng | 14
222 files changed, 1,144 insertions(+), 560 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 5ea448a..02ad8d3 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -61,10 +61,9 @@
if ($this->connect_error) {
$this->updateError('DB::__construct');
return false;
+ } else {
+ $this->setCharacterEncoding();
}
- parent::query( 'SET NAMES '.$this->dbCharset);
- parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
-
}
public function __destruct() {
@@ -89,14 +88,36 @@
// This right here will allow us to use the samefile for server & interface
if($this->show_error_messages) {
echo $error_msg;
- } else if(method_exists($app, 'log')) {
+ } else if(is_object($app) && method_exists($app, 'log')) {
$app->log($error_msg, LOGLEVEL_WARN);
}
}
}
+
+ private function setCharacterEncoding() {
+ parent::query( 'SET NAMES '.$this->dbCharset);
+ parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
+ }
public function query($queryString) {
- parent::ping();
+ $try = 0;
+ do {
+ $try++;
+ $ok = parent::ping();
+ if(!$ok) {
+ if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) {
+ if($try > 9) {
+ $this->updateError('DB::query -> reconnect');
+ return false;
+ } else {
+ sleep(1);
+ }
+ } else {
+ $this->setCharacterEncoding();
+ $ok = true;
+ }
+ }
+ } while($ok == false);
$this->queryId = parent::query($queryString);
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
if($this->errorNumber) debug_print_backtrace();
@@ -184,10 +205,10 @@
if(is_array($record_old) && count($record_old) > 0) {
foreach($record_old as $key => $val) {
// if(!isset($record_new[$key]) || $record_new[$key] != $val) {
- if($record_new[$key] != $val) {
+ if(@$record_new[$key] != $val) {
// Record has changed
$diffrec_full['old'][$key] = $val;
- $diffrec_full['new'][$key] = $record_new[$key];
+ $diffrec_full['new'][$key] = @$record_new[$key];
$diff_num++;
} else {
$diffrec_full['old'][$key] = $val;
diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php
index ff4f3e7..0ccf65c 100644
--- a/interface/lib/classes/listform_tpl_generator.inc.php
+++ b/interface/lib/classes/listform_tpl_generator.inc.php
@@ -94,7 +94,7 @@
$html .= " <td class=\"tbl_col_buttons\">
<div class=\"buttons icons16\">
- <a class=\"icons16 icoDelete\" href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\"><span>{tmpl_var name='delete_txt'}</span></a>
+ <a class=\"button icons16 icoDelete\" href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\"><span>{tmpl_var name='delete_txt'}</span></a>
</div>
</td>
</tr>
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 617250c..c636518 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -681,7 +681,9 @@
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
- $sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), ";
+ $tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
+ $record[$key] = $tmp['crypted'];
+ $sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
} else {
$record[$key] = md5(stripslashes($record[$key]));
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
@@ -708,7 +710,9 @@
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
- $sql_update .= "`$key` = PASSWORD('".$app->db->quote($record[$key])."'), ";
+ $tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
+ $record[$key] = $tmp['crypted'];
+ $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
} else {
$record[$key] = md5(stripslashes($record[$key]));
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index c51e3e1..bd28db4 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -1057,7 +1057,9 @@
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
} elseif ($field['encryption'] == 'MYSQL') {
- $sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), ";
+ $tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
+ $record[$key] = $tmp['crypted'];
+ $sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
} elseif ($field['encryption'] == 'CLEARTEXT') {
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
} else {
@@ -1084,7 +1086,9 @@
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
- $sql_update .= "`$key` = PASSWORD('".$app->db->quote($record[$key])."'), ";
+ $tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
+ $record[$key] = $tmp['crypted'];
+ $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
} elseif (isset($field['encryption']) && $field['encryption'] == 'CLEARTEXT') {
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
} else {
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 0179788..a0cf367 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -131,3 +131,5 @@
$wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro adresáře chráněné heslem';
$wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng
index c531b68..8c80d12 100644
--- a/interface/web/admin/lib/lang/cz.lng
+++ b/interface/web/admin/lib/lang/cz.lng
@@ -25,9 +25,9 @@
$wb['Web'] = 'Web';
$wb['FastCGI'] = 'FastCGI';
$wb['Jailkit'] = 'Jailkit';
-$wb['Rescue'] = 'Monitorování';
+$wb['Rescue'] = 'Zachrána';
$wb['Server IP addresses'] = 'IP adresy serveru';
-$wb['Additional PHP Versions'] = 'Další PHP verze';
+$wb['Additional PHP Versions'] = 'Další verze PHP';
$wb['Firewall'] = 'Firewall';
$wb['Interface'] = 'Rozhraní';
$wb['Interface Config'] = 'Hlavní konfigurace';
@@ -48,3 +48,5 @@
$wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig';
$wb['Directive Snippets'] = 'Directive Snippets';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets.lng b/interface/web/admin/lib/lang/cz_directive_snippets.lng
index 2204ff5..9a579d2 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng
@@ -1,9 +1,11 @@
<?php
$wb['Directive Snippets'] = 'Directive Snippets';
$wb['name_txt'] = 'Name of Snippet';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Verze';
$wb['snippet_txt'] = 'Snippet';
$wb['active_txt'] = 'Aktivní';
$wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
index 42d45a6..cf1bb28 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
@@ -2,6 +2,8 @@
$wb['list_head_txt'] = 'Directive Snippets';
$wb['active_txt'] = 'Aktivní';
$wb['name_txt'] = 'Name of Snippet';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Verze';
$wb['add_new_record_txt'] = 'Add Directive Snippet';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_firewall.lng b/interface/web/admin/lib/lang/cz_firewall.lng
index c6146ae..df9386a 100644
--- a/interface/web/admin/lib/lang/cz_firewall.lng
+++ b/interface/web/admin/lib/lang/cz_firewall.lng
@@ -9,3 +9,5 @@
$wb['tcp_ports_error_regex'] = 'Znak není povole v definici TCP portu. Povolené symboly jsou čísla, : a ,.';
$wb['udp_ports_error_regex'] = 'Znak není povole v definici UDP portu. Povolené symboly jsou čísla, : a ,.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_firewall_list.lng b/interface/web/admin/lib/lang/cz_firewall_list.lng
index aecc4cf..da1af43 100644
--- a/interface/web/admin/lib/lang/cz_firewall_list.lng
+++ b/interface/web/admin/lib/lang/cz_firewall_list.lng
@@ -6,3 +6,5 @@
$wb['udp_port_txt'] = 'Otevřené UDP porty';
$wb['add_new_record_txt'] = 'Přidat záznam';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_groups.lng b/interface/web/admin/lib/lang/cz_groups.lng
index a6281be..0f1a6be 100644
--- a/interface/web/admin/lib/lang/cz_groups.lng
+++ b/interface/web/admin/lib/lang/cz_groups.lng
@@ -3,3 +3,5 @@
$wb['name_txt'] = 'Skupina';
$wb['name_err'] = 'Skupina musí mít min. 1, max. 30 znaků.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_groups_list.lng b/interface/web/admin/lib/lang/cz_groups_list.lng
index c1d7ef9..f285b38 100644
--- a/interface/web/admin/lib/lang/cz_groups_list.lng
+++ b/interface/web/admin/lib/lang/cz_groups_list.lng
@@ -5,3 +5,5 @@
$wb['add_new_record_txt'] = 'Přidat skupinu';
$wb['warning_txt'] = '<b>VAROVÁNÍ:</b> Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_iptables.lng b/interface/web/admin/lib/lang/cz_iptables.lng
index d6f45fe..4e2b8a4 100644
--- a/interface/web/admin/lib/lang/cz_iptables.lng
+++ b/interface/web/admin/lib/lang/cz_iptables.lng
@@ -4,10 +4,12 @@
$wb['singleport_txt'] = 'Single Port';
$wb['protocol_txt'] = 'Protocol';
$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
+$wb['target_txt'] = 'Cíl';
$wb['state_txt'] = 'State';
$wb['destination_ip_txt'] = 'Destination Address';
$wb['source_ip_txt'] = 'Source Address';
$wb['active_txt'] = 'Aktivní';
$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng
index a823c4c..99dab01 100644
--- a/interface/web/admin/lib/lang/cz_iptables_list.lng
+++ b/interface/web/admin/lib/lang/cz_iptables_list.lng
@@ -6,10 +6,12 @@
$wb['singleport_txt'] = 'Single Port';
$wb['protocol_txt'] = 'Protocol';
$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
+$wb['target_txt'] = 'Cíl';
$wb['state_txt'] = 'State';
$wb['destination_ip_txt'] = 'Destination Address';
$wb['source_ip_txt'] = 'Source Address';
$wb['active_txt'] = 'Aktivní';
$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng
index 285dff2..d95f12e 100644
--- a/interface/web/admin/lib/lang/cz_language_add.lng
+++ b/interface/web/admin/lib/lang/cz_language_add.lng
@@ -6,3 +6,5 @@
$wb['btn_save_txt'] = 'Vytvořit novou jazykovou sadu souborů';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_complete.lng b/interface/web/admin/lib/lang/cz_language_complete.lng
index 2967693..eb222b3 100644
--- a/interface/web/admin/lib/lang/cz_language_complete.lng
+++ b/interface/web/admin/lib/lang/cz_language_complete.lng
@@ -1,7 +1,9 @@
<?php
$wb['list_head_txt'] = 'Sloučit jazykový soubor';
-$wb['list_desc_txt'] = 'Sloučit vybraný jazykový soubor s hlavním anglickým jazykovým souborem. <br />Toto přidá chybějící řetězce z anglického hlavního souboru do vybraného jazykového souboru. Odebere také zrušené řetezce. <br /> V nových verzích ISPConfigu vznikají nové moduly a položky, které chybějí ve starších jazykových souborech a takto je doplníte k překladu.';
+$wb['list_desc_txt'] = 'Sloučit vybraný jazykový soubor s hlavním anglickým jazykovým souborem. <br />Toto přidá chybějící řetězce z anglického hlavního souboru do vybraného jazykového souboru. <br /> V nových verzích ISPConfigu vznikají nové moduly a položky, které chybějí ve starších jazykových souborech a takto je doplníte k překladu.';
$wb['language_select_txt'] = 'Vybrat jazyk k doplnění';
$wb['btn_save_txt'] = 'Sloučit / doplnit jazykový soubor';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_edit.lng b/interface/web/admin/lib/lang/cz_language_edit.lng
index 2a71ed0..f880e6d 100644
--- a/interface/web/admin/lib/lang/cz_language_edit.lng
+++ b/interface/web/admin/lib/lang/cz_language_edit.lng
@@ -6,3 +6,5 @@
$wb['btn_save_txt'] = 'Uložit';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_export.lng b/interface/web/admin/lib/lang/cz_language_export.lng
index 7998eea..7ffdccf 100644
--- a/interface/web/admin/lib/lang/cz_language_export.lng
+++ b/interface/web/admin/lib/lang/cz_language_export.lng
@@ -4,3 +4,5 @@
$wb['btn_save_txt'] = 'Uložit vybranou jazykovou sadu do souboru';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_import.lng b/interface/web/admin/lib/lang/cz_language_import.lng
index 838c325..17dfa89 100644
--- a/interface/web/admin/lib/lang/cz_language_import.lng
+++ b/interface/web/admin/lib/lang/cz_language_import.lng
@@ -6,3 +6,5 @@
$wb['btn_cancel_txt'] = 'Zpět';
$wb['ignore_version_txt'] = 'Přeskočit kontrolu verze ISPConfigu.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_list.lng b/interface/web/admin/lib/lang/cz_language_list.lng
index b2a7863..77810e0 100644
--- a/interface/web/admin/lib/lang/cz_language_list.lng
+++ b/interface/web/admin/lib/lang/cz_language_list.lng
@@ -5,3 +5,5 @@
$wb['lang_file_txt'] = 'Jazykový soubor';
$wb['lang_file_date_txt'] = 'Poslední úprava';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng
index 0d5162e..6f77e49 100644
--- a/interface/web/admin/lib/lang/cz_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_package_install.lng
@@ -1,7 +1,9 @@
<?php
-$wb['repo_name_txt'] = 'Skladiště';
+$wb['repo_name_txt'] = 'Repository';
$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Uživatel (volitelné)';
-$wb['repo_password_txt'] = 'Heslo (volitelné)';
+$wb['repo_username_txt'] = 'User (optional)';
+$wb['repo_password_txt'] = 'Password (optional)';
$wb['active_txt'] = 'Aktivní';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng
index 68da1c0..561db1e 100644
--- a/interface/web/admin/lib/lang/cz_remote_action.lng
+++ b/interface/web/admin/lib/lang/cz_remote_action.lng
@@ -2,11 +2,13 @@
$wb['select_server_txt'] = 'Zvolit server';
$wb['btn_do_txt'] = 'Provést akci';
$wb['do_osupdate_caption'] = 'Aktualizace operačního systému na vzdáleném serveru.';
-$wb['do_osupdate_desc'] = 'Tato akce provede \"aptitude -y\" aktualizaci na vybraném serveru.<br><br><strong>POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !</strong>';
+$wb['do_osupdate_desc'] = 'Tato akce provede \\"aptitude -y\\" aktualizaci na vybraném serveru.<br><br><strong>POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !</strong>';
$wb['do_ispcupdate_caption'] = 'Provedení ISPConfig 3 - aktualizace na vzdáleném serveru';
-$wb['do_ispcupdate_desc'] = 'Tato akce provede \"ISPConfig 3\" aktualizaci na vašem vybraném serveru.<br><br><strong>POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !</strong>';
+$wb['do_ispcupdate_desc'] = 'Tato akce provede \\"ISPConfig 3\\" aktualizaci na vašem vybraném serveru.<br><br><strong>POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !</strong>';
$wb['action_scheduled'] = 'Akce je naplánována na provedení';
$wb['select_all_server'] = 'Všechny servery';
$wb['ispconfig_update_title'] = 'ISPConfig pokyny k aktualizaci';
$wb['ispconfig_update_text'] = 'Přihlaste se jako uživatel root na terminal (shell) serveru a proveďte příkaz<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />spustí se ISPConfig aktualizace.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Klikněte zde pro podrobnější informace o provedení aktualizace</a>';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng
index b62526d..4bb34c4 100644
--- a/interface/web/admin/lib/lang/cz_remote_user.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user.lng
@@ -39,9 +39,11 @@
$wb['DNS rp functions'] = 'Funkce DNS RP';
$wb['DNS srv functions'] = 'Funkce DNS SRV';
$wb['DNS txt functions'] = 'Funkce DNS TXT';
-$wb['Mail mailing list functions'] = 'Funkce e-mailové konference (mailinglist)';
+$wb['Mail mailing list functions'] = 'Mail mailinglist functions';
$wb['generate_password_txt'] = 'Generovat heslo';
$wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_user_list.lng b/interface/web/admin/lib/lang/cz_remote_user_list.lng
index 66b6494..1b40308 100644
--- a/interface/web/admin/lib/lang/cz_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng
@@ -5,3 +5,5 @@
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Uživatel';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server.lng b/interface/web/admin/lib/lang/cz_server.lng
index 337e9ca..9d44fd2 100644
--- a/interface/web/admin/lib/lang/cz_server.lng
+++ b/interface/web/admin/lib/lang/cz_server.lng
@@ -1,15 +1,17 @@
<?php
$wb['config_txt'] = 'Konfigurace';
$wb['server_name_txt'] = 'Název serveru';
-$wb['mail_server_txt'] = 'Poštovní server';
-$wb['web_server_txt'] = 'Webový server';
+$wb['mail_server_txt'] = 'Mail server';
+$wb['web_server_txt'] = 'Web server';
$wb['dns_server_txt'] = 'DNS server';
$wb['file_server_txt'] = 'Souborový server';
-$wb['db_server_txt'] = 'Databázový server';
-$wb['vserver_server_txt'] = 'Virtualizační server (Vserver)';
+$wb['db_server_txt'] = 'DB server';
+$wb['vserver_server_txt'] = 'VServer server';
$wb['active_txt'] = 'Aktivní';
$wb['mirror_server_id_txt'] = 'Je zrcadlem serveru';
$wb['- None -'] = '- Žádný -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index 77e3e46..3696fed 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -9,14 +9,14 @@
$wb['website_basedir_txt'] = 'Website config adresář';
$wb['vhost_conf_dir_txt'] = 'Vhost config adresář';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled adresář';
-$wb['getmail_config_dir_txt'] = '<b>Getmail</b> cesta k adresáři kde jsou umístěny konfigurace';
+$wb['getmail_config_dir_txt'] = 'Getmail config adresář';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter cesta';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter skript';
$wb['fastcgi_alias_txt'] = 'FastCGI alias';
-$wb['fastcgi_phpini_path_txt'] = 'FastCGI cesta k adresáři kde je umístěn php.ini';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini cesta';
$wb['fastcgi_children_txt'] = 'FastCGI děti';
$wb['fastcgi_max_requests_txt'] = 'FastCGI max. požadavků';
-$wb['fastcgi_bin_txt'] = 'FastCGI cesta k binarnímu balíčku';
+$wb['fastcgi_bin_txt'] = 'FastCGI bin';
$wb['module_txt'] = 'Modul';
$wb['maildir_path_txt'] = 'Cesta k mail adresáři';
$wb['homedir_path_txt'] = 'Cesta k domácímu adresáři';
@@ -32,15 +32,15 @@
$wb['ip_address_txt'] = 'IP adresa';
$wb['netmask_txt'] = 'Maska';
$wb['gateway_txt'] = 'Brána';
-$wb['hostname_txt'] = 'Název hostitele (hostname)';
-$wb['nameservers_txt'] = 'Jmenné servery (DNS)';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Jmenné servery';
$wb['auto_network_configuration_txt'] = 'Konfigurace sítě';
$wb['ip_address_error_wrong'] = 'Neplatný formát IP adresy.';
$wb['netmask_error_wrong'] = 'Neplatný formát síťové masky.';
$wb['gateway_error_wrong'] = 'Neplatný formát brány.';
-$wb['hostname_error_empty'] = 'Název hostitele (hostname) je prázdný.';
+$wb['hostname_error_empty'] = 'Hostname je prázdný.';
$wb['nameservers_error_empty'] = 'Jmenný server je prázdný.';
-$wb['config_dir_txt'] = '<b>Vlogger</b> cesta k adresáři kde je umístěna konfigurace';
+$wb['config_dir_txt'] = 'Vlogger config adresář';
$wb['init_script_txt'] = 'Název cron init skriptu';
$wb['crontab_dir_txt'] = 'Cesta k individuálním cron tabulkám';
$wb['wget_txt'] = 'Cesta k wget programu';
@@ -71,23 +71,23 @@
$wb['awstats_pl_txt'] = 'awstats.pl script';
$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
$wb['backup_dir_txt'] = 'Adresář pro zálohy';
-$wb['named_conf_local_path_txt'] = 'Cesta k BIND named.conf.local';
-$wb['php_ini_path_cgi_txt'] = 'Cesta k CGI php.ini';
-$wb['php_ini_path_apache_txt'] = 'Cesta k Apache php.ini';
-$wb['check_apache_config_txt'] = 'Provést test konfigurace apache před restartováním';
-$wb['CA_path_txt'] = 'CA cesta';
-$wb['CA_pass_txt'] = 'CA heslo';
-$wb['ufw_enable_txt'] = 'Aktivovat';
-$wb['ufw_manage_builtins_txt'] = 'Správa vestavěných pravidel';
-$wb['ufw_ipv6_txt'] = 'Aktivovat IPv6';
-$wb['ufw_default_input_policy_txt'] = 'Standardní vstupní politika';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
-$wb['ufw_log_level_txt'] = 'Úroveň logování';
+$wb['ufw_log_level_txt'] = 'Log Level';
$wb['network_config_warning_txt'] = 'Možnost konfigurace sítě je k dispozici pouze pro Debian a Ubuntu servery. Nepoužívejte tuto volbu, pokud vaše síťové rozhraní není eth0.';
$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
-$wb['server_type_txt'] = 'Typ serveru';
+$wb['server_type_txt'] = 'Server Type';
$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
$wb['nginx_user_txt'] = 'Nginx user';
@@ -143,11 +143,11 @@
$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
$wb['try_rescue_txt'] = 'Povolit monitorování služeb a restartovat při selhání';
-$wb['do_not_try_rescue_mysql_txt'] = 'Zakázat MySQL monitorování';
-$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail monitorování';
-$wb['rescue_description_txt'] = '<b>Informace:</b> Pokud chcete např. vypnout MySQL zatrhněte políčko \\"Zakázat MySQL monitorování\\" změna se provede do 2-3 minut.<br>Pokud nepočkáte 2-3 minuty, monitorování restartuje mysql!!';
-$wb['enable_sni_txt'] = 'Aktivovat SNI';
-$wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD monitorování';
+$wb['do_not_try_rescue_mysql_txt'] = 'Zakázat MySQL sledování';
+$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail sledování';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD sledování';
$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
@@ -159,18 +159,20 @@
$wb['backup_mode_rootgz'] = 'Zálohování všech souborů v adresáři web jako uživatel root';
$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
$wb['realtime_blackhole_list_note_txt'] = '(Samostatná RBL se odděluje čárkou)';
-$wb['ssl_settings_txt'] = 'SSL Nastavení';
-$wb['permissions_txt'] = 'Nastavit oprávnění';
-$wb['php_settings_txt'] = 'PHP Nastavení';
-$wb['apps_vhost_settings_txt'] = 'Apps Vhost Nastavení';
-$wb['awstats_settings_txt'] = 'AWStats Nastavení';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
$wb['firewall_txt'] = 'Firewall';
$wb['mailbox_quota_stats_txt'] = 'Statistika kvóty poštovní schránky';
-$wb['enable_ip_wildcard_txt'] = 'Aktivovat IP wildcard (*)';
+$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
-$wb['overtraffic_notify_admin_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení adminovi';
-$wb['overtraffic_notify_client_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení klientovi';
+$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
+$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
$wb['v6_prefix_txt'] = 'IPv6 Prefix';
$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_config_list.lng b/interface/web/admin/lib/lang/cz_server_config_list.lng
index 2118c35..8589dbc 100644
--- a/interface/web/admin/lib/lang/cz_server_config_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_config_list.lng
@@ -2,3 +2,5 @@
$wb['list_head_txt'] = 'Konfigurace serveru';
$wb['server_name_txt'] = 'Server';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_ip.lng b/interface/web/admin/lib/lang/cz_server_ip.lng
index fa71966..634898a 100644
--- a/interface/web/admin/lib/lang/cz_server_ip.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip.lng
@@ -9,3 +9,5 @@
$wb['virtualhost_port_txt'] = 'HTTP Ports';
$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_ip_list.lng b/interface/web/admin/lib/lang/cz_server_ip_list.lng
index a5b3bf8..2a47ca7 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng
@@ -6,5 +6,7 @@
$wb['client_id_txt'] = 'Klient';
$wb['virtualhost_txt'] = 'HTTP Vhost';
$wb['virtualhost_port_txt'] = 'HTTP Ports';
-$wb['ip_type_txt'] = 'Type';
+$wb['ip_type_txt'] = 'Verze';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_list.lng b/interface/web/admin/lib/lang/cz_server_list.lng
index ecddbf2..e7a2efd 100644
--- a/interface/web/admin/lib/lang/cz_server_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_list.lng
@@ -11,3 +11,5 @@
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
index 2393f31..59cf3c7 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -1,16 +1,18 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['client_id_txt'] = 'Klient';
-$wb['name_txt'] = 'Název PHP verze';
-$wb['Name'] = 'Název';
+$wb['name_txt'] = 'Verze PHP';
+$wb['Name'] = 'Jméno';
$wb['FastCGI Settings'] = 'FastCGI nastavení';
$wb['PHP-FPM Settings'] = 'PHP-FPM nastavení';
-$wb['Additional PHP Versions'] = 'Additional PHP Versions';
-$wb['Form to edit additional PHP versions'] = 'Form to edit additional PHP versions';
+$wb['Additional PHP Versions'] = 'Další verze PHP';
+$wb['Form to edit additional PHP versions'] = 'Formulář pro úpravu dalších PHP verzí';
$wb['server_php_name_error_empty'] = 'Název pole nesmí být prázdné.';
-$wb['php_fastcgi_binary_txt'] = 'Cesta k binarnímu balíčku PHP FastCGI';
-$wb['php_fastcgi_ini_dir_txt'] = 'Cesta k adresáři ve kterém je umístěn php.ini';
-$wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init skriptu';
-$wb['php_fpm_ini_dir_txt'] = 'Cesta k adresáři ve kterém je umístěn php.ini';
-$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM společnému (pool) adresáři';
+$wb['php_fastcgi_binary_txt'] = 'Cesta k PHP FastCGI binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Cesta k php.ini adresáři';
+$wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
+$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
+$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_php_list.lng b/interface/web/admin/lib/lang/cz_server_php_list.lng
index cc3ae1f..e0b43a4 100644
--- a/interface/web/admin/lib/lang/cz_server_php_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_php_list.lng
@@ -1,7 +1,9 @@
<?php
-$wb['list_head_txt'] = 'Další PHP verze';
+$wb['list_head_txt'] = 'Další verze PHP';
$wb['server_id_txt'] = 'Server';
$wb['add_new_record_txt'] = 'Přidat novou verzi PHP';
$wb['client_id_txt'] = 'Klient';
-$wb['name_txt'] = 'Název PHP verze';
+$wb['name_txt'] = 'Verze PHP';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng
index 5c8b756..1a9becc 100644
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_install.lng
@@ -2,5 +2,7 @@
$wb['head_txt'] = 'Install software package';
$wb['install_key_txt'] = 'Enter install key';
$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['btn_cancel_txt'] = 'Zrušit';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng
index 3936cdb..80f729c 100644
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_list.lng
@@ -8,3 +8,5 @@
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng
index 64a190d..f48a2c4 100644
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo.lng
@@ -5,3 +5,5 @@
$wb['repo_password_txt'] = 'Heslo (volitelné)';
$wb['active_txt'] = 'Aktivní';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng
index 5c82d4c..4ae3c66 100644
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng
@@ -4,3 +4,5 @@
$wb['repo_name_txt'] = 'Repozitář';
$wb['repo_url_txt'] = 'URL';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng
index 32671d3..c1aa17f 100644
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_update_list.lng
@@ -6,3 +6,5 @@
$wb['version_txt'] = 'Verze';
$wb['action_txt'] = 'Akce';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 83dc869..2b0a317 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -35,15 +35,17 @@
$wb['smtp_user_txt'] = 'SMTP uživatel';
$wb['smtp_pass_txt'] = 'SMTP heslo';
$wb['smtp_crypt_txt'] = 'Použít SSL/TLS šifrované spojení pro SMTP';
-$wb['smtp_missing_admin_mail_txt'] = 'Zadejte prosím jméno správce a admin e-mailovou adresu, pokud chcete používat poštu SMTP pro odesílání.';
-$wb['tab_change_discard_txt'] = 'Zahodit změny na záložce změny';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
$wb['tab_change_warning_txt'] = 'Záložka změna varování';
-$wb['tab_change_warning_note_txt'] = 'Zobrazit varování na kartě změny ve formách úprav případné data byla změněna uživatelem.';
-$wb['vhost_subdomains_txt'] = 'Vytvořit subdomény jako webové stránky';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
-$wb['phpmyadmin_url_error_regex'] = 'Neplatná phpmyadmin URL';
+$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL';
$wb['use_combobox_txt'] = 'Use jQuery UI Combobox';
$wb['use_loadindicator_txt'] = 'Use Load Indicator';
$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
index 592d5c0..edf6696 100644
--- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
@@ -1,18 +1,20 @@
<?php
-$wb['tpl_default_admin_head_txt'] = 'Global Default-Theme Settings';
+$wb['tpl_default_admin_head_txt'] = 'Globální nastavení výchozího grafického téma';
$wb['tpl_default_admin_desc_txt'] = '';
$wb['server_id_txt'] = 'Server';
$wb['client_id_txt'] = 'Klient';
-$wb['name_txt'] = 'Název PHP verze';
-$wb['Name'] = 'Název';
+$wb['name_txt'] = 'Verze PHP';
+$wb['Name'] = 'Jméno';
$wb['FastCGI Settings'] = 'FastCGI nastavení';
$wb['PHP-FPM Settings'] = 'PHP-FPM nastavení';
$wb['Additional PHP Versions'] = 'Další PHP verze';
-$wb['Form to edit additional PHP versions'] = 'Formulář pro úpravu další PHP verzí';
+$wb['Form to edit additional PHP versions'] = 'Formulář pro úpravu dalších PHP verzí';
$wb['server_php_name_error_empty'] = 'Název pole nesmí být prázdné.';
-$wb['php_fastcgi_binary_txt'] = 'Cesta k binarnímu balíčku PHP FastCGI';
-$wb['php_fastcgi_ini_dir_txt'] = 'Cesta k adresáři ve kterém je umístěn php.ini';
-$wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init skriptu';
-$wb['php_fpm_ini_dir_txt'] = 'Cesta k adresáři ve kterém je umístěn php.ini';
-$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM společnému (pool) adresáři';
+$wb['php_fastcgi_binary_txt'] = 'Cesta k PHP FastCGI binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Cesta k php.ini adresáři';
+$wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
+$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
+$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng
index b1ff4b1..28bf9c9 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -7,7 +7,7 @@
$wb['password_strength_txt'] = 'Bezpečnost hesla';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Výchozí modul';
-$wb['app_theme_txt'] = 'Výchozí grafické téma';
+$wb['app_theme_txt'] = 'Design';
$wb['typ_txt'] = 'Typ';
$wb['active_txt'] = 'Aktivní';
$wb['language_txt'] = 'Jazyk';
@@ -29,5 +29,7 @@
$wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'Uživatelské jméno nesmí být web nebo web a číslo.\"';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng
index e5a7d1e..4e7e34c 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -1,9 +1,11 @@
<?php
$wb['list_head_txt'] = 'Uživatelé';
$wb['username_txt'] = 'Uživatelské jméno';
-$wb['client_id_txt'] = 'Klient ID';
+$wb['client_id_txt'] = 'Client ID';
$wb['active_txt'] = 'Aktivní';
$wb['add_new_record_txt'] = 'Přidat uživatele';
$wb['warning_txt'] = '<b>VAROVÁNÍ:</b> Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelů nebo skupin zde může způsobit ztrátu dat!';
$wb['groups_txt'] = 'Skupiny';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng
index d9abdff..9c1d91c 100644
--- a/interface/web/client/lib/lang/cz.lng
+++ b/interface/web/client/lib/lang/cz.lng
@@ -1,4 +1,5 @@
<?php
+$wb['Client'] = 'Klient';
$wb['Address'] = 'Adresa';
$wb['Limits'] = 'Limity';
$wb['Add Client'] = 'Přidat klienta';
@@ -7,19 +8,20 @@
$wb['Edit Client-Templates'] = 'Upravit klientské šablony';
$wb['Add Reseller'] = 'Přidat distributora';
$wb['Edit Reseller'] = 'Upravit distributora';
-$wb['Resellers'] = 'Distributoři';
+$wb['Resellers'] = 'Distributoři (prodejci)';
$wb['error_has_clients'] = 'Distributor má klienty. Nejdříve smažte tyto klienty.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['Messaging'] = 'Messaging';
-$wb['Send email'] = 'Send Email';
-$wb['Edit Client Circle'] = 'Edit Client Circle';
-$wb['Domains'] = 'Domains';
+$wb['add_additional_template_txt'] = 'Přidat dodatečnou šablonu';
+$wb['delete_additional_template_txt'] = 'Smazat dodatečnou šablonu';
+$wb['Messaging'] = 'Odesílání zpráv';
+$wb['Send email'] = 'Odeslat e-mail';
+$wb['Edit Client Circle'] = 'Upravit skupinu klientů';
+$wb['Domains'] = 'Domény';
$wb['domain_txt'] = 'Doména';
$wb['client_txt'] = 'Klient';
-$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';
-$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain';
-$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain';
-$wb['error_client_group_id_empty'] = 'You have to select a customer<br>';
-$wb['Client'] = 'Client';
+$wb['error_domain_in mailuse'] = 'Tato doména nelze odstranit, protože je v používána jako poštovní doména';
+$wb['error_domain_in webuse'] = 'Tato doména nelze odstranit, protože je v používána jako webová doména';
+$wb['error_client_can_not_add_domain'] = 'Nemůžete přidat novou doménu';
+$wb['error_client_group_id_empty'] = 'Musíte vybrat zákazníka<br>';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index eb5e20d..12da7e8 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -8,11 +8,11 @@
$wb['limit_mailrouting_txt'] = 'Max. počet emailových směrování';
$wb['limit_mailfilter_txt'] = 'Max. počet emailových filtrů';
$wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání emailů';
-$wb['limit_mailquota_txt'] = 'Kvóty poštovních schránek';
+$wb['limit_mailquota_txt'] = 'Mailbox kvóta';
$wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů';
$wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
$wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
-$wb['default_mailserver_txt'] = 'Výchozí e-mailserver';
+$wb['default_mailserver_txt'] = 'Výchozí mailserver';
$wb['company_name_txt'] = 'Název společnosti';
$wb['contact_name_txt'] = 'Název kontaktu';
$wb['username_txt'] = 'Uživatelské jméno';
@@ -28,7 +28,7 @@
$wb['telephone_txt'] = 'Telefon';
$wb['mobile_txt'] = 'Mobilní telefon';
$wb['fax_txt'] = 'Fax';
-$wb['email_txt'] = 'Kontaktní e-mail na klienta';
+$wb['email_txt'] = 'Kontaktní email na klienta';
$wb['internet_txt'] = 'WWW stránky klienta';
$wb['icq_txt'] = 'ICQ';
$wb['notes_txt'] = 'Poznámky';
@@ -54,7 +54,7 @@
$wb['limit_ftp_user_txt'] = 'Max. počet FTP uživatelů';
$wb['default_dnsserver_txt'] = 'Výchozí DNS server';
$wb['limit_dns_zone_txt'] = 'Max. počet DNS zón';
-$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
+$wb['limit_dns_slave_zone_txt'] = 'Max. počet sekundárních zón DNS';
$wb['limit_dns_record_txt'] = 'Max. počet DNS záznamů';
$wb['limit_shell_user_txt'] = 'Max. počet shell uživatelů';
$wb['limit_client_txt'] = 'Max. počet klientů';
@@ -88,18 +88,18 @@
$wb['template_master_txt'] = 'Hlavní šablona';
$wb['template_additional_txt'] = 'Addon šablona';
$wb['ssh_chroot_txt'] = 'SSH chroot volby';
-$wb['web_php_options_txt'] = 'PHP - dostupné volby pro klienta';
-$wb['limit_client_error'] = 'Max. počet klientů dosažen.';
-$wb['limit_web_quota_txt'] = 'Webová kvóta';
+$wb['web_php_options_txt'] = 'PHP volby';
+$wb['limit_client_error'] = 'Max. počet kleintů dosažen.';
+$wb['limit_web_quota_txt'] = 'Web kvóta';
$wb['limit_traffic_quota_txt'] = 'Přenosová kvóta';
$wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.';
-$wb['limit_webdav_user_txt'] = 'Max. počet WebDAV uživatelů';
-$wb['limit_webdav_user_error_notint'] = 'Limit pro WebDAV uživatele musí být číslo.';
+$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
+$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
$wb['customer_no_txt'] = 'Zákaznické číslo';
$wb['vat_id_txt'] = 'DIČ';
$wb['required_fields_txt'] = '* Povinná pole';
$wb['company_id_txt'] = 'IČO';
-$wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailovových konferencí (mailinglist)';
+$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
@@ -107,37 +107,39 @@
$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
-$wb['add_additional_template_txt'] = 'Přidat další šablonu';
-$wb['delete_additional_template_txt'] = 'Odstranit další šablonu';
-$wb['limit_cgi_txt'] = 'CGI - dostupná volba pro klienta';
-$wb['limit_ssi_txt'] = 'SSI - dostupná volba pro klienta';
-$wb['limit_perl_txt'] = 'Perl - dostupná volba pro klienta';
-$wb['limit_ruby_txt'] = 'Ruby - dostupná volba pro klienta';
-$wb['limit_python_txt'] = 'Python - dostupná volba pro klienta';
-$wb['force_suexec_txt'] = 'SuEXEC - vynucená volba u klienta';
+$wb['add_additional_template_txt'] = 'Přidat dodatečnou šablonu';
+$wb['delete_additional_template_txt'] = 'Smazat dodatečnou šablonu';
+$wb['limit_cgi_txt'] = 'CGI available';
+$wb['limit_ssi_txt'] = 'SSI available';
+$wb['limit_perl_txt'] = 'Perl available';
+$wb['limit_ruby_txt'] = 'Ruby available';
+$wb['limit_python_txt'] = 'Python available';
+$wb['force_suexec_txt'] = 'SuEXEC forced';
$wb['limit_hterror_txt'] = 'Custom error docs available';
$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL - dostupná volba pro klienta';
-$wb['bank_account_number_txt'] = 'Číslo bankovního účtu';
+$wb['limit_ssl_txt'] = 'SSL available';
+$wb['bank_account_number_txt'] = 'Číslo účtu';
$wb['bank_code_txt'] = 'Kód banky';
$wb['bank_name_txt'] = 'Název banky';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
-$wb['web_limits_txt'] = 'Web nastavení limitů';
-$wb['email_limits_txt'] = 'E-mail nastavení limitů ';
-$wb['database_limits_txt'] = 'Databáze nastavení limitů';
-$wb['cron_job_limits_txt'] = 'Cron úlohy nastavení limitů';
-$wb['dns_limits_txt'] = 'DNS nastavení limitů';
-$wb['virtualization_limits_txt'] = 'Virtualizace nastavení limitů';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'Email Limits';
+$wb['database_limits_txt'] = 'Database Limits';
+$wb['cron_job_limits_txt'] = 'Cron Job Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualization Limits';
$wb['generate_password_txt'] = 'Generovat heslo';
$wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
$wb['active_template_additional_txt'] = 'Active Addons';
$wb['bank_account_owner_txt'] = 'Bankovní účet vlastníka';
-$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
-$wb['customer_no_error_unique'] = 'Číslo zákazníka musí být unikátní (nebo prázdné).';
-$wb['paypal_email_error_isemail'] = 'Zadejte prosím platnou PayPal e-mailovou adresu.';
-$wb['paypal_email_txt'] = 'PayPal E-mail';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
+$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
+$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng
index 107b2a5..cb4b143 100644
--- a/interface/web/client/lib/lang/cz_client_circle.lng
+++ b/interface/web/client/lib/lang/cz_client_circle.lng
@@ -1,9 +1,11 @@
<?php
-$wb['Client Circle'] = 'Klient Circle';
-$wb['Circle'] = 'Circle';
-$wb['circle_txt'] = 'Circle';
-$wb['circle_name_txt'] = 'Circle Name';
-$wb['client_ids_txt'] = 'Clients/Resellers';
-$wb['description_txt'] = 'Description';
+$wb['Client Circle'] = 'Skupina klientů';
+$wb['Circle'] = 'Skupina';
+$wb['circle_txt'] = 'Skupina';
+$wb['circle_name_txt'] = 'Název skupiny';
+$wb['client_ids_txt'] = 'Klienti/Distributoři';
+$wb['description_txt'] = 'Popis';
$wb['active_txt'] = 'Aktivní';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_circle_list.lng b/interface/web/client/lib/lang/cz_client_circle_list.lng
index 2e81e50..2402551 100644
--- a/interface/web/client/lib/lang/cz_client_circle_list.lng
+++ b/interface/web/client/lib/lang/cz_client_circle_list.lng
@@ -1,10 +1,12 @@
<?php
-$wb['list_head_txt'] = 'Client Circles';
-$wb['circle_id_txt'] = 'Circle ID';
-$wb['circle_name_txt'] = 'Circle Name';
-$wb['description_txt'] = 'Description';
-$wb['add_new_record_txt'] = 'Add new circle';
-$wb['filter_txt'] = 'Filter';
-$wb['delete_txt'] = 'Delete';
+$wb['list_head_txt'] = 'Skupiny klientů';
+$wb['circle_id_txt'] = 'ID skupiny';
+$wb['circle_name_txt'] = 'Název skupiny';
+$wb['description_txt'] = 'Popis';
+$wb['add_new_record_txt'] = 'Přidat novou skupinu';
+$wb['filter_txt'] = 'Filtr';
+$wb['delete_txt'] = 'Smazat';
$wb['active_txt'] = 'Aktivní';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng
index 4515806..a759ab6 100644
--- a/interface/web/client/lib/lang/cz_client_del.lng
+++ b/interface/web/client/lib/lang/cz_client_del.lng
@@ -4,3 +4,5 @@
$wb['btn_save_txt'] = 'Smazat klienta';
$wb['btn_cancel_txt'] = 'Zrušit bez smazání klienta';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_message.lng b/interface/web/client/lib/lang/cz_client_message.lng
index 476baca..f1c3870 100644
--- a/interface/web/client/lib/lang/cz_client_message.lng
+++ b/interface/web/client/lib/lang/cz_client_message.lng
@@ -5,14 +5,16 @@
$wb['subject_txt'] = 'Předmět';
$wb['message_txt'] = 'Zpráva';
$wb['form_legend_client_txt'] = 'Poslat e-mailovou zprávu všem klientům.';
-$wb['form_legend_admin_txt'] = 'Poslat e-mailovou zprávu všem klientům a prodejcům.';
-$wb['sender_invalid_error'] = 'Odesílatel e-mailu je neplatný.';
+$wb['form_legend_admin_txt'] = 'Poslat e-mailovou zprávu všem klientům a distributorům (prodejcům).';
+$wb['sender_invalid_error'] = 'E-mail odesílatele je neplatný.';
$wb['subject_invalid_error'] = 'Předmět je prázdný.';
-$wb['message_invalid_error'] = 'Zpráva je prázdný.';
-$wb['email_sent_to_txt'] = 'E-mail poslat na adresu:';
-$wb['page_head_txt'] = 'Poslat informace zákazníkovi';
-$wb['recipient_txt'] = 'Příjemce';
-$wb['all_clients_resellers_txt'] = 'Všichni klienti a prodejci';
+$wb['message_invalid_error'] = 'Zpráva je prázdná.';
+$wb['email_sent_to_txt'] = 'E-mail byl odeslán:';
+$wb['page_head_txt'] = 'Poslat informace zákazníkovi (klientovi)';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
+$wb['all_clients_resellers_txt'] = 'Všichni klienti a distributoři (prodejci)';
$wb['all_clients_txt'] = 'Všichni klienti';
-$wb['variables_txt'] = 'Výběr:';
+$wb['variables_txt'] = 'Výběr (možnosti):';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng
index 1877887..9f5ad6c 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -9,7 +9,7 @@
$wb['limit_mailrouting_txt'] = 'Max. počet emailových směrování';
$wb['limit_mailfilter_txt'] = 'Max. počet emailových filtrů';
$wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání emailů';
-$wb['limit_mailquota_txt'] = 'Kvóty poštovních schránek';
+$wb['limit_mailquota_txt'] = 'Mailbox kvóta';
$wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů';
$wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
$wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
@@ -25,10 +25,10 @@
$wb['limit_web_subdomain_txt'] = 'Max. počet webových subdomén';
$wb['limit_ftp_user_txt'] = 'Max. počet FTP uživatelů';
$wb['limit_dns_zone_txt'] = 'Max. počet DNS zón';
-$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
+$wb['limit_dns_slave_zone_txt'] = 'Max. počet sekundárních zón DNS';
$wb['limit_dns_record_txt'] = 'Max. počet DNS záznamů';
$wb['limit_shell_user_txt'] = 'Max. počet shell uživatelů';
-$wb['limit_client_txt'] = 'Max. počet klient';
+$wb['limit_client_txt'] = 'Max. počet klientů';
$wb['limit_maildomain_error_notint'] = 'Limit pro email doménu musí být číslo.';
$wb['limit_mailbox_error_notint'] = 'Limit pro mailboxy musí být číslo.';
$wb['limit_mailalias_error_notint'] = 'Limit pro emailové aliasy musí být číslo.';
@@ -66,22 +66,24 @@
$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
-$wb['web_php_options_txt'] = 'PHP - dostupné volby pro klienta';
-$wb['template_type_txt'] = 'Typ šablony';
-$wb['template_name_txt'] = 'Název šablony';
-$wb['limit_cgi_txt'] = 'CGI - dostupná volba pro klienta';
-$wb['limit_ssi_txt'] = 'SSI - dostupná volba pro klienta';
-$wb['limit_perl_txt'] = 'Perl - dostupná volba pro klienta';
-$wb['limit_ruby_txt'] = 'Ruby - dostupná volba pro klienta';
-$wb['limit_python_txt'] = 'Python - dostupná volba pro klienta';
-$wb['force_suexec_txt'] = 'SuEXEC - vynucená volba u klienta';
+$wb['web_php_options_txt'] = 'PHP Options';
+$wb['template_type_txt'] = 'Template type';
+$wb['template_name_txt'] = 'Template name';
+$wb['limit_cgi_txt'] = 'CGI available';
+$wb['limit_ssi_txt'] = 'SSI available';
+$wb['limit_perl_txt'] = 'Perl available';
+$wb['limit_ruby_txt'] = 'Ruby available';
+$wb['limit_python_txt'] = 'Python available';
+$wb['force_suexec_txt'] = 'SuEXEC forced';
$wb['limit_hterror_txt'] = 'Custom error docs available';
$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL - dostupná volba pro klienta';
-$wb['web_limits_txt'] = 'Web nastavení limitů';
-$wb['email_limits_txt'] = 'E-mail nastavení limitů';
-$wb['database_limits_txt'] = 'Databáze nastavení limitů';
-$wb['cron_job_limits_txt'] = 'Cron úlohy nastavení limitů';
-$wb['dns_limits_txt'] = 'DNS nastavení limitů';
-$wb['virtualization_limits_txt'] = 'Virtualizace nastavení limitů';
+$wb['limit_ssl_txt'] = 'SSL available';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'Email Limits';
+$wb['database_limits_txt'] = 'Database Limits';
+$wb['cron_job_limits_txt'] = 'Cron Job Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualization Limits';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_template_list.lng b/interface/web/client/lib/lang/cz_client_template_list.lng
index c3faae1..7d9e923 100644
--- a/interface/web/client/lib/lang/cz_client_template_list.lng
+++ b/interface/web/client/lib/lang/cz_client_template_list.lng
@@ -3,3 +3,5 @@
$wb['template_type_txt'] = 'Typ';
$wb['template_name_txt'] = 'Název šablony';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng
index f2f92b8..aad4999 100644
--- a/interface/web/client/lib/lang/cz_clients_list.lng
+++ b/interface/web/client/lib/lang/cz_clients_list.lng
@@ -6,6 +6,8 @@
$wb['city_txt'] = 'Město';
$wb['country_txt'] = 'Stát';
$wb['add_new_record_txt'] = 'Přidat klienta';
-$wb['username_txt'] = 'Uživatelské jméno';
+$wb['username_txt'] = 'Username';
$wb['customer_no_txt'] = 'Customer No.';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng
index 4b1845b..26117ae 100644
--- a/interface/web/client/lib/lang/cz_domain.lng
+++ b/interface/web/client/lib/lang/cz_domain.lng
@@ -1,6 +1,8 @@
<?php
-$wb['domain_error_empty'] = 'Doménové jméno je prázdné';
-$wb['domain_error_unique'] = 'Doména již existuje';
-$wb['domain_error_regex'] = 'Toto doménové jméno není dovoleno';
+$wb['domain_error_empty'] = 'The domain-name is empty';
+$wb['domain_error_unique'] = 'The domain already exists';
+$wb['domain_error_regex'] = 'This domain-name is not allowed';
$wb['Domain'] = 'Doména';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng
index 6cf7376..924f5de 100644
--- a/interface/web/client/lib/lang/cz_domain_list.lng
+++ b/interface/web/client/lib/lang/cz_domain_list.lng
@@ -1,6 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Domény';
-$wb['add_new_record_txt'] = 'Přidat novou doménu';
+$wb['list_head_txt'] = 'Domains';
+$wb['add_new_record_txt'] = 'Add new Domain';
$wb['domain_txt'] = 'Doména';
$wb['user_txt'] = 'Klient';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index d8703fb..af56780 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -1,13 +1,13 @@
<?php
-$wb['limit_maildomain_txt'] = 'Max. počet e-mailových domén';
+$wb['limit_maildomain_txt'] = 'Max. počet emailových domén';
$wb['limit_mailbox_txt'] = 'Max. počet mailboxů';
-$wb['limit_mailalias_txt'] = 'Max. počet e-mailových aliasů';
-$wb['limit_mailforward_txt'] = 'Max. počet e-mailových předávání';
-$wb['limit_mailcatchall_txt'] = 'Max. počet e-mailových košů';
-$wb['limit_mailrouting_txt'] = 'Max. počet e-mailových směrování';
-$wb['limit_mailfilter_txt'] = 'Max. počet e-mailových filtrů';
+$wb['limit_mailalias_txt'] = 'Max. počet emailových aliasů';
+$wb['limit_mailforward_txt'] = 'Max. počet emailových předávání';
+$wb['limit_mailcatchall_txt'] = 'Max. počet emailových košů';
+$wb['limit_mailrouting_txt'] = 'Max. počet emailových směrování';
+$wb['limit_mailfilter_txt'] = 'Max. počet emailových filtrů';
$wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání emailů';
-$wb['limit_mailquota_txt'] = 'Kvóty poštovních schránek';
+$wb['limit_mailquota_txt'] = 'Mailbox kvóta';
$wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů';
$wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
$wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
@@ -53,10 +53,10 @@
$wb['limit_ftp_user_txt'] = 'Max. počet FTP uživatelů';
$wb['default_dnsserver_txt'] = 'Výchozí DNS server';
$wb['limit_dns_zone_txt'] = 'Max. počet DNS zón';
-$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
+$wb['limit_dns_slave_zone_txt'] = 'Max. počet sekundárních zón DNS';
$wb['limit_dns_record_txt'] = 'Max. počet DNS záznamů';
$wb['limit_shell_user_txt'] = 'Max. počet shell uživatelů';
-$wb['limit_client_txt'] = 'Max. počet klient';
+$wb['limit_client_txt'] = 'Max. počet klientů';
$wb['username_error_empty'] = 'Uživatelské jméno je prázdné.';
$wb['username_error_unique'] = 'Uživatelské jméno musí být unikátní.';
$wb['limit_maildomain_error_notint'] = 'Limit pro email doménu musí být číslo.';
@@ -96,9 +96,9 @@
$wb['customer_no_txt'] = 'Zákaznické číslo';
$wb['vat_id_txt'] = 'DIČ';
$wb['required_fields_txt'] = '* Povinná pole';
-$wb['limit_webdav_user_txt'] = 'Max. počet WebDAV uživatelů';
+$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailovových konferencí (mailinglist)';
+$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
@@ -107,8 +107,8 @@
$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['add_additional_template_txt'] = 'Přidat dodatečnou šablonu';
+$wb['delete_additional_template_txt'] = 'Smazat dodatečnou šablonu';
$wb['limit_cgi_txt'] = 'CGI available';
$wb['limit_ssi_txt'] = 'SSI available';
$wb['limit_perl_txt'] = 'Perl available';
@@ -128,15 +128,17 @@
$wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
-$wb['customer_no_error_unique'] = 'Číslo zákazníka musí být unikátní (nebo prázdné).';
-$wb['paypal_email_error_isemail'] = 'Zadejte prosím platnou PayPal e-mailovou adresu.';
-$wb['paypal_email_txt'] = 'PayPal E-mail';
-$wb['company_id_txt'] = 'Firma / podnikatel ID';
-$wb['bank_account_number_txt'] = 'Číslo bankovního účtu';
-$wb['bank_account_owner_txt'] = 'Bankovní účet vlastníka';
-$wb['bank_code_txt'] = 'Kód banky';
-$wb['bank_name_txt'] = 'Název banky';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
+$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
+$wb['paypal_email_txt'] = 'PayPal Email';
+$wb['company_id_txt'] = 'Company/Entrepreneur ID';
+$wb['bank_account_number_txt'] = 'Bank account no.';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['bank_code_txt'] = 'Bank code';
+$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng
index c14cee7..31226ce 100644
--- a/interface/web/client/lib/lang/cz_resellers_list.lng
+++ b/interface/web/client/lib/lang/cz_resellers_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'Distributoři';
+$wb['list_head_txt'] = 'Distributoři (prodejci)';
$wb['client_id_txt'] = 'ID';
$wb['company_name_txt'] = 'Název společnosti';
$wb['contact_name_txt'] = 'Název kontaktu';
@@ -9,3 +9,5 @@
$wb['customer_no_txt'] = 'Customer No.';
$wb['username_txt'] = 'Username';
?>
+
+
diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng
index 9d2a321..297b639 100644
--- a/interface/web/dashboard/lib/lang/cz.lng
+++ b/interface/web/dashboard/lib/lang/cz.lng
@@ -2,3 +2,5 @@
$wb['welcome_user_txt'] = 'Vítejte %s';
$wb['available_modules_txt'] = 'Dostupné moduly';
?>
+
+
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
index bedb98f..9810ba9 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
@@ -28,3 +28,5 @@
$wb['limit_database_txt'] = 'Počet databází';
$wb['limit_mailmailinglist_txt'] = 'Počet e-mailových konferencí';
?>
+
+
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
index 66275f1..a25ba21 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
@@ -1,3 +1,5 @@
<?php
$wb['available_modules_txt'] = 'Dostupné moduly';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz.lng b/interface/web/designer/lib/lang/cz.lng
index acb6c35..dd815ad 100644
--- a/interface/web/designer/lib/lang/cz.lng
+++ b/interface/web/designer/lib/lang/cz.lng
@@ -1,2 +1,4 @@
<?php
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng
index 75bf5a5..2b04eb9 100644
--- a/interface/web/designer/lib/lang/cz_form_edit.lng
+++ b/interface/web/designer/lib/lang/cz_form_edit.lng
@@ -22,3 +22,5 @@
$wb['auth_preset_perm_group_txt'] = 'Opr. Skupina';
$wb['auth_preset_perm_other_txt'] = 'Opr. Ostatní';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_form_list.lng b/interface/web/designer/lib/lang/cz_form_list.lng
index 1e677f2..46241cf 100644
--- a/interface/web/designer/lib/lang/cz_form_list.lng
+++ b/interface/web/designer/lib/lang/cz_form_list.lng
@@ -5,3 +5,5 @@
$wb['title_txt'] = 'Titulek';
$wb['description_txt'] = 'Popis';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_form_show.lng b/interface/web/designer/lib/lang/cz_form_show.lng
index 37017fa..45829d5 100644
--- a/interface/web/designer/lib/lang/cz_form_show.lng
+++ b/interface/web/designer/lib/lang/cz_form_show.lng
@@ -2,7 +2,7 @@
$wb['header_txt'] = 'Formeditor';
$wb['title_txt'] = 'Formtitle';
$wb['name_txt'] = 'Formname';
-$wb['delete_txt'] = 'Delete';
+$wb['delete_txt'] = 'Smazat';
$wb['properties_txt'] = 'Properties';
$wb['new_tab_txt'] = 'Tab new';
$wb['edit_txt'] = 'Edit';
@@ -11,8 +11,10 @@
$wb['down_txt'] = 'v';
$wb['module_txt'] = 'Module';
$wb['form_txt'] = 'Form';
-$wb['description_txt'] = 'Description';
+$wb['description_txt'] = 'Popis';
$wb['module_del_txt'] = 'Delete the module and all subdirectories?';
$wb['menu_del_txt'] = 'Delete menu with all menuitems?';
$wb['item_del_txt'] = 'Delete menuitem?';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_edit.lng b/interface/web/designer/lib/lang/cz_module_edit.lng
index 847896d..f6da04e 100644
--- a/interface/web/designer/lib/lang/cz_module_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_edit.lng
@@ -20,3 +20,5 @@
<b>Rada:</b> Všechny cesty jsou relativně k adresáři web web.
';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_list.lng b/interface/web/designer/lib/lang/cz_module_list.lng
index b568f69..b37872c 100644
--- a/interface/web/designer/lib/lang/cz_module_list.lng
+++ b/interface/web/designer/lib/lang/cz_module_list.lng
@@ -3,3 +3,5 @@
$wb['module_txt'] = 'Modul';
$wb['title_txt'] = 'Titulek';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_nav_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
index 01f5df6..8c21ea4 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
@@ -4,3 +4,5 @@
$wb['save_txt'] = 'Uložit';
$wb['cancel_txt'] = 'Zrušit';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
index 23f7d15..65f6c76 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
@@ -1,8 +1,10 @@
<?php
$wb['title_txt'] = 'Title';
-$wb['target_txt'] = 'Target';
+$wb['target_txt'] = 'Cíl';
$wb['link_txt'] = 'Link';
$wb['header_txt'] = 'Navi properties';
-$wb['save_txt'] = 'Save';
-$wb['cancel_txt'] = 'Cancel';
+$wb['save_txt'] = 'Uložit';
+$wb['cancel_txt'] = 'Zrušit';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_show.lng b/interface/web/designer/lib/lang/cz_module_show.lng
index 2cf9b07..605d11d 100644
--- a/interface/web/designer/lib/lang/cz_module_show.lng
+++ b/interface/web/designer/lib/lang/cz_module_show.lng
@@ -2,7 +2,7 @@
$wb['header_txt'] = 'Menu editor';
$wb['title_txt'] = 'Title';
$wb['name_txt'] = 'Module';
-$wb['delete_txt'] = 'Delete';
+$wb['delete_txt'] = 'Smazat';
$wb['properties_txt'] = 'Properties';
$wb['new_menu_txt'] = 'Menu new';
$wb['edit_txt'] = 'Edit';
@@ -14,3 +14,5 @@
$wb['menu_del_txt'] = 'Wollen Sie das Menü mit allen Untereinträgen löschen?';
$wb['item_del_txt'] = 'Wollen Sie den Menüeintrag löschen?';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng
index f143b0b..876a575 100644
--- a/interface/web/dns/lib/lang/cz.lng
+++ b/interface/web/dns/lib/lang/cz.lng
@@ -20,3 +20,5 @@
$wb['Secondary Zones'] = 'Sekundární DNS zóny';
$wb['Import Zone File'] = 'Importovat vybraný DNS zonový soubor';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_a.lng b/interface/web/dns/lib/lang/cz_dns_a.lng
index 8b8c206..6d9a24d 100644
--- a/interface/web/dns/lib/lang/cz_dns_a.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a.lng
@@ -14,3 +14,5 @@
$wb['data_error_regex'] = 'IP adresa má chybný formát';
$wb['data_error_duplicate'] = 'Duplikace A záznamu';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_a_list.lng b/interface/web/dns/lib/lang/cz_dns_a_list.lng
index dd3cdfd..22920c1 100644
--- a/interface/web/dns/lib/lang/cz_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng
@@ -1,15 +1,17 @@
<?php
-$wb['list_head_txt'] = 'A záznam';
-$wb['active_txt'] = 'AktivnÃ';
+$wb['list_head_txt'] = 'A záznam';
+$wb['active_txt'] = 'Aktivní';
$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zóna';
-$wb['name_txt'] = 'Název';
+$wb['zone_txt'] = 'Zóna';
+$wb['name_txt'] = 'Název';
$wb['data_txt'] = 'Data';
$wb['aux_txt'] = 'Priorita';
$wb['ttl_txt'] = 'TTL';
$wb['type_txt'] = 'Typ';
-$wb['add_new_record_txt'] = 'Přidat DNS A záznam';
-$wb['page_txt'] = 'Stránka';
+$wb['add_new_record_txt'] = 'Přidat DNS A záznam';
+$wb['page_txt'] = 'Stránka';
$wb['page_of_txt'] = 'z';
-$wb['delete_confirmation'] = 'Skute�ně chcete smazat tento záznam?';
+$wb['delete_confirmation'] = 'Skutečně chcete smazat tento záznam?';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_aaaa.lng b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
index 26c6ae9..143885f 100644
--- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
@@ -13,3 +13,5 @@
$wb['data_error_empty'] = 'IP adresa je prázdná';
$wb['data_error_regex'] = 'IP adresa má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_alias.lng b/interface/web/dns/lib/lang/cz_dns_alias.lng
index 572478a..c25dc7b 100644
--- a/interface/web/dns/lib/lang/cz_dns_alias.lng
+++ b/interface/web/dns/lib/lang/cz_dns_alias.lng
@@ -13,3 +13,5 @@
$wb['data_error_empty'] = 'Cílový Hostname je prázdný';
$wb['data_error_regex'] = 'Cílový Hostname má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_cname.lng b/interface/web/dns/lib/lang/cz_dns_cname.lng
index 0c5ebe2..ad120c9 100644
--- a/interface/web/dns/lib/lang/cz_dns_cname.lng
+++ b/interface/web/dns/lib/lang/cz_dns_cname.lng
@@ -14,3 +14,5 @@
$wb['data_error_regex'] = 'Cílový hostname má chybný formát';
$wb['data_error_duplicate'] = 'Duplicate A-Record or CNAME-Record';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_hinfo.lng b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
index 5f67d5e..3633fdb 100644
--- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
@@ -13,3 +13,5 @@
$wb['data_error_empty'] = 'Informace o hostovi je prázdná';
$wb['data_error_regex'] = 'Informace o hostovi má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng
index 4020f8a..3986983 100644
--- a/interface/web/dns/lib/lang/cz_dns_import.lng
+++ b/interface/web/dns/lib/lang/cz_dns_import.lng
@@ -12,3 +12,5 @@
$wb['no_file_uploaded_error'] = 'Nelze odeslat DNS zonový soubor';
$wb['zone_file_import_txt'] = 'Importovat vybraný DNS zonový soubor';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_mx.lng b/interface/web/dns/lib/lang/cz_dns_mx.lng
index b04bc66..c5f97f3 100644
--- a/interface/web/dns/lib/lang/cz_dns_mx.lng
+++ b/interface/web/dns/lib/lang/cz_dns_mx.lng
@@ -1,16 +1,18 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['zone_txt'] = 'Zóna';
-$wb['name_txt'] = 'Název hostitele (hostname)';
+$wb['name_txt'] = 'Hostname';
$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Název hostitele (hostname) e-mail serveru';
+$wb['data_txt'] = 'Hostname mailserveru';
$wb['aux_txt'] = 'Priorita';
$wb['ttl_txt'] = 'TTL';
$wb['active_txt'] = 'Aktivní';
$wb['limit_dns_record_txt'] = 'Dosažen maximální počet DNS záznamů pro Váš účet.';
$wb['no_zone_perm'] = 'Nemáte oprávnění přidat záznam do této zóny.';
-$wb['name_error_empty'] = 'Název hostitele (hostname) je prázdný.';
-$wb['name_error_regex'] = 'Název hostitele (hostname) má chybný formát.';
-$wb['data_error_empty'] = 'Název hostitele (hostname) e-mail serveru je prázdný';
-$wb['data_error_regex'] = 'Název hostitele (hostname) e-mail serveru má chybný formát';
+$wb['name_error_empty'] = 'Hostname je prázdný.';
+$wb['name_error_regex'] = 'Hostname má chybný formát.';
+$wb['data_error_empty'] = 'Hostname mailserveru je prázdný';
+$wb['data_error_regex'] = 'Hostname mailserveru má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng
index ba38e2a..4b01184 100644
--- a/interface/web/dns/lib/lang/cz_dns_ns.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ns.lng
@@ -13,3 +13,5 @@
$wb['data_error_empty'] = 'Jmenný server je prázdný';
$wb['data_error_regex'] = 'Jmenný server má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_ptr.lng b/interface/web/dns/lib/lang/cz_dns_ptr.lng
index d7b19e5..33f1166 100644
--- a/interface/web/dns/lib/lang/cz_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng
@@ -3,7 +3,7 @@
$wb['zone_txt'] = 'Zóna';
$wb['name_txt'] = 'Název';
$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Kanonický Název hostitele (hostname)';
+$wb['data_txt'] = 'Kanonický hostname';
$wb['ttl_txt'] = 'TTL';
$wb['active_txt'] = 'Aktivní';
$wb['limit_dns_record_txt'] = 'Dosažen maximální počet DNS záznamů pro Váš účet.';
@@ -13,3 +13,5 @@
$wb['data_error_empty'] = 'Kanonický hostname je prázdný';
$wb['data_error_regex'] = 'Kanonického hostname má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_rp.lng b/interface/web/dns/lib/lang/cz_dns_rp.lng
index 8b1e7e4..bcebed3 100644
--- a/interface/web/dns/lib/lang/cz_dns_rp.lng
+++ b/interface/web/dns/lib/lang/cz_dns_rp.lng
@@ -13,3 +13,5 @@
$wb['data_error_empty'] = 'Odpovědná osoba je prázdná';
$wb['data_error_regex'] = 'Odpovědná osoba má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_slave.lng b/interface/web/dns/lib/lang/cz_dns_slave.lng
index 16617f6..b8cc5f1 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave.lng
@@ -15,3 +15,5 @@
$wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4';
$wb['secondary_zone_txt'] = 'Sekundární DNS zóna';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_slave_list.lng b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
index 1e0a3d0..eead22a 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
@@ -7,3 +7,5 @@
$wb['add_new_record_txt'] = 'Přidat sekundární DNS zónu';
$wb['eg_domain_tld'] = 'např. domena.cz';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng
index 829d5f5..2b089c2 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa.lng
@@ -19,8 +19,8 @@
$wb['origin_error_unique'] = 'Záznam pro tuto zónu již existuje.';
$wb['origin_error_regex'] = 'Zóna má chybný formát.';
$wb['ns_error_regex'] = 'NS má chybný formát.';
-$wb['mbox_error_empty'] = 'Email je prázdný.';
-$wb['mbox_error_regex'] = 'Email má chybný formát.';
+$wb['mbox_error_empty'] = 'E-mail je prázdný.';
+$wb['mbox_error_regex'] = 'E-mail má chybný formát.';
$wb['also_notify_txt'] = 'Také upozornit';
$wb['also_notify_error_regex'] = 'Prosím, použijte IP adresu.';
$wb['update_acl_txt'] = 'Aktualizovat ACL';
@@ -35,3 +35,5 @@
$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_soa_list.lng b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
index beba8a2..999e5bd 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
@@ -8,3 +8,5 @@
$wb['add_new_record_txt'] = 'Přidat DNS zónu (SOA záznam)';
$wb['add_new_record_wizard_txt'] = 'Přidat DNS zónu (dle šablony)';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_srv.lng b/interface/web/dns/lib/lang/cz_dns_srv.lng
index 8ab784a..60d844a 100644
--- a/interface/web/dns/lib/lang/cz_dns_srv.lng
+++ b/interface/web/dns/lib/lang/cz_dns_srv.lng
@@ -8,7 +8,7 @@
$wb['port_txt'] = 'Port';
$wb['ttl_txt'] = 'TTL';
$wb['active_txt'] = 'Aktivní';
-$wb['limit_dns_record_txt'] = 'Dosažen maximální počet DNS záznamů pro Váš účet.';
+$wb['limit_dns_record_txt'] = 'Dosažen maximální počet DNS záznamú pro Váš Účet.';
$wb['no_zone_perm'] = 'Nemáte oprávnění přidat záznam do této zóny.';
$wb['name_error_empty'] = 'Hostname je prázdný.';
$wb['name_error_regex'] = 'Hostname má chybný formát.';
@@ -17,3 +17,5 @@
$wb['srv_error_regex'] = 'Neplatný formát záznamu serveru. Záznam serveru musí obsahovat 3 textové řetězce oddělené mezerami.';
$wb['aux_txt'] = 'Priority';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_template.lng b/interface/web/dns/lib/lang/cz_dns_template.lng
index be4ac0e..b91b3ae 100644
--- a/interface/web/dns/lib/lang/cz_dns_template.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template.lng
@@ -4,3 +4,5 @@
$wb['template_txt'] = 'Šablona';
$wb['visible_txt'] = 'Viditelný';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_template_list.lng b/interface/web/dns/lib/lang/cz_dns_template_list.lng
index bdd6e18..a7218a4 100644
--- a/interface/web/dns/lib/lang/cz_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng
@@ -4,3 +4,5 @@
$wb['name_txt'] = 'Název';
$wb['add_new_record_txt'] = 'Přidat záznam';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_txt.lng b/interface/web/dns/lib/lang/cz_dns_txt.lng
index 76047b0..8784c7e 100644
--- a/interface/web/dns/lib/lang/cz_dns_txt.lng
+++ b/interface/web/dns/lib/lang/cz_dns_txt.lng
@@ -13,3 +13,5 @@
$wb['data_error_empty'] = 'Text je prázdný';
$wb['data_error_regex'] = 'Text má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng
index dcfc0ba..bf462ca 100644
--- a/interface/web/dns/lib/lang/cz_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng
@@ -18,21 +18,23 @@
$wb['error_minimum_empty'] = 'Minimum je prázdný.';
$wb['error_ttl_empty'] = 'TTL je prázdný.';
$wb['error_domain_empty'] = 'Doména je prázdná';
-$wb['error_ip_empty'] = 'IP je prázdná.';
+$wb['error_ip_empty'] = 'IP adresa je prázdná.';
$wb['error_ns1_empty'] = 'NS1 je prázdný.';
$wb['error_ns2_empty'] = 'NS2 je prázdný.';
-$wb['error_email_empty'] = 'EMail je prázdný.';
+$wb['error_email_empty'] = 'E-mail je prázdný.';
$wb['error_domain_regex'] = 'Doména obsahuje neplatné znaky.';
$wb['error_ns1_regex'] = 'NS1 obsahuje neplatné znaky.';
$wb['error_ns2_regex'] = 'NS2 obsahuje neplatné znaky.';
-$wb['error_email_regex'] = 'Email neobsahuje platnou emailovou adresu.';
-$wb['dns_zone_txt'] = 'DNS Zóna';
+$wb['error_email_regex'] = 'E-mail neobsahuje platnou e-mailovou adresu.';
+$wb['dns_zone_txt'] = 'DNS zóna';
$wb['globalsearch_resultslimit_of_txt'] = 'z';
$wb['globalsearch_resultslimit_results_txt'] = 'výsledky';
$wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.';
$wb['globalsearch_noresults_limit_txt'] = '0 výsledků';
$wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
$wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
-$wb['list_head_txt'] = 'DNS Průvodce vytvořením zóny';
-$wb['list_desc_txt'] = 'Vytvoření zóny DNS pomocí průvodce';
+$wb['list_head_txt'] = 'Průvodce vytvořením DNS zóny';
+$wb['list_desc_txt'] = 'Vytvoření DNS zóny pomocí průvodce';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng
index 18f8f21..721aaf3 100644
--- a/interface/web/help/lib/lang/cz.lng
+++ b/interface/web/help/lib/lang/cz.lng
@@ -12,3 +12,5 @@
$wb['Manage Questions'] = 'Spravovat dotazy';
$wb['Add a Question & Answer Pair'] = 'Přidat otázku a odpověď';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_faq_form.lng b/interface/web/help/lib/lang/cz_faq_form.lng
index 73feee6..dc951a4 100644
--- a/interface/web/help/lib/lang/cz_faq_form.lng
+++ b/interface/web/help/lib/lang/cz_faq_form.lng
@@ -4,3 +4,5 @@
$wb['faq_answer_txt'] = 'Odpověď';
$wb['faq_section_txt'] = 'Sekce';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
index a948844..ab5d07c 100644
--- a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
@@ -7,3 +7,5 @@
$wb['faq_faq_questions_txt'] = 'Často kladené dotazy';
$wb['faq_new_question_txt'] = 'Přidat nový dotaz';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_help_faq_list.lng b/interface/web/help/lib/lang/cz_help_faq_list.lng
index 923d9b8..15eb20a 100644
--- a/interface/web/help/lib/lang/cz_help_faq_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_list.lng
@@ -1,3 +1,5 @@
<?php
-$wb['edit_txt'] = 'Upravit';
+$wb['edit_txt'] = 'Edit';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
index 967b0ab..60906e5 100644
--- a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
@@ -6,3 +6,5 @@
$wb['faq_faq_sections_txt'] = 'Sekce FAQ';
$wb['faq_new_section_txt'] = 'Přidat novou sekci';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_support_message.lng b/interface/web/help/lib/lang/cz_support_message.lng
index 6c27284..63bce28 100644
--- a/interface/web/help/lib/lang/cz_support_message.lng
+++ b/interface/web/help/lib/lang/cz_support_message.lng
@@ -6,3 +6,5 @@
$wb['tstamp_txt'] = 'Časové razítko';
$wb['reply_txt'] = 'Odpovědět';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_support_message_list.lng b/interface/web/help/lib/lang/cz_support_message_list.lng
index 8629a2f..3a2c9a9 100644
--- a/interface/web/help/lib/lang/cz_support_message_list.lng
+++ b/interface/web/help/lib/lang/cz_support_message_list.lng
@@ -4,3 +4,5 @@
$wb['subject_txt'] = 'Předmět';
$wb['add_new_record_txt'] = 'Vytvořit zprávu pro podporu';
?>
+
+
diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng
index 6b4539e..b988a2e 100644
--- a/interface/web/login/lib/lang/cz.lng
+++ b/interface/web/login/lib/lang/cz.lng
@@ -4,7 +4,7 @@
$wb['error_user_blocked'] = 'Uživatel blokován.';
$wb['error_user_too_many_logins'] = 'Příliš mnoho nesprávných přihlášení, zkuste to za 15 minut znova';
$wb['pass_reset_txt'] = 'Bude Vám vygenerováno a zasláno nové heslo na e-mail, pokud Vaše adresa zadaná níže odpovídá adrese ve Vašem klientském nastavení.';
-$wb['pw_reset'] = 'Heslo bylo resetováno a zasláno na Váš email.';
+$wb['pw_reset'] = 'Heslo bylo resetováno a zasláno na Váš e-mail.';
$wb['pw_error'] = 'Uživatelské jméno nebo e-mail neodpovídá.';
$wb['pw_error_noinput'] = 'Prosím zadejte uživatelské jméno a e-mail.';
$wb['pw_reset_mail_msg'] = 'Vaše heslo do ISPConfigu bylo resetováno. Nové heslo je: ';
@@ -22,3 +22,5 @@
$wb['email_txt'] = 'E-mail';
$wb['theme_not_compatible'] = 'Zvolené téma není kompatibilní s aktuální verzí ISPConfig. Zkontrolujte prosím, zda není nová verze tématu.<br />Výchozí motiv byl aktivován automaticky.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng
index 2b4240a..65fb134 100644
--- a/interface/web/mail/lib/lang/cz.lng
+++ b/interface/web/mail/lib/lang/cz.lng
@@ -1,14 +1,15 @@
<?php
$wb['Email Alias'] = 'E-mailový alias';
-$wb['Email Blacklist'] = 'E-mail černá listina';
+$wb['Email Blacklist'] = 'Email černá listina';
$wb['Blacklist'] = 'Černá listina';
$wb['Mail Content Filter'] = 'Obsahový filtr';
$wb['Filter'] = 'Filtr';
$wb['Mail Domain'] = 'Doména e-mailů';
+$wb['Domain'] = 'Domény';
$wb['Email Catchall'] = 'E-mailový koš';
$wb['Email Forward'] = 'Přesměrování e-mailů';
-$wb['Get Email'] = 'Získat e-mail';
-$wb['Spamfilter'] = 'Spamové filtry';
+$wb['Get Email'] = 'Získat externí e-maily';
+$wb['Spamfilter'] = 'Spamfiltr';
$wb['Email Routing'] = 'Směrování';
$wb['Email transport'] = 'Transport';
$wb['Mailbox'] = 'Mailbox';
@@ -18,30 +19,32 @@
$wb['Email filter'] = 'E-mailový filtr';
$wb['Email Whitelist'] = 'E-mail bílá listina';
$wb['Whitelist'] = 'Bílá listina';
-$wb['Spamfilter blacklist'] = 'Spamový filter černá listina';
-$wb['Spamfilter Config'] = 'Konfigurace spamového filtru';
+$wb['Spamfilter blacklist'] = 'Spamfiltr černá listina';
+$wb['Spamfilter Config'] = 'Konfigurace spamfiltru';
$wb['Server'] = 'Server';
-$wb['Spamfilter policy'] = 'Politika spamového filtru';
+$wb['Spamfilter policy'] = 'Spamfiltr politika';
$wb['Policy'] = 'Politika';
$wb['Quarantine'] = 'Karanténa';
$wb['Tag-Level'] = 'Tag úroveň';
$wb['Other'] = 'Jiný';
-$wb['Spamfilter users'] = 'Uživatelé spamového filtru';
+$wb['Spamfilter users'] = 'Spamfiltr uživatelé';
$wb['Users'] = 'Uživatelé';
-$wb['Spamfilter Whitelist'] = 'Spamový filtr bílá listina';
+$wb['Spamfilter Whitelist'] = 'Spamfiltr bílá listina';
+$wb['Email'] = 'E-mail';
$wb['Email Mailbox'] = 'E-mailové schránky';
-$wb['Email Accounts'] = 'Nastavení e-mailů';
+$wb['Email Accounts'] = 'E-mail účty';
$wb['User / Domain'] = 'Uživatel / Doména';
$wb['Server Settings'] = 'Nastavení serveru';
-$wb['Fetchmail'] = 'Externí získávání e-mailů';
+$wb['Fetchmail'] = 'Externí získávání emailů';
$wb['Mailbox traffic'] = 'Přenesená data';
$wb['Postfix Whitelist'] = 'Postfix bílá listina';
$wb['Postfix Blacklist'] = 'Postfix černá listina';
$wb['Content Filter'] = 'Obsahový filtr';
-$wb['Global Filters'] = 'Globální e-mailové filtry';
-$wb['Domain Alias'] = 'Alias e-mailové domény';
+$wb['Global Filters'] = 'Globální filtry';
+$wb['Domain Alias'] = 'Alias domény';
$wb['Relay Recipients'] = 'Relay adresáti';
$wb['Statistics'] = 'Statistiky';
-$wb['Domain'] = 'E-mailová doména';
-$wb['Email'] = 'E-mail';
+$wb['Mailbox quota'] = 'Mailbox kvóta';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng
index d5c83e4..414e102 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias.lng
@@ -2,13 +2,15 @@
$wb['email_txt'] = 'E-mail';
$wb['destination_txt'] = 'Cíl';
$wb['active_txt'] = 'Aktivní';
-$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
+$wb['email_error_isemail'] = 'E-mail adresa je chybná.';
$wb['email_error_unique'] = 'Duplikování e-mail adresy.';
$wb['no_domain_perm'] = 'Nemáte oprávnění pro tuto doménu.';
$wb['destination_error_isemail'] = 'Cílová e-mail adresa je chybná.';
$wb['limit_mailalias_txt'] = 'Dosažen maximální počet e-mail aliasů pro Váš účet.';
-$wb['duplicate_mailbox_txt'] = 'Mailbox s touto e-mail adresou již existuje';
+$wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
$wb['domain_txt'] = 'Doména';
-$wb['duplicate_email_alias_txt'] = 'Tento e-mailový alias již existuje.';
+$wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.';
$wb['source_txt'] = 'Alias';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_alias_list.lng b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
index de8cc2e..0d8f779 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
@@ -6,3 +6,5 @@
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Přidat nový e-mailový alias';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
index 0387c18..e0cde68 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
@@ -3,9 +3,11 @@
$wb['destination_txt'] = 'Cíl';
$wb['active_txt'] = 'Aktivní';
$wb['no_domain_perm'] = 'Nemáte oprávnění pro tuto doménu.';
-$wb['limit_mailaliasdomain_txt'] = 'Dosažen maximální počet e-mailových doménových aliasů pro Váš účet.';
+$wb['limit_mailaliasdomain_txt'] = 'Dosažen maximální počet emailových doménových aliasů pro Váš účet.';
$wb['source_destination_identical_txt'] = 'Zdrojová a cílová doména jsou stejné.';
$wb['source_error_empty'] = 'Zdrojová doména je prázdná.';
$wb['source_error_unique'] = 'Duplikování zdrojové domény.';
$wb['source_error_regex'] = 'Chybná zdrojová doména.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
index fd850d6..cfc0154 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
@@ -5,3 +5,5 @@
$wb['destination_txt'] = 'Cíl';
$wb['add_new_record_txt'] = 'Přidat doménový alias';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
index 76a60e2..4719142 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
@@ -1,9 +1,11 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Adresa černé listiny';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
$wb['active_txt'] = 'Aktivní';
$wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ';
-$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet e-mail filtrů pro Váš účet.';
+$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
index 6b2a708..fbf6e2d 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
@@ -2,9 +2,11 @@
$wb['list_head_txt'] = 'E-mail černá listina';
$wb['active_txt'] = 'Aktivní';
$wb['server_id_txt'] = 'Server';
-$wb['source_txt'] = 'Adresy na černé listině';
+$wb['source_txt'] = 'Adresy na černé lisitně';
$wb['type_txt'] = 'Typ';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
$wb['add_new_record_txt'] = 'Přidat záznam na černou listinu';
$wb['access_txt'] = 'Přístup';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter.lng b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
index 459ca22..1405881 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
@@ -7,3 +7,5 @@
$wb['active_txt'] = 'Aktivní';
$wb['pattern_error_empty'] = 'Vzor je prázdný.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
index da9709e..6e7ebf5 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
@@ -6,3 +6,5 @@
$wb['action_txt'] = 'Akce';
$wb['add_new_record_txt'] = 'Přidat obsahový filtr';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng
index ba67856..d71c471 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -4,10 +4,12 @@
$wb['type_txt'] = 'Typ';
$wb['active_txt'] = 'Aktivní';
$wb['domain_error_empty'] = 'Doména je prázdná.';
-$wb['domain_error_unique'] = 'Duplikování domény.';
+$wb['domain_error_unique'] = 'Dupolikování domény.';
$wb['domain_error_regex'] = 'Chybný název domény.';
$wb['client_txt'] = 'Klient';
-$wb['limit_maildomain_txt'] = 'Dosažen maximální počet e-mail domén pro Váš účet.';
-$wb['policy_txt'] = 'Spamový filter';
+$wb['limit_maildomain_txt'] = 'Dosažen maximální počet email domén pro Váš účet.';
+$wb['policy_txt'] = 'Spamfiltr';
$wb['no_policy'] = '- nepovoleno -';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
index b579d2d..da42190 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
@@ -6,3 +6,5 @@
$wb['active_txt'] = 'Aktivní';
$wb['sys_groupid_txt'] = 'Klient';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
index bfdc509..75efd56 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
@@ -1,11 +1,13 @@
<?php
$wb['domain_txt'] = 'Doména';
-$wb['destination_txt'] = 'Cílová e-mailová adresa';
+$wb['destination_txt'] = 'Popis';
$wb['active_txt'] = 'Aktivní';
-$wb['domain_error_unique'] = 'Pro tuto doménu již existuje doménový koš.';
+$wb['domain_error_unique'] = 'Pro tuto doménu již existuje koš.';
$wb['no_domain_perm'] = 'Nemáte oprávnění pro tuto doménu.';
$wb['domain_error_regex'] = 'Chybné doménové jméno nebo doména obsahuje chybné znaky.';
-$wb['limit_mailcatchall_txt'] = 'Dosažen maximální počet doménových košů pro Váš účet.';
+$wb['limit_mailcatchall_txt'] = 'Dosažen maximální počet košů účtů pro Váš účet.';
$wb['source_txt'] = 'Zdroj';
-$wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná e-mailová adresa.';
+$wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
index 3b24645..aa0b76d 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
@@ -7,3 +7,5 @@
$wb['domain_txt'] = 'E-malová doména';
$wb['add_new_record_txt'] = 'Přidat e-mailový koš';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
index 2abb05c..05bb747 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
@@ -5,3 +5,5 @@
$wb['add_new_record_txt'] = 'Přidat doménu';
$wb['active_txt'] = 'Aktivní';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_forward.lng b/interface/web/mail/lib/lang/cz_mail_forward.lng
index 7e3ab72..ba79e1a 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward.lng
@@ -2,8 +2,10 @@
$wb['email_txt'] = 'E-mail';
$wb['destination_txt'] = 'Cílový email';
$wb['active_txt'] = 'Aktivní';
-$wb['limit_mailforward_txt'] = 'Dosažen maximální počet e-mailových předávání pro Váš účet.';
-$wb['duplicate_mailbox_txt'] = 'Mailbox s touto e-mailovou adresou již existuje';
+$wb['limit_mailforward_txt'] = 'Dosažen maximální počet email předávání pro Váš účet.';
+$wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
$wb['domain_txt'] = 'Doména';
$wb['source_txt'] = 'Zdrojový e-mail';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_forward_list.lng b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
index e5381fe..bdbff70 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
@@ -6,3 +6,5 @@
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Přidat nové přesměrování';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng
index eb71673..6fc9101 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -7,12 +7,14 @@
$wb['source_delete_txt'] = 'Smazat e-maily po obdržení';
$wb['destination_txt'] = 'Cíl';
$wb['active_txt'] = 'Aktivní';
-$wb['limit_fetchmail_txt'] = 'Dosažen maximální počet záznamů externího získávání emailů pro Váš účet.';
+$wb['limit_fetchmail_txt'] = 'Dosažen maximální počet záznamů externího získávání e-mailů pro Váš účet.';
$wb['source_server_error_isempty'] = 'Server je prázdný.';
$wb['source_username_error_isempty'] = 'Uživatelské jméno je prázdné.';
$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'] = 'Načíst všechny e-maily (vč. přečtených)';
+$wb['source_read_all_txt'] = 'Načíst všechny e-maily (včetně již přečtené pošty)';
$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_get_list.lng b/interface/web/mail/lib/lang/cz_mail_get_list.lng
index 9ca8b86..daeae8d 100644
--- a/interface/web/mail/lib/lang/cz_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'Získávat e-maily z externích POP3 / IMAP serverů';
+$wb['list_head_txt'] = 'Získávat emaily z externích POP3 / IMAP serverů';
$wb['active_txt'] = 'Aktivní';
$wb['server_id_txt'] = 'Server';
$wb['source_server_txt'] = 'Externí server';
@@ -7,3 +7,5 @@
$wb['destination_txt'] = 'Cíl';
$wb['add_new_record_txt'] = 'Přidat účet';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
index 2a39298..b44112a 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
@@ -1,9 +1,9 @@
<?php
-$wb['limit_mailmailinglist_txt'] = 'Limit dosažen';
-$wb['domain_error_empty'] = 'Doména je prázdná.';
-$wb['listname_error_empty'] = 'Název seznamu je prázdný.';
-$wb['domain_error_regex'] = 'Neplatný název domény.';
-$wb['email_in_use_txt'] = 'E-mail je již použit';
+$wb['limit_mailmailinglist_txt'] = 'Limit reached';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['listname_error_empty'] = 'Listname is empty.';
+$wb['domain_error_regex'] = 'Invalid domain name.';
+$wb['email_in_use_txt'] = 'Email is in use';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
$wb['password_strength_txt'] = 'Síla hesla';
$wb['server_id_txt'] = 'Server';
@@ -19,3 +19,5 @@
$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
$wb['email_error_isemail'] = 'Email address is invalid.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
index 6dedb19..b3e2cf8 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
@@ -1,5 +1,7 @@
<?php
-$wb['list_head_txt'] = 'E-mailové konference (mailinglist)';
+$wb['list_head_txt'] = 'E-mailové konference';
$wb['domain_txt'] = 'Doména';
$wb['listname_txt'] = 'Název seznamu';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
index b4d867d..b64c311 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
@@ -1,9 +1,11 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Relay adresát';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
$wb['active_txt'] = 'Aktivní';
$wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ';
-$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet e-mailových filtrů pro Váš účet.';
+$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
index 261ea38..bf34af6 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
@@ -3,7 +3,9 @@
$wb['active_txt'] = 'Aktivní';
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Adresa adresáta';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
$wb['add_new_record_txt'] = 'Přidat relay adresáta';
$wb['access_txt'] = 'Přístup';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
index 280fac9..f19706d 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
@@ -6,12 +6,14 @@
$wb['spam_rewrite_subject_txt'] = 'Přepisovací předmět';
$wb['spam_redirect_maildir_txt'] = 'Přesměrovací mailbox';
$wb['active_txt'] = 'Aktivní';
-$wb['spam_rewrite_txt'] = 'Přepsat předmět e-mailu nad toto skóre.';
-$wb['spam_redirect_txt'] = 'Přesměrovat e-mail nad toto skóre do vybraného mailboxu.';
-$wb['spam_delete_txt'] = 'Smazat e-mail nad toto skóre.';
+$wb['spam_rewrite_txt'] = 'Přepsat předmět emailu nad toto skóre.';
+$wb['spam_redirect_txt'] = 'Přesměrovat email nad toto skóre do vybraného mailboxu.';
+$wb['spam_delete_txt'] = 'Smazat email nad toto skóre.';
$wb['disable_txt'] = 'Rada: Pro zrušení filtrování nastavte skóre na 0.00.';
-$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
-$wb['email_error_unique'] = 'Pro tuto e-mail adresu již existuje filtrovací záznam.';
+$wb['email_error_isemail'] = 'Email adresa je chybná.';
+$wb['email_error_unique'] = 'Pro tuto email adresu již existuje filtrovací záznam.';
$wb['spam_redirect_maildir_purge_txt'] = 'Vyčistit poté mailový adresář';
$wb['days_txt'] = 'Dny.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
index fa3c763..1271765 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
@@ -1,8 +1,10 @@
<?php
-$wb['list_head_txt'] = 'Spamový filter';
+$wb['list_head_txt'] = 'Spamfiltr';
$wb['active_txt'] = 'Aktivní';
$wb['server_id_txt'] = 'Server';
$wb['server_name_txt'] = 'server_name';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Přidat nový záznam spamfiltru';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_transport.lng b/interface/web/mail/lib/lang/cz_mail_transport.lng
index 508ca76..710e577 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport.lng
@@ -6,6 +6,8 @@
$wb['mx_txt'] = 'Neprovádět MX lookup';
$wb['sort_order_txt'] = 'Třídit podle';
$wb['active_txt'] = 'Aktivní';
-$wb['limit_mailrouting_txt'] = 'Dosažen maximální počet e-mail směrování pro Váš účet.';
+$wb['limit_mailrouting_txt'] = 'Dosažen maximální počet email směrování pro Váš účet.';
$wb['transport_txt'] = 'Transport';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_transport_list.lng b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
index f8d9323..de6292b 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
@@ -7,3 +7,5 @@
$wb['sort_order_txt'] = 'Třídit podle';
$wb['add_new_record_txt'] = 'Přidat transport';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index 4a2322e..d8805f0 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -4,7 +4,7 @@
$wb['cryptpwd_txt'] = 'Heslo';
$wb['password_strength_txt'] = 'Bezpečnost hesla';
$wb['active_txt'] = 'Aktivní';
-$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
+$wb['email_error_isemail'] = 'E-mail adresa je chybná.';
$wb['email_error_unique'] = 'Duplikování email adresy.';
$wb['autoresponder_text_txt'] = 'Text';
$wb['autoresponder_txt'] = 'Aktivní';
@@ -48,3 +48,5 @@
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter.lng b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
index ec91e22..0973856 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
@@ -10,7 +10,7 @@
$wb['limit_mailfilter_txt'] = 'Byl dosažen max. počet e-mailový filtrovacích pravidel.';
$wb['subject_txt'] = 'Předmět';
$wb['from_txt'] = 'Odesílatel';
-$wb['to_txt'] = 'Adresát';
+$wb['to_txt'] = 'Příjemce (adresát)';
$wb['contains_txt'] = 'Obsahuje';
$wb['is_txt'] = 'Je';
$wb['begins_with_txt'] = 'Začíná na';
@@ -18,3 +18,5 @@
$wb['move_to_txt'] = 'Přesunout do';
$wb['delete_txt'] = 'Smazat';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
index 1d1b1f3..d9f6748 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
@@ -3,5 +3,7 @@
$wb['add_new_record_txt'] = 'Přidat filtr';
$wb['page_txt'] = 'Stránka';
$wb['page_of_txt'] = 'z';
-$wb['delete_confirmation'] = 'Opravdu smazat e-mailový filtr?';
+$wb['delete_confirmation'] = 'Opravdu smazat mailový filtr?';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_list.lng b/interface/web/mail/lib/lang/cz_mail_user_list.lng
index e6dfd00..08d28fb 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng
@@ -6,3 +6,5 @@
$wb['name_txt'] = 'Skutečný název';
$wb['login_txt'] = 'Přihlášení';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
index 50cbc31..92600a1 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
@@ -6,3 +6,5 @@
$wb['this_year_txt'] = 'Tento rok';
$wb['last_year_txt'] = 'Minulý rok';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
index a1cede7..cd5d032 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
@@ -1,9 +1,11 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Adresa bílé listiny';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
$wb['active_txt'] = 'Aktivní';
$wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ';
-$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet e-mail filtrů pro Váš účet.';
+$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
index 0025c48..042cd71 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
@@ -1,10 +1,12 @@
<?php
-$wb['list_head_txt'] = 'E-mail bílá listina';
+$wb['list_head_txt'] = 'Email bílá listina';
$wb['active_txt'] = 'Aktivní';
$wb['server_id_txt'] = 'Server';
$wb['source_txt'] = 'Adresy na bílé listině';
$wb['type_txt'] = 'Typ';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
$wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu';
$wb['access_txt'] = 'Přístup';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
index 5e0c6b7..98e7649 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
@@ -7,3 +7,5 @@
$wb['active_txt'] = 'Aktivní';
$wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximální počet záznamů pro bílou / černou listinu pro Váš účet.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
index d0e89ed..194aeb9 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
@@ -7,3 +7,5 @@
$wb['email_txt'] = 'Emaily na černé listině';
$wb['add_new_record_txt'] = 'Přidat záznam na černou listinu';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config.lng b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
index a4b913d..d0ebcc4 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
@@ -4,7 +4,7 @@
$wb['netmask_txt'] = 'Maska';
$wb['gateway_txt'] = 'Brána';
$wb['hostname_txt'] = 'Hostname';
-$wb['nameservers_txt'] = 'Jmenné servery (DNS)';
+$wb['nameservers_txt'] = 'Jmenné servery';
$wb['module_txt'] = 'Modul serveru';
$wb['maildir_path_txt'] = 'Cesta k mail adresáři';
$wb['homedir_path_txt'] = 'Cesta k domácímu adresáři';
@@ -18,3 +18,5 @@
$wb['mailbox_size_limit_txt'] = 'Limit velikosti e-mailové schránky';
$wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
index fe2ee8d..8b5b1e7 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
@@ -3,3 +3,5 @@
$wb['server_name_txt'] = 'Server';
$wb['server_id_txt'] = 'server_id';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
index 54d0155..1a77830 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
@@ -36,3 +36,5 @@
$wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
$wb['banned_rulenames_txt'] = 'Název pravidel zabanované';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
index 9a0c361..37f41d3 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
@@ -7,3 +7,5 @@
$wb['bad_header_lover_txt'] = 'Špatné hlavičky';
$wb['add_new_record_txt'] = 'Přidat záznam politiky';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users.lng b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
index 8c19e9f..d795af1 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
@@ -2,7 +2,9 @@
$wb['server_id_txt'] = 'Server';
$wb['priority_txt'] = 'Priorita';
$wb['policy_id_txt'] = 'Politika';
-$wb['email_txt'] = 'E-mail (vzor)';
+$wb['email_txt'] = 'Email (vzor)';
$wb['fullname_txt'] = 'Název';
$wb['local_txt'] = 'Lokální';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
index d2faf5a..26c4df1 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
@@ -1,10 +1,12 @@
<?php
-$wb['list_head_txt'] = 'Uživatelé spamového filtru';
+$wb['list_head_txt'] = 'Spamfiltr uživatelé';
$wb['local_txt'] = 'Lokální';
$wb['server_id_txt'] = 'Server';
$wb['priority_txt'] = 'Priorita';
$wb['policy_id_txt'] = 'Politika';
$wb['fullname_txt'] = 'Jméno';
$wb['email_txt'] = 'E-mail';
-$wb['add_new_record_txt'] = 'Přidat spamový filter uživatele';
+$wb['add_new_record_txt'] = 'Přidat spamfiltr uživatele';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
index 5e0c6b7..98e7649 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
@@ -7,3 +7,5 @@
$wb['active_txt'] = 'Aktivní';
$wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximální počet záznamů pro bílou / černou listinu pro Váš účet.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
index 176d5ab..e437fc7 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
@@ -1,9 +1,11 @@
<?php
-$wb['list_head_txt'] = 'Spamový filter bílá listina';
+$wb['list_head_txt'] = 'Spamfiltr bílá listina';
$wb['active_txt'] = 'Aktivní';
$wb['server_id_txt'] = 'Server';
$wb['priority_txt'] = 'Priorita';
$wb['rid_txt'] = 'Uživatel';
-$wb['email_txt'] = 'E-maily na bílé listině';
+$wb['email_txt'] = 'Emaily na bílé listině';
$wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
index 13abef3..0c30e75 100755
--- a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
@@ -1,7 +1,9 @@
<?php
-$wb['list_head_txt'] = 'Kvóty poštovních schránek';
+$wb['list_head_txt'] = 'Mailbox kvóta';
$wb['quota_txt'] = 'Kvóta';
-$wb['name_txt'] = 'Název';
+$wb['name_txt'] = 'Jméno';
$wb['email_txt'] = 'E-mailová adresa';
$wb['used_txt'] = 'Využité místo';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng
index 1c16fb2..8740216 100644
--- a/interface/web/mailuser/lib/lang/cz.lng
+++ b/interface/web/mailuser/lib/lang/cz.lng
@@ -1,9 +1,11 @@
<?php
$wb['Email Account'] = 'E-mailový účet';
$wb['Overview'] = 'Přehled';
+$wb['Password'] = 'Heslo';
$wb['Autoresponder'] = 'Automatická odpověď';
$wb['Send copy'] = 'Poslat kopii na e-mail';
$wb['Spamfilter'] = 'Spamový filter';
$wb['Email Filters'] = 'E-mailové filtry';
-$wb['Password'] = 'Heslo';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_index.lng b/interface/web/mailuser/lib/lang/cz_index.lng
index 45af56e..9b820cd 100644
--- a/interface/web/mailuser/lib/lang/cz_index.lng
+++ b/interface/web/mailuser/lib/lang/cz_index.lng
@@ -10,3 +10,5 @@
$wb['mb_txt'] = 'MB';
$wb['none_txt'] = 'Nenastaveno';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
index ef3aeb4..f8d331b 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
@@ -11,3 +11,5 @@
$wb['now_txt'] = 'Nyní';
$wb['autoresponder_subject_txt'] = 'Předmět e-mailu';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
index 36f11a9..fc8a0f9 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
@@ -5,3 +5,5 @@
$wb['cc_error_isemail'] = 'Vyplněná e-mailová adresa neplatná';
$wb['email_is_cc_error'] = 'Vyplněná e-mailová adresa a poslat kopii na e-mail adresu, nemůžou být stejné.';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
index 57b9d61..65300b6 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
@@ -10,7 +10,7 @@
$wb['limit_mailfilter_txt'] = 'Byl dosažen max. počet e-mailový filtrovacích pravidel.';
$wb['subject_txt'] = 'Předmět';
$wb['from_txt'] = 'Odesílatel';
-$wb['to_txt'] = 'Adresát';
+$wb['to_txt'] = 'Příjemce (adresát)';
$wb['contains_txt'] = 'Obsahuje';
$wb['is_txt'] = 'Je';
$wb['begins_with_txt'] = 'Začíná na';
@@ -18,3 +18,5 @@
$wb['move_to_txt'] = 'Přesunout do';
$wb['delete_txt'] = 'Smazat';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
index 3c2593d..4b64af9 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
@@ -6,3 +6,5 @@
$wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'Opravdu chcete odstranit e-mail filter?';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
index 36555a2..4481539 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
@@ -8,3 +8,5 @@
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
index f0f5bb5..92828ee 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
@@ -5,3 +5,5 @@
$wb['no_policy'] = '- nepovoleno -';
$wb['policy_txt'] = 'Politika';
?>
+
+
diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng
index 587409c..1fee3c0 100644
--- a/interface/web/monitor/lib/lang/cz.lng
+++ b/interface/web/monitor/lib/lang/cz.lng
@@ -134,16 +134,18 @@
$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter log';
$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban log';
$wb['monitor_updates_nosupport_txt'] = 'Vaše distribuce nepodporuje toto monitorování';
-$wb['monitor_nosupportedraid1_txt'] = 'V současné době, podporujeme nástroje mdadm nebo MPT-stav pro sledování sofwarových RAID polí.<br>Nemůžeme najít žádné z nich na serveru.<br><br>To znamená, že nemůžeme monitorovat váš RAID.';
-$wb['monitor_serverstate_beancounterok_txt'] = 'Soubor čítačů (limitů) je v pořádku';
+$wb['monitor_nosupportedraid1_txt'] = 'At the moment, we support mdadm or mpt-status for monitoring the RAID.<br>We cant find any of them at your server.<br><br>This means we can not support your RAID yet.';
+$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok';
$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter';
-$wb['monitor_serverstate_beancounterwarning_txt'] = 'Některé čítače (limity) vykazují selhání.';
-$wb['monitor_serverstate_beancountercritical_txt'] = 'Existuje mnoho selhání čítačů (limitů)';
-$wb['monitor_serverstate_beancountererror_txt'] = 'Existuje příliš mnoho selhání čítačů (limitů)';
-$wb['monitor_title_beancounter_txt'] = 'OpenVz VE čítače (limity)';
+$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter';
+$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter';
+$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter';
+$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter';
$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information';
$wb['monitor_title_iptables_txt'] = 'IPTables Pravidla';
$wb['Show fail2ban-Log'] = 'Zobrazit Fail2Ban Log';
$wb['Show IPTables'] = 'Zobrazit IPTables pravidla';
-$wb['Show OpenVz VE BeanCounter'] = 'Ukázat OpenVz VE čítače (limity)';
+$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter';
?>
+
+
diff --git a/interface/web/monitor/lib/lang/cz_datalog_list.lng b/interface/web/monitor/lib/lang/cz_datalog_list.lng
index c9e9a86..70adcad 100644
--- a/interface/web/monitor/lib/lang/cz_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng
@@ -6,3 +6,5 @@
$wb['action_txt'] = 'Akce';
$wb['status_txt'] = 'Stav';
?>
+
+
diff --git a/interface/web/monitor/lib/lang/cz_syslog_list.lng b/interface/web/monitor/lib/lang/cz_syslog_list.lng
index 9906625..85cd4b3 100644
--- a/interface/web/monitor/lib/lang/cz_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng
@@ -5,3 +5,5 @@
$wb['loglevel_txt'] = 'Logovací úroveň';
$wb['message_txt'] = 'Zpráva';
?>
+
+
diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php
index aa28bf1..b7255c0 100644
--- a/interface/web/sites/form/web_aliasdomain.tform.php
+++ b/interface/web/sites/form/web_aliasdomain.tform.php
@@ -122,7 +122,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
+ 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
'errmsg'=> 'redirect_error_regex'),
),
'default' => '',
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index 86bc116..fcbd8d8 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -297,7 +297,7 @@
'redirect_path' => array (
'datatype' => 'VARCHAR',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
+ 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
'errmsg'=> 'redirect_error_regex'),
),
'formtype' => 'TEXT',
diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php
index 20c5b14..0205c56 100644
--- a/interface/web/sites/form/web_subdomain.tform.php
+++ b/interface/web/sites/form/web_subdomain.tform.php
@@ -123,7 +123,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
+ 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
'errmsg'=> 'redirect_error_regex'),
),
'default' => '',
diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php
index 9c6bfa6..bb12974 100644
--- a/interface/web/sites/form/web_vhost_subdomain.tform.php
+++ b/interface/web/sites/form/web_vhost_subdomain.tform.php
@@ -149,7 +149,7 @@
'web_folder' => array (
'datatype' => 'VARCHAR',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^([\w/_\.\-]{1,100})$@',
+ 'regex' => '@^((?!.*\.\.)[\w/_\.\-]{1,100})$@',
'errmsg'=> 'web_folder_error_regex'),
),
'formtype' => 'TEXT',
@@ -296,7 +296,7 @@
'redirect_path' => array (
'datatype' => 'VARCHAR',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
+ 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
'errmsg'=> 'redirect_error_regex'),
),
'formtype' => 'TEXT',
diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng
index 8d3f7b0..6d6ba6b 100644
--- a/interface/web/sites/lib/lang/cz.lng
+++ b/interface/web/sites/lib/lang/cz.lng
@@ -21,13 +21,16 @@
$wb['Webdav'] = 'WebDAV';
$wb['FTP'] = 'FTP';
$wb['Options'] = 'Volby';
+$wb['Domain'] = 'Doména';
$wb['Redirect'] = 'Přesměrování';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Stránky';
$wb['Database User'] = 'Uživatelé databáze';
-$wb['APS Installer'] = 'APS instalátor';
-$wb['Available packages'] = 'Dostupné balíčky';
-$wb['Installed packages'] = 'Nainstalované balíčky';
-$wb['Update Packagelist'] = 'Aktualizace seznamu balíčků';
-$wb['Domain'] = 'Domain';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
+$wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng
index 1ed9e61..3c32316 100644
--- a/interface/web/sites/lib/lang/cz_aps.lng
+++ b/interface/web/sites/lib/lang/cz_aps.lng
@@ -55,3 +55,5 @@
$wb['btn_install_txt'] = 'Instalovat';
$wb['btn_cancel_txt'] = 'Zrušit';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_aps_instances_list.lng b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
index 961ecba..0ff26ac 100644
--- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
@@ -1,13 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Nainstalované balíčky';
-$wb['name_txt'] = 'Název';
-$wb['version_txt'] = 'Verze';
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Jméno';
+$wb['version_txt'] = 'Version';
$wb['customer_txt'] = 'Klient';
$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Umístění instalace';
-$wb['pkg_delete_confirmation'] = 'Opravdu chcete smazat tuto instalaci ?';
-$wb['pkg_reinstall_confirmation'] = 'Opravdu chcete přeinstalovat tento balíček se stejným nastavením ?';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
$wb['filter_txt'] = 'Hledat';
-$wb['delete_txt'] = 'Vymazat';
-$wb['reinstall_txt'] = 'Přeinstalovat';
+$wb['delete_txt'] = 'Smazat';
+$wb['reinstall_txt'] = 'Reinstall';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_aps_packages_list.lng b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
index 2c83eac..973e70c 100644
--- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
@@ -1,8 +1,10 @@
<?php
-$wb['list_head_txt'] = 'Dostupné balíčky';
-$wb['name_txt'] = 'Název';
-$wb['version_txt'] = 'Verze';
-$wb['category_txt'] = 'Kategorie';
-$wb['status_txt'] = 'Odemčený';
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Jméno';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
$wb['filter_txt'] = 'Hledat';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng
index d4e6c17..5ea9bb5 100644
--- a/interface/web/sites/lib/lang/cz_cron.lng
+++ b/interface/web/sites/lib/lang/cz_cron.lng
@@ -19,3 +19,5 @@
$wb['command_error_format'] = 'Chybná formát příkazu. V případě URL je povoleno volání pouze http/https.';
$wb['unknown_fieldtype_error'] = 'Bylp použito pole neznámého typu.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_cron_list.lng b/interface/web/sites/lib/lang/cz_cron_list.lng
index f50dee2..05b4163 100644
--- a/interface/web/sites/lib/lang/cz_cron_list.lng
+++ b/interface/web/sites/lib/lang/cz_cron_list.lng
@@ -9,5 +9,7 @@
$wb['run_wday_txt'] = 'Dny týdne';
$wb['command_txt'] = 'Příkaz';
$wb['add_new_cron_txt'] = 'Přidat novou cron úlohu';
-$wb['parent_domain_id_txt'] = 'Webové stránky';
+$wb['parent_domain_id_txt'] = 'Website';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng
index 7c41fbf..8187ee0 100644
--- a/interface/web/sites/lib/lang/cz_database.lng
+++ b/interface/web/sites/lib/lang/cz_database.lng
@@ -31,10 +31,10 @@
$wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
+$wb['globalsearch_resultslimit_of_txt'] = 'z';
+$wb['globalsearch_resultslimit_results_txt'] = 'výsledky';
+$wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.';
+$wb['globalsearch_noresults_limit_txt'] = '0 výsledků';
$wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
$wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
$wb['database_ro_user_txt'] = 'Uživatel databáze - jen právo ke čtení';
@@ -43,3 +43,5 @@
$wb['no_dbuser_txt'] = 'Žádný';
$wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_admin_list.lng b/interface/web/sites/lib/lang/cz_database_admin_list.lng
index a006940..4eb24c9 100644
--- a/interface/web/sites/lib/lang/cz_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng
@@ -8,3 +8,5 @@
$wb['add_new_record_txt'] = 'Přidat nové databáze';
$wb['sys_groupid_txt'] = 'Klient';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_list.lng b/interface/web/sites/lib/lang/cz_database_list.lng
index 9bb80dd..269dc21 100644
--- a/interface/web/sites/lib/lang/cz_database_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_list.lng
@@ -7,3 +7,5 @@
$wb['database_name_txt'] = 'Název databáze';
$wb['add_new_record_txt'] = 'Přidat databázi';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_user.lng b/interface/web/sites/lib/lang/cz_database_user.lng
index 3b5dea5..4621087 100644
--- a/interface/web/sites/lib/lang/cz_database_user.lng
+++ b/interface/web/sites/lib/lang/cz_database_user.lng
@@ -14,10 +14,12 @@
$wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['globalsearch_resultslimit_of_txt'] = 'z';
+$wb['globalsearch_resultslimit_results_txt'] = 'výsledky';
+$wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.';
+$wb['globalsearch_noresults_limit_txt'] = '0 výsledků';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
+$wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
index 8703e71..db76d10 100644
--- a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
@@ -4,3 +4,5 @@
$wb['add_new_record_txt'] = 'Vytvořit nového uživatele databáze';
$wb['sys_groupid_txt'] = 'Klient';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_user_list.lng b/interface/web/sites/lib/lang/cz_database_user_list.lng
index 42cf36d..68cd34d 100644
--- a/interface/web/sites/lib/lang/cz_database_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_list.lng
@@ -3,3 +3,5 @@
$wb['database_user_txt'] = 'Uživatelé databáze';
$wb['add_new_record_txt'] = 'Přidat nového uživatele databáze';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_ftp_user.lng b/interface/web/sites/lib/lang/cz_ftp_user.lng
index 876ad51..2b9dd54 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user.lng
@@ -32,3 +32,5 @@
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_ftp_user_list.lng b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
index 41649df..6f6f502 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
@@ -6,3 +6,5 @@
$wb['username_txt'] = 'Uživatelské jméno';
$wb['add_new_record_txt'] = 'Přidat FTP uživatele';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_shell_user.lng b/interface/web/sites/lib/lang/cz_shell_user.lng
index 97b8a0d..234b7a5 100644
--- a/interface/web/sites/lib/lang/cz_shell_user.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user.lng
@@ -27,3 +27,5 @@
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_shell_user_list.lng b/interface/web/sites/lib/lang/cz_shell_user_list.lng
index 1d6bc19..6d4a8fe 100644
--- a/interface/web/sites/lib/lang/cz_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user_list.lng
@@ -6,3 +6,5 @@
$wb['username_txt'] = 'Uživatelské jméno';
$wb['add_new_record_txt'] = 'Přidat shell uživatele';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
index 2c9625a..3324ca2 100644
--- a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
@@ -5,5 +5,7 @@
$wb['used_txt'] = 'Využité místo';
$wb['hard_txt'] = 'Tvrdý limit';
$wb['soft_txt'] = 'Měkký limit';
-$wb['files_txt'] = 'Počet souborů';
+$wb['files_txt'] = 'Single files';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
index 9641511..afdb030 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
@@ -1,3 +1,5 @@
<?php
-$wb['domain_txt'] = 'Alias domény';
+$wb['domain_txt'] = 'Aliasdomain';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
index 22a4ffe..6cf247f 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
@@ -12,3 +12,5 @@
$wb['no_flag_txt'] = 'Žádný příznak';
$wb['none_txt'] = 'Žádná';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_backup_list.lng b/interface/web/sites/lib/lang/cz_web_backup_list.lng
index 9a10ca6..d2b6dcb 100644
--- a/interface/web/sites/lib/lang/cz_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng
@@ -1,7 +1,7 @@
<?php
$wb['list_head_txt'] = 'Existing backups';
$wb['date_txt'] = 'Date';
-$wb['backup_type_txt'] = 'Type';
+$wb['backup_type_txt'] = 'Verze';
$wb['filename_txt'] = 'Backup file';
$wb['restore_backup_txt'] = 'Restore backup';
$wb['download_backup_txt'] = 'Download backup';
@@ -13,3 +13,5 @@
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng
index 33134ac..c5beed5 100644
--- a/interface/web/sites/lib/lang/cz_web_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain.lng
@@ -112,3 +112,5 @@
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
index e52a794..c79a51b 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
@@ -7,3 +7,5 @@
$wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Přidat webovou stránku';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_domain_list.lng b/interface/web/sites/lib/lang/cz_web_domain_list.lng
index cbf025e..af0947c 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_list.lng
@@ -6,3 +6,5 @@
$wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Přidat webovou stránku';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder.lng b/interface/web/sites/lib/lang/cz_web_folder.lng
index fcf9e04..e5756a7 100644
--- a/interface/web/sites/lib/lang/cz_web_folder.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder.lng
@@ -5,3 +5,5 @@
$wb['active_txt'] = 'Aktivní';
$wb['path_error_regex'] = 'Invalid folder path.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder_list.lng b/interface/web/sites/lib/lang/cz_web_folder_list.lng
index 8702d5d..3b43fb4 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng
@@ -5,3 +5,5 @@
$wb['parent_domain_id_txt'] = 'Website';
$wb['path_txt'] = 'Cesta';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder_user.lng b/interface/web/sites/lib/lang/cz_web_folder_user.lng
index d3dc99d..805eb51 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng
@@ -10,3 +10,5 @@
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
index 14bec62..6cc0cc9 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
@@ -4,3 +4,5 @@
$wb['web_folder_id_txt'] = 'Folder';
$wb['username_txt'] = 'Username';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
index ed93596..ffab544 100644
--- a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
@@ -7,3 +7,5 @@
$wb['last_year_txt'] = 'Minulý rok';
$wb['sum_txt'] = 'Součet';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng
index c482017..a0d4a4f 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng
@@ -43,3 +43,5 @@
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
index 8a0bafe..1eab4a8 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
@@ -6,3 +6,5 @@
$wb['domain_txt'] = 'Subdoména';
$wb['add_new_record_txt'] = 'Přidat subdoménu';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
index a13aea8..3077ca7 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
@@ -20,7 +20,7 @@
$wb['domain_txt'] = 'Doména';
$wb['host_txt'] = 'Hostname';
$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Verze';
$wb['redirect_type_txt'] = 'Redirect Type';
$wb['redirect_path_txt'] = 'Redirect Path';
$wb['active_txt'] = 'Aktivní';
@@ -116,3 +116,5 @@
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
index 36d7b86..4afe021 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
@@ -6,3 +6,5 @@
$wb['domain_txt'] = 'Subdomain';
$wb['add_new_record_txt'] = 'Add new subdomain';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng
index 35dae3b..57ac930 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user.lng
@@ -19,3 +19,5 @@
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_webdav_user_list.lng b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
index 791710e..2f480fd 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
@@ -6,3 +6,5 @@
$wb['username_txt'] = 'Username';
$wb['add_new_record_txt'] = 'Add new Webdav-User';
?>
+
+
diff --git a/interface/web/sites/lib/lang/de.lng b/interface/web/sites/lib/lang/de.lng
index 3d260c0..aa244c1 100644
--- a/interface/web/sites/lib/lang/de.lng
+++ b/interface/web/sites/lib/lang/de.lng
@@ -30,4 +30,5 @@
$wb['Available packages'] = 'Verfügbare Pakete';
$wb['Installed packages'] = 'Installierte Pakete';
$wb['Update Packagelist'] = 'Paketliste aktualisieren';
+$wb['error_proxy_requires_url'] = 'Weiterleitungstyp "proxy" erfordert eine URL als Weiterleitungspfad.';
?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng
index a913291..41c6df5 100644
--- a/interface/web/sites/lib/lang/de_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_subdomain.lng
@@ -42,4 +42,5 @@
$wb['no_flag_txt'] = 'Kein Flag';
$wb['proxy_directives_txt'] = 'Proxy Direktiven';
$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
+$wb['error_proxy_requires_url'] = 'Weiterleitungstyp "proxy" erfordert eine URL als Weiterleitungspfad.';
?>
diff --git a/interface/web/sites/lib/lang/en.lng b/interface/web/sites/lib/lang/en.lng
index 7160dac..81010a6 100644
--- a/interface/web/sites/lib/lang/en.lng
+++ b/interface/web/sites/lib/lang/en.lng
@@ -31,4 +31,5 @@
$wb['Installed packages'] = 'Installed packages';
$wb['Update Packagelist'] = 'Update Packagelist';
$wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)';
+$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_subdomain.lng b/interface/web/sites/lib/lang/en_web_subdomain.lng
index 72059a4..cd1c1fb 100644
--- a/interface/web/sites/lib/lang/en_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/en_web_subdomain.lng
@@ -42,4 +42,5 @@
$wb['no_flag_txt'] = 'No flag';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
?>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index c415066..570d462 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -195,11 +195,13 @@
if(data.servertype == "nginx"){
var selected = jQuery('#php').val();
jQuery('.apache').hide();
+ if(selected != "no" && selected != "php-fpm") {
+ jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
+ }
jQuery('#php option[value="fast-cgi"]').hide();
jQuery('#php option[value="cgi"]').hide();
jQuery('#php option[value="mod"]').hide();
jQuery('#php option[value="suphp"]').hide();
- if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected');
} else {
jQuery('.apache').show();
jQuery('#php option[value="fast-cgi"]').show();
@@ -207,8 +209,13 @@
jQuery('#php option[value="mod"]').show();
jQuery('#php option[value="suphp"]').show();
}
- if(noFormChange) resetFormChanged();
- else jQuery('#php').change();
+ if(noFormChange) {
+ resetFormChanged();
+ jQuery('#php').addClass('no-page-form-change').change();
+ jQuery('#php').removeClass('no-page-form-change');
+ } else {
+ jQuery('#php').change();
+ }
});
}
diff --git a/interface/web/sites/templates/web_vhost_subdomain_edit.htm b/interface/web/sites/templates/web_vhost_subdomain_edit.htm
index 5212b5d..67c26f3 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_edit.htm
@@ -140,8 +140,7 @@
reloadFastcgiPHPVersions();
});
}
- adjustForm();
- reloadFastcgiPHPVersions();
+ reloadServerId(true);
jQuery('#client_group_id').change(function(){
clientGroupId = $(this).val();
@@ -161,17 +160,31 @@
jQuery('.fastcgi_php_version:visible').hide();
}
});
-
- function adjustForm(){
+ jQuery('#parent_domain_id').change(function() {
+ reloadServerId(false);
+ });
+
+ function reloadServerId(noFormChange) {
+ var parentWebId = jQuery('#parent_domain_id').val();
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : parentWebId, type : "getserverid"}, function(data) {
+ if(data.serverid) serverId = data.serverid;
+ adjustForm(noFormChange);
+ if(noFormChange) reloadFastcgiPHPVersions(noFormChange);
+ });
+ }
+
+ function adjustForm(noFormChange){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
if(data.servertype == "nginx"){
var selected = jQuery('#php').val();
jQuery('.apache').hide();
+ if(selected != "no" && selected != "php-fpm") {
+ jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
+ }
jQuery('#php option[value="fast-cgi"]').hide();
jQuery('#php option[value="cgi"]').hide();
jQuery('#php option[value="mod"]').hide();
jQuery('#php option[value="suphp"]').hide();
- if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected');
} else {
jQuery('.apache').show();
jQuery('#php option[value="fast-cgi"]').show();
@@ -179,7 +192,13 @@
jQuery('#php option[value="mod"]').show();
jQuery('#php option[value="suphp"]').show();
}
- jQuery('#php').change();
+ if(noFormChange) {
+ resetFormChanged();
+ jQuery('#php').addClass('no-page-form-change').change();
+ jQuery('#php').removeClass('no-page-form-change');
+ } else {
+ jQuery('#php').change();
+ }
});
}
@@ -188,7 +207,7 @@
loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
}
- function reloadFastcgiPHPVersions() {
+ function reloadFastcgiPHPVersions(noFormChange) {
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) {
var options = '<option value="">Default</option>';
var phpfastcgiselected = '';
@@ -201,6 +220,7 @@
options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
});
$('#fastcgi_php_version').html(options).change();
+ if(noFormChange) resetFormChanged();
});
}
diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php
index 901cb35..150cb36 100644
--- a/interface/web/sites/web_aliasdomain_edit.php
+++ b/interface/web/sites/web_aliasdomain_edit.php
@@ -136,6 +136,11 @@
$this->dataRecord['domain'] = $domain_check;
}
}
+
+ // nginx: if redirect type is proxy and redirect path is no URL, display error
+ if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'],0,1) == '/'){
+ $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
+ }
// Get the record of the parent domain
$parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 72be72a..c9398b0 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -474,6 +474,11 @@
}
}
}
+
+ // nginx: if redirect type is proxy and redirect path is no URL, display error
+ //if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'],0,1) == '/'){
+ // $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
+ //}
// Set a few fixed values
$this->dataRecord["parent_domain_id"] = 0;
diff --git a/interface/web/sites/web_subdomain_edit.php b/interface/web/sites/web_subdomain_edit.php
index a424680..ae9ee07 100644
--- a/interface/web/sites/web_subdomain_edit.php
+++ b/interface/web/sites/web_subdomain_edit.php
@@ -147,6 +147,11 @@
} else {
$this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
}
+
+ // nginx: if redirect type is proxy and redirect path is no URL, display error
+ if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'],0,1) == '/'){
+ $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
+ }
// Set a few fixed values
$this->dataRecord["type"] = 'subdomain';
diff --git a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
index cff29d5..59a146c 100644
--- a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
@@ -6,3 +6,5 @@
$wb['password_strength_4_txt'] = 'Silné';
$wb['password_strength_5_txt'] = 'Velmi silné';
?>
+
+
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index ce74406..f80193a 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -57,8 +57,10 @@
jQuery(".panel #Filter").trigger('click');
}
if(elName == 'select' || elName == 'input' || elName == 'textarea') {
- // set marker that something was changed
- pageFormChanged = true;
+ if(jQuery(event.target).hasClass('no-page-form-change') == false) {
+ // set marker that something was changed
+ pageFormChanged = true;
+ }
}
});
diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng
index 66bcaf4..480434e 100644
--- a/interface/web/tools/lib/lang/cz.lng
+++ b/interface/web/tools/lib/lang/cz.lng
@@ -11,3 +11,5 @@
$wb['PDNS Tupa'] = 'PowerDNS Tupa';
$wb['Interface'] = 'Rozhraní';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_import_ispconfig.lng b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
index 8ebf717..ba24f58 100644
--- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
@@ -21,3 +21,5 @@
$wb['import_user_filter_txt'] = 'Importovat uživatelský filter';
$wb['import_spamfilter_txt'] = 'Importovat spamový filter';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_index.lng b/interface/web/tools/lib/lang/cz_index.lng
index 5ebf1ec..b1f32ec 100644
--- a/interface/web/tools/lib/lang/cz_index.lng
+++ b/interface/web/tools/lib/lang/cz_index.lng
@@ -2,3 +2,5 @@
$wb['page_head_txt'] = 'ISPConfig nástroje';
$wb['page_desc_txt'] = 'Změna uživatelského nastavení';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_interface.lng b/interface/web/tools/lib/lang/cz_interface.lng
index 507b7c3..1125032 100644
--- a/interface/web/tools/lib/lang/cz_interface.lng
+++ b/interface/web/tools/lib/lang/cz_interface.lng
@@ -5,3 +5,5 @@
$wb['startmodule_txt'] = 'Výchozí modul po přihlášení';
$wb['app_theme_txt'] = 'Výchozí grafické téma';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng
index 96d622e..3b53ca0 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -11,3 +11,5 @@
$wb['btn_start_txt'] = 'Zahájit';
$wb['btn_cancel_txt'] = 'Zrušit';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_tpl_default.lng b/interface/web/tools/lib/lang/cz_tpl_default.lng
index c062463..53e9bd8 100644
--- a/interface/web/tools/lib/lang/cz_tpl_default.lng
+++ b/interface/web/tools/lib/lang/cz_tpl_default.lng
@@ -1,7 +1,9 @@
<?php
-$wb['list_head_txt'] = 'Default Theme settings';
-$wb['list_desc_txt'] = 'Modify default-theme specific options';
-$wb['no_settings_txt'] = 'There are no settings for the default theme.';
-$wb['btn_start_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['list_head_txt'] = 'Výchozí nastavení motivu';
+$wb['list_desc_txt'] = 'Upravit výchozí téma - specifické volby';
+$wb['no_settings_txt'] = 'Nejsou žádné nastavení pro výchozí motiv.';
+$wb['btn_start_txt'] = 'Uložit';
+$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_usersettings.lng b/interface/web/tools/lib/lang/cz_usersettings.lng
index dec46b7..7490e52 100644
--- a/interface/web/tools/lib/lang/cz_usersettings.lng
+++ b/interface/web/tools/lib/lang/cz_usersettings.lng
@@ -10,3 +10,5 @@
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng
index b666d6f..2122438 100644
--- a/interface/web/vm/lib/lang/cz.lng
+++ b/interface/web/vm/lib/lang/cz.lng
@@ -1,7 +1,9 @@
<?php
-$wb['Virtual Servers'] = 'Virtuální server';
-$wb['OS Templates'] = 'Šablona OS';
-$wb['VM Templates'] = 'Šablona VM';
-$wb['IP addresses'] = 'IP adresy';
+$wb['Virtual Servers'] = 'Virtual Servers';
+$wb['OS Templates'] = 'OS Templates';
+$wb['VM Templates'] = 'VM Templates';
+$wb['IP addresses'] = 'IP addresses';
$wb['OpenVZ'] = 'OpenVZ';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_action.lng b/interface/web/vm/lib/lang/cz_openvz_action.lng
index 52f7328..2930fff 100644
--- a/interface/web/vm/lib/lang/cz_openvz_action.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_action.lng
@@ -6,7 +6,7 @@
$wb['ostemplate_txt'] = 'Create OSTemplate';
$wb['ostemplate_desc_txt'] = '(example: debian-6.0-i386-custom)';
$wb['btn_save_txt'] = 'Execute selected action';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['btn_cancel_txt'] = 'Zrušit';
$wb['start_exec_txt'] = 'Start command has been sent to the VM host server. It may take a minute until the VM is started.';
$wb['stop_exec_txt'] = 'Stop command has been sent to the VM host server. It may take a minute until the VM is stopped.';
$wb['restart_exec_txt'] = 'Restart command has been sent to the VM host server. It may take a minute until the VM is restarted.';
@@ -14,3 +14,5 @@
$wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.';
$wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ip.lng b/interface/web/vm/lib/lang/cz_openvz_ip.lng
index 84c42ce..6afda02 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng
@@ -1,9 +1,11 @@
<?php
-$wb['server_id_txt'] = 'Hostitelský server';
-$wb['ip_address_txt'] = 'IP adresa';
-$wb['vm_id_txt'] = 'Virtuální server';
-$wb['reserved_txt'] = 'Rezervováno';
-$wb['ip_error_wrong'] = 'Prosím, vyplňte platné IPv4 adresy.';
-$wb['ip_error_unique'] = 'Tato IP adresa již existuje.';
-$wb['IP address'] = 'IP adresa';
+$wb['server_id_txt'] = 'Hostserver';
+$wb['ip_address_txt'] = 'IP address';
+$wb['vm_id_txt'] = 'Virtual server';
+$wb['reserved_txt'] = 'Reserved';
+$wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
+$wb['ip_error_unique'] = 'This IP address does already exist.';
+$wb['IP address'] = 'IP address';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
index e6a3a68..e392e9c 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
@@ -5,3 +5,5 @@
$wb['reserved_txt'] = 'Reserved';
$wb['vm_id_txt'] = 'VM';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
index 458877d..8fd50e2 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
@@ -4,8 +4,10 @@
$wb['server_id_txt'] = 'Server';
$wb['allservers_txt'] = 'Exists on all servers';
$wb['active_txt'] = 'Aktivní';
-$wb['description_txt'] = 'Description';
+$wb['description_txt'] = 'Popis';
$wb['template_name_error_empty'] = 'Template name is empty.';
$wb['template_file_error_empty'] = 'Template filename is empty.';
$wb['Template'] = 'Template';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
index 76cab8c..c8be29a 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
@@ -1,8 +1,10 @@
<?php
-$wb['list_head_txt'] = 'OpenVZ šablona OS';
+$wb['list_head_txt'] = 'OpenVZ OSTemplate';
$wb['active_txt'] = 'Aktivní';
-$wb['template_name_txt'] = 'Název šablony';
+$wb['template_name_txt'] = 'Template name';
$wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Existuje na všech serverech';
+$wb['allservers_txt'] = 'Exists on all servers';
$wb['ostemplate_id_txt'] = 'ID';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng
index 8b07949..0acacaf 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template.lng
@@ -21,20 +21,20 @@
$wb['dcachesize_txt'] = 'Dcachesize';
$wb['numiptent_txt'] = 'Numiptent';
$wb['swappages_txt'] = 'Swappages';
-$wb['hostname_txt'] = 'Název hostitele (hostname)';
-$wb['nameserver_txt'] = 'Jmený server(y)';
-$wb['nameserver_desc_txt'] = '(oddělené mezerou)';
-$wb['capability_txt'] = 'Schopnost';
-$wb['template_name_txt'] = 'Název šablony';
-$wb['diskspace_txt'] = 'Velikost disku';
-$wb['ram_txt'] = 'RAM (garantovaná)';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameserver_txt'] = 'Nameserver(s)';
+$wb['nameserver_desc_txt'] = '(separated by whitespace)';
+$wb['capability_txt'] = 'Capability';
+$wb['template_name_txt'] = 'Template name';
+$wb['diskspace_txt'] = 'Diskspace';
+$wb['ram_txt'] = 'RAM (guaranteed)';
$wb['ram_burst_txt'] = 'RAM (burst)';
$wb['cpu_units_txt'] = 'CPU units';
$wb['cpu_num_txt'] = 'CPU cores';
$wb['cpu_limit_txt'] = 'CPU limit %';
$wb['io_priority_txt'] = 'I/O priority';
$wb['active_txt'] = 'Aktivní';
-$wb['description_txt'] = 'Description';
+$wb['description_txt'] = 'Popis';
$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.';
@@ -91,3 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_template_list.lng b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
index d1e8e5e..813dc6a 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
@@ -3,3 +3,5 @@
$wb['active_txt'] = 'Aktivní';
$wb['template_name_txt'] = 'Template name';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng
index 36f0b42..b24a14b 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng
@@ -1,40 +1,42 @@
<?php
-$wb['diskspace_txt'] = 'Velikost disku';
-$wb['ram_txt'] = 'RAM (garantovaná)';
+$wb['diskspace_txt'] = 'Diskspace';
+$wb['ram_txt'] = 'RAM (guaranteed)';
$wb['ram_burst_txt'] = 'RAM (burst)';
-$wb['cpu_units_txt'] = 'CPU jednotka';
-$wb['cpu_num_txt'] = 'Počet CPU';
+$wb['cpu_units_txt'] = 'CPU units';
+$wb['cpu_num_txt'] = 'CPU number';
$wb['cpu_limit_txt'] = 'CPU limit';
-$wb['io_priority_txt'] = 'I/O priorita';
-$wb['nameserver_txt'] = 'Jmený server(y)';
+$wb['io_priority_txt'] = 'I/O priority';
+$wb['nameserver_txt'] = 'Nameserver(s)';
$wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Schopnost';
-$wb['server_id_txt'] = 'Hostitelský server';
-$wb['ostemplate_id_txt'] = 'Šablona OS';
-$wb['template_id_txt'] = 'Šablona';
-$wb['ip_address_txt'] = 'IP adresa';
-$wb['hostname_txt'] = 'Název hostitele (hostname)';
-$wb['vm_password_txt'] = 'VM Heslo';
-$wb['start_boot_txt'] = 'Spuštění při startu';
+$wb['capability_txt'] = 'Capability';
+$wb['server_id_txt'] = 'Hostserver';
+$wb['ostemplate_id_txt'] = 'OSTemplate';
+$wb['template_id_txt'] = 'Template';
+$wb['ip_address_txt'] = 'IP address';
+$wb['hostname_txt'] = 'Hostname';
+$wb['vm_password_txt'] = 'VM Password';
+$wb['start_boot_txt'] = 'Start at boot';
$wb['active_txt'] = 'Aktivní';
$wb['description_txt'] = 'Popis';
$wb['client_group_id_txt'] = 'Klient';
$wb['veid_txt'] = 'VEID';
-$wb['create_dns_txt'] = 'Vytvořte DNS pro hostitele';
-$wb['active_until_date_txt'] = 'Aktivní do data';
-$wb['ip_address_error_empty'] = 'IP adresa nebyla vyplněna.';
-$wb['hostname_error_empty'] = 'Název hostitele (hostname) nebylo zadáno.';
-$wb['vm_password_error_empty'] = 'VM Heslo nebylo zadáno.';
-$wb['veid_error_empty'] = 'VEID nebylo vyplněno.';
-$wb['veid_error_unique'] = 'VEID již existuje.';
+$wb['create_dns_txt'] = 'Create DNS for hostname';
+$wb['active_until_date_txt'] = 'Active until date';
+$wb['ip_address_error_empty'] = 'IP address is empty.';
+$wb['hostname_error_empty'] = 'Hostname is empty.';
+$wb['vm_password_error_empty'] = 'VM Password is empty.';
+$wb['veid_error_empty'] = 'VEID is empty.';
+$wb['veid_error_unique'] = 'VEID does already exist.';
$wb['diskspace_error_empty'] = 'Diskspace is empty.';
$wb['ram_error_empty'] = 'RAM (guaranteed) is empty.';
$wb['ram_burst_error_empty'] = 'RAM (burst) is empty.';
$wb['cpu_units_error_empty'] = 'CPU units is empty.';
-$wb['cpu_num_error_empty'] = 'Počet CPU nebyl vyplněn.';
-$wb['cpu_limit_error_empty'] = 'CPU limit nebyl vyplněn.';
-$wb['io_priority_error_empty'] = 'I/O priorita nebyla vyplněna.';
-$wb['template_nameserver_error_empty'] = 'Jmený server(y) nebyl vyplněn.';
-$wb['Virtual server'] = 'Virtuální server';
-$wb['Advanced'] = 'Pokročilé nastavení';
+$wb['cpu_num_error_empty'] = 'CPU number is empty.';
+$wb['cpu_limit_error_empty'] = 'CPU limit is empty.';
+$wb['io_priority_error_empty'] = 'I/O priority is empty.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
+$wb['Virtual server'] = 'Virtual server';
+$wb['Advanced'] = 'Advanced';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
index d9c7e4d..ae49a1b 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
@@ -1,10 +1,12 @@
<?php
-$wb['list_head_txt'] = 'Virtuální server';
+$wb['list_head_txt'] = 'Virtual server';
$wb['active_txt'] = 'Aktivní';
-$wb['server_id_txt'] = 'Hostitelský server';
-$wb['ostemplate_id_txt'] = 'Šablona OS';
-$wb['template_id_txt'] = 'Šablona';
-$wb['hostname_txt'] = 'Název hostitele (hostname)';
-$wb['ip_address_txt'] = 'IP adresa';
+$wb['server_id_txt'] = 'Hostserver';
+$wb['ostemplate_id_txt'] = 'OSTemplate';
+$wb['template_id_txt'] = 'Template';
+$wb['hostname_txt'] = 'Hostname';
+$wb['ip_address_txt'] = 'IP address';
$wb['veid_txt'] = 'VEID';
?>
+
+
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index c8b4d06..7217636 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -27,15 +27,20 @@
rewrite ^ $scheme://<tmpl_var name='alias_seo_redirect_target_domain'>$request_uri? permanent;
}
</tmpl_loop>
+<tmpl_loop name="local_redirects">
+ if ($http_host <tmpl_var name='local_redirect_operator'> "<tmpl_var name='local_redirect_origin_domain'>") {
+ rewrite ^<tmpl_var name='local_redirect_exclude'>(.*)$ <tmpl_var name='local_redirect_target'>$2 <tmpl_var name='local_redirect_type'>;
+ }
+</tmpl_loop>
<tmpl_loop name="own_redirects">
<tmpl_if name='use_rewrite'>
- rewrite ^<tmpl_var name='rewrite_exclude'>(.*)$ <tmpl_var name='rewrite_target'>$2 <tmpl_var name='rewrite_type'>;
+ <tmpl_if name='exclude_own_hostname'>if ($http_host != "<tmpl_var name='exclude_own_hostname'>") { </tmpl_if>rewrite ^<tmpl_var name='rewrite_exclude'>(.*)$ <tmpl_var name='rewrite_target'>$2 <tmpl_var name='rewrite_type'>;<tmpl_if name='exclude_own_hostname'> }</tmpl_if>
</tmpl_if>
<tmpl_if name='use_proxy'>
location / {
proxy_pass <tmpl_var name='rewrite_target'>;
- rewrite ^/<tmpl_var name='rewrite_subdir'>/(.*) /$1;
+ <tmpl_if name='rewrite_subdir'>rewrite ^/<tmpl_var name='rewrite_subdir'>(.*) /$1;</tmpl_if>
<tmpl_loop name="proxy_directives">
<tmpl_var name='proxy_directive'>
</tmpl_loop>
@@ -143,7 +148,7 @@
</tmpl_if>
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- fastcgi_param PATH_INFO $fastcgi_script_name;
+ #fastcgi_param PATH_INFO $fastcgi_script_name;
fastcgi_intercept_errors on;
}
</tmpl_else>
@@ -212,7 +217,7 @@
<tmpl_if name='use_proxy'>
location / {
proxy_pass <tmpl_var name='rewrite_target'>;
- rewrite ^/<tmpl_var name='rewrite_subdir'>/(.*) /$1;
+ <tmpl_if name='rewrite_subdir'>rewrite ^/<tmpl_var name='rewrite_subdir'>(.*) /$1;</tmpl_if>
<tmpl_loop name="proxy_directives">
<tmpl_var name='proxy_directive'>
</tmpl_loop>
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 4c75e62..005bd1a 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -61,9 +61,9 @@
parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
if ($this->connect_error) {
$this->updateError('DB::__construct');
+ } else {
+ $this->setCharacterEncoding();
}
- parent::query( 'SET NAMES '.$this->dbCharset);
- parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
}
public function __destruct() {
@@ -101,9 +101,31 @@
}
}
}
+
+ private function setCharacterEncoding() {
+ parent::query( 'SET NAMES '.$this->dbCharset);
+ parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
+ }
public function query($queryString) {
- parent::ping();
+ $try = 0;
+ do {
+ $try++;
+ $ok = parent::ping();
+ if(!$ok) {
+ if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) {
+ if($try > 9) {
+ $this->updateError('DB::query -> reconnect');
+ return false;
+ } else {
+ sleep(1);
+ }
+ } else {
+ $this->setCharacterEncoding();
+ $ok = true;
+ }
+ }
+ } while($ok == false);
$this->queryId = parent::query($queryString);
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
if(!$this->queryId) {
@@ -152,6 +174,10 @@
public function numRows() {
return $this->queryId->num_rows;
}
+
+ public function affectedRows() {
+ return $this->queryId->affected_rows;
+ }
// returns mySQL insert id
public function insertID() {
@@ -180,44 +206,6 @@
}
return $out;
}
-
- /*
- //* These functions are deprecated and will be removed.
- function insert($tablename,$form,$debug = 0)
- {
- if(is_array($form)){
- foreach($form as $key => $value)
- {
- $sql_key .= "$key, ";
- $sql_value .= "'".$this->check($value)."', ";
- }
- $sql_key = substr($sql_key,0,strlen($sql_key) - 2);
- $sql_value = substr($sql_value,0,strlen($sql_value) - 2);
-
- $sql = "INSERT INTO $tablename (" . $sql_key . ") VALUES (" . $sql_value .")";
-
- if($debug == 1) echo "SQL-Statement: ".$sql."<br><br>";
- $this->query($sql);
- if($debug == 1) echo "mySQL Error Message: ".$this->errorMessage;
- }
- }
-
- function update($tablename,$form,$bedingung,$debug = 0)
- {
-
- if(is_array($form)){
- foreach($form as $key => $value)
- {
- $insql .= "$key = '".$this->check($value)."', ";
- }
- $insql = substr($insql,0,strlen($insql) - 2);
- $sql = "UPDATE $tablename SET " . $insql . " WHERE $bedingung";
- if($debug == 1) echo "SQL-Statement: ".$sql."<br><br>";
- $this->query($sql);
- if($debug == 1) echo "mySQL Error Message: ".$this->errorMessage;
- }
- }
- */
public function diffrec($record_old, $record_new) {
$diffrec_full = array();
@@ -253,9 +241,9 @@
return array('diff_num' => $diff_num, 'diff_rec' => $diffrec_full);
}
-
- //** Function to fill the datalog with a full differential record.
- public function datalogSave($db_table, $action, $primary_field, $primary_id, $record_old, $record_new) {
+
+ //** Function to fill the datalog with a full differential record.
+ public function datalogSave($db_table, $action, $primary_field, $primary_id, $record_old, $record_new, $force_update = false) {
global $app,$conf;
// Insert backticks only for incomplete table names.
@@ -265,10 +253,17 @@
$escape = '`';
}
- $tmp = $this->diffrec($record_old, $record_new);
- $diffrec_full = $tmp['diff_rec'];
- $diff_num = $tmp['diff_num'];
- unset($tmp);
+ if($force_update == true) {
+ //* We force a update even if no record has changed
+ $diffrec_full = array('new' => $record_new,'old' => $record_old);
+ $diff_num = count($record_new);
+ } else {
+ //* get the difference record between old and new record
+ $tmp = $this->diffrec($record_old, $record_new);
+ $diffrec_full = $tmp['diff_rec'];
+ $diff_num = $tmp['diff_num'];
+ unset($tmp);
+ }
// Insert the server_id, if the record has a server_id
$server_id = (isset($record_old['server_id']) && $record_old['server_id'] > 0)?$record_old['server_id']:0;
@@ -297,9 +292,23 @@
//** Inserts a record and saves the changes into the datalog
public function datalogInsert($tablename, $insert_data, $index_field) {
global $app;
+
+ if(is_array($insert_data)) {
+ $key_str = '';
+ $val_str = '';
+ foreach($insert_data as $key => $val) {
+ $key_str .= "`".$key ."`,";
+ $val_str .= "'".$this->quote($val)."',";
+ }
+ $key_str = substr($key_str,0,-1);
+ $val_str = substr($val_str,0,-1);
+ $insert_data_str = '('.$key_str.') VALUES ('.$val_str.')';
+ } else {
+ $insert_data_str = $insert_data;
+ }
$old_rec = array();
- $this->query("INSERT INTO $tablename $insert_data");
+ $this->query("INSERT INTO $tablename $insert_data_str");
$index_value = $this->insertID();
$new_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
$this->datalogSave($tablename, 'INSERT', $index_field, $index_value, $old_rec, $new_rec);
@@ -308,13 +317,24 @@
}
//** Updates a record and saves the changes into the datalog
- public function datalogUpdate($tablename, $update_data, $index_field, $index_value) {
- global $app;
-
- $old_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
- $this->query("UPDATE $tablename SET $update_data WHERE $index_field = '$index_value'");
+ public function datalogUpdate($tablename, $update_data, $index_field, $index_value, $force_update = false) {
+ global $app;
+
+ $old_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
+
+ if(is_array($update_data)) {
+ $update_data_str = '';
+ foreach($update_data as $key => $val) {
+ $update_data_str .= "`".$key ."` = '".$this->quote($val)."',";
+ }
+ $update_data_str = substr($update_data_str,0,-1);
+ } else {
+ $update_data_str = $update_data;
+ }
+
+ $this->query("UPDATE $tablename SET $update_data_str WHERE $index_field = '$index_value'");
$new_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
- $this->datalogSave($tablename, 'UPDATE', $index_field, $index_value, $old_rec, $new_rec);
+ $this->datalogSave($tablename, 'UPDATE', $index_field, $index_value, $old_rec, $new_rec, $force_update);
return true;
}
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index afcafef..7c0e7f9 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -210,8 +210,14 @@
$this->ssl_certificate_changed = true;
//* Rename files if they exist
- if(file_exists($key_file)) $app->system->rename($key_file,$key_file.'.bak');
- if(file_exists($key_file2)) $app->system->rename($key_file2,$key_file2.'.bak');
+ if(file_exists($key_file)){
+ $app->system->rename($key_file,$key_file.'.bak');
+ $app->system->chmod($key_file.'.bak',0400);
+ }
+ if(file_exists($key_file2)){
+ $app->system->rename($key_file2,$key_file2.'.bak');
+ $app->system->chmod($key_file2.'.bak',0400);
+ }
if(file_exists($csr_file)) $app->system->rename($csr_file,$csr_file.'.bak');
if(file_exists($crt_file)) $app->system->rename($crt_file,$crt_file.'.bak');
@@ -283,6 +289,7 @@
}
+ $app->system->chmod($key_file,0400);
$app->system->chmod($key_file2,0400);
@$app->system->unlink($config_file);
@$app->system->unlink($rand_file);
@@ -309,8 +316,14 @@
$bundle_file = $ssl_dir.'/'.$domain.".bundle";
//* Backup files
- if(file_exists($key_file)) $app->system->copy($key_file,$key_file.'~');
- if(file_exists($key_file2)) $app->system->copy($key_file2,$key_file2.'~');
+ if(file_exists($key_file)){
+ $app->system->copy($key_file,$key_file.'~');
+ $app->system->chmod($key_file.'~',0400);
+ }
+ if(file_exists($key_file2)){
+ $app->system->copy($key_file2,$key_file2.'~');
+ $app->system->chmod($key_file2.'~',0400);
+ }
if(file_exists($csr_file)) $app->system->copy($csr_file,$csr_file.'~');
if(file_exists($crt_file)) $app->system->copy($crt_file,$crt_file.'~');
if(file_exists($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'~');
@@ -1543,8 +1556,14 @@
$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
//* Backup the files that might have caused the error
- if(is_file($key_file)) $app->system->copy($key_file,$key_file.'.err');
- if(is_file($key_file2)) $app->system->copy($key_file2,$key_file2.'.err');
+ if(is_file($key_file)){
+ $app->system->copy($key_file,$key_file.'.err');
+ $app->system->chmod($key_file.'.err',0400);
+ }
+ if(is_file($key_file2)){
+ $app->system->copy($key_file2,$key_file2.'.err');
+ $app->system->chmod($key_file2.'.err',0400);
+ }
if(is_file($csr_file)) $app->system->copy($csr_file,$csr_file.'.err');
if(is_file($crt_file)) $app->system->copy($crt_file,$crt_file.'.err');
if(is_file($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'.err');
diff --git a/server/plugins-available/cron_jailkit_plugin.inc.php b/server/plugins-available/cron_jailkit_plugin.inc.php
index 41669b5..8df854a 100644
--- a/server/plugins-available/cron_jailkit_plugin.inc.php
+++ b/server/plugins-available/cron_jailkit_plugin.inc.php
@@ -262,6 +262,8 @@
function _add_jailkit_programs()
{
+ global $app;
+
//copy over further programs and its libraries
$command = '/usr/local/ispconfig/server/scripts/create_jailkit_programs.sh';
$command .= ' '.escapeshellcmd($this->parent_domain['document_root']);
@@ -280,6 +282,8 @@
function _add_jailkit_user()
{
+ global $app;
+
//add the user to the chroot
$jailkit_chroot_userhome = $this->_get_home_dir($this->parent_domain['system_user']);
diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
index e4825c8..ce6bb5a 100644
--- a/server/plugins-available/mysql_clientdb_plugin.inc.php
+++ b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -393,7 +393,7 @@
}
if($data['new']['database_password'] != $data['old']['database_password'] && $data['new']['database_password'] != '') {
- $link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = PASSWORD('".$link->escape_string($data['new']['database_password'])."');"); // is contained in clear text so PASSWORD() func is needed
+ $link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = '".$link->escape_string($data['new']['database_password'])."';");
$app->log('Changing MySQL user password for: '.$data['new']['database_user'].'@'.$db_host,LOGLEVEL_DEBUG);
}
}
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 854320e..1c37a5a 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -120,8 +120,14 @@
$this->ssl_certificate_changed = true;
//* Rename files if they exist
- if(file_exists($key_file)) $app->system->rename($key_file,$key_file.'.bak');
- if(file_exists($key_file2)) $app->system->rename($key_file2,$key_file2.'.bak');
+ if(file_exists($key_file)){
+ $app->system->rename($key_file,$key_file.'.bak');
+ $app->system->chmod($key_file.'.bak',0400);
+ }
+ if(file_exists($key_file2)){
+ $app->system->rename($key_file2,$key_file2.'.bak');
+ $app->system->chmod($key_file2.'.bak',0400);
+ }
if(file_exists($csr_file)) $app->system->rename($csr_file,$csr_file.'.bak');
if(file_exists($crt_file)) $app->system->rename($crt_file,$crt_file.'.bak');
@@ -193,6 +199,7 @@
}
+ $app->system->chmod($key_file,0400);
$app->system->chmod($key_file2,0400);
@$app->system->unlink($config_file);
@$app->system->unlink($rand_file);
@@ -219,8 +226,14 @@
//$bundle_file = $ssl_dir.'/'.$domain.".bundle";
//* Backup files
- if(file_exists($key_file)) $app->system->copy($key_file,$key_file.'~');
- if(file_exists($key_file2)) $app->system->copy($key_file2,$key_file2.'~');
+ if(file_exists($key_file)){
+ $app->system->copy($key_file,$key_file.'~');
+ $app->system->chmod($key_file.'~',0400);
+ }
+ if(file_exists($key_file2)){
+ $app->system->copy($key_file2,$key_file2.'~');
+ $app->system->chmod($key_file2.'~',0400);
+ }
if(file_exists($csr_file)) $app->system->copy($csr_file,$csr_file.'~');
if(file_exists($crt_file)) $app->system->copy($crt_file,$crt_file.'~');
//if(file_exists($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'~');
@@ -969,6 +982,7 @@
// Rewrite rules
$own_rewrite_rules = array();
$rewrite_rules = array();
+ $local_rewrite_rules = array();
if($data['new']['redirect_type'] != '' && $data['new']['redirect_path'] != '') {
if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
if(substr($data['new']['redirect_path'],0,8) == '[scheme]'){
@@ -998,6 +1012,7 @@
switch($data['new']['subdomain']) {
case 'www':
+ $exclude_own_hostname = '';
if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
if($data['new']['redirect_type'] == 'proxy'){
$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
@@ -1020,6 +1035,7 @@
break;
} else {
$rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+ $exclude_own_hostname = $tmp_redirect_path_parts['host'];
}
} else {
// external URL
@@ -1028,7 +1044,8 @@
$vhost_data['use_proxy'] = 'y';
$rewrite_subdir = $tmp_redirect_path_parts['path'];
if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+ if($rewrite_subdir == '/') $rewrite_subdir = '';
}
}
unset($tmp_redirect_path);
@@ -1039,11 +1056,13 @@
'rewrite_target' => $data['new']['redirect_path'],
'rewrite_exclude' => $rewrite_exclude,
'rewrite_subdir' => $rewrite_subdir,
+ 'exclude_own_hostname' => $exclude_own_hostname,
'proxy_directives' => $final_proxy_directives,
'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
break;
case '*':
+ $exclude_own_hostname = '';
if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
if($data['new']['redirect_type'] == 'proxy'){
$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
@@ -1068,6 +1087,7 @@
break;
} else {
$rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+ $exclude_own_hostname = $tmp_redirect_path_parts['host'];
}
} else {
// external URL
@@ -1076,7 +1096,8 @@
$vhost_data['use_proxy'] = 'y';
$rewrite_subdir = $tmp_redirect_path_parts['path'];
if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+ if($rewrite_subdir == '/') $rewrite_subdir = '';
}
}
unset($tmp_redirect_path);
@@ -1087,12 +1108,14 @@
'rewrite_target' => $data['new']['redirect_path'],
'rewrite_exclude' => $rewrite_exclude,
'rewrite_subdir' => $rewrite_subdir,
+ 'exclude_own_hostname' => $exclude_own_hostname,
'proxy_directives' => $final_proxy_directives,
'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
break;
default:
if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
+ $exclude_own_hostname = '';
if($data['new']['redirect_type'] == 'proxy'){
$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
$vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
@@ -1114,6 +1137,7 @@
break;
} else {
$rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+ $exclude_own_hostname = $tmp_redirect_path_parts['host'];
}
} else {
// external URL
@@ -1122,7 +1146,8 @@
$vhost_data['use_proxy'] = 'y';
$rewrite_subdir = $tmp_redirect_path_parts['path'];
if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+ if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+ if($rewrite_subdir == '/') $rewrite_subdir = '';
}
}
unset($tmp_redirect_path);
@@ -1133,6 +1158,7 @@
'rewrite_target' => $data['new']['redirect_path'],
'rewrite_exclude' => $rewrite_exclude,
'rewrite_subdir' => $rewrite_subdir,
+ 'exclude_own_hostname' => $exclude_own_hostname,
'proxy_directives' => $final_proxy_directives,
'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
@@ -1189,7 +1215,7 @@
$final_proxy_directives = false;
}
- if($alias['redirect_type'] == '' || $alias['redirect_path'] == '') {
+ if($alias['redirect_type'] == '' || $alias['redirect_path'] == '' || substr($alias['redirect_path'],0,1) == '/') {
switch($alias['subdomain']) {
case 'www':
$server_alias[] = 'www.'.$alias['domain'].' '.$alias['domain'].' ';
@@ -1212,8 +1238,44 @@
}
}
- // Rewriting
- if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
+ // Local Rewriting (inside vhost server {} container)
+ if($alias['redirect_type'] != '' && substr($alias['redirect_path'],0,1) == '/' && $alias['redirect_type'] != 'proxy') { // proxy makes no sense with local path
+ if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
+ $rewrite_exclude = '(?!/\b('.substr($alias['redirect_path'],1,-1).(substr($alias['redirect_path'],1,-1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+ switch($alias['subdomain']) {
+ case 'www':
+ // example.com
+ $local_rewrite_rules[] = array( 'local_redirect_origin_domain' => $alias['domain'],
+ 'local_redirect_operator' => '=',
+ 'local_redirect_exclude' => $rewrite_exclude,
+ 'local_redirect_target' => $alias['redirect_path'],
+ 'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
+
+ // www.example.com
+ $local_rewrite_rules[] = array( 'local_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'local_redirect_operator' => '=',
+ 'local_redirect_exclude' => $rewrite_exclude,
+ 'local_redirect_target' => $alias['redirect_path'],
+ 'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
+ break;
+ case '*':
+ $local_rewrite_rules[] = array( 'local_redirect_origin_domain' => '^('.str_replace('.', '\.', $alias['domain']).'|.+\.'.str_replace('.', '\.', $alias['domain']).')$',
+ 'local_redirect_operator' => '~*',
+ 'local_redirect_exclude' => $rewrite_exclude,
+ 'local_redirect_target' => $alias['redirect_path'],
+ 'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
+ break;
+ default:
+ $local_rewrite_rules[] = array( 'local_redirect_origin_domain' => $alias['domain'],
+ 'local_redirect_operator' => '=',
+ 'local_redirect_exclude' => $rewrite_exclude,
+ 'local_redirect_target' => $alias['redirect_path'],
+ 'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
+ }
+ }
+
+ // External Rewriting (extra server {} containers)
+ if($alias['redirect_type'] != '' && $alias['redirect_path'] != '' && substr($alias['redirect_path'],0,1) != '/') {
if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
if(substr($alias['redirect_path'],0,8) == '[scheme]'){
if($alias['redirect_type'] != 'proxy'){
@@ -1225,21 +1287,15 @@
switch($alias['subdomain']) {
case 'www':
- if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
- if($alias['redirect_type'] == 'proxy'){
- $rewrite_subdir = substr($alias['redirect_path'],1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
- }
- $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
- } else {
- if($alias['redirect_type'] == 'proxy'){
- $tmp_redirect_path = $alias['redirect_path'];
- $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- $rewrite_subdir = $tmp_redirect_path_parts['path'];
- if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
- }
+ if($alias['redirect_type'] == 'proxy'){
+ $tmp_redirect_path = $alias['redirect_path'];
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ $rewrite_subdir = $tmp_redirect_path_parts['path'];
+ if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+ if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+ if($rewrite_subdir == '/') $rewrite_subdir = '';
}
+
if($alias['redirect_type'] != 'proxy'){
if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
}
@@ -1259,26 +1315,7 @@
'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
-
-
- if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
- if($alias['redirect_type'] == 'proxy'){
- $rewrite_subdir = substr($alias['redirect_path'],1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
- }
- $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
- } else {
- if($alias['redirect_type'] == 'proxy'){
- $tmp_redirect_path = $alias['redirect_path'];
- $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- $rewrite_subdir = $tmp_redirect_path_parts['path'];
- if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
- }
- }
- if($alias['redirect_type'] != 'proxy'){
- if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
- }
+
// Add SEO redirects for alias domains
$alias_seo_redirects2 = array();
if($alias['seo_redirect'] != ''){
@@ -1297,21 +1334,15 @@
'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
break;
case '*':
- if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
- if($alias['redirect_type'] == 'proxy'){
- $rewrite_subdir = substr($alias['redirect_path'],1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
- }
- $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
- } else {
- if($alias['redirect_type'] == 'proxy'){
- $tmp_redirect_path = $alias['redirect_path'];
- $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- $rewrite_subdir = $tmp_redirect_path_parts['path'];
- if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
- }
+ if($alias['redirect_type'] == 'proxy'){
+ $tmp_redirect_path = $alias['redirect_path'];
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ $rewrite_subdir = $tmp_redirect_path_parts['path'];
+ if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+ if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+ if($rewrite_subdir == '/') $rewrite_subdir = '';
}
+
if($alias['redirect_type'] != 'proxy'){
if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
}
@@ -1333,21 +1364,15 @@
'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
break;
default:
- if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
- if($alias['redirect_type'] == 'proxy'){
- $rewrite_subdir = substr($alias['redirect_path'],1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
- }
- $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
- } else {
- if($alias['redirect_type'] == 'proxy'){
- $tmp_redirect_path = $alias['redirect_path'];
- $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
- $rewrite_subdir = $tmp_redirect_path_parts['path'];
- if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
- if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
- }
+ if($alias['redirect_type'] == 'proxy'){
+ $tmp_redirect_path = $alias['redirect_path'];
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ $rewrite_subdir = $tmp_redirect_path_parts['path'];
+ if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+ if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+ if($rewrite_subdir == '/') $rewrite_subdir = '';
}
+
if($alias['redirect_type'] != 'proxy'){
if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
}
@@ -1398,6 +1423,9 @@
}
if(count($own_rewrite_rules) > 0) {
$tpl->setLoop('own_redirects',$own_rewrite_rules);
+ }
+ if(count($local_rewrite_rules) > 0) {
+ $tpl->setLoop('local_redirects',$local_rewrite_rules);
}
if(count($alias_seo_redirects) > 0) {
$tpl->setLoop('alias_seo_redirects',$alias_seo_redirects);
@@ -1523,8 +1551,14 @@
//$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
//* Backup the files that might have caused the error
- if(is_file($key_file)) $app->system->copy($key_file,$key_file.'.err');
- if(is_file($key_file2)) $app->system->copy($key_file2,$key_file2.'.err');
+ if(is_file($key_file)){
+ $app->system->copy($key_file,$key_file.'.err');
+ $app->system->chmod($key_file.'.err',0400);
+ }
+ if(is_file($key_file2)){
+ $app->system->copy($key_file2,$key_file2.'.err');
+ $app->system->chmod($key_file2.'.err',0400);
+ }
if(is_file($csr_file)) $app->system->copy($csr_file,$csr_file.'.err');
if(is_file($crt_file)) $app->system->copy($crt_file,$crt_file.'.err');
//if(is_file($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'.err');
@@ -2294,8 +2328,35 @@
$lines = explode("\n", $vhost_conf);
+ // if whole location block is in one line, split it up into multiple lines
if(is_array($lines) && !empty($lines)){
+ $linecount = sizeof($lines);
+ for($h=0;$h<$linecount;$h++){
+ $lines[$h] = rtrim($lines[$h]);
+ if(substr(ltrim($lines[$h]), 0, 8) == 'location' && strpos($lines[$h], '{') !== false && strpos($lines[$h], ';') !== false){
+ $lines[$h] = str_replace("{", "{\n", $lines[$h]);
+ $lines[$h] = str_replace(";", ";\n", $lines[$h]);
+ if(strpos($lines[$h], '##merge##') !== false){
+ $lines[$h] = str_replace('##merge##', '', $lines[$h]);
+ $lines[$h] = substr($lines[$h],0,strpos($lines[$h], '{')).' ##merge##'.substr($lines[$h],strpos($lines[$h], '{')+1);
+ }
+ }
+ if(substr(ltrim($lines[$h]), 0, 8) == 'location' && strpos($lines[$h], '{') !== false && strpos($lines[$h], '}') !== false && strpos($lines[$h], ';') === false){
+ $lines[$h] = str_replace("{", "{\n", $lines[$h]);
+ if(strpos($lines[$h], '##merge##') !== false){
+ $lines[$h] = str_replace('##merge##', '', $lines[$h]);
+ $lines[$h] = substr($lines[$h],0,strpos($lines[$h], '{')).' ##merge##'.substr($lines[$h],strpos($lines[$h], '{')+1);
+ }
+ }
+ }
+ }
+ $vhost_conf = implode("\n", $lines);
+ unset($lines);
+ unset($linecount);
+ $lines = explode("\n", $vhost_conf);
+
+ if(is_array($lines) && !empty($lines)){
$locations = array();
$islocation = false;
$linecount = sizeof($lines);
@@ -2364,7 +2425,7 @@
$vhost_conf = implode("\n", $lines);
}
- return $vhost_conf;
+ return trim($vhost_conf);
}
function client_delete($event_name,$data) {
--
Gitblit v1.9.1