From 43b345cabb3e8743a91c39e8d6367c1aa594ebd2 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 17 Jan 2013 15:33:59 +0000 Subject: [PATCH] Merged revisions from 3.0.5 stable branch: 3758-3768, 3769 shall not be merged to trunk. --- interface/lib/classes/db_mysql.inc.php | 35 ++- .../classes/listform_tpl_generator.inc.php | 2 +- interface/lib/classes/remoting_lib.inc.php | 8 +- interface/lib/classes/tform.inc.php | 8 +- interface/lib/lang/cz.lng | 2 + interface/web/admin/lib/lang/cz.lng | 6 +- .../admin/lib/lang/cz_directive_snippets.lng | 4 +- .../lib/lang/cz_directive_snippets_list.lng | 4 +- interface/web/admin/lib/lang/cz_firewall.lng | 2 + .../web/admin/lib/lang/cz_firewall_list.lng | 2 + interface/web/admin/lib/lang/cz_groups.lng | 2 + .../web/admin/lib/lang/cz_groups_list.lng | 2 + interface/web/admin/lib/lang/cz_iptables.lng | 4 +- .../web/admin/lib/lang/cz_iptables_list.lng | 4 +- .../web/admin/lib/lang/cz_language_add.lng | 2 + .../admin/lib/lang/cz_language_complete.lng | 4 +- .../web/admin/lib/lang/cz_language_edit.lng | 2 + .../web/admin/lib/lang/cz_language_export.lng | 2 + .../web/admin/lib/lang/cz_language_import.lng | 2 + .../web/admin/lib/lang/cz_language_list.lng | 2 + .../web/admin/lib/lang/cz_package_install.lng | 8 +- .../web/admin/lib/lang/cz_remote_action.lng | 6 +- .../web/admin/lib/lang/cz_remote_user.lng | 4 +- .../admin/lib/lang/cz_remote_user_list.lng | 2 + interface/web/admin/lib/lang/cz_server.lng | 10 +- .../web/admin/lib/lang/cz_server_config.lng | 66 +++--- .../admin/lib/lang/cz_server_config_list.lng | 2 + interface/web/admin/lib/lang/cz_server_ip.lng | 2 + .../web/admin/lib/lang/cz_server_ip_list.lng | 4 +- .../web/admin/lib/lang/cz_server_list.lng | 2 + .../web/admin/lib/lang/cz_server_php.lng | 20 +- .../web/admin/lib/lang/cz_server_php_list.lng | 6 +- .../lib/lang/cz_software_package_install.lng | 4 +- .../lib/lang/cz_software_package_list.lng | 2 + .../web/admin/lib/lang/cz_software_repo.lng | 2 + .../admin/lib/lang/cz_software_repo_list.lng | 2 + .../lib/lang/cz_software_update_list.lng | 2 + .../web/admin/lib/lang/cz_system_config.lng | 12 +- .../admin/lib/lang/cz_tpl_default_admin.lng | 20 +- interface/web/admin/lib/lang/cz_users.lng | 6 +- .../web/admin/lib/lang/cz_users_list.lng | 4 +- interface/web/client/lib/lang/cz.lng | 26 ++- interface/web/client/lib/lang/cz_client.lng | 62 ++--- .../web/client/lib/lang/cz_client_circle.lng | 14 +- .../client/lib/lang/cz_client_circle_list.lng | 16 +- .../web/client/lib/lang/cz_client_del.lng | 2 + .../web/client/lib/lang/cz_client_message.lng | 18 +- .../client/lib/lang/cz_client_template.lng | 40 ++-- .../lib/lang/cz_client_template_list.lng | 2 + .../web/client/lib/lang/cz_clients_list.lng | 4 +- interface/web/client/lib/lang/cz_domain.lng | 8 +- .../web/client/lib/lang/cz_domain_list.lng | 6 +- interface/web/client/lib/lang/cz_reseller.lng | 46 ++-- .../web/client/lib/lang/cz_resellers_list.lng | 4 +- interface/web/dashboard/lib/lang/cz.lng | 2 + .../dashboard/lib/lang/cz_dashlet_limits.lng | 2 + .../dashboard/lib/lang/cz_dashlet_modules.lng | 2 + interface/web/designer/lib/lang/cz.lng | 2 + .../web/designer/lib/lang/cz_form_edit.lng | 2 + .../web/designer/lib/lang/cz_form_list.lng | 2 + .../web/designer/lib/lang/cz_form_show.lng | 6 +- .../web/designer/lib/lang/cz_module_edit.lng | 2 + .../web/designer/lib/lang/cz_module_list.lng | 2 + .../designer/lib/lang/cz_module_nav_edit.lng | 2 + .../lib/lang/cz_module_nav_item_edit.lng | 8 +- .../web/designer/lib/lang/cz_module_show.lng | 4 +- interface/web/dns/lib/lang/cz.lng | 2 + interface/web/dns/lib/lang/cz_dns_a.lng | 2 + interface/web/dns/lib/lang/cz_dns_a_list.lng | 16 +- interface/web/dns/lib/lang/cz_dns_aaaa.lng | 2 + interface/web/dns/lib/lang/cz_dns_alias.lng | 2 + interface/web/dns/lib/lang/cz_dns_cname.lng | 2 + interface/web/dns/lib/lang/cz_dns_hinfo.lng | 2 + interface/web/dns/lib/lang/cz_dns_import.lng | 2 + interface/web/dns/lib/lang/cz_dns_mx.lng | 14 +- interface/web/dns/lib/lang/cz_dns_ns.lng | 2 + interface/web/dns/lib/lang/cz_dns_ptr.lng | 4 +- interface/web/dns/lib/lang/cz_dns_rp.lng | 2 + interface/web/dns/lib/lang/cz_dns_slave.lng | 2 + .../web/dns/lib/lang/cz_dns_slave_list.lng | 2 + interface/web/dns/lib/lang/cz_dns_soa.lng | 6 +- .../web/dns/lib/lang/cz_dns_soa_list.lng | 2 + interface/web/dns/lib/lang/cz_dns_srv.lng | 4 +- .../web/dns/lib/lang/cz_dns_template.lng | 2 + .../web/dns/lib/lang/cz_dns_template_list.lng | 2 + interface/web/dns/lib/lang/cz_dns_txt.lng | 2 + interface/web/dns/lib/lang/cz_dns_wizard.lng | 14 +- interface/web/help/lib/lang/cz.lng | 2 + interface/web/help/lib/lang/cz_faq_form.lng | 2 + .../lib/lang/cz_faq_manage_questions_list.lng | 2 + .../web/help/lib/lang/cz_help_faq_list.lng | 4 +- .../lib/lang/cz_help_faq_sections_list.lng | 2 + .../web/help/lib/lang/cz_support_message.lng | 2 + .../help/lib/lang/cz_support_message_list.lng | 2 + interface/web/login/lib/lang/cz.lng | 4 +- interface/web/mail/lib/lang/cz.lng | 31 +-- interface/web/mail/lib/lang/cz_mail_alias.lng | 8 +- .../web/mail/lib/lang/cz_mail_alias_list.lng | 2 + .../web/mail/lib/lang/cz_mail_aliasdomain.lng | 4 +- .../lib/lang/cz_mail_aliasdomain_list.lng | 2 + .../web/mail/lib/lang/cz_mail_blacklist.lng | 6 +- .../mail/lib/lang/cz_mail_blacklist_list.lng | 6 +- .../mail/lib/lang/cz_mail_content_filter.lng | 2 + .../lib/lang/cz_mail_content_filter_list.lng | 2 + .../web/mail/lib/lang/cz_mail_domain.lng | 8 +- .../lib/lang/cz_mail_domain_admin_list.lng | 2 + .../mail/lib/lang/cz_mail_domain_catchall.lng | 10 +- .../lib/lang/cz_mail_domain_catchall_list.lng | 2 + .../web/mail/lib/lang/cz_mail_domain_list.lng | 2 + .../web/mail/lib/lang/cz_mail_forward.lng | 6 +- .../mail/lib/lang/cz_mail_forward_list.lng | 2 + interface/web/mail/lib/lang/cz_mail_get.lng | 6 +- .../web/mail/lib/lang/cz_mail_get_list.lng | 4 +- .../web/mail/lib/lang/cz_mail_mailinglist.lng | 12 +- .../lib/lang/cz_mail_mailinglist_list.lng | 4 +- .../mail/lib/lang/cz_mail_relay_recipient.lng | 6 +- .../lib/lang/cz_mail_relay_recipient_list.lng | 4 +- .../web/mail/lib/lang/cz_mail_spamfilter.lng | 12 +- .../mail/lib/lang/cz_mail_spamfilter_list.lng | 4 +- .../web/mail/lib/lang/cz_mail_transport.lng | 4 +- .../mail/lib/lang/cz_mail_transport_list.lng | 2 + interface/web/mail/lib/lang/cz_mail_user.lng | 4 +- .../web/mail/lib/lang/cz_mail_user_filter.lng | 4 +- .../lib/lang/cz_mail_user_filter_list.lng | 4 +- .../web/mail/lib/lang/cz_mail_user_list.lng | 2 + .../mail/lib/lang/cz_mail_user_stats_list.lng | 2 + .../web/mail/lib/lang/cz_mail_whitelist.lng | 6 +- .../mail/lib/lang/cz_mail_whitelist_list.lng | 6 +- .../mail/lib/lang/cz_spamfilter_blacklist.lng | 2 + .../lib/lang/cz_spamfilter_blacklist_list.lng | 2 + .../mail/lib/lang/cz_spamfilter_config.lng | 4 +- .../lib/lang/cz_spamfilter_config_list.lng | 2 + .../mail/lib/lang/cz_spamfilter_policy.lng | 2 + .../lib/lang/cz_spamfilter_policy_list.lng | 2 + .../web/mail/lib/lang/cz_spamfilter_users.lng | 4 +- .../lib/lang/cz_spamfilter_users_list.lng | 6 +- .../mail/lib/lang/cz_spamfilter_whitelist.lng | 2 + .../lib/lang/cz_spamfilter_whitelist_list.lng | 6 +- .../lib/lang/cz_user_quota_stats_list.lng | 6 +- interface/web/mailuser/lib/lang/cz.lng | 4 +- interface/web/mailuser/lib/lang/cz_index.lng | 2 + .../lib/lang/cz_mail_user_autoresponder.lng | 2 + .../web/mailuser/lib/lang/cz_mail_user_cc.lng | 2 + .../mailuser/lib/lang/cz_mail_user_filter.lng | 4 +- .../lib/lang/cz_mail_user_filter_list.lng | 2 + .../lib/lang/cz_mail_user_password.lng | 2 + .../lib/lang/cz_mail_user_spamfilter.lng | 2 + interface/web/monitor/lib/lang/cz.lng | 16 +- .../web/monitor/lib/lang/cz_datalog_list.lng | 2 + .../web/monitor/lib/lang/cz_syslog_list.lng | 2 + .../web/sites/form/web_aliasdomain.tform.php | 2 +- interface/web/sites/form/web_domain.tform.php | 2 +- .../web/sites/form/web_subdomain.tform.php | 2 +- .../sites/form/web_vhost_subdomain.tform.php | 4 +- interface/web/sites/lib/lang/cz.lng | 13 +- interface/web/sites/lib/lang/cz_aps.lng | 2 + .../sites/lib/lang/cz_aps_instances_list.lng | 18 +- .../sites/lib/lang/cz_aps_packages_list.lng | 12 +- interface/web/sites/lib/lang/cz_cron.lng | 2 + interface/web/sites/lib/lang/cz_cron_list.lng | 4 +- interface/web/sites/lib/lang/cz_database.lng | 10 +- .../sites/lib/lang/cz_database_admin_list.lng | 2 + .../web/sites/lib/lang/cz_database_list.lng | 2 + .../web/sites/lib/lang/cz_database_user.lng | 14 +- .../lib/lang/cz_database_user_admin_list.lng | 2 + .../sites/lib/lang/cz_database_user_list.lng | 2 + interface/web/sites/lib/lang/cz_ftp_user.lng | 2 + .../web/sites/lib/lang/cz_ftp_user_list.lng | 2 + .../web/sites/lib/lang/cz_shell_user.lng | 2 + .../web/sites/lib/lang/cz_shell_user_list.lng | 2 + .../lib/lang/cz_user_quota_stats_list.lng | 4 +- .../web/sites/lib/lang/cz_web_aliasdomain.lng | 4 +- .../lib/lang/cz_web_aliasdomain_list.lng | 2 + .../web/sites/lib/lang/cz_web_backup_list.lng | 4 +- .../web/sites/lib/lang/cz_web_domain.lng | 2 + .../lib/lang/cz_web_domain_admin_list.lng | 2 + .../web/sites/lib/lang/cz_web_domain_list.lng | 2 + .../web/sites/lib/lang/cz_web_folder.lng | 2 + .../web/sites/lib/lang/cz_web_folder_list.lng | 2 + .../web/sites/lib/lang/cz_web_folder_user.lng | 2 + .../lib/lang/cz_web_folder_user_list.lng | 2 + .../lib/lang/cz_web_sites_stats_list.lng | 2 + .../web/sites/lib/lang/cz_web_subdomain.lng | 2 + .../sites/lib/lang/cz_web_subdomain_list.lng | 2 + .../sites/lib/lang/cz_web_vhost_subdomain.lng | 4 +- .../lib/lang/cz_web_vhost_subdomain_list.lng | 2 + .../web/sites/lib/lang/cz_webdav_user.lng | 2 + .../sites/lib/lang/cz_webdav_user_list.lng | 2 + interface/web/sites/lib/lang/de.lng | 1 + .../web/sites/lib/lang/de_web_subdomain.lng | 1 + interface/web/sites/lib/lang/en.lng | 1 + .../web/sites/lib/lang/en_web_subdomain.lng | 1 + .../web/sites/templates/web_domain_edit.htm | 13 +- .../templates/web_vhost_subdomain_edit.htm | 34 ++- interface/web/sites/web_aliasdomain_edit.php | 5 + interface/web/sites/web_domain_edit.php | 5 + interface/web/sites/web_subdomain_edit.php | 5 + .../lib/lang/cz_strengthmeter.lng | 2 + .../web/themes/default/templates/main.tpl.htm | 6 +- interface/web/tools/lib/lang/cz.lng | 2 + .../tools/lib/lang/cz_import_ispconfig.lng | 2 + interface/web/tools/lib/lang/cz_index.lng | 2 + interface/web/tools/lib/lang/cz_interface.lng | 2 + interface/web/tools/lib/lang/cz_resync.lng | 2 + .../web/tools/lib/lang/cz_tpl_default.lng | 12 +- .../web/tools/lib/lang/cz_usersettings.lng | 2 + interface/web/vm/lib/lang/cz.lng | 10 +- .../web/vm/lib/lang/cz_openvz_action.lng | 4 +- interface/web/vm/lib/lang/cz_openvz_ip.lng | 16 +- .../web/vm/lib/lang/cz_openvz_ip_list.lng | 2 + .../web/vm/lib/lang/cz_openvz_ostemplate.lng | 4 +- .../vm/lib/lang/cz_openvz_ostemplate_list.lng | 8 +- .../web/vm/lib/lang/cz_openvz_template.lng | 18 +- .../vm/lib/lang/cz_openvz_template_list.lng | 2 + interface/web/vm/lib/lang/cz_openvz_vm.lng | 56 ++--- .../web/vm/lib/lang/cz_openvz_vm_list.lng | 14 +- server/conf/nginx_vhost.conf.master | 13 +- server/lib/classes/db_mysql.inc.php | 130 ++++++----- .../plugins-available/apache2_plugin.inc.php | 31 ++- .../cron_jailkit_plugin.inc.php | 4 + .../mysql_clientdb_plugin.inc.php | 2 +- server/plugins-available/nginx_plugin.inc.php | 211 +++++++++++------- 222 files changed, 1144 insertions(+), 560 deletions(-) diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index 5ea448a7e..02ad8d3ec 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -61,10 +61,9 @@ class db extends mysqli 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 @@ class db extends mysqli // 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 @@ public function toLower($record) { 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 ff4f3e7ef..0ccf65cf5 100644 --- a/interface/lib/classes/listform_tpl_generator.inc.php +++ b/interface/lib/classes/listform_tpl_generator.inc.php @@ -94,7 +94,7 @@ class listform_tpl_generator { $html .= "
- {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'}
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php index 617250cae..c636518f6 100644 --- a/interface/lib/classes/remoting_lib.inc.php +++ b/interface/lib/classes/remoting_lib.inc.php @@ -681,7 +681,9 @@ class remoting_lib { $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 @@ class remoting_lib { $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 c51e3e16f..bd28db4f3 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -1057,7 +1057,9 @@ class tform { $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 @@ class tform { $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 017978827..a0cf36788 100644 --- a/interface/lib/lang/cz.lng +++ b/interface/lib/lang/cz.lng @@ -131,3 +131,5 @@ $wb['datalog_status_i_web_folder_user'] = 'Vytvoření uživatele pro adresáře $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 c531b6884..8c80d1292 100644 --- a/interface/web/admin/lib/lang/cz.lng +++ b/interface/web/admin/lib/lang/cz.lng @@ -25,9 +25,9 @@ $wb['Getmail'] = 'Getmail'; $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 OS-Update'] = 'Aktualizovat operační systém'; $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 2204ff5f7..9a579d25e 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 @@ + + 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 42d45a6f7..cf1bb28c7 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 c6146ae93..df9386ae6 100644 --- a/interface/web/admin/lib/lang/cz_firewall.lng +++ b/interface/web/admin/lib/lang/cz_firewall.lng @@ -9,3 +9,5 @@ $wb['firewall_error_unique'] = 'Pro tento server již existuje záznam firewallu $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 aecc4cf06..da1af438d 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['tcp_port_txt'] = 'Otevřené TCP porty'; $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 a6281be24..0f1a6be92 100644 --- a/interface/web/admin/lib/lang/cz_groups.lng +++ b/interface/web/admin/lib/lang/cz_groups.lng @@ -3,3 +3,5 @@ $wb['description_txt'] = 'Popis'; $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 c1d7ef9a8..f285b382b 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['name_txt'] = 'Skupina'; $wb['add_new_record_txt'] = 'Přidat skupinu'; $wb['warning_txt'] = 'VAROVÁNÍ: 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 d6f45feda..4e2b8a4a3 100644 --- a/interface/web/admin/lib/lang/cz_iptables.lng +++ b/interface/web/admin/lib/lang/cz_iptables.lng @@ -4,10 +4,12 @@ $wb['multiport_txt'] = 'Multi Port'; $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 a823c4ca9..99dab0148 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['multiport_txt'] = 'Multi Port'; $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 285dff276..d95f12eb3 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['language_new_hint_txt'] = '2 znakové ISO 639-1 jazykové kódy (Viz: http: $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 2967693ae..eb222b3bd 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 @@ 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.
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.
Toto přidá chybějící řetězce z anglického hlavního souboru do vybraného jazykového souboru.
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 2a71ed0a7..f880e6dbe 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['lang_file_txt'] = 'Jazykový soubor'; $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 7998eea01..7ffdccf52 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['language_select_txt'] = 'Vybrat jazykovou sadu'; $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 838c325f7..17dfa89aa 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['language_overwrite_txt'] = 'Přepsat soubor, pokud existuje.'; $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 b2a786371..77810e0a7 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['module_txt'] = 'Modul'; $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 0d5162eab..6f77e4907 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 @@ + + diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng index 68da1c065..561db1e89 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.

POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !'; +$wb['do_osupdate_desc'] = 'Tato akce provede \\"aptitude -y\\" aktualizaci na vybraném serveru.

POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !'; $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.

POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !'; +$wb['do_ispcupdate_desc'] = 'Tato akce provede \\"ISPConfig 3\\" aktualizaci na vašem vybraném serveru.

POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !'; $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

ispconfig_update.sh

spustí se ISPConfig aktualizace.

Klikněte zde pro podrobnější informace o provedení aktualizace'; ?> + + diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng index b62526dc8..4bb34c4d4 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 ptr functions'] = 'Funkce DNS PTR'; $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 66b64946e..1b4030873 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['add_new_record_txt'] = 'Přidat uživatele'; $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 337e9ca2e..9d44fd27c 100644 --- a/interface/web/admin/lib/lang/cz_server.lng +++ b/interface/web/admin/lib/lang/cz_server.lng @@ -1,15 +1,17 @@ + + diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index 77e3e46e5..3696fedb8 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_symlinks_rel_txt'] = 'Make relative symlinks'; $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'] = 'Getmail 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['message_size_limit_txt'] = 'Limit velikosti zprávy'; $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'] = 'Vlogger 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_data_dir_txt'] = 'awstats data folder'; $wb['awstats_pl_txt'] = 'awstats.pl script'; $wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script'; $wb['backup_dir_txt'] = '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_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = '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'] = 'Informace: Pokud chcete např. vypnout MySQL zatrhněte políčko \\"Zakázat MySQL monitorování\\" změna se provede do 2-3 minut.
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'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; +$wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = '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_userzip'] = 'Zálohování všech souborů v adresáři web jak $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 2118c3535..8589dbc9d 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 fa719665b..634898abf 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['ip_type_txt'] = 'Verze'; $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 a5b3bf866..2a47ca759 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['add_new_record_txt'] = 'Přidat IP adresu'; $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 ecddbf28e..e7a2efd80 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['add_new_record_txt'] = 'Přidat server'; $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 2393f31f0..59cf3c736 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 @@ + + 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 cc3ae1f22..e0b43a4a9 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 @@ + + 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 5c8b75643..1a9becc5f 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 3936cdb49..80f729c9d 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['toolsarea_head_txt'] = 'Packages'; $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 64a190d9a..f48a2c4a3 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_username_txt'] = 'Uživatel (volitelné)'; $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 5c82d4c41..4ae3c662d 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['active_txt'] = 'Aktivní'; $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 32671d382..c1aa17fcd 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['update_title_txt'] = 'Aktualizovat'; $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 83dc8694f..2b0a31739 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_port_txt'] = 'SMTP port'; $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 592d5c081..edf66963d 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 @@ + + diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng index b1ff4b1e1..28bf9c9b2 100644 --- a/interface/web/admin/lib/lang/cz_users.lng +++ b/interface/web/admin/lib/lang/cz_users.lng @@ -7,7 +7,7 @@ $wb['passwort_txt'] = 'Heslo'; $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['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['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 e5a7d1e4d..4e7e34c27 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 @@ VAROVÁNÍ: 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 d9abdff46..9c1d91cc2 100644 --- a/interface/web/client/lib/lang/cz.lng +++ b/interface/web/client/lib/lang/cz.lng @@ -1,4 +1,5 @@ '; -$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
'; ?> + + diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index eb5e20d45..12da7e8da 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_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'; -$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['country_txt'] = 'Země'; $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_web_subdomain_txt'] = 'Max. počet webových subdomén'; $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['username_error_regex'] = 'Uživatelské jméno obsahuje neplatné znaky.'; $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['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; $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 107b2a559..cb4b143b1 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 @@ + + 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 2e81e501e..24025510d 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 @@ + + diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng index 4515806be..a759ab6a9 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['delete_explanation'] = 'Tato akce smaže následující počet záznamů p $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 476baca09..f1c3870bc 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['sender_txt'] = 'E-mailová adresa odesílatele'; $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 1877887e9..9f5ad6cff 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_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'; @@ -25,10 +25,10 @@ $wb['limit_web_aliasdomain_txt'] = 'Max. počet webových alias domén'; $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_txt'] = 'Max. number of virtual servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; $wb['ssh_chroot_txt'] = 'SSH-Chroot Options'; -$wb['web_php_options_txt'] = 'PHP - 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 c3faae17c..7d9e9238d 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['list_head_txt'] = 'Klientské šablony'; $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 f2f92b88e..aad49997e 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['contact_name_txt'] = 'Název kontaktu'; $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 4b1845bc2..26117aef5 100644 --- a/interface/web/client/lib/lang/cz_domain.lng +++ b/interface/web/client/lib/lang/cz_domain.lng @@ -1,6 +1,8 @@ + + diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng index 6cf7376bd..924f5de13 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 @@ + + diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index d8703fbbb..af56780a3 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -1,13 +1,13 @@ + + diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng index c14cee7b9..31226ce87 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 @@ + + diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng index 9d2a3211c..297b6397f 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 bedb98f86..9810ba980 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_client_txt'] = 'Počet klientů'; $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 66275f1d0..a25ba21fc 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 @@ + + diff --git a/interface/web/designer/lib/lang/cz.lng b/interface/web/designer/lib/lang/cz.lng index acb6c3546..dd815ad75 100644 --- a/interface/web/designer/lib/lang/cz.lng +++ b/interface/web/designer/lib/lang/cz.lng @@ -1,2 +1,4 @@ + + diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng index 75bf5a560..2b04eb968 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_user_txt'] = 'Opr. Uživatel'; $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 1e677f241..46241cfd5 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['module_txt'] = 'Modul'; $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 37017fa4a..45829d54d 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['up_txt'] = '^'; $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 847896d30..f6da04e2e 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 @@ $wb['description_txt'] = ' Rada: 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 b568f69d6..b37872ced 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['list_head_txt'] = 'Backend modul'; $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 01f5df68f..8c21ea4a7 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['header_txt'] = 'Navi vlastnosti'; $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 23f7d1592..65f6c765a 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 @@ + + diff --git a/interface/web/designer/lib/lang/cz_module_show.lng b/interface/web/designer/lib/lang/cz_module_show.lng index 2cf9b07a8..605d11de0 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['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Datei $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 f143b0b92..876a5751e 100644 --- a/interface/web/dns/lib/lang/cz.lng +++ b/interface/web/dns/lib/lang/cz.lng @@ -20,3 +20,5 @@ $wb['Templates'] = 'Šablony DNS'; $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 8b8c206b6..6d9a24d64 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_empty'] = 'IP adresa je prázdná'; $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 dd3cdfd2f..22920c1d5 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 @@ + + diff --git a/interface/web/dns/lib/lang/cz_dns_aaaa.lng b/interface/web/dns/lib/lang/cz_dns_aaaa.lng index 26c6ae906..143885f96 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['name_error_regex'] = 'Hostname má chybný formát.'; $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 572478a98..c25dc7b3e 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['name_error_regex'] = 'Hostname má chybný formát.'; $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 0c5ebe21e..ad120c97d 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_empty'] = 'Cílový hostname je prázdný'; $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 5f67d5e82..3633fdb80 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['name_error_regex'] = 'Hostname má chybný formát.'; $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 4020f8a97..3986983a9 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['title'] = 'Importovat soubory zón'; $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 b04bc66a2..c5f97f3f1 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 @@ + + diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng index ba38e2a65..4b011849f 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['name_error_regex'] = 'Zóna má chybný formát.'; $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 d7b19e523..33f116631 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['server_id_txt'] = 'Server'; $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['name_error_regex'] = 'Název má chybný formát.'; $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 8b1e7e442..bcebed3ef 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['name_error_regex'] = 'Hostname má chybný formát.'; $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 16617f6c5..b8cc5f139 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['eg_domain_tld'] = 'např. domena.cz'; $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 1e0a3d010..eead22a8b 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['ns_txt'] = 'NS'; $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 829d5f5b4..2b089c252 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_empty'] = 'Zóna je prázdná.'; $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['expire_range_error'] = 'Min. Expire time is 60 seconds.'; $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 beba8a22b..999e5bd68 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['mbox_txt'] = 'E-mail'; $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 8ab784a2a..60d844ac9 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['weight_txt'] = 'Weight'; $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['data_error_regex'] = 'Záznam serveru má chybný formát'; $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 be4ac0e94..b91b3ae25 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['fields_txt'] = 'Pole'; $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 bdd6e1820..a7218a497 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['visible_txt'] = 'Viditelný'; $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 76047b0ce..8784c7e2b 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['name_error_regex'] = 'Hostname má chybný formát.'; $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 dcfc0ba2c..bf462caf9 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_expire_empty'] = 'Expire je prázdný.'; $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 18f8f210b..721aaf388 100644 --- a/interface/web/help/lib/lang/cz.lng +++ b/interface/web/help/lib/lang/cz.lng @@ -12,3 +12,5 @@ $wb['Manage Sections'] = 'Spravovat sekce'; $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 73feee695..dc951a40a 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_question_txt'] = 'Otázka'; $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 a9488445c..ab5d07c4e 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_sections_txt'] = 'Sekce'; $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 923d9b892..15eb20ad5 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 @@ + + 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 967b0abfc..60906e5d3 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_sections_txt'] = 'Sekce'; $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 6c2728443..63bce2889 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['message_txt'] = 'Zpráva'; $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 8629a2f8a..3a2c9a90d 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['sender_id_txt'] = 'Odesílatel'; $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 6b4539e95..b988a2ec5 100644 --- a/interface/web/login/lib/lang/cz.lng +++ b/interface/web/login/lib/lang/cz.lng @@ -4,7 +4,7 @@ $wb['error_user_password_incorrect'] = 'Uživatelské jméno nebo heslo je špat $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['pw_button_txt'] = 'Znovu odeslat heslo'; $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.
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 2b4240ad2..65fb13491 100644 --- a/interface/web/mail/lib/lang/cz.lng +++ b/interface/web/mail/lib/lang/cz.lng @@ -1,14 +1,15 @@ + + diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng index d5c83e4f9..414e1023c 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 de8cc2ef2..0d8f779c3 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['destination_txt'] = 'Cíl'; $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 0387c18da..e0cde6835 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['source_txt'] = 'Zdroj'; $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 fd850d6f5..cfc0154d8 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['source_txt'] = 'Zdroj'; $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 76a60e218..4719142af 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 @@ + + 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 6b2a7086d..fbf6e2d23 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 459ca228a..1405881fb 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['action_txt'] = 'Akce'; $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 da9709e7f..6e7ebf518 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['pattern_txt'] = 'Vzor'; $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 ba6785664..d71c4714f 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['domain_txt'] = 'Doména'; $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 b579d2de0..da42190fa 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['add_new_record_txt'] = 'Přidat doménu'; $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 bfdc509ef..75efd5621 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 @@ + + 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 3b24645ec..aa0b76df8 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['server_id_txt'] = 'Server'; $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 2abb05cf7..05bb74753 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['domain_txt'] = 'Doména'; $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 7e3ab720c..ba79e1a2f 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 e5381fe5f..bdbff701e 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['destination_txt'] = 'Cíl'; $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 eb7167306..6fc910169 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_password_txt'] = 'Heslo'; $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 9ca8b86dc..daeae8db4 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 @@ + + diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng index 2a3929861..b44112a11 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 @@ + + 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 6dedb190d..b3e2cf85a 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 @@ + + 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 b4d867d77..b64c3113b 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 @@ + + 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 261ea38c5..bf34af6ec 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['list_head_txt'] = 'Relay adresáti'; $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 280fac94b..f19706dc3 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_delete_score_int_txt'] = 'Mazací skóre'; $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 fa3c76398..1271765c6 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 @@ + + diff --git a/interface/web/mail/lib/lang/cz_mail_transport.lng b/interface/web/mail/lib/lang/cz_mail_transport.lng index 508ca764b..710e577ec 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['type_txt'] = 'Typ'; $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 f8d932321..de6292b8d 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['transport_txt'] = 'Transport'; $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 4a2322e09..d8805f0fa 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['email_txt'] = 'E-mail'; $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['repeat_password_txt'] = 'Opakujte heslo'; $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 ec91e223e..097385684 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['target_error_regex'] = 'Cíl může obsahovat jen tyto znaky: a-z, 0-9, -, $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['ends_with_txt'] = 'Končí na'; $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 1d1b1f37a..d9f6748c1 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['rulename_txt'] = 'Název'; $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 e6dfd006e..08d28fbc0 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['add_new_record_txt'] = 'Přidat e-mailovou schránku'; $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 50cbc31d5..92600a17d 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['last_month_txt'] = 'Minulý měsíc'; $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 a1cede7f3..cd5d03295 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 @@ + + 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 0025c48ce..042cd71c5 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 @@ + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng index 5e0c6b779..98e7649ba 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['priority_txt'] = 'Priorita'; $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 d0e89ed5b..194aeb9b9 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['rid_txt'] = 'Uživatel'; $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 a4b913d15..d0ebcc4bf 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['ip_address_txt'] = 'IP adresa'; $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['relayhost_password_txt'] = 'Relayhost heslo'; $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 fe2ee8d51..8b5b1e758 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['list_head_txt'] = 'Konfigurace serveru'; $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 54d0155d7..1a778301e 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['spam_admin_txt'] = 'SPAM admin'; $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 9a0c36199..37f41d3ac 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['banned_files_lover_txt'] = 'Zabanované soubory'; $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 8c19e9f30..d795af11d 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 d2faf5a97..26c4df143 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 @@ + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng index 5e0c6b779..98e7649ba 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['priority_txt'] = 'Priorita'; $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 176d5ab9e..e437fc70f 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 @@ + + 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 13abef37f..0c30e7574 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 @@ + + diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng index 1c16fb2e5..8740216ff 100644 --- a/interface/web/mailuser/lib/lang/cz.lng +++ b/interface/web/mailuser/lib/lang/cz.lng @@ -1,9 +1,11 @@ + + diff --git a/interface/web/mailuser/lib/lang/cz_index.lng b/interface/web/mailuser/lib/lang/cz_index.lng index 45af56ee8..9b820cdee 100644 --- a/interface/web/mailuser/lib/lang/cz_index.lng +++ b/interface/web/mailuser/lib/lang/cz_index.lng @@ -10,3 +10,5 @@ $wb['unlimited_txt'] = 'Neomezený'; $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 ef3aeb42d..f8d331b55 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['autoresponder_active'] = 'Povolit automatický odpovídač'; $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 36f11a9ba..fc8a0f9df 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['email_txt'] = 'E-mail'; $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 57b9d61c0..65300b6d9 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['target_error_regex'] = 'Cíl může obsahovat jen tyto znaky: a-z, 0-9, -, $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['ends_with_txt'] = 'Končí na'; $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 3c2593d6d..4b64af920 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_txt'] = 'Stránka'; $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 36555a203..44815399d 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['repeat_password_txt'] = 'Opakujte heslo'; $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 f0f5bb52a..92828ee60 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['email_txt'] = 'E-mail'; $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 587409cf8..1fee3c03b 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -134,16 +134,18 @@ $wb['monitor_title_raidstate_txt'] = 'Stav pole RAID'; $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í.
Nemůžeme najít žádné z nich na serveru.

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.
We cant find any of them at your server.

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 c9e9a8655..70adcad1a 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['dbtable_txt'] = 'DB tabulka'; $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 990662552..85cd4b3b0 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['server_id_txt'] = 'Server'; $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 aa28bf135..b7255c0cf 100644 --- a/interface/web/sites/form/web_aliasdomain.tform.php +++ b/interface/web/sites/form/web_aliasdomain.tform.php @@ -122,7 +122,7 @@ $form["tabs"]['domain'] = array ( '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 86bc116b9..fcbd8d831 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -297,7 +297,7 @@ $form["tabs"]['redirect'] = array ( '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 20c5b14d7..0205c56d4 100644 --- a/interface/web/sites/form/web_subdomain.tform.php +++ b/interface/web/sites/form/web_subdomain.tform.php @@ -123,7 +123,7 @@ $form["tabs"]['domain'] = array ( '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 9c6bfa6a6..bb12974c8 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 @@ $form["tabs"]['domain'] = array ( '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 @@ $form["tabs"]['redirect'] = array ( '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 8d3f7b013..6d6ba6ba3 100644 --- a/interface/web/sites/lib/lang/cz.lng +++ b/interface/web/sites/lib/lang/cz.lng @@ -21,13 +21,16 @@ $wb['Shell'] = 'Shell'; $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 1ed9e616d..3c32316be 100644 --- a/interface/web/sites/lib/lang/cz_aps.lng +++ b/interface/web/sites/lib/lang/cz_aps.lng @@ -55,3 +55,5 @@ $wb['packagelist_update_finished_txt'] = 'APS aktualizace balíčku dokončena.' $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 961ecbac6..0ff26acaf 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 @@ + + 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 2c83eac21..973e70ca5 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 @@ + + diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng index d4e6c1767..5ea9bb5b7 100644 --- a/interface/web/sites/lib/lang/cz_cron.lng +++ b/interface/web/sites/lib/lang/cz_cron.lng @@ -19,3 +19,5 @@ $wb['run_wday_error_format'] = 'Chybný formát pro dny týdne.'; $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 f50dee2fa..05b41634e 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_month_txt'] = 'Měsíce'; $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 7c41fbfce..8187ee03b 100644 --- a/interface/web/sites/lib/lang/cz_database.lng +++ b/interface/web/sites/lib/lang/cz_database.lng @@ -31,10 +31,10 @@ $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['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['select_dbuser_txt'] = 'Vyberte uživatele databáze'; $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 a0069404d..4eb24c99c 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['database_name_txt'] = 'Jméno databáze'; $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 9bb80dd94..269dc2114 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_user_txt'] = 'Uživatel databáze'; $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 3b5dea58f..4621087b5 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['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['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 8703e713e..db76d1099 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['database_user_txt'] = 'Uživatel databáze'; $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 42cf36d70..68cd34d2e 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['list_head_txt'] = 'Uživatelé databáze'; $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 876ad5108..2b9dd5450 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['repeat_password_txt'] = 'Opakujte heslo'; $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 41649df7f..6f6f5021e 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['parent_domain_id_txt'] = 'Webová stránka'; $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 97b8a0d08..234b7a592 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['repeat_password_txt'] = 'Opakujte heslo'; $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 1d6bc198d..6d4a8fe52 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['parent_domain_id_txt'] = 'Stránka'; $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 2c9625ad4..3324ca2e9 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['system_user_txt'] = 'Linuxový uživatel'; $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 964151136..afdb03080 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 @@ + + 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 22a4ffe32..6cf247f99 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_redirect_txt'] = 'Žádné přesměrování'; $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 9a10ca6d0..d2b6dcb3c 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 @@ + + diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng index 33134ac0e..c5beed5e8 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['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snipp $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 e52a79442..c79a51beb 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['server_id_txt'] = 'Server'; $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 cbf025e79..af0947c9f 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['server_id_txt'] = 'Server'; $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 fcf9e0453..e5756a74a 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['path_txt'] = 'Path'; $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 8702d5d6a..3b43fb452 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['server_id_txt'] = 'Server'; $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 d3dc99d10..805eb51e7 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['repeat_password_txt'] = 'Opakujte heslo'; $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 14bec62c8..6cc0cc99c 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['active_txt'] = 'Aktivní'; $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 ed9359682..ffab54466 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['this_year_txt'] = 'Tento rok'; $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 c4820176e..a0d4a4f49 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['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $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 8a0bafe0f..1eab4a8aa 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['parent_domain_id_txt'] = 'Webová stránka'; $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 a13aea822..3077ca721 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['server_id_txt'] = 'Server'; $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['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snipp $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 36d7b8669..4afe0218d 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['parent_domain_id_txt'] = 'Website'; $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 35dae3bb9..57ac9308a 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['repeat_password_txt'] = 'Opakujte heslo'; $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 791710e8d..2f480fd0a 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['parent_domain_id_txt'] = 'Website'; $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 3d260c0a6..aa244c1aa 100644 --- a/interface/web/sites/lib/lang/de.lng +++ b/interface/web/sites/lib/lang/de.lng @@ -30,4 +30,5 @@ $wb['APS Installer'] = 'APS Installationsassistent'; $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 a91329172..41c6df57a 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_redirect_txt'] = 'Kein Redirect'; $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 7160dacfb..81010a651 100644 --- a/interface/web/sites/lib/lang/en.lng +++ b/interface/web/sites/lib/lang/en.lng @@ -31,4 +31,5 @@ $wb['Available packages'] = 'Available packages'; $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 72059a48c..cd1c1fbfa 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_redirect_txt'] = 'No redirect'; $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 c415066e3..570d4626c 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 5212b5d86..67c26f32e 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 = ''; var phpfastcgiselected = ''; @@ -201,6 +220,7 @@ options += ''; }); $('#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 901cb3525..150cb36a4 100644 --- a/interface/web/sites/web_aliasdomain_edit.php +++ b/interface/web/sites/web_aliasdomain_edit.php @@ -136,6 +136,11 @@ class page_action extends tform_actions { $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")."
"; + } // 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 72be72a3d..c9398b016 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -474,6 +474,11 @@ class page_action extends tform_actions { } } } + + // 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")."
"; + //} // 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 a42468005..ae9ee074e 100644 --- a/interface/web/sites/web_subdomain_edit.php +++ b/interface/web/sites/web_subdomain_edit.php @@ -147,6 +147,11 @@ class page_action extends tform_actions { } 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")."
"; + } // 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 cff29d541..59a146cbf 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_3_txt'] = 'Dobré'; $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 ce7440618..f80193a05 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 66bcaf49a..480434e14 100644 --- a/interface/web/tools/lib/lang/cz.lng +++ b/interface/web/tools/lib/lang/cz.lng @@ -11,3 +11,5 @@ $wb['ISPConfig 3 mail'] = 'ISPConfig 3 vzdalený e-mail server'; $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 8ebf71795..ba24f58f7 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_forward_txt'] = 'Import forward'; $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 5ebf1ec34..b1f32ec11 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 507b7c3cb..1125032b1 100644 --- a/interface/web/tools/lib/lang/cz_interface.lng +++ b/interface/web/tools/lib/lang/cz_interface.lng @@ -5,3 +5,5 @@ $wb['language_txt'] = 'Jazyk'; $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 96d622e28..3b53ca06a 100644 --- a/interface/web/tools/lib/lang/cz_resync.lng +++ b/interface/web/tools/lib/lang/cz_resync.lng @@ -11,3 +11,5 @@ $wb['resync_dns_txt'] = 'Resynchronizovat DNS záznamy'; $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 c06246304..53e9bd844 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 @@ + + diff --git a/interface/web/tools/lib/lang/cz_usersettings.lng b/interface/web/tools/lib/lang/cz_usersettings.lng index dec46b7a0..7490e52f9 100644 --- a/interface/web/tools/lib/lang/cz_usersettings.lng +++ b/interface/web/tools/lib/lang/cz_usersettings.lng @@ -10,3 +10,5 @@ $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/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng index b666d6fe5..21224389a 100644 --- a/interface/web/vm/lib/lang/cz.lng +++ b/interface/web/vm/lib/lang/cz.lng @@ -1,7 +1,9 @@ + + diff --git a/interface/web/vm/lib/lang/cz_openvz_action.lng b/interface/web/vm/lib/lang/cz_openvz_action.lng index 52f732858..2930fff65 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['restart_txt'] = 'Restart virtual server'; $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_error'] = 'The OSTemplate name conatains unallowed characte $wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.'; $wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.'; ?> + + diff --git a/interface/web/vm/lib/lang/cz_openvz_ip.lng b/interface/web/vm/lib/lang/cz_openvz_ip.lng index 84c42ceeb..6afda0271 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 @@ + + 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 e6a3a68c2..e392e9c97 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['ip_address_txt'] = 'IP address'; $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 458877dca..8fd50e2ed 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['template_file_txt'] = 'Template filename'; $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 76cab8cce..c8be29a47 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 @@ + + diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng index 8b07949a6..0acacaf88 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['numsiginfo_txt'] = 'Numsiginfo'; $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['swappages_error_empty'] = 'Swappages is empty.'; $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 d1e8e5e92..813dc6ab9 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['list_head_txt'] = 'OpenVZ Virtual Machine Template'; $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 36f0b4274..b24a14bf2 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 @@ + + 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 d9c7e4d05..ae49a1bf4 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 @@ + + diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master index c8b4d06e8..7217636d1 100644 --- a/server/conf/nginx_vhost.conf.master +++ b/server/conf/nginx_vhost.conf.master @@ -27,15 +27,20 @@ server { rewrite ^ $scheme://$request_uri? permanent; } + + if ($http_host "") { + rewrite ^(.*)$ $2 ; + } + - rewrite ^(.*)$ $2 ; + if ($http_host != "") { rewrite ^(.*)$ $2 ; } location / { proxy_pass ; - rewrite ^//(.*) /$1; + rewrite ^/(.*) /$1; @@ -143,7 +148,7 @@ server { 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; } @@ -212,7 +217,7 @@ server { location / { proxy_pass ; - rewrite ^//(.*) /$1; + rewrite ^/(.*) /$1; diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php index 4c75e62bc..005bd1abe 100644 --- a/server/lib/classes/db_mysql.inc.php +++ b/server/lib/classes/db_mysql.inc.php @@ -61,9 +61,9 @@ class db extends mysqli 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 @@ class db extends mysqli } } } + + 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 @@ class db extends mysqli public function numRows() { return $this->queryId->num_rows; } + + public function affectedRows() { + return $this->queryId->affected_rows; + } // returns mySQL insert id public function insertID() { @@ -181,44 +207,6 @@ public function toLower($record) { 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."

"; - $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."

"; - $this->query($sql); - if($debug == 1) echo "mySQL Error Message: ".$this->errorMessage; - } - } - */ - public function diffrec($record_old, $record_new) { $diffrec_full = array(); $diff_num = 0; @@ -253,9 +241,9 @@ public function toLower($record) { 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 @@ public function toLower($record) { $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 @@ public function toLower($record) { //** 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 @@ public function toLower($record) { } //** 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 afcafef72..7c0e7f961 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -210,8 +210,14 @@ class apache2_plugin { $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 @@ class apache2_plugin { } + $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 @@ class apache2_plugin { $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 @@ class apache2_plugin { $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 41669b5f8..8df854a31 100644 --- a/server/plugins-available/cron_jailkit_plugin.inc.php +++ b/server/plugins-available/cron_jailkit_plugin.inc.php @@ -262,6 +262,8 @@ class cron_jailkit_plugin { 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 @@ class cron_jailkit_plugin { 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 e4825c8e9..ce6bb5ab1 100644 --- a/server/plugins-available/mysql_clientdb_plugin.inc.php +++ b/server/plugins-available/mysql_clientdb_plugin.inc.php @@ -393,7 +393,7 @@ class mysql_clientdb_plugin { } 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 854320e08..1c37a5a81 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -120,8 +120,14 @@ class nginx_plugin { $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 @@ class nginx_plugin { } + $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 @@ class nginx_plugin { //$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 @@ class nginx_plugin { // 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 @@ class nginx_plugin { 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 @@ class nginx_plugin { 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 @@ class nginx_plugin { $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 @@ class nginx_plugin { '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 @@ class nginx_plugin { 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 @@ class nginx_plugin { $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 @@ class nginx_plugin { '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 @@ class nginx_plugin { 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 @@ class nginx_plugin { $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 @@ class nginx_plugin { '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 @@ class nginx_plugin { $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 @@ class nginx_plugin { } } - // 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 @@ class nginx_plugin { 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 @@ class nginx_plugin { '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 @@ class nginx_plugin { '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 @@ class nginx_plugin { '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); } @@ -1399,6 +1424,9 @@ class nginx_plugin { 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 @@ class nginx_plugin { //$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 @@ class nginx_plugin { $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 @@ class nginx_plugin { $vhost_conf = implode("\n", $lines); } - return $vhost_conf; + return trim($vhost_conf); } function client_delete($event_name,$data) { -- GitLab