diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index a4bc4d5bc8ccd2ad1f154959b97c80e8a5d34fae..ea7f3781892c4c68be337998300fb2e3ed2b97fe 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -100,7 +100,7 @@ class installer_dist extends installer_base { 'smtpd_tls_security_level = may', 'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert', 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key', - 'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', + 'transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', 'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf', 'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf', 'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps', diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index ea03589e1342bdb37b02f05de2c9f842a109ffbe..5ff3af1a4135fb04198fab586ad141e84d64a3ac 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -97,7 +97,7 @@ class installer extends installer_base 'smtpd_tls_security_level = may', 'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert', 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key', - 'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', + 'transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', 'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf', 'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps', 'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf', diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 32c1e79f4a2ff6e09be047d679aed2587dacf176..75b2f66d3e36035341f5e21101927bbd34ac2ef6 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -114,7 +114,7 @@ class installer_dist extends installer_base { 'smtpd_tls_security_level = may', 'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert', 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key', - 'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', + 'transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', 'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf', 'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf', 'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps', diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 16865df54bd1de09ba902370ffe86a8b6c76b32d..97853a097ee6598eb7820fc35a700c6a5e15e45c 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -566,6 +566,23 @@ class installer_base { } } } + + $config_dir = $conf['mailman']['config_dir'].'/'; + $full_file_name = $config_dir.'virtual_to_transport.sh'; + + //* Backup exiting virtual_to_transport.sh script + if(is_file($full_file_name)) { + copy($full_file_name, $config_dir.'virtual_to_transport.sh~'); + } + + copy('tpl/mailman-virtual_to_transport.sh',$full_file_name); + chgrp($full_file_name,'list'); + chmod($full_file_name,0750); + + if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman'); + exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman'); + + exec('/usr/lib/mailman/bin/genaliases'); $virtual_domains = ''; if($status == 'update') @@ -681,7 +698,7 @@ class installer_base { 'smtpd_tls_security_level = may', 'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert', 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key', - 'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', + 'transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', 'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf', 'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf', 'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps', diff --git a/install/sql/incremental/upd_0047.sql b/install/sql/incremental/upd_0047.sql new file mode 100644 index 0000000000000000000000000000000000000000..fd9ac0a0912722c7469cf4cfc4c51e0b003c4f8d --- /dev/null +++ b/install/sql/incremental/upd_0047.sql @@ -0,0 +1 @@ +ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm'; \ No newline at end of file diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index ce304b38d8f474977d8ca9b1b8fe2dd22f766dea..921c768df3a43f4e4d740df88dae24a92066237f 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -185,7 +185,7 @@ CREATE TABLE `client` ( `limit_web_ip` text, `limit_web_domain` int(11) NOT NULL DEFAULT '-1', `limit_web_quota` int(11) NOT NULL DEFAULT '-1', - `web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp', + `web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm', `limit_cgi` enum('n','y') NOT NULL DEFAULT 'n', `limit_ssi` enum('n','y') NOT NULL DEFAULT 'n', `limit_perl` enum('n','y') NOT NULL DEFAULT 'n', diff --git a/install/tpl/apps_php_fpm_pool.conf.master b/install/tpl/apps_php_fpm_pool.conf.master index e851cf543152631667915c9e3716074631a56f2f..ce6a92fcfba48ab25848ab56ce763634fd01544e 100644 --- a/install/tpl/apps_php_fpm_pool.conf.master +++ b/install/tpl/apps_php_fpm_pool.conf.master @@ -9,7 +9,7 @@ user = {fpm_user} group = {fpm_group} pm = dynamic -pm.max_children = 10 +pm.max_children = 50 pm.start_servers = 2 pm.min_spare_servers = 1 pm.max_spare_servers = 5 diff --git a/install/tpl/mailman-virtual_to_transport.sh b/install/tpl/mailman-virtual_to_transport.sh new file mode 100644 index 0000000000000000000000000000000000000000..6c57d25c06620922774823aa9e798823302fd5c5 --- /dev/null +++ b/install/tpl/mailman-virtual_to_transport.sh @@ -0,0 +1,3 @@ +#!/bin/sh +sed -r -e 's/(^[^#]\S+\s+).+$/\1local/' $1 > /var/lib/mailman/data/transport-mailman +/usr/sbin/postmap /var/lib/mailman/data/transport-mailman \ No newline at end of file diff --git a/install/tpl/mm_cfg.py.master b/install/tpl/mm_cfg.py.master index 9501c61b97e13f20a97f4070e13ae8b9c8dc4dee..c0de780e0d19eec4ca07e900a7e1beb8459a3ba5 100644 --- a/install/tpl/mm_cfg.py.master +++ b/install/tpl/mm_cfg.py.master @@ -102,5 +102,7 @@ POSTFIX_STYLE_VIRTUAL_DOMAINS = [{virtual_domains}] # http://www.jamesh.id.au/articles/mailman-spamassassin/ # GLOBAL_PIPELINE.insert(1, 'SpamAssassin') +POSTFIX_MAP_CMD = '/etc/mailman/virtual_to_transport.sh' + # Note - if you're looking for something that is imported from mm_cfg, but you # didn't find it above, it's probably in /usr/lib/mailman/Mailman/Defaults.py. \ No newline at end of file diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index 02ad8d3ec1e2dc6787fedb39da13b2b174e690b8..01eae1bd5c6cfdfd4de068af76c06480c1d657e0 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -45,6 +45,7 @@ class db extends mysqli public $errorMessage = ''; // last error message private $errorLocation = '';// last error location public $show_error_messages = true; // false in server, true in interface + private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor // constructor public function __construct($prefix = '') { @@ -58,12 +59,20 @@ class db extends mysqli $this->dbNewLink = $conf[$prefix.'db_new_link']; $this->dbClientFlags = $conf[$prefix.'db_client_flags']; parent::__construct($conf[$prefix.'db_host'], $conf[$prefix.'db_user'],$conf[$prefix.'db_password'],$conf[$prefix.'db_database']); - if ($this->connect_error) { + $try = 0; + while(!is_null($this->connect_error) && $try < 5) { + if($try > 0) sleep(1); + + $try++; $this->updateError('DB::__construct'); - return false; - } else { - $this->setCharacterEncoding(); + + parent::__construct($conf[$prefix.'db_host'], $conf[$prefix.'db_user'],$conf[$prefix.'db_password'],$conf[$prefix.'db_database']); } + + if(is_null($this->connect_error)) $this->isConnected = true; + else return false; + + $this->setCharacterEncoding(); } public function __destruct() { @@ -74,7 +83,7 @@ class db extends mysqli public function updateError($location) { global $app; - if($this->connect_error) { + if(!is_null($this->connect_error)) { $this->errorNumber = $this->connect_errno; $this->errorMessage = $this->connect_error; } else { @@ -95,18 +104,20 @@ class db extends mysqli } private function setCharacterEncoding() { + if($this->isConnected == false) return false; 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) { + if($this->isConnected == false) return false; $try = 0; do { $try++; - $ok = parent::ping(); + $ok = $this->ping(); if(!$ok) { - if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) { - if($try > 9) { + if(!$this->real_connect($this->dbHost, $this->dbUser, $this->dbPass, $this->dbName)) { + if($try > 4) { $this->updateError('DB::query -> reconnect'); return false; } else { @@ -479,7 +490,7 @@ public function toLower($record) { // gibt Array mit Tabellennamen zur�ck public function getTables($database_name = '') { - + if($this->isConnected == false) return false; if($database_name == '') $database_name = $this->dbName; $result = parent::query("SHOW TABLES FROM $database_name"); for ($i = 0; $i < $result->num_rows; $i++) { diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php index 0ccf65cf5f06006eeed30194c28dee7a4843c71d..e19b52c3ff66a511c54b2f5b60deb2dee6f7e8b9 100644 --- a/interface/lib/classes/listform_tpl_generator.inc.php +++ b/interface/lib/classes/listform_tpl_generator.inc.php @@ -59,10 +59,12 @@ class listform_tpl_generator { '; $lang["list_head_txt"] = $listDef["name"]; + $colcount = 0; foreach($listDef["item"] as $field) { $key = $field["field"]; $html .= " \n"; $lang[$key."_txt"] = $key; + $colcount++; } $html .= '   @@ -99,6 +101,11 @@ class listform_tpl_generator { + + uneven\"> + {tmpl_var name='globalsearch_noresults_text_txt'} + + "; $html .= ' diff --git a/interface/lib/classes/searchform.inc.php b/interface/lib/classes/searchform.inc.php index ef18baf446891dd089a13ba850ca30f691b5ec83..e87547a9d97ed19ebd2db2e868fcfb644056bea8 100644 --- a/interface/lib/classes/searchform.inc.php +++ b/interface/lib/classes/searchform.inc.php @@ -208,6 +208,8 @@ class searchform { $content .= ' '.$app->lng('Page').' '.$vars['next_page'].' '.$app->lng('of').' '.$vars['max_pages'].' '; if($vars['show_page_next'] == 1){ $content .= '   '; + } else{ + $content .= ' '; } $content .= ' '; return $content; diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php index 564fad5427563a1680461814bc0c908b9dbfc4cd..b0da004cf3f0a3abc56cc7f8a180f45435998e0a 100644 --- a/interface/lib/classes/simplepie.inc.php +++ b/interface/lib/classes/simplepie.inc.php @@ -9103,7 +9103,7 @@ class SimplePie_Misc return $time; } - function absolutize_url($relative, $base) + static function absolutize_url($relative, $base) { $iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative); return $iri->get_iri(); @@ -9163,7 +9163,7 @@ class SimplePie_Misc return $output . $input; } - function get_element($realname, $string) + static function get_element($realname, $string) { $return = array(); $name = preg_quote($realname, '/'); @@ -11006,7 +11006,7 @@ class SimplePie_Misc } } - function atom_10_construct_type($attribs) + static function atom_10_construct_type($attribs) { if (isset($attribs['']['type'])) { @@ -11059,7 +11059,7 @@ class SimplePie_Misc } } - function is_isegment_nz_nc($string) + static function is_isegment_nz_nc($string) { return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string); } @@ -11699,7 +11699,7 @@ class SimplePie_IRI * @param string $relative Relative IRI * @return SimplePie_IRI */ - function absolutize($base, $relative) + static function absolutize($base, $relative) { $relative = (string) $relative; if ($relative !== '') diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index bd28db4f3ae0e51e9cba06d398e901d0aba4ab79..9f696aff76fa845ba47a6d23e2c9f8aa609443c2 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -937,31 +937,44 @@ class tform { } break; case 'ISIP': - //* Check if its a IPv4 or IPv6 address - if(function_exists('filter_var')) { - if(!filter_var($field_value,FILTER_VALIDATE_IP)) { - $errmsg = $validator['errmsg']; - if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; - } else { - $this->errorMessage .= $errmsg."
\r\n"; - } - } + if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n'; + if($validator['allowempty'] == 'y' && $field_value == '') { + //* Do nothing } else { - //* Check content with regex, if we use php < 5.2 - $ip_ok = 0; - if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){ - $ip_ok = 1; - } - if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){ - $ip_ok = 1; + //* Check if its a IPv4 or IPv6 address + if(isset($validator['separator']) && $validator['separator'] != '') { + //* When the field may contain several IP addresses, split them by the char defined as separator + $field_value_array = explode($validator['separator'],$field_value); + } else { + $field_value_array[] = $field_value; } - if($ip_ok == 0) { - $errmsg = $validator['errmsg']; - if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + foreach($field_value_array as $field_value) { + if(function_exists('filter_var')) { + if(!filter_var($field_value,FILTER_VALIDATE_IP)) { + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + } else { + $this->errorMessage .= $errmsg."
\r\n"; + } + } } else { - $this->errorMessage .= $errmsg."
\r\n"; + //* Check content with regex, if we use php < 5.2 + $ip_ok = 0; + if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){ + $ip_ok = 1; + } + if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){ + $ip_ok = 1; + } + if($ip_ok == 0) { + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + } else { + $this->errorMessage .= $errmsg."
\r\n"; + } + } } } } diff --git a/interface/lib/classes/tpl_error.inc.php b/interface/lib/classes/tpl_error.inc.php index 5f6360978c89b616843f6ebeb38f84802b84741f..a4095d8188fb038fbbba17b17cff40982ead8eac 100644 --- a/interface/lib/classes/tpl_error.inc.php +++ b/interface/lib/classes/tpl_error.inc.php @@ -31,7 +31,7 @@ class vlibTemplateError { | DO NOT TOUCH ANYTHING IN THIS CLASS IT MAY NOT WORK OTHERWISE | \-----------------------------------------------------------------------------*/ - function raiseError ($code, $level = null, $extra=null) { + public static function raiseError ($code, $level = null, $extra=null) { if (!($level & error_reporting())&& $level != KILL) return; // binary AND checks for reporting level $error_codes = array( diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng index a0cf367882147075f889ca819eea34f3291130af..43b46498cb571c8be0fa01c2682f0fe4bd3f5610 100644 --- a/interface/lib/lang/cz.lng +++ b/interface/lib/lang/cz.lng @@ -132,4 +132,3 @@ $wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro $wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem'; ?> - diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index f73f4e242d4a06613f1ca8f4ad66c5de329771bd..60e9bd30d14054f51dc58bfc7103c7e7ec9655b2 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -131,4 +131,6 @@ $wb['datalog_status_d_web_folder'] = 'Delete folder protection'; $wb['datalog_status_i_web_folder_user'] = 'Create folder protection user'; $wb['datalog_status_u_web_folder_user'] = 'Update folder protection user'; $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; + +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/web/admin/lib/lang/ar_login_as.lng b/interface/web/admin/lib/lang/ar_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/ar_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index 1ad2bd8275ba2005bfd40a23d9dba87bb03ba34b..ef609bb052cb6930a767f124bef92ea0472e19f5 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/ar_users.lng b/interface/web/admin/lib/lang/ar_users.lng index 8abda49849acf86cf33f70782de639e659156719..2ed24d890c8f3b93f21f31e64faf98af4ef97cc7 100644 --- a/interface/web/admin/lib/lang/ar_users.lng +++ b/interface/web/admin/lib/lang/ar_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/bg_login_as.lng b/interface/web/admin/lib/lang/bg_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/bg_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index d35ad21ab837e0b7a448117785d8b02648e1d323..5c2b5f6c5dc86a859578ec88e9001ef6182d40f7 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -170,7 +170,4 @@ $wb['website_autoalias_txt'] = 'Website auto alias'; $wb['website_autoalias_note_txt'] = 'Placeholders:'; $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/bg_users.lng b/interface/web/admin/lib/lang/bg_users.lng index b5dcbca37d74c03e0081e13fda4313e7fdc620de..c9522f4e3d1d942f0c11556688e81e8d32b14f0e 100644 --- a/interface/web/admin/lib/lang/bg_users.lng +++ b/interface/web/admin/lib/lang/bg_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/br_login_as.lng b/interface/web/admin/lib/lang/br_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/br_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index 25026796ae10b98bcb78d496d139eb17bf692248..c7237996be76bf3f537b84ba23ac358110dce585 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/br_users.lng b/interface/web/admin/lib/lang/br_users.lng index c5f3d07c410a53414b340c2b5739d803744e2886..34296eced6c61e6dd1528c051ed3850e6f984360 100644 --- a/interface/web/admin/lib/lang/br_users.lng +++ b/interface/web/admin/lib/lang/br_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng index 8c80d1292df23d3b0ef4b644253e0bee6e28ecff..23a64d8ba26d1f3c03cbb31b41ac6703509bd51e 100644 --- a/interface/web/admin/lib/lang/cz.lng +++ b/interface/web/admin/lib/lang/cz.lng @@ -49,4 +49,3 @@ $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 9a579d25e3b7a687d9b9ec7facc0a9cccbfddee9..085aec4d40d6de89f9eedf1b09b4fb95eb92de95 100644 --- a/interface/web/admin/lib/lang/cz_directive_snippets.lng +++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng @@ -8,4 +8,3 @@ $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.'; $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.'; ?> - diff --git a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng index cf1bb28c772e72033df780efd24d61a186798c98..c8cedfe36d4dbd6b642e52f59afef7210336a23a 100644 --- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng @@ -6,4 +6,3 @@ $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 df9386ae66d7115a96d5e49b44755f60caaa460d..abe744f065e18def6aa6d3d5720d1913365f5943 100644 --- a/interface/web/admin/lib/lang/cz_firewall.lng +++ b/interface/web/admin/lib/lang/cz_firewall.lng @@ -10,4 +10,3 @@ $wb['tcp_ports_error_regex'] = 'Znak není povole v definici TCP portu. Povolen $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 da1af438deb23ac2f7a8c6e5397b7a8797f04cd1..76ee5c0f76e6bf855067464871ec42a42dbd1401 100644 --- a/interface/web/admin/lib/lang/cz_firewall_list.lng +++ b/interface/web/admin/lib/lang/cz_firewall_list.lng @@ -7,4 +7,3 @@ $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 0f1a6be926302278b2257ef58e0e2d132fe08e3e..b7bb634f5eaabfb3f2e3190777fbce6684282313 100644 --- a/interface/web/admin/lib/lang/cz_groups.lng +++ b/interface/web/admin/lib/lang/cz_groups.lng @@ -4,4 +4,3 @@ $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 f285b382b947dc2a29fc1a75f46e9b12014ae6ef..9bc2c9eb720bdd292f108967049a9ed63f6c3e08 100644 --- a/interface/web/admin/lib/lang/cz_groups_list.lng +++ b/interface/web/admin/lib/lang/cz_groups_list.lng @@ -6,4 +6,3 @@ $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 4e2b8a4a3e76cf37d39e77bc2a8f8297875bf563..b7d736e15dd4d3fb02bffc6df466652d63439b93 100644 --- a/interface/web/admin/lib/lang/cz_iptables.lng +++ b/interface/web/admin/lib/lang/cz_iptables.lng @@ -2,14 +2,13 @@ $wb['server_id_txt'] = 'Server'; $wb['multiport_txt'] = 'Multi Port'; $wb['singleport_txt'] = 'Single Port'; -$wb['protocol_txt'] = 'Protocol'; -$wb['table_txt'] = 'Table'; +$wb['protocol_txt'] = 'Protokol'; +$wb['table_txt'] = 'Tabulka'; $wb['target_txt'] = 'Cíl'; -$wb['state_txt'] = 'State'; -$wb['destination_ip_txt'] = 'Destination Address'; -$wb['source_ip_txt'] = 'Source Address'; +$wb['state_txt'] = 'Stav'; +$wb['destination_ip_txt'] = 'Cílové adresy'; +$wb['source_ip_txt'] = 'Zdrojové adresy'; $wb['active_txt'] = 'Aktivní'; -$wb['iptables_error_unique'] = 'There is already a firewall record for this server.'; +$wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.'; ?> - diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng index 99dab0148f17ad4a25a9596288075ceabf4265a1..02177f6d996733c56ad3970b3ad2dc698b869b88 100644 --- a/interface/web/admin/lib/lang/cz_iptables_list.lng +++ b/interface/web/admin/lib/lang/cz_iptables_list.lng @@ -4,14 +4,13 @@ $wb['add_new_rule_txt'] = 'Add IPTables Rule'; $wb['server_id_txt'] = 'Server'; $wb['multiport_txt'] = 'Multi Port'; $wb['singleport_txt'] = 'Single Port'; -$wb['protocol_txt'] = 'Protocol'; -$wb['table_txt'] = 'Table'; +$wb['protocol_txt'] = 'Protokol'; +$wb['table_txt'] = 'Tabulka'; $wb['target_txt'] = 'Cíl'; -$wb['state_txt'] = 'State'; -$wb['destination_ip_txt'] = 'Destination Address'; -$wb['source_ip_txt'] = 'Source Address'; +$wb['state_txt'] = 'Stav'; +$wb['destination_ip_txt'] = 'Cílové adresy'; +$wb['source_ip_txt'] = 'Zdrojové adresy'; $wb['active_txt'] = 'Aktivní'; -$wb['iptables_error_unique'] = 'There is already a firewall record for this server.'; +$wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.'; ?> - diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng index d95f12eb35ecf997e55dc41e32c75ca4582a40e5..3af00bf303e5f15abc449cdb5e25fd8e45fc5ca8 100644 --- a/interface/web/admin/lib/lang/cz_language_add.lng +++ b/interface/web/admin/lib/lang/cz_language_add.lng @@ -7,4 +7,3 @@ $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 eb222b3bd031ce42e91fbe2089a0b462587e4f52..5f1b2f75b11fcdc3bb910cb2c0c7fc018086045e 100644 --- a/interface/web/admin/lib/lang/cz_language_complete.lng +++ b/interface/web/admin/lib/lang/cz_language_complete.lng @@ -6,4 +6,3 @@ $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 f880e6dbe71644cf41d9e852302867cbbd9e7084..086e166bbac2477df48a58d4b797241260005bc9 100644 --- a/interface/web/admin/lib/lang/cz_language_edit.lng +++ b/interface/web/admin/lib/lang/cz_language_edit.lng @@ -7,4 +7,3 @@ $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 7ffdccf5229e62c2ac1ea2487fdee62b07433b4f..54f138a2ea16aa69199ce70d023e2a584dd8e1d2 100644 --- a/interface/web/admin/lib/lang/cz_language_export.lng +++ b/interface/web/admin/lib/lang/cz_language_export.lng @@ -5,4 +5,3 @@ $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 17dfa89aafad1c7318c66f0f2431106cfb9679c1..11e42f8041eef086acce587ebd60fa8c75ac58ec 100644 --- a/interface/web/admin/lib/lang/cz_language_import.lng +++ b/interface/web/admin/lib/lang/cz_language_import.lng @@ -7,4 +7,3 @@ $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 77810e0a759bcf331ae60e9dfda4073057dd5ace..49614e0529a3c16e4ee75bf6811a0e8d1450c842 100644 --- a/interface/web/admin/lib/lang/cz_language_list.lng +++ b/interface/web/admin/lib/lang/cz_language_list.lng @@ -6,4 +6,3 @@ $wb['lang_file_txt'] = 'Jazykový soubor'; $wb['lang_file_date_txt'] = 'Poslední úprava'; ?> - diff --git a/interface/web/admin/lib/lang/cz_login_as.lng b/interface/web/admin/lib/lang/cz_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/cz_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng index 6f77e49079d71c3b8ad971912aa5868af0523401..aec170b2fba74aa358b62b9a7e1faeb40fad018b 100644 --- a/interface/web/admin/lib/lang/cz_package_install.lng +++ b/interface/web/admin/lib/lang/cz_package_install.lng @@ -6,4 +6,3 @@ $wb['repo_password_txt'] = 'Password (optional)'; $wb['active_txt'] = 'Aktivní'; ?> - diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng index 561db1e89c10f41d107fbe24ad19008fa661ecc9..536ccfb357635150d618d05f6b991b613abf2640 100644 --- a/interface/web/admin/lib/lang/cz_remote_action.lng +++ b/interface/web/admin/lib/lang/cz_remote_action.lng @@ -11,4 +11,3 @@ $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 4bb34c4d4aefe29a326dc044bb480299842c0ff4..d35c800c5cc89d159a19ed6aa94c6dc95ad3725a 100644 --- a/interface/web/admin/lib/lang/cz_remote_user.lng +++ b/interface/web/admin/lib/lang/cz_remote_user.lng @@ -46,4 +46,3 @@ $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 1b40308735bbc3df08d0b6dd7488ae11d4196e67..c466a2a8b5c6ee6d135a528be50ac5287123becc 100644 --- a/interface/web/admin/lib/lang/cz_remote_user_list.lng +++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng @@ -6,4 +6,3 @@ $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 9d44fd27c840ef95abe4fea148e6c93572f5799d..ced7e5fb338875042032596af66a009161dcdc04 100644 --- a/interface/web/admin/lib/lang/cz_server.lng +++ b/interface/web/admin/lib/lang/cz_server.lng @@ -14,4 +14,3 @@ $wb['proxy_server_txt'] = 'Proxy-Server'; $wb['firewall_server_txt'] = 'Firewall-Server'; ?> - diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index 3696fedb8f0aaf29dcca53d614b47add02010d82..d0d7f488ca27975134e54d5e11670d7c61a935f5 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 config adresář'; +$wb['getmail_config_dir_txt'] = 'Getmail složka pro konfigurace'; $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 php.ini cesta'; +$wb['fastcgi_phpini_path_txt'] = 'FastCGI cesta k adresáři kde je umístěn php.ini'; $wb['fastcgi_children_txt'] = 'FastCGI děti'; $wb['fastcgi_max_requests_txt'] = 'FastCGI max. požadavků'; -$wb['fastcgi_bin_txt'] = 'FastCGI bin'; +$wb['fastcgi_bin_txt'] = 'FastCGI cesta k binarnímu balíčku'; $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'] = 'Hostname'; -$wb['nameservers_txt'] = 'Jmenné servery'; +$wb['hostname_txt'] = 'Název hostitele (hostname)'; +$wb['nameservers_txt'] = 'Jmenné servery (DNS)'; $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'] = 'Hostname je prázdný.'; +$wb['hostname_error_empty'] = 'Název hostitele (hostname) je prázdný.'; $wb['nameservers_error_empty'] = 'Jmenný server je prázdný.'; -$wb['config_dir_txt'] = 'Vlogger config adresář'; +$wb['config_dir_txt'] = 'Vlogger cesta k vlogger-dbi.conf'; $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'; @@ -54,7 +54,7 @@ $wb['apps_vhost_servername_txt'] = 'Apps-vhost doména'; $wb['bind_user_txt'] = 'BIND uživatel'; $wb['bind_group_txt'] = 'BIND skupina'; $wb['bind_zonefiles_dir_txt'] = 'BIND adresář se zónovými soubory'; -$wb['named_conf_path_txt'] = 'BIND named.conf cesta'; +$wb['named_conf_path_txt'] = 'BIND named.conf cesta k souboru'; $wb['bind_user_error_empty'] = 'BIND uživatel je prázdný.'; $wb['bind_group_error_empty'] = 'BIND skupina je prázdná.'; $wb['bind_zonefiles_dir_error_empty'] = 'BIND adresář se zónovými soubory je prázdný.'; @@ -63,37 +63,37 @@ $wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local cesta je práz $wb['mail_filter_syntax_txt'] = 'Syntaxe mailového filtru'; $wb['pop3_imap_daemon_txt'] = 'POP3/IMAP démon'; $wb['php_open_basedir_txt'] = 'PHP open_basedir'; -$wb['php_open_basedir_error_empty'] = 'PHP open_basedir ije prázdný.'; +$wb['php_open_basedir_error_empty'] = 'PHP open_basedir je prázdný.'; $wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride'; $wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride je prázdný.'; -$wb['awstats_conf_dir_txt'] = 'awstats conf folder'; -$wb['awstats_data_dir_txt'] = 'awstats data folder'; -$wb['awstats_pl_txt'] = 'awstats.pl script'; -$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script'; +$wb['awstats_conf_dir_txt'] = 'awstats složka pro konfigurace'; +$wb['awstats_data_dir_txt'] = 'awstats složka pro data'; +$wb['awstats_pl_txt'] = 'awstats.pl cesta ke skriptu'; +$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl cesta ke skriptu'; $wb['backup_dir_txt'] = 'Adresář pro zálohy'; -$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['named_conf_local_path_txt'] = 'BIND named.conf.local cesta k souboru'; +$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['ufw_default_output_policy_txt'] = 'Default Output Policy'; $wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy'; $wb['ufw_default_application_policy_txt'] = 'Default Application Policy'; -$wb['ufw_log_level_txt'] = 'Log Level'; +$wb['ufw_log_level_txt'] = 'Úroveň logování'; $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'] = 'Server Type'; +$wb['server_type_txt'] = 'Typ serveru'; $wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir'; $wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir'; $wb['nginx_user_txt'] = 'Nginx user'; $wb['nginx_group_txt'] = 'Nginx group'; $wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket'; -$wb['backup_dir_error_empty'] = 'Backup directory is empty.'; +$wb['backup_dir_error_empty'] = 'Adresář se zálohou je prázdný.'; $wb['maildir_path_error_empty'] = 'Maildir Path is empty.'; $wb['homedir_path_error_empty'] = 'Homedir Path is empty.'; $wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.'; @@ -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 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['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 (Server Name Indication)'; +$wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD monitorová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,20 +159,24 @@ $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 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['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['firewall_txt'] = 'Firewall'; $wb['mailbox_quota_stats_txt'] = 'Statistika kvóty poštovní schránky'; -$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; +$wb['enable_ip_wildcard_txt'] = 'Aktivovat IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; -$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; -$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; +$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['v6_prefix_txt'] = 'IPv6 Prefix'; $wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; $wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; +$wb['php_ini_check_minutes_txt'] = 'Check system php.ini files for changes each'; +$wb['php_ini_check_minutes_info_txt'] = 'minutes (0 disables checking)'; +$wb['php_ini_check_minutes_error_empty'] = 'Invalid value for php.ini checking.'; +$wb['sendmail_path_txt'] = 'Sendmail Path'; +$wb['sendmail_path_error_empty'] = 'Sendmail Path is empty.'; ?> - 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 8589dbc9d16f2eda14e03769bc6a2ffbc8a42371..9a56c34e2add4a15751ed65e019e80b7b2469858 100644 --- a/interface/web/admin/lib/lang/cz_server_config_list.lng +++ b/interface/web/admin/lib/lang/cz_server_config_list.lng @@ -3,4 +3,3 @@ $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 634898abfcdceffe572aa5caf4340289ba919a17..111286c418299750a039e78b241af9825eca8bbc 100644 --- a/interface/web/admin/lib/lang/cz_server_ip.lng +++ b/interface/web/admin/lib/lang/cz_server_ip.lng @@ -10,4 +10,3 @@ $wb['virtualhost_port_txt'] = 'HTTP Ports'; $wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443'; ?> - diff --git a/interface/web/admin/lib/lang/cz_server_ip_list.lng b/interface/web/admin/lib/lang/cz_server_ip_list.lng index 2a47ca75917b4dde544382f9d99a027407c735b9..3aaa3abb098f39017b144d985827a1fd95e7ce89 100644 --- a/interface/web/admin/lib/lang/cz_server_ip_list.lng +++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng @@ -9,4 +9,3 @@ $wb['virtualhost_port_txt'] = 'HTTP Ports'; $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 e7a2efd805ccf0ac030968b53abd6251b3a7faac..437f376284d03b7c03ddccfbf69bac0e989cbc50 100644 --- a/interface/web/admin/lib/lang/cz_server_list.lng +++ b/interface/web/admin/lib/lang/cz_server_list.lng @@ -12,4 +12,3 @@ $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 59cf3c7365046db053b32658451a67f21b2947a1..fc8f7ad4afb3c4a4c855ab7d5ea7d6b4d9f61399 100644 --- a/interface/web/admin/lib/lang/cz_server_php.lng +++ b/interface/web/admin/lib/lang/cz_server_php.lng @@ -15,4 +15,3 @@ $wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři'; $wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři'; ?> - diff --git a/interface/web/admin/lib/lang/cz_server_php_list.lng b/interface/web/admin/lib/lang/cz_server_php_list.lng index e0b43a4a996b6ebb49c9d231793446ebfcd73abc..25b95f9c4d7ec65e4b1abae68f3dcd06df5d33df 100644 --- a/interface/web/admin/lib/lang/cz_server_php_list.lng +++ b/interface/web/admin/lib/lang/cz_server_php_list.lng @@ -6,4 +6,3 @@ $wb['client_id_txt'] = 'Klient'; $wb['name_txt'] = 'Verze PHP'; ?> - diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng index 1a9becc5f2465abd9912e903407ae8ce98a27fdf..d80ffa0476f58feb865b07d57ec32dbaf982ab4c 100644 --- a/interface/web/admin/lib/lang/cz_software_package_install.lng +++ b/interface/web/admin/lib/lang/cz_software_package_install.lng @@ -5,4 +5,3 @@ $wb['btn_save_txt'] = 'Start Installation'; $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 80f729c9d50ddac0b850e5a7e5ba56b8c2651b29..2f1feced3782f994f1eec7266f34eca74d98c448 100644 --- a/interface/web/admin/lib/lang/cz_software_package_list.lng +++ b/interface/web/admin/lib/lang/cz_software_package_list.lng @@ -4,9 +4,8 @@ $wb['installed_txt'] = 'Stav'; $wb['package_title_txt'] = 'Balíček'; $wb['package_description_txt'] = 'Popis'; $wb['action_txt'] = 'Akce'; -$wb['toolsarea_head_txt'] = 'Packages'; -$wb['repoupdate_txt'] = 'Update package list'; -$wb['package_id_txt'] = 'local App-ID'; +$wb['toolsarea_head_txt'] = 'Balíčky'; +$wb['repoupdate_txt'] = 'Aktualizace seznamu balíků'; +$wb['package_id_txt'] = 'místní 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 f48a2c4a363aff9694042db16e2ee7b71de90fc1..843bab668722c0404eef990059bca584a9abb9f4 100644 --- a/interface/web/admin/lib/lang/cz_software_repo.lng +++ b/interface/web/admin/lib/lang/cz_software_repo.lng @@ -6,4 +6,3 @@ $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 4ae3c662d86ab872011ea7f14dfd83e77d9468fe..d45b792fbcc0c14541b9df281aae1e38a101a791 100644 --- a/interface/web/admin/lib/lang/cz_software_repo_list.lng +++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng @@ -5,4 +5,3 @@ $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 c1aa17fcdef8880c4521d7f802dd8c12b71283b8..f95d8c3159c648743fb083b5aded3ffee061cca2 100644 --- a/interface/web/admin/lib/lang/cz_software_update_list.lng +++ b/interface/web/admin/lib/lang/cz_software_update_list.lng @@ -7,4 +7,3 @@ $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 2b0a31739910c34210a9de8619f9cf673ca2ebdc..0b6479e599e0d5ff28b6423d90192a2e8534b87f 100644 --- a/interface/web/admin/lib/lang/cz_system_config.lng +++ b/interface/web/admin/lib/lang/cz_system_config.lng @@ -46,6 +46,8 @@ $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\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show Autoresponder tab in Mailbox detail'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show Mail Filter tab in Mailbox detail'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show Custom Rules tab in Mailbox detail'; ?> - 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 edf66963d4555510e745627e697caedfc887a274..efecb6d979a0996d011b8f50768f5d8a344a1bb6 100644 --- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng +++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng @@ -17,4 +17,3 @@ $wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři'; $wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři'; ?> - diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng index 28bf9c9b2e396e60d7122d6159db038cd12d9779..0324f16a8ddafe265a26a433554d97a029b66fb6 100644 --- a/interface/web/admin/lib/lang/cz_users.lng +++ b/interface/web/admin/lib/lang/cz_users.lng @@ -29,7 +29,6 @@ $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'] = 'Uživatelské jméno nesmí být web nebo web a číslo.\"'; +$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 4e7e34c278476d0aab66310ec2029acf00fca76b..37b0e7e29b5c1e96a104e1393b8bca74a44319dc 100644 --- a/interface/web/admin/lib/lang/cz_users_list.lng +++ b/interface/web/admin/lib/lang/cz_users_list.lng @@ -1,11 +1,10 @@ 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/admin/lib/lang/de_login_as.lng b/interface/web/admin/lib/lang/de_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..f905b45115ce496317ec18b4e0cede40b22ba8d8 --- /dev/null +++ b/interface/web/admin/lib/lang/de_login_as.lng @@ -0,0 +1,11 @@ + diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 670fbe02c514415c454dc9e2e2c400be8f487e5c..b08dc3b8bf583cb3439b6fe4fcc670c12983f4ba 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -170,9 +170,6 @@ $wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren'; $wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)'; $wb['overtraffic_notify_admin_txt'] = 'Überschreiten des Transfer Limits an den Administrator senden'; $wb['overtraffic_notify_client_txt'] = 'Überschreiten des Transfer Limits an den Kunden senden'; -$wb['v6_prefix_txt'] = 'IPv6 Präfix'; -$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 auf dem Mirror'; -$wb['v6_prefix_wrong'] = 'Falsches IPv6 Netzmasken Format.'; $wb['php_ini_check_minutes_txt'] = 'Prüfe System php.ini Dateien auf Änderungen alle'; $wb['php_ini_check_minutes_info_txt'] = 'Minute(n) (0 deaktiviert diese Funktion)'; $wb['php_ini_check_minutes_error_empty'] = 'Der Wert für die Einstellung der php.ini Prüfung ist ungültig.'; diff --git a/interface/web/admin/lib/lang/el_login_as.lng b/interface/web/admin/lib/lang/el_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/el_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index c580600fe737270d4453881559291d3d2dbc55b2..5768d3f79ce723603c35b1c77d2cf86117990727 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/el_users.lng b/interface/web/admin/lib/lang/el_users.lng index 993d697b1e32d5a4c2a0c1df5c36a2f3deb88495..3323424f102fd37e0803c79f6a26da2faa77fbb4 100644 --- a/interface/web/admin/lib/lang/el_users.lng +++ b/interface/web/admin/lib/lang/el_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/en_login_as.lng b/interface/web/admin/lib/lang/en_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/en_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/es_login_as.lng b/interface/web/admin/lib/lang/es_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/es_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index 9a25490c3208e10286cac55dd9a4d4c5a6fbc417..431076408815e39bbb64031b548af42ab5e13d78 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/es_users.lng b/interface/web/admin/lib/lang/es_users.lng index eee23b1c5724dfd96e6a531e49347ea801b9b628..5a408e86f607dc85d152da787b8a7ec1c2c462cc 100644 --- a/interface/web/admin/lib/lang/es_users.lng +++ b/interface/web/admin/lib/lang/es_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/fi_login_as.lng b/interface/web/admin/lib/lang/fi_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/fi_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 4865f2a9e868a90ec062a739a6c9aa4c3998e7bb..d56ca7508dd69dc16c6430c7f6538c39448ad1b4 100755 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/fi_users.lng b/interface/web/admin/lib/lang/fi_users.lng index c123ca998e4c5647c41c96cdc53bca1d49f1efb6..f19be64b79ffa039429d598e9f1872f61dce1fac 100755 --- a/interface/web/admin/lib/lang/fi_users.lng +++ b/interface/web/admin/lib/lang/fi_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/fr_directive_snippets.lng b/interface/web/admin/lib/lang/fr_directive_snippets.lng index ee40ab06f9c236b846ebe8daec35f7603aefe520..d836ab0da0d88fc0a5c4aa9e78eaa5b7d3fd557d 100644 --- a/interface/web/admin/lib/lang/fr_directive_snippets.lng +++ b/interface/web/admin/lib/lang/fr_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = 'Snippet'; +$wb['active_txt'] = 'Active'; +$wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.'; +$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.'; +?> diff --git a/interface/web/admin/lib/lang/fr_directive_snippets_list.lng b/interface/web/admin/lib/lang/fr_directive_snippets_list.lng index 702e7e250480306e6f717010d84662c0e03d41e1..4124ea34641c48c25db6319110a5f119264242e6 100644 --- a/interface/web/admin/lib/lang/fr_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/fr_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$wb['active_txt'] = 'Active'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['add_new_record_txt'] = 'Add Directive Snippet'; +?> diff --git a/interface/web/admin/lib/lang/fr_login_as.lng b/interface/web/admin/lib/lang/fr_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/fr_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index ce25160f0e4e49fa698d5e85b67cc48748c62475..595596c60a9022f2049206fb828a33b0ce1e4e0d 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/fr_users.lng b/interface/web/admin/lib/lang/fr_users.lng index 85e24cfc17697ac9c1020cc48bfa625f3c73ee2d..0d581155ed1438849726d52a8e508d9c5018f0ec 100644 --- a/interface/web/admin/lib/lang/fr_users.lng +++ b/interface/web/admin/lib/lang/fr_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/hr_login_as.lng b/interface/web/admin/lib/lang/hr_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/hr_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 79a0397aa7db2c6a5bafe0199535367c1529c7c5..5c9e7d0ed9fc2bf07d91bb6af40058f68070e517 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng index 4f0f1e98441d035dc5f8a089ca3fccd385d49b54..ca9f3cb29ab54b97b06b8f007475da512382e684 100644 --- a/interface/web/admin/lib/lang/hr_users.lng +++ b/interface/web/admin/lib/lang/hr_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/hu_login_as.lng b/interface/web/admin/lib/lang/hu_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/hu_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index 7cb7938603593c3d55c99db861bdb09d697b5573..c3a6806a84a29fd5ecb0b38bca647037f66846e8 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/hu_users.lng b/interface/web/admin/lib/lang/hu_users.lng index 9ffde2170187693adb895af091c68b426016b428..7d26ff9972af9e2b58d896ac81f11c8357a566f4 100644 --- a/interface/web/admin/lib/lang/hu_users.lng +++ b/interface/web/admin/lib/lang/hu_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/id_login_as.lng b/interface/web/admin/lib/lang/id_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/id_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index c875b78122c680f2d167b159908a0fa904e51f94..34ea127fe85f82957fc0d617c7bdbd5f2693cbd3 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/id_users.lng b/interface/web/admin/lib/lang/id_users.lng index 1703841da25107785a2bade411b99584d0230948..8766690a2be36f7bfb1c51cf371b0e0f1b8a2f0d 100644 --- a/interface/web/admin/lib/lang/id_users.lng +++ b/interface/web/admin/lib/lang/id_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/it_login_as.lng b/interface/web/admin/lib/lang/it_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/it_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index 0b5e31f45ca70cb63184e1d4cb1a02d61c9b07a8..9a32425b42486727067cd0160d7b690fbf4ab2d1 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/it_users.lng b/interface/web/admin/lib/lang/it_users.lng index 3e141ed4362b1b08c8b922d9e18f6ddbdd341c77..3a42baaa244f8d99046535e850636422abf80f46 100644 --- a/interface/web/admin/lib/lang/it_users.lng +++ b/interface/web/admin/lib/lang/it_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/ja_login_as.lng b/interface/web/admin/lib/lang/ja_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/ja_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 09536687f4ac1c0f4ac96dfef245ee977fe70fc3..2cd8c38a313481f65abc1731461de722861ae7cf 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/ja_users.lng b/interface/web/admin/lib/lang/ja_users.lng index d70389fe8ae98d211a5ef554da9cfbe9d611f1e9..ea0db7ab41fe1e39956454a48540806d4e390123 100644 --- a/interface/web/admin/lib/lang/ja_users.lng +++ b/interface/web/admin/lib/lang/ja_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/nl_login_as.lng b/interface/web/admin/lib/lang/nl_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/nl_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index f178da32a671a23e10e780e7b4f8791104684af9..4cb30925626acbf046cd805f9d641d2db976c899 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng index 613802f16996fda8e04f2d6ca04bfdf2e19b3045..b65f9a5fa1f8c7bfe106a2eb97d34dc882c4718e 100644 --- a/interface/web/admin/lib/lang/nl_users.lng +++ b/interface/web/admin/lib/lang/nl_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/pl_login_as.lng b/interface/web/admin/lib/lang/pl_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/pl_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index 586a64e0fc5eb33c6f4eb2759d547d015d406814..ac1d280e28793b70ccc12c47d657e32b852df3c7 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng index 477eab2c40f5c1b054494eff65c2362fc9dfd730..7fcc601446254aa0151fc7771c127203fcb6fa2d 100644 --- a/interface/web/admin/lib/lang/pl_users.lng +++ b/interface/web/admin/lib/lang/pl_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/pt_login_as.lng b/interface/web/admin/lib/lang/pt_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/pt_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index f434b0ffcb6aed9110c13b54000449fea6f67280..3470e28a722ce57ce2a86f6620948299ad80e6da 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/pt_users.lng b/interface/web/admin/lib/lang/pt_users.lng index e09048d6c253dff318d7f160d4d58584934f40da..9aaa66350a9504ebcc90d02ca2a55b9850adfc7d 100644 --- a/interface/web/admin/lib/lang/pt_users.lng +++ b/interface/web/admin/lib/lang/pt_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/ro_login_as.lng b/interface/web/admin/lib/lang/ro_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/ro_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 26f1b89cc612575d441ce46620ae9f73cd57c5e3..56ce46cc5a3c1c8636694784301fbb41bf57baf5 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/ro_users.lng b/interface/web/admin/lib/lang/ro_users.lng index 8abda49849acf86cf33f70782de639e659156719..2ed24d890c8f3b93f21f31e64faf98af4ef97cc7 100644 --- a/interface/web/admin/lib/lang/ro_users.lng +++ b/interface/web/admin/lib/lang/ro_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/ru_login_as.lng b/interface/web/admin/lib/lang/ru_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/ru_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index 8745232546315d842d94ce5141ccbfb7ee1664e2..fd76bf6db6f590f7753bb83c6006b09fa7fd3176 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/ru_users.lng b/interface/web/admin/lib/lang/ru_users.lng index 6156d22359f6bab93c0fc64affd3be1bb3056b16..495d9f1ca30321ca3a5cbd9dd0c52ff8c62a727b 100644 --- a/interface/web/admin/lib/lang/ru_users.lng +++ b/interface/web/admin/lib/lang/ru_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/se_login_as.lng b/interface/web/admin/lib/lang/se_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/se_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index 5baef7e364a0e5dc8f0a33e608679f61906d266a..0d16cedb90447ce3a59e4e6f1d8158d5df8adbb4 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/se_users.lng b/interface/web/admin/lib/lang/se_users.lng index 5d92d301dfab5c05caa1c1f98e19efea36b373a0..76cb33ae8e1bb0ae7cb4ec822b9a40897adaa52f 100644 --- a/interface/web/admin/lib/lang/se_users.lng +++ b/interface/web/admin/lib/lang/se_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/sk_login_as.lng b/interface/web/admin/lib/lang/sk_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/sk_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index 92841b8c2da316c506b6336010682907a0ff9e25..d2f27c7cbe6d9cecbb6192e19388d02685582295 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/sk_users.lng b/interface/web/admin/lib/lang/sk_users.lng index fc389c5562c146b393543aef4d36475d097fc8f1..aee901f21695c301a58161aba3393625e7e713b0 100644 --- a/interface/web/admin/lib/lang/sk_users.lng +++ b/interface/web/admin/lib/lang/sk_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/lib/lang/tr_login_as.lng b/interface/web/admin/lib/lang/tr_login_as.lng new file mode 100644 index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c --- /dev/null +++ b/interface/web/admin/lib/lang/tr_login_as.lng @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index c8972108735e28ec2acc81b05d667dc078ba3f2a..a94949020185fd8a7a2bf89cd27a4d49aa1a6311 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $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/tr_users.lng b/interface/web/admin/lib/lang/tr_users.lng index 455d8c7987898c3f9f9a1b8f6c8704efd95d260b..3508a832f865edcc735e56e53fe9eca61eb63934 100644 --- a/interface/web/admin/lib/lang/tr_users.lng +++ b/interface/web/admin/lib/lang/tr_users.lng @@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; ?> diff --git a/interface/web/admin/login_as.php b/interface/web/admin/login_as.php index 6c6b48788f3cd08e7409cdaa36aea16b95970163..f7103b7aad5d187c4a3b495fd2f08af9cdd7d8d3 100644 --- a/interface/web/admin/login_as.php +++ b/interface/web/admin/login_as.php @@ -67,10 +67,14 @@ $dbData = $app->db->queryOneRecord( * Now generate the login-Form * TODO: move the login_as form to a template file -> themeability */ + + $lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_login_as.lng'; +include($lng_file); + echo '



- Do you want to login as user ' . $dbData['username'] . '?
- If you do so, you can "go back" by clicking at logout.
+ '.$wb['login_1_txt'].' ' . $dbData['username'] . '?
+ '.$wb['login_2_txt'].'
@@ -78,8 +82,8 @@ echo '
- - + +
'; ?> diff --git a/interface/web/admin/templates/directive_snippets_list.htm b/interface/web/admin/templates/directive_snippets_list.htm index e3db36ed75e279ee93a36cba35120c03640ae6f1..32a10ddc0101c25cc42ca5e07d73459f76b3c7a1 100644 --- a/interface/web/admin/templates/directive_snippets_list.htm +++ b/interface/web/admin/templates/directive_snippets_list.htm @@ -43,6 +43,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm index e9cb42527e973d6fc5283c369621655183adbba9..44c7f3403fe8c3b06615aa397a50c4ba8d86d9a7 100644 --- a/interface/web/admin/templates/firewall_list.htm +++ b/interface/web/admin/templates/firewall_list.htm @@ -46,6 +46,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm index 2718d1f10e45f58c35d3ff7f4d400ae4ec6a21cf..dc685623480b7a99e1b0c794724816b198ec365b 100644 --- a/interface/web/admin/templates/groups_list.htm +++ b/interface/web/admin/templates/groups_list.htm @@ -41,6 +41,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/iptables_list.htm b/interface/web/admin/templates/iptables_list.htm index b570b97d2fb55d8114c5787b93b15479668b2410..e3747054e3f5261af38a0ad2e267ef0b063e910e 100644 --- a/interface/web/admin/templates/iptables_list.htm +++ b/interface/web/admin/templates/iptables_list.htm @@ -57,6 +57,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/language_complete.htm b/interface/web/admin/templates/language_complete.htm index 86d3a44d454ac3ba77f8a322c6c5134d788790d9..4f1fd64065f93d9046406f58c0fb76a0c7af2c4d 100644 --- a/interface/web/admin/templates/language_complete.htm +++ b/interface/web/admin/templates/language_complete.htm @@ -18,12 +18,13 @@ {tmpl_var name='language_option'}
+
+ + +
-
- - -
+ \ No newline at end of file diff --git a/interface/web/admin/templates/remote_action_osupdate.htm b/interface/web/admin/templates/remote_action_osupdate.htm index 05f2b296362fa8f5efd4cb2a163f6d1907561a4b..b941b83ca864569dbea3d14450f156b511b93691 100644 --- a/interface/web/admin/templates/remote_action_osupdate.htm +++ b/interface/web/admin/templates/remote_action_osupdate.htm @@ -7,7 +7,7 @@
{tmpl_var name='do_osupdate_caption'}
- {tmpl_var name='server_option'}
diff --git a/interface/web/admin/templates/remote_user_list.htm b/interface/web/admin/templates/remote_user_list.htm index c7e86b44c925d2d434a4caf1f8d290cf359954ce..4bc5db3b34a8680668ef2e3a38ff0a6edd73b701 100644 --- a/interface/web/admin/templates/remote_user_list.htm +++ b/interface/web/admin/templates/remote_user_list.htm @@ -39,6 +39,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/server_config_list.htm b/interface/web/admin/templates/server_config_list.htm index 05efdcb226d9586dff561ca26432887033d08872..d5b421962e0317be1d7a34dea08099eb8895f388 100644 --- a/interface/web/admin/templates/server_config_list.htm +++ b/interface/web/admin/templates/server_config_list.htm @@ -27,6 +27,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm index eef98aadd89e5c57be01dc5a31bc8a3e1aca3862..713e1e97bc9a67cbcb38decb8fed3f6dde526b67 100644 --- a/interface/web/admin/templates/server_ip_list.htm +++ b/interface/web/admin/templates/server_ip_list.htm @@ -51,6 +51,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm index 413ce4642b731309b179f2204dc28f8168ab9f02..3545e324c6add6570d4af109ccf84b21be447b73 100644 --- a/interface/web/admin/templates/server_list.htm +++ b/interface/web/admin/templates/server_list.htm @@ -45,6 +45,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm index 92aa0801c7a138e41fd9e58f6dc2d45442efcc09..42f8ab10270d9f34e85581616b0b4aebf42b6c42 100644 --- a/interface/web/admin/templates/server_php_list.htm +++ b/interface/web/admin/templates/server_php_list.htm @@ -42,6 +42,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm index d030e5e5c46dc4d8061c7ce9cdc2e073f4175840..b455f7a4da08a9010c8dc8d325cc07bb52afc779 100644 --- a/interface/web/admin/templates/software_package_list.htm +++ b/interface/web/admin/templates/software_package_list.htm @@ -37,6 +37,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm index 466e8f8eda9b47004e2e3c6f9edff20646963d2e..1a7964b22f032878143745588dc3795b6e1d17d7 100644 --- a/interface/web/admin/templates/software_repo_list.htm +++ b/interface/web/admin/templates/software_repo_list.htm @@ -43,6 +43,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm index 7f8a5f833736564e800bf0359676843df1d36e28..d85009665fce8e8c31e1ae64035f471cb6130153 100644 --- a/interface/web/admin/templates/software_update_list.htm +++ b/interface/web/admin/templates/software_update_list.htm @@ -36,6 +36,11 @@ {tmpl_var name="version"} + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm index e67050c857c9ec362a2bf2d62c66ac2a01022afb..8c41ac8fa226fccf5fe952f47ff8def60f5e9ed1 100644 --- a/interface/web/admin/templates/users_list.htm +++ b/interface/web/admin/templates/users_list.htm @@ -50,6 +50,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php index f86de154c1c8ccf4fd23653729429a3335128fa7..14f211e00139c1f1d906984fad300cc897f37b52 100644 --- a/interface/web/client/client_del.php +++ b/interface/web/client/client_del.php @@ -112,7 +112,7 @@ class page_action extends tform_actions { - function onAfterDelete() { + function onBeforeDelete() { global $app, $conf; $client_id = $app->functions->intval($this->dataRecord['client_id']); diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index aab26b28fd1883dd218030375f479f41af8c57d3..9732186e82d4508f85646e97c50f94d639e066c3 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index 5b4e19ad6621a5685fd1801e4ea6599043748cbe..8e16a792bcd5fd1ea36221e1ec117bc048ba49c0 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/br_client.lng b/interface/web/client/lib/lang/br_client.lng index bbdcb0c692b11f8f8f338d7c937d63da6a8730ed..f50fa77fff6de0564ad0d7beb3bec29d1f60097e 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -139,5 +139,5 @@ $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.'; +$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.lng b/interface/web/client/lib/lang/cz.lng index 9c1d91cc2010a9df662ca6da90746e2f23d4c8e0..fa1c78df750a6461120bf2a67bd24d66758f86b8 100644 --- a/interface/web/client/lib/lang/cz.lng +++ b/interface/web/client/lib/lang/cz.lng @@ -24,4 +24,3 @@ $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 12da7e8da9e36a4ab3cabe46e3f2d5af51215e08..66bb8d12e3a54f1acbf65569b2b88d0136d18173 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -1,18 +1,18 @@ - diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng index cb4b143b114e60231c13db1cf3d87a356df4f1fc..c47f934f6f86156d57ed89c30aa2b7fbcec17c0d 100644 --- a/interface/web/client/lib/lang/cz_client_circle.lng +++ b/interface/web/client/lib/lang/cz_client_circle.lng @@ -8,4 +8,3 @@ $wb['description_txt'] = 'Popis'; $wb['active_txt'] = 'Aktivní'; ?> - diff --git a/interface/web/client/lib/lang/cz_client_circle_list.lng b/interface/web/client/lib/lang/cz_client_circle_list.lng index 24025510de0da4c0ceaab32d786f5f6cd745d297..5895f82defae91090208bd4556bc92458262d846 100644 --- a/interface/web/client/lib/lang/cz_client_circle_list.lng +++ b/interface/web/client/lib/lang/cz_client_circle_list.lng @@ -9,4 +9,3 @@ $wb['delete_txt'] = 'Smazat'; $wb['active_txt'] = 'Aktivní'; ?> - diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng index a759ab6a94569eb0c497af259e4aec514c85e54c..f564b37a15425053e118edf16ae077508846cc0d 100644 --- a/interface/web/client/lib/lang/cz_client_del.lng +++ b/interface/web/client/lib/lang/cz_client_del.lng @@ -5,4 +5,3 @@ $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 f1c3870bca3595faf7e29e788e4eb23b92c6ea5d..401908daedf9dd902937b3ae44b6faebc856e22c 100644 --- a/interface/web/client/lib/lang/cz_client_message.lng +++ b/interface/web/client/lib/lang/cz_client_message.lng @@ -17,4 +17,3 @@ $wb['all_clients_txt'] = 'Všichni klienti'; $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 9f5ad6cff00457e5704a48e85ff78d42c7013ecc..8c3aac87e144adc413992d39b1ddf3778c96ece5 100644 --- a/interface/web/client/lib/lang/cz_client_template.lng +++ b/interface/web/client/lib/lang/cz_client_template.lng @@ -1,14 +1,14 @@ - 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 7d9e9238d4865d4f0b51de4badc40c8621104f39..bd2b066c39827f87bf487bc8b9fac6049b212a9a 100644 --- a/interface/web/client/lib/lang/cz_client_template_list.lng +++ b/interface/web/client/lib/lang/cz_client_template_list.lng @@ -4,4 +4,3 @@ $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 aad49997e4bc1032db38afd437ef70005a3e292b..bceac34bc8cedbed12afded909dc1fabee7abff3 100644 --- a/interface/web/client/lib/lang/cz_clients_list.lng +++ b/interface/web/client/lib/lang/cz_clients_list.lng @@ -6,8 +6,7 @@ $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'] = 'Username'; -$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Uživatelské jméno'; +$wb['customer_no_txt'] = 'Zákaznické číslo'; ?> - diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng index 26117aef5ffb3841ebc4bede418151191ecbd7e4..09e1d8e22d708170d1e6b9a131d023d7ce474aa8 100644 --- a/interface/web/client/lib/lang/cz_domain.lng +++ b/interface/web/client/lib/lang/cz_domain.lng @@ -5,4 +5,3 @@ $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Doména'; ?> - diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng index 924f5de13ba108ddbf48262e77c37fefa7704d7c..88df8383cd78044fb5a03d33331b6f38df5325af 100644 --- a/interface/web/client/lib/lang/cz_domain_list.lng +++ b/interface/web/client/lib/lang/cz_domain_list.lng @@ -1,8 +1,7 @@ - diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index af56780a3fe98b2526c5868e4f7fa64b36b606f7..c860b6694eca22e62394502343f20e164f0b1c32 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -1,17 +1,17 @@ 0'; -$wb['limit_web_quota_txt'] = 'Web kvóta'; +$wb['limit_web_quota_txt'] = 'Webová 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_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['customer_no_txt'] = 'Zákaznické číslo'; $wb['vat_id_txt'] = 'DIČ'; $wb['required_fields_txt'] = '* Povinná pole'; -$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users'; +$wb['limit_webdav_user_txt'] = 'Max. počet Webdav uživatelů'; $wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.'; -$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; +$wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailových konferencí'; $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases'; $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; -$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; +$wb['limit_openvz_vm_txt'] = 'Max. počet virtuálních serverů'; $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; @@ -109,36 +109,35 @@ $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one $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 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_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 - povinné pro klienta'; +$wb['limit_hterror_txt'] = 'Vlastní Error (chybové) dokumenty'; $wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; -$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'; +$wb['limit_ssl_txt'] = 'SSL - dostupná volba pro klienta'; +$wb['web_limits_txt'] = 'Webové limity'; +$wb['email_limits_txt'] = 'E-mailové limity'; +$wb['database_limits_txt'] = 'Databázové limity'; +$wb['cron_job_limits_txt'] = 'Cron pracovní limity'; +$wb['dns_limits_txt'] = 'DNS limity'; +$wb['virtualization_limits_txt'] = 'Virtualizace limity'; $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['email_error_isemail'] = 'Please enter a valid email address.'; -$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; -$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; -$wb['paypal_email_txt'] = 'PayPal Email'; -$wb['company_id_txt'] = 'Company/Entrepreneur ID'; -$wb['bank_account_number_txt'] = 'Bank account no.'; -$wb['bank_account_owner_txt'] = 'Bank account owner'; -$wb['bank_code_txt'] = 'Bank code'; -$wb['bank_name_txt'] = 'Bank name'; +$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.'; +$wb['customer_no_error_unique'] = 'Zákaznické číslo musí být jedinečné (nebo prázdné).'; +$wb['paypal_email_error_isemail'] = 'Zadejte prosím platnou PayPal e-mail addresu.'; +$wb['paypal_email_txt'] = 'PayPal e-mail'; +$wb['company_id_txt'] = 'IČO'; +$wb['bank_account_number_txt'] = 'Číslo účtu'; +$wb['bank_account_owner_txt'] = 'Bankovní účet vlastníka'; +$wb['bank_code_txt'] = 'Kód banky'; +$wb['bank_name_txt'] = 'Název banky'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> - diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng index 31226ce87a5bd29516f9fa0b2942e42ba0d31483..859c97f1c278162e0c07398229f1549123b2f0e9 100644 --- a/interface/web/client/lib/lang/cz_resellers_list.lng +++ b/interface/web/client/lib/lang/cz_resellers_list.lng @@ -6,8 +6,7 @@ $wb['contact_name_txt'] = 'Název kontaktu'; $wb['city_txt'] = 'Město'; $wb['country_txt'] = 'Stát'; $wb['add_new_record_txt'] = 'Přidat distributora'; -$wb['customer_no_txt'] = 'Customer No.'; -$wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Zákaznické číslo'; +$wb['username_txt'] = 'Uživatelské jméno'; ?> - diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 1f752efd9f9497b1a1942fba1d0007e84b004e41..586c8b80a9a9f7c7728867c5c71e9f5feae0f428 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -139,5 +139,5 @@ $wb['customer_no_error_unique'] = 'Die Kundennummer muß einzigartig sein (oder $wb['email_error_isemail'] = 'Bitte geben Sie eine gültige Email-Adresse an.'; $wb['paypal_email_error_isemail'] = 'Bitte geben Sie eine gültige PayPal-E-Mail-Adresse an.'; $wb['paypal_email_txt'] = 'PayPal-E-Mail'; -$wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert, wenn als Mastervorlage nicht \"Custom\" gewählt ist.'; +$wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert, wenn als Mastervorlage nicht \\"Custom\\" gewählt ist.'; ?> diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index 641746e48031b6d193bbcdf7e349939d9bf63efe..27d5531f489f6d2a9048fade25b45fc481e82b77 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/es_client.lng b/interface/web/client/lib/lang/es_client.lng index c9255e86002f2971e8dda07f501b1b6cef6ce10b..1bb597150cf20bcd7fa2b9cba3c081457eff4eae 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index 5908aa9c8b4247f9b231329a364f9350c2d82ad9..b83d912d28a0a8a05b767b38cb44d4c550de5fe4 100755 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index 7a174e80f78654080cf927b9ac01eea5f38e69c2..cb8ef3861aab726a150a678380ac0038f0543085 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index d6f3f76c3bc21c37938890b30798b644f1345a74..105715d81c44d157e0441a6d20f9945135934784 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index 5c7668fc03c14acbfb5635cc7de07fa58169a530..f9834008cd79c96919dfd4677e5cfb2481cdd8c8 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/id_client.lng b/interface/web/client/lib/lang/id_client.lng index a346cd8b034ea372b57bef9fc744a27040bfe6e0..2b87ab26bcf6e9012ccf9911c6d92f7103b5fb51 100644 --- a/interface/web/client/lib/lang/id_client.lng +++ b/interface/web/client/lib/lang/id_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/it_client.lng b/interface/web/client/lib/lang/it_client.lng index 9312ada5512686bd84d7f5bd025e183776e70a7f..aa7dee3bfcf82dce162d5cd263888654fbfb1a47 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index 74aa3409e89a62956924e3e2c80da7679c2c6ffe..ab212ee35c586eb296153b23ecc7425e90a4c93b 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index 62e43bc3322066ed5f031ff247e7093714cf71d1..f0ffa3f398d9d277015eb4cacc79a1072a694b26 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index b7a5d339f5e914b25dead8b10e1ddf0c08ec5499..2d7aade174e877fe1bb7f9926654936f8612f1c1 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index 30283d5f2aebb876004daa18ec82b5b0ed3b2193..340a24300304a1096d7a83f93994dd56aff11962 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index f091e85a8d92a80586fe4332586c2aed8f9a698f..bbce82597ec203f123d2911739f30a1e75a2b1fb 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index 5c3a63037f1fe836d0a59dd5c100cb91f05c714a..5893a19285844cefe37927d1cd7a987704ae1705 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/se_client.lng b/interface/web/client/lib/lang/se_client.lng index ce964232d9157eb3e8ed3ce96ac9c0dd22206f33..910caea924e662e3088fdbde64b76c7b09b8aee6 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index 01e9f4d62d54eecd80a92e47006ad0c3eeb6f295..91afc026b7143c64807199a29cc8d83eea0a5c61 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index 9c058f40899320685d02eb7c2453e973fe3c27bf..866a5f43a1b51a11568c2788af4ffd5b0882a076 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -139,5 +139,5 @@ $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.'; +$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/templates/client_circle_list.htm b/interface/web/client/templates/client_circle_list.htm index 036f38d9fcaed0dba9b1af3030c2bcb35126145e..a0d7991d9efd0c9d6777d2b1454a7a2f269db849 100644 --- a/interface/web/client/templates/client_circle_list.htm +++ b/interface/web/client/templates/client_circle_list.htm @@ -46,6 +46,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/client/templates/client_template_list.htm b/interface/web/client/templates/client_template_list.htm index a760a17d3d62a752fff248eeaf9ed3c71b9368a8..5106aef6c97c9c9fc6484f2bfeaa7aa14282a1c6 100644 --- a/interface/web/client/templates/client_template_list.htm +++ b/interface/web/client/templates/client_template_list.htm @@ -43,6 +43,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm index 6164d3d3b0f4733df1f07ede26e60f92791782de..8f33ace188e4e8a8d60a43d0bd3a19ed5a7ab047 100644 --- a/interface/web/client/templates/clients_list.htm +++ b/interface/web/client/templates/clients_list.htm @@ -58,6 +58,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/client/templates/domain_list.htm b/interface/web/client/templates/domain_list.htm index ef52ffc472c71c75a5f97c6ffffcfc6c34eb58b5..38882f256da49087f5e3660add3fd218af3affaa 100644 --- a/interface/web/client/templates/domain_list.htm +++ b/interface/web/client/templates/domain_list.htm @@ -46,6 +46,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm index 2e5dfc7f7b6ce2635eb0bff40b166bf2658c1444..6bf1150ab1bd5af0c8d5ece7328d84dbce701ffc 100644 --- a/interface/web/client/templates/resellers_list.htm +++ b/interface/web/client/templates/resellers_list.htm @@ -56,6 +56,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng index 297b6397facd9c9c6d3e3fa6c5b595e818a8a28f..15063c03fa38eb867a7317c8ec83a57870b4c44c 100644 --- a/interface/web/dashboard/lib/lang/cz.lng +++ b/interface/web/dashboard/lib/lang/cz.lng @@ -3,4 +3,3 @@ $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 9810ba9808fc54c2bc002f28b52bcb753149e1e8..ac3266ec1d10e6aff8df038bacadcdedb86a57ea 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng @@ -29,4 +29,3 @@ $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 a25ba21fc3ba9c5ec9144516bf135d40d99644be..be21791ff07cd61966e5fa2bc3474d0e435b2c5f 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng @@ -2,4 +2,3 @@ $wb['available_modules_txt'] = 'Dostupné moduly'; ?> - diff --git a/interface/web/designer/lib/lang/cz.lng b/interface/web/designer/lib/lang/cz.lng index dd815ad751cd365370e6ef7caec82948b35eba6d..29f4a51efebb370aeb04c5144a604ca2c04e02be 100644 --- a/interface/web/designer/lib/lang/cz.lng +++ b/interface/web/designer/lib/lang/cz.lng @@ -1,4 +1,3 @@ - diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng index 2b04eb968d0a22ab9d143a8e11f53779f770bd7d..00eeb204d040f9b0a225bb75f294a8d24e08c075 100644 --- a/interface/web/designer/lib/lang/cz_form_edit.lng +++ b/interface/web/designer/lib/lang/cz_form_edit.lng @@ -23,4 +23,3 @@ $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 46241cfd5e641219b2c899509b9034166a7187fc..edaa422253cc77327c10327e68541de4f0729d4e 100644 --- a/interface/web/designer/lib/lang/cz_form_list.lng +++ b/interface/web/designer/lib/lang/cz_form_list.lng @@ -6,4 +6,3 @@ $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 45829d54def7efb5ce158d5d0efe17c9ff416c31..7d63b02d3acb82fc33ed7a845324b016252d5ef5 100644 --- a/interface/web/designer/lib/lang/cz_form_show.lng +++ b/interface/web/designer/lib/lang/cz_form_show.lng @@ -17,4 +17,3 @@ $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 f6da04e2e7b8735594c324bc3d962a125d6991a6..e5f988ed7c5fc2f69a619911e2b874fafe746d66 100644 --- a/interface/web/designer/lib/lang/cz_module_edit.lng +++ b/interface/web/designer/lib/lang/cz_module_edit.lng @@ -21,4 +21,3 @@ $wb['description_txt'] = ' '; ?> - diff --git a/interface/web/designer/lib/lang/cz_module_list.lng b/interface/web/designer/lib/lang/cz_module_list.lng index b37872cedc376f886678982854783efedab79ff1..6617c8c30007fee8ce9e448cab3585ae3a8ab534 100644 --- a/interface/web/designer/lib/lang/cz_module_list.lng +++ b/interface/web/designer/lib/lang/cz_module_list.lng @@ -4,4 +4,3 @@ $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 8c21ea4a7d09fbb1127603a26cc4f7446dab3623..58d57732315961127a10ded53ff482cb33306bd2 100644 --- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng @@ -5,4 +5,3 @@ $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 65f6c765a65dce7acd836bd9a23ac8a2fa86aca8..39aaae8c41ec18a95a2c7458f4e645b921344f95 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 @@ -7,4 +7,3 @@ $wb['save_txt'] = 'Uložit'; $wb['cancel_txt'] = 'Zrušit'; ?> - diff --git a/interface/web/designer/lib/lang/cz_module_show.lng b/interface/web/designer/lib/lang/cz_module_show.lng index 605d11de08594039db3432ac85f99be1d27e27fb..e032f9dade47c0caf88f3ac68e91b852a0bec600 100644 --- a/interface/web/designer/lib/lang/cz_module_show.lng +++ b/interface/web/designer/lib/lang/cz_module_show.lng @@ -15,4 +15,3 @@ $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/designer/templates/form_list.htm b/interface/web/designer/templates/form_list.htm index 39eb7b901543dcfbba6197d65b51e6c32f09de6a..9e4fc38b957fe2695faa5469213246c0acfcfabf 100644 --- a/interface/web/designer/templates/form_list.htm +++ b/interface/web/designer/templates/form_list.htm @@ -17,6 +17,11 @@ [Delete] + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/designer/templates/module_list.htm b/interface/web/designer/templates/module_list.htm index 1e148f3ee2a564da293df343ef0ddc7349ffe6e9..c82ebef93206c190b79957070c5e43012bc5fe50 100644 --- a/interface/web/designer/templates/module_list.htm +++ b/interface/web/designer/templates/module_list.htm @@ -12,6 +12,11 @@ [Delete] + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php index d8404a8285bb928c1f5a2c9e27af0f2bc0069dca..aa3a1e520c6ba0298855b46b3337bde2be471820 100644 --- a/interface/web/dns/dns_wizard.php +++ b/interface/web/dns/dns_wizard.php @@ -133,15 +133,18 @@ if($_POST['create'] == 1) { $error = ''; if(isset($_POST['domain']) && $_POST['domain'] == '') $error .= $app->lng('error_domain_empty').'
'; + elseif(isset($_POST['domain']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9\-]{2,30}$/',$_POST['domain'])) $error .= $app->lng('error_domain_regex').'
'; + if(isset($_POST['ip']) && $_POST['ip'] == '') $error .= $app->lng('error_ip_empty').'
'; + if(isset($_POST['ns1']) && $_POST['ns1'] == '') $error .= $app->lng('error_ns1_empty').'
'; + elseif(isset($_POST['ns1']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,30}$/',$_POST['ns1'])) $error .= $app->lng('error_ns1_regex').'
'; + if(isset($_POST['ns2']) && $_POST['ns2'] == '') $error .= $app->lng('error_ns2_empty').'
'; + elseif(isset($_POST['ns2']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,30}$/',$_POST['ns2'])) $error .= $app->lng('error_ns2_regex').'
'; + if(isset($_POST['email']) && $_POST['email'] == '') $error .= $app->lng('error_email_empty').'
'; - - if(isset($_POST['domain']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9\-]{2,30}$/',$_POST['domain'])) $error .= $app->lng('error_domain_regex').'
'; - if(isset($_POST['ns1']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,30}$/',$_POST['ns1'])) $error .= $app->lng('error_ns1_regex').'
'; - if(isset($_POST['ns2']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,30}$/',$_POST['ns2'])) $error .= $app->lng('error_ns2_regex').'
'; - if(isset($_POST['email']) && !preg_match('/^\w+[\w.-]*\w+@\w+[\w.-]*\w+\.[a-z0-9\-]{2,30}$/i',$_POST['email'])) $error .= $app->lng('error_email_regex').'
'; + elseif(isset($_POST['email']) && !preg_match('/^\w+[\w.-]*\w+@\w+[\w.-]*\w+\.[a-z0-9\-]{2,30}$/i',$_POST['email'])) $error .= $app->lng('error_email_regex').'
'; // make sure that the record belongs to the client group and not the admin group when admin inserts it if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($_POST['client_group_id'])) { diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php index c8306aeee7de8a336f28d1b24e3e588f660419de..ebc49cfceb30df253f45794c66ce3ffce94701a5 100644 --- a/interface/web/dns/form/dns_soa.tform.php +++ b/interface/web/dns/form/dns_soa.tform.php @@ -217,8 +217,9 @@ $form["tabs"]['dns_soa'] = array ( 'xfer' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9\.\,]{0,255}$/', + 'validators' => array ( 0 => array ( 'type' => 'ISIP', + 'allowempty' => 'y', + 'separator' => ',', 'errmsg'=> 'xfer_error_regex'), ), 'default' => '', @@ -229,13 +230,11 @@ $form["tabs"]['dns_soa'] = array ( 'also_notify' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '/^(((25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})\.){3}(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(;){0,1}(\ ){0,1}){0,10}$/', + 'validators' => array ( 0 => array ( 'type' => 'ISIP', + 'allowempty' => 'y', + 'separator' => ',', 'errmsg'=> 'also_notify_error_regex' ), -// 0 => array ( 'type' => 'ISIPV4', -// 'errmsg'=> 'also_notify_error_regex' -// ), ), 'default' => '', 'value' => '', diff --git a/interface/web/dns/lib/lang/ar_dns_soa.lng b/interface/web/dns/lib/lang/ar_dns_soa.lng index d0de83a75ed1338ed4fc05c3867c790f0ba8ae69..c805d7e48f3632aedf9d3e87d8f31bd9bb6fe502 100644 --- a/interface/web/dns/lib/lang/ar_dns_soa.lng +++ b/interface/web/dns/lib/lang/ar_dns_soa.lng @@ -27,11 +27,12 @@ $wb['update_acl_txt'] = 'Update ACL'; $wb['seconds_txt'] = 'Seconds'; $wb['eg_domain_tld'] = 'e.g. domain.tld'; $wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld'; -$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld'; +$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld (saved in zone file format, webmaster.domain.tld.)'; $wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'; $wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.'; $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/bg_dns_soa.lng b/interface/web/dns/lib/lang/bg_dns_soa.lng index 8e01e76a2ef0fbf24a7fa2e2434aa74b98644d0f..3ec655d8a965d44419e1ad0530f9e52748c26f61 100644 --- a/interface/web/dns/lib/lang/bg_dns_soa.lng +++ b/interface/web/dns/lib/lang/bg_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/br_dns_soa.lng b/interface/web/dns/lib/lang/br_dns_soa.lng index b4438988ce5c35ff04b94d93e094f97087338fca..591f5d8b64b2021d85096b5cd85d1b153d69b811 100644 --- a/interface/web/dns/lib/lang/br_dns_soa.lng +++ b/interface/web/dns/lib/lang/br_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng index 876a5751e295c4e553df618c71130b0380eef420..126fb7ab99572360ee459338bb00b0a0ea28536f 100644 --- a/interface/web/dns/lib/lang/cz.lng +++ b/interface/web/dns/lib/lang/cz.lng @@ -21,4 +21,3 @@ $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 6d9a24d64c6380ac207025870ab9057d150f7b1d..463183620186aa50fcd009563074127a8d17285c 100644 --- a/interface/web/dns/lib/lang/cz_dns_a.lng +++ b/interface/web/dns/lib/lang/cz_dns_a.lng @@ -15,4 +15,3 @@ $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 22920c1d5c33741537cd4c09e1a2e9fc36f07b88..5770094c08e3084f426adaacb56862810ca90547 100644 --- a/interface/web/dns/lib/lang/cz_dns_a_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng @@ -14,4 +14,3 @@ $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Skutečně chcete smazat tento záznam?'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_aaaa.lng b/interface/web/dns/lib/lang/cz_dns_aaaa.lng index 143885f969b75638200b997a28bed1c72e87aef0..1936207d70459f8e5b9cb7362eeeb01134ece0f1 100644 --- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng @@ -14,4 +14,3 @@ $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 c25dc7b3ebd51c3d7050bcd784d63d8b78c224d7..a32def2ae181cf9f8fff0b240be6d05d5f63299a 100644 --- a/interface/web/dns/lib/lang/cz_dns_alias.lng +++ b/interface/web/dns/lib/lang/cz_dns_alias.lng @@ -14,4 +14,3 @@ $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 ad120c97db53717055040c6268817206610a5de0..f4e5f220adf8828f928f12fdf75d0020d2795d9a 100644 --- a/interface/web/dns/lib/lang/cz_dns_cname.lng +++ b/interface/web/dns/lib/lang/cz_dns_cname.lng @@ -15,4 +15,3 @@ $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 3633fdb80be22de243ba95843a550a2f8678afd0..636600ba225c793dc10fabf84b71ab4a37ca7da8 100644 --- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng @@ -14,4 +14,3 @@ $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 3986983a93ddcade151fba09946fa9e2cc750f38..29f5803e762d1f5b29639e724abe5f2086715acb 100644 --- a/interface/web/dns/lib/lang/cz_dns_import.lng +++ b/interface/web/dns/lib/lang/cz_dns_import.lng @@ -13,4 +13,3 @@ $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 c5f97f3f184178f466d0a958676947368d2f8c83..534bba59a0795442a0249d5e1d7b3e7db826bcd3 100644 --- a/interface/web/dns/lib/lang/cz_dns_mx.lng +++ b/interface/web/dns/lib/lang/cz_dns_mx.lng @@ -15,4 +15,3 @@ $wb['data_error_empty'] = 'Hostname mailserveru je prázdný'; $wb['data_error_regex'] = 'Hostname mailserveru má chybný formát'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng index 4b011849f892b74a14eef566ef44be2b89561357..73f897b683f21b0f7007cb5fd009e14a95d73d80 100644 --- a/interface/web/dns/lib/lang/cz_dns_ns.lng +++ b/interface/web/dns/lib/lang/cz_dns_ns.lng @@ -14,4 +14,3 @@ $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 33f116631e0c8b6028536ebc3755d9a286dc1f94..6124f30d30bf672073e01b8bfc77c0e3b0e9df1b 100644 --- a/interface/web/dns/lib/lang/cz_dns_ptr.lng +++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng @@ -14,4 +14,3 @@ $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 bcebed3ef327bfd0b627c0bf286cdc59f3053c47..10218a77385f96e83d525ccc791d6a9067e2220f 100644 --- a/interface/web/dns/lib/lang/cz_dns_rp.lng +++ b/interface/web/dns/lib/lang/cz_dns_rp.lng @@ -14,4 +14,3 @@ $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 b8cc5f139fe5cbdcfa1799015560e6d12e3cb344..2870562a8c4c0cc2f9b1579152bc5aabddfcaf47 100644 --- a/interface/web/dns/lib/lang/cz_dns_slave.lng +++ b/interface/web/dns/lib/lang/cz_dns_slave.lng @@ -16,4 +16,3 @@ $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 eead22a8b7886b36519de41106e3ed44ab81a625..3f801f97b944e3a5ec062d7f9369703247a96503 100644 --- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng @@ -8,4 +8,3 @@ $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 2b089c252ff0a645e934867b85de73a1da431b8f..029cf36e15590c16682a409081102336cf0e691b 100644 --- a/interface/web/dns/lib/lang/cz_dns_soa.lng +++ b/interface/web/dns/lib/lang/cz_dns_soa.lng @@ -36,4 +36,3 @@ $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 999e5bd68d96fafe9f22bacd83b31514505c5fee..05834d4933bc5544c90935db2091b5a13edc4946 100644 --- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng @@ -9,4 +9,3 @@ $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 60d844ac9b707d5c1c90eb3d9bf78bdd9d9494d3..88b1fc1cbf5dd60cf777a01d8aaa8687affe5973 100644 --- a/interface/web/dns/lib/lang/cz_dns_srv.lng +++ b/interface/web/dns/lib/lang/cz_dns_srv.lng @@ -18,4 +18,3 @@ $wb['srv_error_regex'] = 'Neplatný formát záznamu serveru. Záznam serveru mu $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 b91b3ae257418df4b24b550f49c12ee9eb4dde51..82e207a83f6920515d30fe2044662bb3a6519856 100644 --- a/interface/web/dns/lib/lang/cz_dns_template.lng +++ b/interface/web/dns/lib/lang/cz_dns_template.lng @@ -5,4 +5,3 @@ $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 a7218a497658d3c9e063ae57438f443e14d37111..10c3fcfabdd0003c855011e37ea1c3b51fb7a5c7 100644 --- a/interface/web/dns/lib/lang/cz_dns_template_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng @@ -5,4 +5,3 @@ $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 8784c7e2b4864ec231cedece16d2017df503b0c3..0c07487276eafc9b331101d49309c86bddb2e55a 100644 --- a/interface/web/dns/lib/lang/cz_dns_txt.lng +++ b/interface/web/dns/lib/lang/cz_dns_txt.lng @@ -14,4 +14,3 @@ $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 bf462caf94543265155427c95eb271b96e3de54e..6eb7b416c4a0c3f1a543c3f6d3cf13650131083a 100644 --- a/interface/web/dns/lib/lang/cz_dns_wizard.lng +++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng @@ -37,4 +37,3 @@ $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/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng index 554c2fdcb4a1e5d383581231e118952b7c779d1b..8145e78bc2a645072ee1a3b264d557f1850ba5f5 100644 --- a/interface/web/dns/lib/lang/de_dns_soa.lng +++ b/interface/web/dns/lib/lang/de_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Refresh ist 60 Sekunden.'; $wb['expire_range_error'] = 'Min. Expire ist 60 Sekunden.'; $wb['minimum_range_error'] = 'Min. Minimum ist 60 Sekunden.'; $wb['ttl_range_error'] = 'Min. TTL ist 60 Sekunden.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng index c30c4e8f2832df72d42fcedd8eade670d3aea9ba..87d5fc7ec53a81e6b611eac32f78cf2d3421d7a1 100644 --- a/interface/web/dns/lib/lang/el_dns_soa.lng +++ b/interface/web/dns/lib/lang/el_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/en_dns_soa.lng b/interface/web/dns/lib/lang/en_dns_soa.lng index d5260933120f0a299e7595540e940a5bca7ee92e..271572d2a75c2bc4b485a3cfb6b70620f6993151 100644 --- a/interface/web/dns/lib/lang/en_dns_soa.lng +++ b/interface/web/dns/lib/lang/en_dns_soa.lng @@ -22,7 +22,8 @@ $wb["ns_error_regex"] = 'NS has a invalid format.'; $wb["mbox_error_empty"] = 'Email is empty.'; $wb["mbox_error_regex"] = 'Email format invalid.'; $wb["also_notify_txt"] = 'Also Notify'; -$wb['also_notify_error_regex'] = 'Please use an IP address.'; +$wb['also_notify_error_regex'] = 'Also notify: Please use an IP address.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; $wb["update_acl_txt"] = 'Update ACL'; $wb['seconds_txt'] = 'Seconds'; $wb['eg_domain_tld'] = 'e.g. domain.tld'; diff --git a/interface/web/dns/lib/lang/en_dns_wizard.lng b/interface/web/dns/lib/lang/en_dns_wizard.lng index 8f9153d9fd1baf81e7d84eabc3c73371505ae133..f7057b45c7950fb645d698fb7285a0669b1185d5 100644 --- a/interface/web/dns/lib/lang/en_dns_wizard.lng +++ b/interface/web/dns/lib/lang/en_dns_wizard.lng @@ -24,7 +24,7 @@ $wb['error_domain_empty'] = 'Domain empty'; $wb['error_ip_empty'] = 'IP empty.'; $wb['error_ns1_empty'] = 'NS1 empty.'; $wb['error_ns2_empty'] = 'NS2 empty.'; -$wb['error_email_empty'] = 'EMail empty.'; +$wb['error_email_empty'] = 'Email empty.'; $wb['error_domain_regex'] = 'Domain contains invalid characters.'; $wb['error_ns1_regex'] = 'NS1 contains invalid characters.'; $wb['error_ns2_regex'] = 'NS2 contains invalid characters.'; diff --git a/interface/web/dns/lib/lang/es_dns_soa.lng b/interface/web/dns/lib/lang/es_dns_soa.lng index 9511223c82f795c569dd13435b9a1d771b5e2588..45c66a9f85e41e6d84962d688855c96e50adf46b 100644 --- a/interface/web/dns/lib/lang/es_dns_soa.lng +++ b/interface/web/dns/lib/lang/es_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/fi_dns_soa.lng b/interface/web/dns/lib/lang/fi_dns_soa.lng index 3f65637a7b013a87d29fe69dc3d0b2e872baf77c..779dfca9afc4c74350fca51d3f37bc07c246caa7 100755 --- a/interface/web/dns/lib/lang/fi_dns_soa.lng +++ b/interface/web/dns/lib/lang/fi_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/fr_dns_soa.lng b/interface/web/dns/lib/lang/fr_dns_soa.lng index c1fa6d6eecc34a85c5cfd054ac89dd57517a0b15..256d5337b32756146101ee7fec60aed51eb7020b 100644 --- a/interface/web/dns/lib/lang/fr_dns_soa.lng +++ b/interface/web/dns/lib/lang/fr_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/hr_dns_soa.lng b/interface/web/dns/lib/lang/hr_dns_soa.lng index f791f0c2e60e4d887cb0db38693d2f583b1db8a8..ef72c7c63319014a33199ffdb7601fbcc10df96f 100644 --- a/interface/web/dns/lib/lang/hr_dns_soa.lng +++ b/interface/web/dns/lib/lang/hr_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/hu_dns_soa.lng b/interface/web/dns/lib/lang/hu_dns_soa.lng index 284c140eef57528480734f14651e1ee0e3e7a464..dce36f6e97ca80f795ccac7379fae4c65a909ddc 100644 --- a/interface/web/dns/lib/lang/hu_dns_soa.lng +++ b/interface/web/dns/lib/lang/hu_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/id_dns_soa.lng b/interface/web/dns/lib/lang/id_dns_soa.lng index 99c516cad56c5e3429f2f57f51f457c6ebf3fd32..544795bcb9293c575be7512ce57ce245b4f4ee73 100644 --- a/interface/web/dns/lib/lang/id_dns_soa.lng +++ b/interface/web/dns/lib/lang/id_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/it_dns_soa.lng b/interface/web/dns/lib/lang/it_dns_soa.lng index 1f9c4ce860540d1538b9fa3833e396d590e69ee2..ff761b261f9acabf52ea0d8f1aaf216d3f562a28 100644 --- a/interface/web/dns/lib/lang/it_dns_soa.lng +++ b/interface/web/dns/lib/lang/it_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/ja_dns_soa.lng b/interface/web/dns/lib/lang/ja_dns_soa.lng index 63d1dc31b2c6121bab960b50e371d4674e613328..81b166b16ffd4c8dc7f378207b0e4ed20333689f 100644 --- a/interface/web/dns/lib/lang/ja_dns_soa.lng +++ b/interface/web/dns/lib/lang/ja_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/nl_dns_soa.lng b/interface/web/dns/lib/lang/nl_dns_soa.lng index 438357695d8a183a424cbe77474492c29cfee5cd..698b0085b9296f4cadf03971d1da168ddea8506e 100644 --- a/interface/web/dns/lib/lang/nl_dns_soa.lng +++ b/interface/web/dns/lib/lang/nl_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng index f806ec6c9c3670fd398fb4a304b1692a1b93ea1e..ea63910f6b0c26e75e5498fb5e3eb24f05dafdb1 100644 --- a/interface/web/dns/lib/lang/pl_dns_soa.lng +++ b/interface/web/dns/lib/lang/pl_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/pt_dns_soa.lng b/interface/web/dns/lib/lang/pt_dns_soa.lng index 693ff58e68238920feb3403a44397dc0c4a16586..fa0dd16ff397fc41252bdd2515eadf402466c132 100644 --- a/interface/web/dns/lib/lang/pt_dns_soa.lng +++ b/interface/web/dns/lib/lang/pt_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/ro_dns_soa.lng b/interface/web/dns/lib/lang/ro_dns_soa.lng index 9005e7477467566c8736d55d38d1b6adfd2c2026..7ceba8c26378efc6740723f8135c8c91fc273f5e 100644 --- a/interface/web/dns/lib/lang/ro_dns_soa.lng +++ b/interface/web/dns/lib/lang/ro_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/ru_dns_soa.lng b/interface/web/dns/lib/lang/ru_dns_soa.lng index b3fa8d8b912096ed141e5b65cd4dc38852489728..c208d4fb545644af6c23455fd777569f311cc17e 100644 --- a/interface/web/dns/lib/lang/ru_dns_soa.lng +++ b/interface/web/dns/lib/lang/ru_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/se_dns_soa.lng b/interface/web/dns/lib/lang/se_dns_soa.lng index d0de83a75ed1338ed4fc05c3867c790f0ba8ae69..87de926a9dd5eeedeafb383ef28786aa5b300dd0 100644 --- a/interface/web/dns/lib/lang/se_dns_soa.lng +++ b/interface/web/dns/lib/lang/se_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/sk_dns_soa.lng b/interface/web/dns/lib/lang/sk_dns_soa.lng index 22d3a4e660137b67b29f6ff909d866f84b3c43e2..b659d6e1b3b797205dff1618719721f221a5d346 100644 --- a/interface/web/dns/lib/lang/sk_dns_soa.lng +++ b/interface/web/dns/lib/lang/sk_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/lib/lang/tr_dns_soa.lng b/interface/web/dns/lib/lang/tr_dns_soa.lng index 87309a025ffd42dec08027d13edfd5df6403e4d7..fb6afee454d07a1b231b6628af5dc9590e790aaf 100644 --- a/interface/web/dns/lib/lang/tr_dns_soa.lng +++ b/interface/web/dns/lib/lang/tr_dns_soa.lng @@ -34,4 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $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.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index 792b294f61897c58b9aee3fa9acdd5e4d8711623..549f0c345a016ba06babe2f4d5ac8ea0a2cef0f6 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -71,6 +71,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm index edb980c6afa206ce3538eb385b7138174c306046..9c871fff66905dca3ced47c4ce128fe73f3df72c 100644 --- a/interface/web/dns/templates/dns_slave_list.htm +++ b/interface/web/dns/templates/dns_slave_list.htm @@ -62,6 +62,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm index be75125ff2f4a29a32a1289852e0bc6e234335b8..5d4e772a9f96da451baf092a42a8d32ce60d61d1 100644 --- a/interface/web/dns/templates/dns_soa_list.htm +++ b/interface/web/dns/templates/dns_soa_list.htm @@ -65,6 +65,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/dns/templates/dns_template_list.htm b/interface/web/dns/templates/dns_template_list.htm index a7ecf410cdf6347b3eaab9f2a4899a21c9a94c60..7b6ec0a1e0cedfe3690b8fb20d92c9afa4c3a327 100644 --- a/interface/web/dns/templates/dns_template_list.htm +++ b/interface/web/dns/templates/dns_template_list.htm @@ -40,6 +40,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng index 721aaf388efb3f9f3e0a0d39b3927862df0c5e16..95efe025d24ad7ced2fe795a0a2521d03ea18aed 100644 --- a/interface/web/help/lib/lang/cz.lng +++ b/interface/web/help/lib/lang/cz.lng @@ -13,4 +13,3 @@ $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 dc951a40abc6bde45696720b3fc46a4fedddb0b7..c71ddfa9ac1a3df5b4c61b2d122126984a56b808 100644 --- a/interface/web/help/lib/lang/cz_faq_form.lng +++ b/interface/web/help/lib/lang/cz_faq_form.lng @@ -5,4 +5,3 @@ $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 ab5d07c4e16fb0433f1a5c4f4bd8a9934f229723..7a4a2fd3ad5c5a7021243db8c5fdcb12463e1014 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 @@ -8,4 +8,3 @@ $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 15eb20ad58e679247d2e8c40da3ed7fd690c3875..db8976195926856bfbae030b5976b5d231e1f169 100644 --- a/interface/web/help/lib/lang/cz_help_faq_list.lng +++ b/interface/web/help/lib/lang/cz_help_faq_list.lng @@ -2,4 +2,3 @@ $wb['edit_txt'] = 'Edit'; ?> - diff --git a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng index 60906e5d3e3be699958bb760a94fb92c2172b5be..596a9ef69b359fc1a9a78dd318dbc574fb0c3530 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 @@ -7,4 +7,3 @@ $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 63bce28898ea2cde84ea366719f23c5ac82181e1..6bb28fe375ca1c66a0ca1e447fd9855f3b6ca868 100644 --- a/interface/web/help/lib/lang/cz_support_message.lng +++ b/interface/web/help/lib/lang/cz_support_message.lng @@ -7,4 +7,3 @@ $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 3a2c9a90d9a6ca1c489ce0618dba7f813f03262c..2d4c14c13a47678752edac71b390e7f53d8595a5 100644 --- a/interface/web/help/lib/lang/cz_support_message_list.lng +++ b/interface/web/help/lib/lang/cz_support_message_list.lng @@ -5,4 +5,3 @@ $wb['subject_txt'] = 'Předmět'; $wb['add_new_record_txt'] = 'Vytvořit zprávu pro podporu'; ?> - diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm index 39aa31a5ac8e53930efd7fdb67bea91951f8d088..0fa724c55526c0a3acf9f74c4ad21f78dd12d3f0 100644 --- a/interface/web/help/templates/faq_manage_questions_list.htm +++ b/interface/web/help/templates/faq_manage_questions_list.htm @@ -35,6 +35,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm index 50d46fc375d34f9b9d11e5b17fe76d88b6afa80c..ae5ae11e5df08b7790ff8f98381e5642080b1199 100644 --- a/interface/web/help/templates/help_faq_list.htm +++ b/interface/web/help/templates/help_faq_list.htm @@ -11,7 +11,6 @@

- - \ No newline at end of file + diff --git a/interface/web/help/templates/help_faq_sections_list.htm b/interface/web/help/templates/help_faq_sections_list.htm index 950c1679b1136c1fe60ef7e287793ec7e5ddb3b3..298b9073bba44607228b4b40aea37b1393d3c2d8 100644 --- a/interface/web/help/templates/help_faq_sections_list.htm +++ b/interface/web/help/templates/help_faq_sections_list.htm @@ -35,6 +35,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm index 1c111fc06d0c7824fefd775f9d2136b29d609aca..af202231392ef0351c8861a4f82f51b44cb4c69c 100644 --- a/interface/web/help/templates/support_message_list.htm +++ b/interface/web/help/templates/support_message_list.htm @@ -40,6 +40,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index 4b89998b6e680b1609d2d0f3a7fbd5f15a69114d..600066b8038330876b073ac6f1a579a773a98bba 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -32,6 +32,8 @@ function resetFormChanged() { } function showLoadIndicator() { + document.body.style.cursor = 'wait'; + @@ -61,6 +63,8 @@ if($server_config_array['misc']['use_loadindicator'] == 'y'){ } function hideLoadIndicator() { + document.body.style.cursor = ''; + requestsRunning -= 1; if(requestsRunning < 1) { requestsRunning = 0; // just for the case... diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng index b988a2ec5d9cf82e143c7a9c47a53cb31c5eb253..06de3c6097b6a354fee0a00913c3ecad0928e7ed 100644 --- a/interface/web/login/lib/lang/cz.lng +++ b/interface/web/login/lib/lang/cz.lng @@ -23,4 +23,3 @@ $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/ar.lng b/interface/web/mail/lib/lang/ar.lng index e3a31e332f3521f303403574d36fd33ac7559d8d..e12b05e27821ca1d7c92da82a9ce411396bf041f 100644 --- a/interface/web/mail/lib/lang/ar.lng +++ b/interface/web/mail/lib/lang/ar.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Content Filter'; $wb['Global Filters'] = 'Global Filters'; $wb['Domain Alias'] = 'Domain Alias'; $wb['Relay Recipients'] = 'Relay Recipients'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/bg.lng b/interface/web/mail/lib/lang/bg.lng index 8fd37dee8282c5186e705a8711da656639272958..a1299f4472da747979ee1231b57a193761e113ba 100644 --- a/interface/web/mail/lib/lang/bg.lng +++ b/interface/web/mail/lib/lang/bg.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Content Filter'; $wb['Global Filters'] = 'Глобални филтри'; $wb['Domain Alias'] = 'Domain Alias'; $wb['Relay Recipients'] = 'Relay Recipients'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/br.lng b/interface/web/mail/lib/lang/br.lng index 11c935da9b11979f915ea11b094931e6825f4df7..a02f879e981206b1f8ffd1d3db8a23f39b87c0d4 100644 --- a/interface/web/mail/lib/lang/br.lng +++ b/interface/web/mail/lib/lang/br.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Filtros de Conteúdo'; $wb['Global Filters'] = 'Filtros Globais'; $wb['Domain Alias'] = 'Alias de Domínio'; $wb['Relay Recipients'] = 'Recipientes de Relay'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng index 65fb13491648b4387216b19ca7a6e8a23d8745fa..a1dab14d9160b266ab7415e92a27f4a1683a45c2 100644 --- a/interface/web/mail/lib/lang/cz.lng +++ b/interface/web/mail/lib/lang/cz.lng @@ -9,7 +9,7 @@ $wb['Domain'] = 'Domény'; $wb['Email Catchall'] = 'E-mailový koš'; $wb['Email Forward'] = 'Přesměrování e-mailů'; $wb['Get Email'] = 'Získat externí e-maily'; -$wb['Spamfilter'] = 'Spamfiltr'; +$wb['Spamfilter'] = 'Spamový filtr'; $wb['Email Routing'] = 'Směrování'; $wb['Email transport'] = 'Transport'; $wb['Mailbox'] = 'Mailbox'; @@ -19,7 +19,7 @@ $wb['Custom Rules'] = 'Vlastní pravidla'; $wb['Email filter'] = 'E-mailový filtr'; $wb['Email Whitelist'] = 'E-mail bílá listina'; $wb['Whitelist'] = 'Bílá listina'; -$wb['Spamfilter blacklist'] = 'Spamfiltr černá listina'; +$wb['Spamfilter blacklist'] = 'Spamový filtr černá listina'; $wb['Spamfilter Config'] = 'Konfigurace spamfiltru'; $wb['Server'] = 'Server'; $wb['Spamfilter policy'] = 'Spamfiltr politika'; @@ -29,13 +29,13 @@ $wb['Tag-Level'] = 'Tag úroveň'; $wb['Other'] = 'Jiný'; $wb['Spamfilter users'] = 'Spamfiltr uživatelé'; $wb['Users'] = 'Uživatelé'; -$wb['Spamfilter Whitelist'] = 'Spamfiltr bílá listina'; +$wb['Spamfilter Whitelist'] = 'Spamový filtr bílá listina'; $wb['Email'] = 'E-mail'; $wb['Email Mailbox'] = 'E-mailové schránky'; $wb['Email Accounts'] = 'E-mail účty'; $wb['User / Domain'] = 'Uživatel / Doména'; $wb['Server Settings'] = 'Nastavení serveru'; -$wb['Fetchmail'] = 'Externí získávání emailů'; +$wb['Fetchmail'] = 'Externí získávání e-mailů'; $wb['Mailbox traffic'] = 'Přenesená data'; $wb['Postfix Whitelist'] = 'Postfix bílá listina'; $wb['Postfix Blacklist'] = 'Postfix černá listina'; @@ -47,4 +47,3 @@ $wb['Statistics'] = 'Statistiky'; $wb['Mailbox quota'] = 'Mailbox kvóta'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng index 414e1023c8eb4739d9c33db2072af0f6db8c5b54..119b849739eebb5819af99fa30c0f26529eec97e 100644 --- a/interface/web/mail/lib/lang/cz_mail_alias.lng +++ b/interface/web/mail/lib/lang/cz_mail_alias.lng @@ -13,4 +13,3 @@ $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 0d8f779c33b3d680a51b9bcef5e17ad0b4fb0c6a..db4fb4f8c7578f811f8141a4573f8ac6e01b4744 100644 --- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng @@ -7,4 +7,3 @@ $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 e0cde683501eaaf17d8e91fbcb449b185f12ed60..7c74fb6edfaa1723c942cec773c69639df96838a 100644 --- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng @@ -10,4 +10,3 @@ $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 cfc0154d84129c34018493a01e7a37b37619f6bf..155a87a7ba850909282efe4bca5a3dd6c8374616 100644 --- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng @@ -6,4 +6,3 @@ $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 4719142aff8d261e445dd287c36c971596df93ca..93978c72f6a4284161eebe9b29a75e34f22fb61c 100644 --- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng @@ -8,4 +8,3 @@ $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng index fbf6e2d230c57ec73defaa130e372addeddb995e..2e0c37b63b28597cd8ee19d86c4d75150857552a 100644 --- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng @@ -9,4 +9,3 @@ $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 1405881fbb1a4c28f6e26b4df2340510fbb96520..240de670e39e035ca3f9147566978a1d71a3519e 100644 --- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng @@ -8,4 +8,3 @@ $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 6e7ebf518677d14f6965b823436c76d165f1e9f7..68acaf780ca74e46eed30c6cc8226df7615683ec 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 @@ -7,4 +7,3 @@ $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 d71c4714f7b1a3ee213ab1dfcb5d4f91ea54ce02..d497e0502ae09ea8ad98557da2f9a14d9cf1672f 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain.lng @@ -8,8 +8,7 @@ $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 email domén pro Váš účet.'; -$wb['policy_txt'] = 'Spamfiltr'; +$wb['policy_txt'] = 'Spamový filtr'; $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 da42190faccc8497d6706ac3a2d189736ea68210..8277ec484849b6ae5349fb41874ccac07a7b2799 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 @@ -7,4 +7,3 @@ $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 75efd562185a0dc212f59148168f2866c8386cc7..635091c425a88114f68335e61bed400426f8a846 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng @@ -10,4 +10,3 @@ $wb['source_txt'] = 'Zdroj'; $wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng index aa0b76df8c6faa9189e418da29e03b50a64889c9..7fd14a7adfec0bf84dec2a034d2eb66ff73133ec 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 @@ -8,4 +8,3 @@ $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 05bb74753064ef9ba1a56e8447e89fb7c80450f7..141e9e87d321a30d94140977d4e46b8e80b6dece 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng @@ -6,4 +6,3 @@ $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 ba79e1a2ff653a234c696b840fa42710fcbd28d2..849ff1bca2f9db9465b2fc938ac76e13eae5858b 100644 --- a/interface/web/mail/lib/lang/cz_mail_forward.lng +++ b/interface/web/mail/lib/lang/cz_mail_forward.lng @@ -8,4 +8,3 @@ $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 bdbff701e1b1ef1abc043469f58b6c005ed4fcf0..6cf1f88ca400366177a24372e38d4f480bc4cea9 100644 --- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng @@ -7,4 +7,3 @@ $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 6fc9101699e951cc01352a08ca5dbc2ccf8bb9d0..b73ddfddb6b7a51f4c70f70cd59509789be43003 100644 --- a/interface/web/mail/lib/lang/cz_mail_get.lng +++ b/interface/web/mail/lib/lang/cz_mail_get.lng @@ -17,4 +17,3 @@ $wb['source_read_all_txt'] = 'Načíst všechny e-maily (včetně již přečten $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 daeae8db4575d37847fb35ac41ebb4240cf34a49..55df9d27d7e56912163ad32488c1862b1cf4f3e8 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 b44112a11f023518598c5acb0ce7a70124d614f5..0123bc7955dbe6fb2439f66b8caa3c2f3921c59e 100644 --- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng @@ -1,10 +1,10 @@ - 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 b3e2cf85ac4a46a3b6a7f6b2a1041bb649f9638b..abd97373381e831711d1b0313e8590098297f8fd 100644 --- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng @@ -4,4 +4,3 @@ $wb['domain_txt'] = 'Doména'; $wb['listname_txt'] = 'Název seznamu'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng index b64c3113bc11a8a52802b521e0a167948728f202..597f6405c53bf70271983e14630206a90d715f61 100644 --- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng @@ -8,4 +8,3 @@ $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng index bf34af6ec33b4c61372f84fa1abd6d58cca328c4..19f46821f33fd7debb07012fc1e37a5fe9766528 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 @@ -8,4 +8,3 @@ $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 f19706dc3a292714bbb26395ce2993f2112ae4db..b538ad044ad472d20972f050422715012b7647a4 100644 --- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng @@ -16,4 +16,3 @@ $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 1271765c638b7c45cebb3f0302c9492e94daefe6..fa5924f2bdcbda90a85024aad6dbd8c2250c2909 100644 --- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng @@ -1,5 +1,5 @@ - diff --git a/interface/web/mail/lib/lang/cz_mail_transport.lng b/interface/web/mail/lib/lang/cz_mail_transport.lng index 710e577ecae0f6686d0aca3a459287a40eaf37a4..a00d33f880e5f34560a012342d74a0c85fd1e6c8 100644 --- a/interface/web/mail/lib/lang/cz_mail_transport.lng +++ b/interface/web/mail/lib/lang/cz_mail_transport.lng @@ -10,4 +10,3 @@ $wb['limit_mailrouting_txt'] = 'Dosažen maximální počet email směrování p $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 de6292b8dc2a63098eea44baf63b6f333e0bccc3..584e329adbbe9458fc3255740a8909f2a692602a 100644 --- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng @@ -1,5 +1,5 @@ - diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng index d8805f0fab289d1215b93ea61bb67e87144f4368..a390b5fa97369888f79259bf1ea062f3d30bd7f9 100644 --- a/interface/web/mail/lib/lang/cz_mail_user.lng +++ b/interface/web/mail/lib/lang/cz_mail_user.lng @@ -49,4 +49,3 @@ $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 097385684379b95c6ee6f3b293361b0c93b1d00e..0fdd4ba147ec0c4ca05af37a80fcce87280dbc28 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng @@ -19,4 +19,3 @@ $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 d9f6748c192900ff90f556ee3bcca982ea33e1fa..f5de2b289b388328aaf5a97cf43558de440cbe98 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 @@ -6,4 +6,3 @@ $wb['page_of_txt'] = 'z'; $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 08d28fbc026f00168d85d59eaa837e141244fec1..b4adbdb5d101c243c2fbcd73f1f816278d305fc5 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng @@ -7,4 +7,3 @@ $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 92600a17d982c680c84f9284aa097e20b6950c4c..9c7602dc389d3dd4386f12904847a1c620f3bbb8 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 @@ -7,4 +7,3 @@ $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 cd5d03295360d6ef84798362bb64c02f77644e99..31dfd7574d28faaf1faff29184f18f92e7c6f4c6 100644 --- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng @@ -8,4 +8,3 @@ $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng index 042cd71c5787412c547db5d454c187a1ccb63aef..bab30222ffbafcb8b53c837b83115885bf2ced3a 100644 --- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng @@ -9,4 +9,3 @@ $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu'; $wb['access_txt'] = 'Přístup'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng index 98e7649ba5f5c2839206913e82725073d4b0ab62..2b929082c7b2cd1a9349f854a66400e68a0d0ac0 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng @@ -8,4 +8,3 @@ $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 194aeb9b920e2e56724cbd7c079646e2996a1178..f0f021432ad486d253fe9c3647b462cf6747bd79 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng @@ -1,5 +1,5 @@ - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config.lng b/interface/web/mail/lib/lang/cz_spamfilter_config.lng index d0ebcc4bf63f5419424425f63759f20b8c03918f..7eae43eb2bb1253801fdd3ee1ccdfb3345d7f732 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng @@ -19,4 +19,3 @@ $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 8b5b1e758dcef47798d09499d66777f29ab59bf8..348fe9b0e5501e16f9269a745b4913f707b1c1ae 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng @@ -4,4 +4,3 @@ $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 1a778301ebc7e8f3e96bd65ebd2fbfd4a084ce38..826050fc5e2761936516885208ab1d734144ab9f 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng @@ -37,4 +37,3 @@ $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 37f41d3ace6a31a75190f259d4d2553c38214275..0ff38e1091612929e12bed58d7823d535e79d94f 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng @@ -8,4 +8,3 @@ $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 d795af11df1ce93035e3fdef021260965177b8eb..1514aa1c873b166b132c806072f7806e4a1d1af7 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng @@ -7,4 +7,3 @@ $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 26c4df143f870448039261886145c39c259234c3..f4dd015aa62973845649c190f4526bcbc8524e7e 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng @@ -9,4 +9,3 @@ $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat spamfiltr uživatele'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng index 98e7649ba5f5c2839206913e82725073d4b0ab62..2b929082c7b2cd1a9349f854a66400e68a0d0ac0 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng @@ -8,4 +8,3 @@ $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 e437fc70f3efbdacc82bdd8471464cd01c20f77b..65ac33365c8a7c79ddfac413293e75182b12237f 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng @@ -1,5 +1,5 @@ - 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 0c30e7574e14f7d251ae8095041dbb9adbbcf8b2..6bd35cafffe8fd6a3102318027f54867fa84a78e 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 @@ -6,4 +6,3 @@ $wb['email_txt'] = 'E-mailová adresa'; $wb['used_txt'] = 'Využité místo'; ?> - diff --git a/interface/web/mail/lib/lang/el.lng b/interface/web/mail/lib/lang/el.lng index d52562f127d435c817bede89c0671332904c2a56..f8cadc62f009b1763e9c1ce6e0d7efc720834792 100644 --- a/interface/web/mail/lib/lang/el.lng +++ b/interface/web/mail/lib/lang/el.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Φίλτρο Περιεχομένου'; $wb['Global Filters'] = 'Καθολικά Φίλτρα'; $wb['Domain Alias'] = 'Ψευδώνυμο Domain'; $wb['Relay Recipients'] = 'Παραλήπτες Relay'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/en_mail_mailinglist.lng b/interface/web/mail/lib/lang/en_mail_mailinglist.lng index b67e4c05d9d45da5a52c3a754ed4b160e50669b2..f78da02da9f541dd116e51311142687ba6e93257 100644 --- a/interface/web/mail/lib/lang/en_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/en_mail_mailinglist.lng @@ -1,4 +1,5 @@ diff --git a/interface/web/mail/lib/lang/fi.lng b/interface/web/mail/lib/lang/fi.lng index ae33d29934793646b98086800d89473221281795..3738c7fd64154b1ca086d9fc5afa49a9cfff1b6f 100755 --- a/interface/web/mail/lib/lang/fi.lng +++ b/interface/web/mail/lib/lang/fi.lng @@ -44,4 +44,5 @@ $wb['Global Filters'] = 'Yleiset suodattimet'; $wb['Server'] = 'Palvelin'; $wb['Domain Alias'] = 'Aliasverkkotunnus'; $wb['Relay Recipients'] = 'Välityksen vastaanottajat'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/fr.lng b/interface/web/mail/lib/lang/fr.lng index ad2f79cfc5b42c6d526f3eb1dcbd39103383c806..a9d7cd8c6434278a282e1f010338912bbc5148ff 100644 --- a/interface/web/mail/lib/lang/fr.lng +++ b/interface/web/mail/lib/lang/fr.lng @@ -44,4 +44,5 @@ $wb['Global Filters'] = 'Filtres globaux'; $wb['Mailbox traffic'] = 'Trafic de la boite email'; $wb['Domain Alias'] = 'Alias de domaine'; $wb['Relay Recipients'] = 'Destinataires de relais'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/hr.lng b/interface/web/mail/lib/lang/hr.lng index 9ed8c6eef0af7db5ce003938ad8a0eb302ab392b..313a90c4dcfa8388d2e5502ca5a970d37881c6d7 100644 --- a/interface/web/mail/lib/lang/hr.lng +++ b/interface/web/mail/lib/lang/hr.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Filter sadržaja'; $wb['Global Filters'] = 'Globalni filter'; $wb['Domain Alias'] = 'Alias domena'; $wb['Relay Recipients'] = 'Relay primatelji'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/hu.lng b/interface/web/mail/lib/lang/hu.lng index fa08c576bcdee81b44eb1d6397359837ae16b25a..752f4003a8f4683f53dedc7e4e30c061f443b92b 100644 --- a/interface/web/mail/lib/lang/hu.lng +++ b/interface/web/mail/lib/lang/hu.lng @@ -44,4 +44,5 @@ $wb['Global Filters'] = 'Globális szűrők'; $wb['Domain Alias'] = 'Domain Alias'; $wb['Relay Recipients'] = 'Relay Recipients'; $wb['Server'] = 'Server'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/id.lng b/interface/web/mail/lib/lang/id.lng index 5be1faab1b454a5829352f026a4d73fd7a794501..c9acaf27f169e12d7bada6a4f21bc960bc753bf3 100644 --- a/interface/web/mail/lib/lang/id.lng +++ b/interface/web/mail/lib/lang/id.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Penyaringan Konten'; $wb['Global Filters'] = 'Penyaringan Global'; $wb['Domain Alias'] = 'Alias Domain'; $wb['Relay Recipients'] = 'Penerima Relay'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/it.lng b/interface/web/mail/lib/lang/it.lng index 3fd27265fef8902652a878eae35ccf2967a0e1f2..5c9de9625dd5bd187ee54d6a265f0b7e12d66af6 100644 --- a/interface/web/mail/lib/lang/it.lng +++ b/interface/web/mail/lib/lang/it.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Filtri contenuti'; $wb['Global Filters'] = 'Filtri globali'; $wb['Domain Alias'] = 'Alias dominio'; $wb['Relay Recipients'] = 'Destinatari inoltro'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/ja.lng b/interface/web/mail/lib/lang/ja.lng index 91dcde5ca1e6d64e4ad0da07904507636a55d31c..f8289d49070912e680894b451d301ea189a02fc7 100644 --- a/interface/web/mail/lib/lang/ja.lng +++ b/interface/web/mail/lib/lang/ja.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'コンテンツフィルター'; $wb['Global Filters'] = 'グローバルフィルター'; $wb['Domain Alias'] = 'Domain Alias'; $wb['Relay Recipients'] = 'Relay Recipients'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/nl.lng b/interface/web/mail/lib/lang/nl.lng index 69228f68431c7914b0d9e93633fdd49d2b73ea64..e47cc658114c9dfd015e145fd4a36b3bc24ee6dc 100644 --- a/interface/web/mail/lib/lang/nl.lng +++ b/interface/web/mail/lib/lang/nl.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Content filter'; $wb['Global Filters'] = 'Globale filters'; $wb['Domain Alias'] = 'Domein alias'; $wb['Relay Recipients'] = 'Relay ontvangers'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng index 36133c06e24b7715993e620e128429faa8684e05..82bcf014e9a83c5673a13d9324f87506ef30bc47 100644 --- a/interface/web/mail/lib/lang/pl.lng +++ b/interface/web/mail/lib/lang/pl.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Zawartość filtru'; $wb['Global Filters'] = 'Globalne filtry'; $wb['Domain Alias'] = 'Alias domeny'; $wb['Relay Recipients'] = 'Odbiorcy przekierowania'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/pt.lng b/interface/web/mail/lib/lang/pt.lng index c6f6bc7a615d87e68f5307be441003b13de40a50..7a9a69cf838c9e80ea109927e7d7061df11b93ce 100644 --- a/interface/web/mail/lib/lang/pt.lng +++ b/interface/web/mail/lib/lang/pt.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Filtros de Conteúdo'; $wb['Global Filters'] = 'Filtros Globais'; $wb['Domain Alias'] = 'Domínios Alias'; $wb['Relay Recipients'] = 'Recipientes de Relay'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/ro.lng b/interface/web/mail/lib/lang/ro.lng index f9ad4e65c8ee00349c36a9a47a530938c23ed66d..dbfa06bcc8510e898890dbe6267abf5db66d82b2 100644 --- a/interface/web/mail/lib/lang/ro.lng +++ b/interface/web/mail/lib/lang/ro.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Filtre Content '; $wb['Global Filters'] = 'Filtre Global'; $wb['Domain Alias'] = 'Domain Alias'; $wb['Relay Recipients'] = 'Relay Recipients'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/ru.lng b/interface/web/mail/lib/lang/ru.lng index 8dca4b71e7bc1253fd743e43d741f022ed0c1783..60d0cd890297d33c6a4a870626e94fc339cb7d1d 100644 --- a/interface/web/mail/lib/lang/ru.lng +++ b/interface/web/mail/lib/lang/ru.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Контент-фильтры'; $wb['Global Filters'] = 'Глобальные фильтры'; $wb['Domain Alias'] = 'Алиасы доменов'; $wb['Relay Recipients'] = 'Relay получатели'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/se.lng b/interface/web/mail/lib/lang/se.lng index e3a31e332f3521f303403574d36fd33ac7559d8d..e12b05e27821ca1d7c92da82a9ce411396bf041f 100644 --- a/interface/web/mail/lib/lang/se.lng +++ b/interface/web/mail/lib/lang/se.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Content Filter'; $wb['Global Filters'] = 'Global Filters'; $wb['Domain Alias'] = 'Domain Alias'; $wb['Relay Recipients'] = 'Relay Recipients'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/sk.lng b/interface/web/mail/lib/lang/sk.lng index 4144a0e4a7a117a9be1f5063e869c09abcf3c558..22773a574a1ef64778d0d885701ea0c999d8f414 100644 --- a/interface/web/mail/lib/lang/sk.lng +++ b/interface/web/mail/lib/lang/sk.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'Filter obsahu'; $wb['Global Filters'] = 'Globálne Filtere'; $wb['Domain Alias'] = 'Domain Alias'; $wb['Relay Recipients'] = 'Relay Recipients'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/lib/lang/tr.lng b/interface/web/mail/lib/lang/tr.lng index 5878a9822b4c561bcf196eb7eedd24d1786ad26c..e31068b5237dc8194a21d89e14d479ea748a76f7 100644 --- a/interface/web/mail/lib/lang/tr.lng +++ b/interface/web/mail/lib/lang/tr.lng @@ -44,4 +44,5 @@ $wb['Content Filter'] = 'İçerik Filtresi'; $wb['Global Filters'] = 'Global Filtreler'; $wb['Domain Alias'] = 'Domain Alias'; $wb['Relay Recipients'] = 'Relay Recipients'; +$wb['Mailbox quota'] = 'Mailbox quota'; ?> diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm index 5ac6862fd202fb2bb23d213249dcd086af756025..73107d95c9427768248af5afb8dea74425fde002 100644 --- a/interface/web/mail/templates/mail_alias_list.htm +++ b/interface/web/mail/templates/mail_alias_list.htm @@ -59,6 +59,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_aliasdomain_list.htm b/interface/web/mail/templates/mail_aliasdomain_list.htm index d053af03e8876aea358778103f28e0c6979fcdb5..30b88a62f435a9add40cd7a1f8fa761d758d1e1f 100644 --- a/interface/web/mail/templates/mail_aliasdomain_list.htm +++ b/interface/web/mail/templates/mail_aliasdomain_list.htm @@ -59,6 +59,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm index b09f91f989aae5d047c953b453252dab3627ef85..7e4e492ebfe5b00e2de9ffee28f107c2009cb997 100644 --- a/interface/web/mail/templates/mail_blacklist_list.htm +++ b/interface/web/mail/templates/mail_blacklist_list.htm @@ -62,6 +62,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm index ef002fb4f7b2ca8aaeb76730b5a65ea4b09823f2..735bf6ab66cba2b3099f835d80a6c463817034c7 100644 --- a/interface/web/mail/templates/mail_content_filter_list.htm +++ b/interface/web/mail/templates/mail_content_filter_list.htm @@ -62,6 +62,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_domain_admin_list.htm b/interface/web/mail/templates/mail_domain_admin_list.htm index 88ef5326806baff74d7280b26d41603e11030b53..0c03c284481630c1783b55d8737f7557634e339b 100644 --- a/interface/web/mail/templates/mail_domain_admin_list.htm +++ b/interface/web/mail/templates/mail_domain_admin_list.htm @@ -45,6 +45,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm index 3cb15d2863969796f5af47bbe0573d994bc93b50..9b256053c8c5a28068f68db039ee4b98680110b7 100644 --- a/interface/web/mail/templates/mail_domain_catchall_list.htm +++ b/interface/web/mail/templates/mail_domain_catchall_list.htm @@ -59,6 +59,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm index 4f6e3a1a8b4edb8085303aa8f7eb78c54848a8b8..402515067fb7a6b3c83732d9a1c4b29df2958b8c 100644 --- a/interface/web/mail/templates/mail_domain_list.htm +++ b/interface/web/mail/templates/mail_domain_list.htm @@ -59,6 +59,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm index a7a98a037901b46ceffd0ce051505b8bc3f7233b..48e85f10a574d91289929e8ae4acb8fe58d0208c 100644 --- a/interface/web/mail/templates/mail_forward_list.htm +++ b/interface/web/mail/templates/mail_forward_list.htm @@ -59,6 +59,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm index 8031b55c343bb9ab415e3f10d44ec55fef5926cd..a4784f967ef3f5b33b273d99195e7e7c387647f5 100644 --- a/interface/web/mail/templates/mail_get_list.htm +++ b/interface/web/mail/templates/mail_get_list.htm @@ -65,6 +65,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm index b24683c71bb537c157fe617e9646fea331df5e0e..12ddd957bdf350446863a19419a6ff900e3574c4 100644 --- a/interface/web/mail/templates/mail_mailinglist_list.htm +++ b/interface/web/mail/templates/mail_mailinglist_list.htm @@ -52,12 +52,17 @@ {tmpl_var name="domain"} - {tmpl_var name='delete_txt'} + {tmpl_var name='mailinglist_txt'} {tmpl_var name='delete_txt'} + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm index 2493b0320a2d51fef9194ee6358fc4aea1a5b349..33f528156aca247b97667913b575d01a07a49068 100644 --- a/interface/web/mail/templates/mail_relay_recipient_list.htm +++ b/interface/web/mail/templates/mail_relay_recipient_list.htm @@ -58,6 +58,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm index fd12fa49aad65029ac6014a61e5586231caee20d..cac01bd42ec0578d91d42c0ae7213aec2e0fe0b1 100644 --- a/interface/web/mail/templates/mail_transport_list.htm +++ b/interface/web/mail/templates/mail_transport_list.htm @@ -65,6 +65,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm index 3bda1a29576623d4bdd2d4cbdee847b98fd92b53..74f1771d0dd1ff1926e6c4152d678e4768148e61 100644 --- a/interface/web/mail/templates/mail_user_filter_list.htm +++ b/interface/web/mail/templates/mail_user_filter_list.htm @@ -49,6 +49,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm index 0febd19c319d84ca87434fd638f8fcbb9021b2d0..9fba82e727b2aa329036f11b6b3a5a059be42d60 100644 --- a/interface/web/mail/templates/mail_user_list.htm +++ b/interface/web/mail/templates/mail_user_list.htm @@ -63,12 +63,17 @@ {tmpl_var name="autoresponder"} - {tmpl_var name='delete_txt'} + {tmpl_var name="webmail_txt"} {tmpl_var name='delete_txt'} + + + 54">{tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm index 973300cc5e73ce640e293482eeddcba44d315b4e..5bd773c1ed0bad5ba723cccafa8fc66e337bb416 100644 --- a/interface/web/mail/templates/mail_user_stats_list.htm +++ b/interface/web/mail/templates/mail_user_stats_list.htm @@ -37,6 +37,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm index 631052c3023a63ffe1ea80b417c7493456f5195c..882aa581d1e244e0ffefc2b4e1bd18c0780a5b0c 100644 --- a/interface/web/mail/templates/mail_whitelist_list.htm +++ b/interface/web/mail/templates/mail_whitelist_list.htm @@ -46,6 +46,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm index 2181b0d48f9068d3c5c7483e91aff2fc15a30174..3407d4a71a74f252dc2541291ed113612fc5eeea 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_list.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm @@ -49,6 +49,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm index d2e936924996ce929700ef470af41dab3da69552..cd43b4d4de5d98939140a78c1903663ad206bcf8 100644 --- a/interface/web/mail/templates/spamfilter_config_list.htm +++ b/interface/web/mail/templates/spamfilter_config_list.htm @@ -37,6 +37,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm index 9dffaa93a9558087ac4f632939fd095259287505..269c5144faef841b1d63b93296cc193f8a341759 100644 --- a/interface/web/mail/templates/spamfilter_policy_list.htm +++ b/interface/web/mail/templates/spamfilter_policy_list.htm @@ -49,6 +49,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm index 92e8821591791e5258adc38e1d7ffa2ee00ff4bc..34b4b2de1ba5f309292c978f6e9b6ac97930aae9 100644 --- a/interface/web/mail/templates/spamfilter_users_list.htm +++ b/interface/web/mail/templates/spamfilter_users_list.htm @@ -49,6 +49,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm index 9bd30eefe2b9dea0526d8d34595aa59c6224efdf..ea4d7240a986334d0063af9fd2ae73d2701ff129 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_list.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm @@ -49,6 +49,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm index da5facb586ddeef2d8eb302eb49afe0780a5a233..fdf75411bfbbf090b8a9a8c91a5a0a1ae60813f4 100644 --- a/interface/web/mail/templates/user_quota_stats_list.htm +++ b/interface/web/mail/templates/user_quota_stats_list.htm @@ -33,6 +33,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng index 8740216ff9cfdf0565345aa554924b1ac3a11a07..4c947bd5f851bac74ae5d900b2a8dbb2092fd0b0 100644 --- a/interface/web/mailuser/lib/lang/cz.lng +++ b/interface/web/mailuser/lib/lang/cz.lng @@ -4,8 +4,7 @@ $wb['Overview'] = 'Přehled'; $wb['Password'] = 'Heslo'; $wb['Autoresponder'] = 'Automatická odpověď'; $wb['Send copy'] = 'Poslat kopii na e-mail'; -$wb['Spamfilter'] = 'Spamový filter'; +$wb['Spamfilter'] = 'Spamový filtr'; $wb['Email Filters'] = 'E-mailové filtry'; ?> - diff --git a/interface/web/mailuser/lib/lang/cz_index.lng b/interface/web/mailuser/lib/lang/cz_index.lng index 9b820cdee63a4bab4a442448d1c5c3358eef4b75..cb39d65ad6077668eb4de8a0a42f845d9727f94c 100644 --- a/interface/web/mailuser/lib/lang/cz_index.lng +++ b/interface/web/mailuser/lib/lang/cz_index.lng @@ -11,4 +11,3 @@ $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 f8d331b55732af9b1448a44da275ee46d3d4ed9e..5ed9a1f46ed8df923f55e2e74b725133f7a11710 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng @@ -12,4 +12,3 @@ $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 fc8a0f9df6f195e8ee6cfdca9b8b1ca01386b627..ef00aa2365a090fa5f7e580389ffdbabe3c1acc8 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng @@ -6,4 +6,3 @@ $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 65300b6d9505e63b0dfec314bc759fa08b12b2cb..60bd6642a22e7e4692ac67a8fbce1ba7364e6838 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng @@ -19,4 +19,3 @@ $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 4b64af9205937b240559b209a779a04d91e95eb2..c7198afa8ef516eae6f52fbf0b1253500eda8651 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 @@ -7,4 +7,3 @@ $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 44815399ddda812c941bf18bc9a2fb0084a43313..c28524026de0c03f46dc7d2368ef49e30a522c36 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng @@ -9,4 +9,3 @@ $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 92828ee60ece20d96b2c9dcea9dc17cf110dfc87..00720f859d811f7ce40fe9cbd02210a9584d7aab 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng @@ -1,9 +1,8 @@ - diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm index 5d252299cfbc5952d688f0254d2ae41370b5c681..07251830911e365e8a180fb9de9701ede61cb614 100644 --- a/interface/web/mailuser/templates/mail_user_filter_list.htm +++ b/interface/web/mailuser/templates/mail_user_filter_list.htm @@ -36,6 +36,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index 1fee3c03b13e19b1067e34fecafd988fc8b8ff1c..5ade79bf642c04d97d0a65a08f73804ad4a25cc3 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -24,7 +24,7 @@ $wb['Status of services'] = 'Stav služeb'; $wb['No Refresh'] = 'Neobnovovat'; $wb['minutes'] = 'minut'; $wb['Show Overview'] = 'Zobrazit přehled'; -$wb['System State (All Servers)'] = 'Stav systému (všechny servery)'; +$wb['System State (All Servers)'] = 'Stav systému (servery)'; $wb['Hardware-Information'] = 'Informace o hardwaru'; $wb['Show CPU info'] = 'Zobrazit CPU informace'; $wb['Server State'] = 'Stav serveru'; @@ -134,13 +134,13 @@ $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'] = '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_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_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; -$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_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_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'; @@ -148,4 +148,3 @@ $wb['Show IPTables'] = 'Zobrazit IPTables pravidla'; $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 70adcad1abbc69fd737747fa997e6c4ce912c68d..29d8cbb448aac6ac01e0976ca67a10ddb0d1cdba 100644 --- a/interface/web/monitor/lib/lang/cz_datalog_list.lng +++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng @@ -7,4 +7,3 @@ $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 85cd4b3b01cfd8a0eab279a97fd323850924ae07..864232ed0d2a22df2a4478c85f0ed1963ff03c15 100644 --- a/interface/web/monitor/lib/lang/cz_syslog_list.lng +++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng @@ -6,4 +6,3 @@ $wb['loglevel_txt'] = 'Logovací úroveň'; $wb['message_txt'] = 'Zpráva'; ?> - diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm index ac9a8c0077b9c949297203cb9b0898f1db18cfa5..480aa94712d0845a5dc805d5d752facca61f8936 100644 --- a/interface/web/monitor/templates/datalog_list.htm +++ b/interface/web/monitor/templates/datalog_list.htm @@ -36,6 +36,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm index fa0449b6af5217fd935514c52e5d516e1a8142ba..a14f68d0bbaa522f805bc0a04bbdb8bd649a354c 100644 --- a/interface/web/monitor/templates/syslog_list.htm +++ b/interface/web/monitor/templates/syslog_list.htm @@ -41,6 +41,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/cron_edit.php b/interface/web/sites/cron_edit.php index a78af2dde5ac706ccbcf595d8f9308958e77b76a..43d047f8161dcb58341026e6e1ce20e379228626 100644 --- a/interface/web/sites/cron_edit.php +++ b/interface/web/sites/cron_edit.php @@ -182,7 +182,7 @@ class page_action extends tform_actions { // The cron shall be owned by the same group then the website $sys_groupid = $web['sys_groupid']; - $sql = "UPDATE shell_user SET server_id = $server_id, sys_groupid = '$sys_groupid' WHERE id = ".$this->id; + $sql = "UPDATE cron SET server_id = $server_id, sys_groupid = '$sys_groupid' WHERE id = ".$this->id; $app->db->query($sql); } diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index e43ec3d2cc2ec1240c7ba9f9930ae8f82737ab3e..a11d38a9e23770d7e5b110c446b8152b4985c1ba 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -206,6 +206,10 @@ class page_action extends tform_actions { $app->tform->errorMessage .= $app->tform->wordbook["database_charset_change_txt"].'
'; } + if(!$this->dataRecord['database_user_id']) { + $app->tform->errorMessage .= $app->tform->wordbook["database_user_missing_txt"].'
'; + } + //* Database username and database name shall not be empty if($this->dataRecord['database_name'] == '') $app->tform->errorMessage .= $app->tform->wordbook["database_name_error_empty"].'
'; diff --git a/interface/web/sites/lib/lang/ar.lng b/interface/web/sites/lib/lang/ar.lng index 1459b344eb44b556e86d1e6c5c830ef76c2a7963..bfd833292d5f91c8bd278d237677997bebfb2661 100644 --- a/interface/web/sites/lib/lang/ar.lng +++ b/interface/web/sites/lib/lang/ar.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ar_database.lng b/interface/web/sites/lib/lang/ar_database.lng index bf90ffcc28f4dea73de97bcc7eebd35bee6ac900..7fcdf24fc4f13acfae74ddb61fb612cd068e7091 100644 --- a/interface/web/sites/lib/lang/ar_database.lng +++ b/interface/web/sites/lib/lang/ar_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/ar_web_subdomain.lng b/interface/web/sites/lib/lang/ar_web_subdomain.lng index d9c0dbd37ca2dcfe958cd623ee2fe73eda6d0e4c..61f5daf53c3e8aca5489f0c0116c5d369159ad18 100644 --- a/interface/web/sites/lib/lang/ar_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ar_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/bg.lng b/interface/web/sites/lib/lang/bg.lng index 1a17867fac8f04bba7be5d40867aa5dd7b34337e..842b70ae027d97ba84cd9acb5a37cf14ca1349e1 100644 --- a/interface/web/sites/lib/lang/bg.lng +++ b/interface/web/sites/lib/lang/bg.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/bg_database.lng b/interface/web/sites/lib/lang/bg_database.lng index 64f09cb71fdaa39e72c3b1255f96577da6fa1d1e..56d9cf5e59483aff3b4f94c14346b783148dac94 100644 --- a/interface/web/sites/lib/lang/bg_database.lng +++ b/interface/web/sites/lib/lang/bg_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/bg_web_subdomain.lng b/interface/web/sites/lib/lang/bg_web_subdomain.lng index 68a604b075f5b4defe2c12bdd96cdbfafed0044b..55489d93dadf603e7eae5af50122eb9af6a105d3 100644 --- a/interface/web/sites/lib/lang/bg_web_subdomain.lng +++ b/interface/web/sites/lib/lang/bg_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/br.lng b/interface/web/sites/lib/lang/br.lng index 63bc914457ec2a13604dc1b9cc46fdd23a433985..bd710eb53acc8f55f56ee8f8059e491d7cdc1a1c 100644 --- a/interface/web/sites/lib/lang/br.lng +++ b/interface/web/sites/lib/lang/br.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/br_database.lng b/interface/web/sites/lib/lang/br_database.lng index 740472d5805593b32b5cacaa2198543c2ef03219..252324e579da086a836bdb4e5d5ba07096c943c0 100644 --- a/interface/web/sites/lib/lang/br_database.lng +++ b/interface/web/sites/lib/lang/br_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/br_web_subdomain.lng b/interface/web/sites/lib/lang/br_web_subdomain.lng index 6777f6e0094c5eebdf2f80b28af129d08e2ed0a5..08608bf54546847f93ffd2ef2c44cdfdd7503582 100644 --- a/interface/web/sites/lib/lang/br_web_subdomain.lng +++ b/interface/web/sites/lib/lang/br_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng index 6d6ba6ba32d73084c557802b88953b37c68e46cf..3a37df3f91139d381c7b2d04d4b1514b5676101f 100644 --- a/interface/web/sites/lib/lang/cz.lng +++ b/interface/web/sites/lib/lang/cz.lng @@ -26,11 +26,11 @@ $wb['Redirect'] = 'Přesměrování'; $wb['SSL'] = 'SSL'; $wb['Sites'] = 'Stránky'; $wb['Database User'] = 'Uživatelé databáze'; -$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)'; +$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['Subdomain (Vhost)'] = 'Subdoména (Vhost)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> - diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng index 3c32316be87a13da16daa9621cb184ea2acec8fc..79f36f5cd62f021a15c23ab8c2e3afa481471fa0 100644 --- a/interface/web/sites/lib/lang/cz_aps.lng +++ b/interface/web/sites/lib/lang/cz_aps.lng @@ -51,9 +51,8 @@ $wb['installation_task_txt'] = 'Instalace plánované'; $wb['installation_error_txt'] = 'Chyba instalace'; $wb['installation_success_txt'] = 'Nainstalované'; $wb['installation_remove_txt'] = 'Odstranění plánu'; -$wb['packagelist_update_finished_txt'] = 'APS aktualizace balíčku dokončena.'; +$wb['packagelist_update_finished_txt'] = 'APS aktualizace seznamu balíčků 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 0ff26acaf69ed3e45c9806aa37743591ec8bacda..16e863ee9c23441513e2a05386e9756021039ee6 100644 --- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng +++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng @@ -1,15 +1,14 @@ - 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 973e70ca57710ea5002d5ecec5c02733a8a61537..cf0d2b69d966060c9f21ad85422b4d08cc2af631 100644 --- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng +++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng @@ -1,10 +1,9 @@ - diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng index 5ea9bb5b7b20f1864baed0afb2acad407eb04111..00017a5aef5aa7554251444852700055239a34e1 100644 --- a/interface/web/sites/lib/lang/cz_cron.lng +++ b/interface/web/sites/lib/lang/cz_cron.lng @@ -20,4 +20,3 @@ $wb['command_error_format'] = 'Chybná formát příkazu. V případě URL je po $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 05b41634ea68b13fbb2192db8fd59e877862999e..dfabfa46acd39636eb1c55e415d8b4a6f819ba38 100644 --- a/interface/web/sites/lib/lang/cz_cron_list.lng +++ b/interface/web/sites/lib/lang/cz_cron_list.lng @@ -9,7 +9,6 @@ $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'] = 'Website'; +$wb['parent_domain_id_txt'] = 'Webové stránky'; ?> - diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng index 8187ee03b192da450d04801a6515af48b054d2f6..39fe4838e7b17bcc50de2fd10eea4dba9bc995c9 100644 --- a/interface/web/sites/lib/lang/cz_database.lng +++ b/interface/web/sites/lib/lang/cz_database.lng @@ -23,7 +23,7 @@ $wb['database_charset_change_txt'] = 'Znaková sada databáze nemůže být změ $wb['database_name_error_len'] = 'Název databáze - {db} - je příliš dlouhý. Maximální délka včetně prefixu je 64 znaků.'; $wb['database_user_error_len'] = 'Jméno uživatele - {user}- je příliš dlouhé. Maximální délka včetně prefixu je 16 znaků.'; $wb['parent_domain_id_txt'] = 'Přiřadit k web doméně'; -$wb['database_site_error_empty'] = 'Select the site to which the database belongs.'; +$wb['database_site_error_empty'] = 'Přiřaďte databázi k webové doméně.'; $wb['select_site_txt'] = '- Vybrat web doménu -'; $wb['btn_save_txt'] = 'Uložit'; $wb['btn_cancel_txt'] = 'Zrušit'; @@ -41,7 +41,6 @@ $wb['database_ro_user_txt'] = 'Uživatel databáze - jen právo ke čtení'; $wb['optional_txt'] = 'Volitelný'; $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.'; +$wb['database_client_differs_txt'] = 'Klient mateřského webu a databáze se neshodují.'; ?> - 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 4eb24c99cac1a8f2ac002f0fb8f6437c8517cebd..fbf078975ad0431edce294740e7f833d150ded01 100644 --- a/interface/web/sites/lib/lang/cz_database_admin_list.lng +++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng @@ -9,4 +9,3 @@ $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 269dc2114da3d4e04e71c8cd7e8b5c85f17f9bc4..9cebca45068e9964ca012195a8cc8a554332da03 100644 --- a/interface/web/sites/lib/lang/cz_database_list.lng +++ b/interface/web/sites/lib/lang/cz_database_list.lng @@ -8,4 +8,3 @@ $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 4621087b5ba0a10baa8f8c7f679fa93db9d85cc6..98f8d1527c0a7fcdd58919a6a69c4e0e44b22c6b 100644 --- a/interface/web/sites/lib/lang/cz_database_user.lng +++ b/interface/web/sites/lib/lang/cz_database_user.lng @@ -22,4 +22,3 @@ $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 db76d1099e271a1952506b1ea74ad9e4166c563f..127be4f9738c571df5326da50105a64493196da1 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 @@ -5,4 +5,3 @@ $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 68cd34d2e4897e3703636d95d0af358b558b421e..5fc1fc39b51f2ff5b2fa95fac70f55c75b6aa06d 100644 --- a/interface/web/sites/lib/lang/cz_database_user_list.lng +++ b/interface/web/sites/lib/lang/cz_database_user_list.lng @@ -4,4 +4,3 @@ $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 2b9dd545055b5f4694f0b7a47291f5a1cf577dc6..494ecda153eae53c0ee93b2f5a8415304605d577 100644 --- a/interface/web/sites/lib/lang/cz_ftp_user.lng +++ b/interface/web/sites/lib/lang/cz_ftp_user.lng @@ -33,4 +33,3 @@ $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 6f6f5021ee9b5bd717c85d53d2eb1d1fa816a2b7..965e1c725682816a575673353bb55e8598ca95a0 100644 --- a/interface/web/sites/lib/lang/cz_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/cz_ftp_user_list.lng @@ -7,4 +7,3 @@ $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 234b7a592107858571bafd3175c9203788f4b7d3..9ed78d8cfb0c6d1cafe3d784c324b561c16059e1 100644 --- a/interface/web/sites/lib/lang/cz_shell_user.lng +++ b/interface/web/sites/lib/lang/cz_shell_user.lng @@ -28,4 +28,3 @@ $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 6d4a8fe52abe0092a5c496261091958aa51e447d..cdc729c9fea65fab2e516c2897c56a392b75a5b0 100644 --- a/interface/web/sites/lib/lang/cz_shell_user_list.lng +++ b/interface/web/sites/lib/lang/cz_shell_user_list.lng @@ -7,4 +7,3 @@ $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 3324ca2e94edf97eabc3bce5a715c628c0f38003..7c60624d3d6f6fde2050601b14fb035d5a51aa6b 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,7 +5,6 @@ $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'] = 'Single files'; +$wb['files_txt'] = 'Jednotlivé soubory'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng index afdb030805b207fa3c7ddf9f2bf47ed9e02a2b4f..b2ce8abd00089dd5af7b5fc132362b3ac1a46907 100644 --- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng @@ -2,4 +2,3 @@ $wb['domain_txt'] = 'Aliasdomain'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng index 6cf247f995f6790cce8490a16e6e1fb88c677106..a3ae2a954d295921238cc6bc6d8b404b5d0e5190 100644 --- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng @@ -13,4 +13,3 @@ $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 d2b6dcb3ca6ba6a5ef77a1480838185f206b44b6..ae06162d72eba2fe15dc70e63157c1fdb543f7e0 100644 --- a/interface/web/sites/lib/lang/cz_web_backup_list.lng +++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng @@ -1,10 +1,10 @@ - diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng index c5beed5e8a55dd98d3c38787f1c45eb2405b3a73..8ded370b15acbd869cd2f5d204cd570972714354 100644 --- a/interface/web/sites/lib/lang/cz_web_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_domain.lng @@ -1,5 +1,5 @@ - 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 c79a51beb90871c2ceb79529714727465dd108fb..4a20c10f5589f5e18dfc6b262b05f1a71213bf73 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 @@ -8,4 +8,3 @@ $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 af0947c9fcb657c2137f3ac724f7701cbfb89eee..78296799a13356effaa5661c3316070858a7264f 100644 --- a/interface/web/sites/lib/lang/cz_web_domain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_domain_list.lng @@ -7,4 +7,3 @@ $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 e5756a74a164cdbd48f44eb3bf58a0ea9d71e4eb..0d1090f5a54cd26c7a8e3acf6ce87b1b552b1a28 100644 --- a/interface/web/sites/lib/lang/cz_web_folder.lng +++ b/interface/web/sites/lib/lang/cz_web_folder.lng @@ -1,9 +1,8 @@ - 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 3b43fb452b5b8e071c70459037422540f299ecb5..74b4d323c1fd08b4329526ee1baf01bf3df255f2 100644 --- a/interface/web/sites/lib/lang/cz_web_folder_list.lng +++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng @@ -2,8 +2,7 @@ $wb['list_head_txt'] = 'Složky / adresáře'; $wb['active_txt'] = 'Aktivní'; $wb['server_id_txt'] = 'Server'; -$wb['parent_domain_id_txt'] = 'Website'; +$wb['parent_domain_id_txt'] = 'Webové stránky'; $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 805eb51e7171fc41c7917051ae58aa34d1f14a1a..61d32c8e5219064517b3f010ce9732d507f366f7 100644 --- a/interface/web/sites/lib/lang/cz_web_folder_user.lng +++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng @@ -1,6 +1,6 @@ - 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 6cc0cc99c553d8270e9aa120cd1fe0c0870dac2f..c4621250b1accc12f1b8a576637b9413973db8e3 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 @@ -1,8 +1,7 @@ - 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 ffab544669c282d411db1319b38b6368c5a4c5b8..a70ccfb9b72d350e025576f4e2a8e68312a3b931 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 @@ -8,4 +8,3 @@ $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 a0d4a4f496f16a5d75da2f2fad4cbfa4de5a8a38..b40c927524b7c00aab7dc5836aa70e8875bdca7a 100644 --- a/interface/web/sites/lib/lang/cz_web_subdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng @@ -1,5 +1,5 @@ - 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 1eab4a8aa41ed47b426c1975a0648a2ec8200d79..d1ad2834fecfd5e993c63aff525e1894baa82159 100644 --- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng @@ -7,4 +7,3 @@ $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 3077ca7216ea6836a7e78e9a53454ae27a821a2b..4a2dc3e85247f62918ae8580245ae6dba9e1cad0 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng @@ -3,19 +3,19 @@ $wb['parent_domain_id_txt'] = 'Parent Website'; $wb['web_folder_txt'] = 'Web folder'; $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.'; $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.'; -$wb['backup_interval_txt'] = 'Backup interval'; -$wb['backup_copies_txt'] = 'Number of backup copies'; -$wb['ssl_state_txt'] = 'State'; -$wb['ssl_locality_txt'] = 'Locality'; -$wb['ssl_organisation_txt'] = 'Organisation'; -$wb['ssl_organisation_unit_txt'] = 'Organisation Unit'; -$wb['ssl_country_txt'] = 'Country'; -$wb['ssl_key_txt'] = 'SSL Key'; -$wb['ssl_request_txt'] = 'SSL Request'; -$wb['ssl_cert_txt'] = 'SSL Certificate'; +$wb['backup_interval_txt'] = 'Interval zálohování'; +$wb['backup_copies_txt'] = 'Počet záložních kopií'; +$wb['ssl_state_txt'] = 'Stát'; +$wb['ssl_locality_txt'] = 'Lokalita'; +$wb['ssl_organisation_txt'] = 'Organizace'; +$wb['ssl_organisation_unit_txt'] = 'Organizační jednotka'; +$wb['ssl_country_txt'] = 'Země'; +$wb['ssl_key_txt'] = 'SSL klíč'; +$wb['ssl_request_txt'] = 'SSL požadavek'; +$wb['ssl_cert_txt'] = 'SSL certifikát'; $wb['ssl_bundle_txt'] = 'SSL Bundle'; -$wb['ssl_action_txt'] = 'SSL Action'; -$wb['ssl_domain_txt'] = 'SSL Domain'; +$wb['ssl_action_txt'] = 'SSL akce'; +$wb['ssl_domain_txt'] = 'SSL Doména'; $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Doména'; $wb['host_txt'] = 'Hostname'; @@ -44,7 +44,7 @@ $wb['limit_web_domain_txt'] = 'The max. Počet webových stránek for your accou $wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.'; $wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.'; $wb['apache_directives_txt'] = 'Apache Directives'; -$wb['domain_error_empty'] = 'Domain is empty.'; +$wb['domain_error_empty'] = 'Doména je prázdná.'; $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.'; $wb['domain_error_regex'] = 'Domain name invalid.'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; @@ -68,7 +68,7 @@ $wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z $wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota'; $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/'; $wb['php_open_basedir_txt'] = 'PHP open_basedir'; -$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded'; +$wb['traffic_quota_exceeded_txt'] = 'Traffik kvóta překročena'; $wb['ruby_txt'] = 'Ruby'; $wb['stats_user_txt'] = 'Webstatistics username'; $wb['stats_type_txt'] = 'Webstatistics program'; @@ -77,11 +77,11 @@ $wb['none_txt'] = 'None'; $wb['disabled_txt'] = 'Disabled'; $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; -$wb['save_certificate_txt'] = 'Save certificate'; -$wb['create_certificate_txt'] = 'Create certificate'; -$wb['delete_certificate_txt'] = 'Delete certificate'; +$wb['save_certificate_txt'] = 'Uložit certifikát'; +$wb['create_certificate_txt'] = 'Vytvořit certifikát'; +$wb['delete_certificate_txt'] = 'Smazat certifikát'; $wb['nginx_directives_txt'] = 'nginx Directives'; -$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['seo_redirect_txt'] = 'SEO přesměrování'; $wb['non_www_to_www_txt'] = 'Non-www -> www'; $wb['www_to_non_www_txt'] = 'www -> non-www'; $wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; @@ -97,19 +97,19 @@ $wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; $wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; $wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; -$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; -$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; -$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['hd_quota_error_regex'] = 'Kvóta pevného disku je neplatná.'; +$wb['traffic_quota_error_regex'] = 'Traffik kvóta je neplatná.'; +$wb['fastcgi_php_version_txt'] = 'PHP verze'; $wb['pm_txt'] = 'PHP-FPM Process Manager'; $wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; $wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; $wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; $wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; $wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; -$wb['generate_password_txt'] = 'Generate Password'; -$wb['repeat_password_txt'] = 'Repeat Password'; -$wb['password_mismatch_txt'] = 'The passwords do not match.'; -$wb['password_match_txt'] = 'The passwords do match.'; +$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; @@ -117,4 +117,3 @@ $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 4afe0218d8893c5af2afd1c7fd1f1df56eaa65a4..e15402b067a20571a9fc163333cd91f91ae01785 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 @@ -1,10 +1,9 @@ - diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng index 57ac9308a799226207639fcf44ade7b802e1ccde..c21555e78ea254bdef3dd7fd187b0f849207b09d 100644 --- a/interface/web/sites/lib/lang/cz_webdav_user.lng +++ b/interface/web/sites/lib/lang/cz_webdav_user.lng @@ -1,8 +1,8 @@ - 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 2f480fd0a7801d989216d376f8425ec128d3222a..af8bfea7490a540ade39e5932d8eed088cb4ecea 100644 --- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng @@ -1,10 +1,9 @@ - diff --git a/interface/web/sites/lib/lang/de.lng b/interface/web/sites/lib/lang/de.lng index aa244c1aa8f70ef5510e0dc49a39356b2b09ea85..4ef7509e4ecf1a3d003cca377ce5b4fe84fe1924 100644 --- a/interface/web/sites/lib/lang/de.lng +++ b/interface/web/sites/lib/lang/de.lng @@ -30,5 +30,6 @@ $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.'; +$wb['error_proxy_requires_url'] = 'Weiterleitungstyp '; +$wb['Subdomain (Vhost)'] = 'Subdomain (vHost)'; ?> diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng index 70b7721d1e4fcd9a2daad0ff80f8bec0edfdb702..bb20e59566659a8af8103acba1f3c2f8da51a29d 100644 --- a/interface/web/sites/lib/lang/de_database.lng +++ b/interface/web/sites/lib/lang/de_database.lng @@ -23,6 +23,7 @@ $wb['database_user_error_unique'] = 'Es existiert bereits ein Benutzer mit diese $wb['database_user_error_regex'] = 'Ungültiger Benutzername. Der Benutzername darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.'; $wb['limit_database_txt'] = 'Die maximale Anzahl an Datenbanken wurde erreicht.'; $wb['database_name_change_txt'] = 'Der Datenbankname kann nicht geändert werden.'; +$wb['database_user_missing_txt'] = 'Bitte wählen Sie einen Datenbanknutzer für die Datenbank aus.'; $wb['database_charset_change_txt'] = 'Der Zeichensatz der Datenbank kann nicht geändert werden.'; $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['database_name_error_len'] = 'Datenbank Name - {db} - zu lang. Die max. Datenbank Namen Länge inkl. Präfix ist 64 Zeichen.'; diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng index 41c6df57a8b42ec90ce0dea1fe2c4019a0128baa..d0c7b3010bb6cd35ac26a35697faa0153d2c090a 100644 --- a/interface/web/sites/lib/lang/de_web_subdomain.lng +++ b/interface/web/sites/lib/lang/de_web_subdomain.lng @@ -42,5 +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.'; +$wb['error_proxy_requires_url'] = 'Weiterleitungstyp \\"proxy\\" erfordert eine URL als Weiterleitungspfad.'; ?> diff --git a/interface/web/sites/lib/lang/el.lng b/interface/web/sites/lib/lang/el.lng index 55ccc325e8c07d4ce4e92e560b35eeedeeaf5f08..19bfc27349f7ad7295100fc0b9808923f3ab303e 100644 --- a/interface/web/sites/lib/lang/el.lng +++ b/interface/web/sites/lib/lang/el.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng index 4c2d70637e4892a96c09faa22abebae51b6c7145..14f05ea35354d9d3b7451ff0ad69ff6ff4bfe634 100644 --- a/interface/web/sites/lib/lang/el_database.lng +++ b/interface/web/sites/lib/lang/el_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng index f4fd9b9b6efc2509ba9e9aae8f42b5d829ea327f..73a79c24ba011d6c06799dbafd6f391eb8d91aa5 100644 --- a/interface/web/sites/lib/lang/el_web_subdomain.lng +++ b/interface/web/sites/lib/lang/el_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'Χωρίς Σημαία'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/en_database.lng b/interface/web/sites/lib/lang/en_database.lng index 288f8954724f24794cb1ca50fb4d85a9cac1fd88..521e8c40fad3bb0f8a2e556ee26f1bb1d5108a76 100644 --- a/interface/web/sites/lib/lang/en_database.lng +++ b/interface/web/sites/lib/lang/en_database.lng @@ -24,6 +24,7 @@ $wb["database_user_error_unique"] = 'There is already a database user with this $wb["database_user_error_regex"] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.'; $wb["limit_database_txt"] = 'The max. number of databases is reached.'; $wb["database_name_change_txt"] = 'The database name can not be changed'; +$wb["database_user_missing_txt"] = 'Please select a database user for this database.'; $wb["database_charset_change_txt"] = 'The database charset can not be changed'; $wb["database_name_error_len"] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.'; $wb["database_user_error_len"] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.'; diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index 5a1b65102a0c7c8146e7dd5c9906363130b21f44..ff96f1fb458cf39cca6f42a4e7102badd3c88a73 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -53,7 +53,7 @@ $wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.'; $wb["error_ssl_country_empty"] = 'SSL Country is empty.'; $wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty'; $wb["client_group_id_txt"] = 'Client'; -$wb["stats_password_txt"] = 'Webstatistics password'; +$wb["stats_password_txt"] = 'Set Webstatistics password'; $wb["allow_override_txt"] = 'Apache AllowOverride'; $wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota'; $wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_'; diff --git a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng index 7ebe9e6b2473ee910dcb520a7f61b4ef9954b6ee..82a3d25ef7f489bba2fdd7bbd9fbfb120cbc8ecd 100644 --- a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng @@ -58,7 +58,7 @@ $wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.'; $wb["error_ssl_country_empty"] = 'SSL Country is empty.'; $wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty'; $wb["client_group_id_txt"] = 'Client'; -$wb["stats_password_txt"] = 'Webstatistics password'; +$wb["stats_password_txt"] = 'Set Webstatistics password'; $wb["allow_override_txt"] = 'Apache AllowOverride'; $wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota'; $wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_'; diff --git a/interface/web/sites/lib/lang/es.lng b/interface/web/sites/lib/lang/es.lng index 054d2aef6ac8234efbf2ac20abda9c8cb1f6920a..241d4e1b39c50f552f827278f704a95e02283f64 100644 --- a/interface/web/sites/lib/lang/es.lng +++ b/interface/web/sites/lib/lang/es.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/es_database.lng b/interface/web/sites/lib/lang/es_database.lng index ed3019002aae5b7e9b4805a4f0d7e89e4a187f8a..86cd76d620b98442f8ee7c4c60d843c29d1c4255 100644 --- a/interface/web/sites/lib/lang/es_database.lng +++ b/interface/web/sites/lib/lang/es_database.lng @@ -42,4 +42,5 @@ $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['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/es_web_subdomain.lng b/interface/web/sites/lib/lang/es_web_subdomain.lng index 31ee11181668927ccd4a91b8ad176044e17069aa..1dc29fadc10fe5ba2306720f43b200e74b4b02aa 100644 --- a/interface/web/sites/lib/lang/es_web_subdomain.lng +++ b/interface/web/sites/lib/lang/es_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/fi.lng b/interface/web/sites/lib/lang/fi.lng index 38d854e09ad966867e3d876e2eb22206f409d154..5adab57775f80127b2e91995316b8953e5f11fe7 100755 --- a/interface/web/sites/lib/lang/fi.lng +++ b/interface/web/sites/lib/lang/fi.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/fi_database.lng b/interface/web/sites/lib/lang/fi_database.lng index 362d4c628a797aeb126dc44f106fc64bd9a6102a..fd64e4d5d970d6dc69a5eb45594375dbb3c54dfa 100755 --- a/interface/web/sites/lib/lang/fi_database.lng +++ b/interface/web/sites/lib/lang/fi_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/fi_web_subdomain.lng b/interface/web/sites/lib/lang/fi_web_subdomain.lng index cf0d5e68dd1c53c2cc8d7c7017721841a5a37391..cde47f999389e40e6beaa42b7981f22b2a3d32ca 100755 --- a/interface/web/sites/lib/lang/fi_web_subdomain.lng +++ b/interface/web/sites/lib/lang/fi_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/fr.lng b/interface/web/sites/lib/lang/fr.lng index 706c12659d28d3e76dfb25f6c3ac16ae4362b3bd..8bf868f8bba6a18c263dad472e1f3a7238d357f0 100644 --- a/interface/web/sites/lib/lang/fr.lng +++ b/interface/web/sites/lib/lang/fr.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/fr_aps.lng b/interface/web/sites/lib/lang/fr_aps.lng index f6d9ed6eda1922fd67a35d982c8c2ca60ec94bbc..8ce5b20eb1085fd2fdebaae64142dde86c95ea50 100644 --- a/interface/web/sites/lib/lang/fr_aps.lng +++ b/interface/web/sites/lib/lang/fr_aps.lng @@ -38,14 +38,14 @@ $wb['error_inv_main_location'] = 'The given install location folder is invalid.' $wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.'; $wb['error_no_database_pw'] = 'You have provided no valid database password.'; $wb['error_short_database_pw'] = 'Please choose a longer database password.'; -$wb['error_no_value_for'] = 'The field \"%s\" must not be empty.'; -$wb['error_short_value_for'] = 'The field \"%s\" requires a longer input value.'; -$wb['error_long_value_for'] = 'The field \"%s\" requires a shorter input value.'; -$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \"%s\".'; -$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \"%s\".'; -$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \"%s\".'; -$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \"%s\".'; -$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \"%s\".'; +$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.'; +$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.'; +$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.'; +$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".'; +$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".'; +$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".'; +$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".'; +$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".'; $wb['error_used_location'] = 'The installation path already contains a package installation.'; $wb['installation_task_txt'] = 'Install planned'; $wb['installation_error_txt'] = 'Install error'; diff --git a/interface/web/sites/lib/lang/fr_database.lng b/interface/web/sites/lib/lang/fr_database.lng index c51423042ffa3e1268726dde0a04e9747bdfa7df..b718bcf5952360cf17332180ca964adde25d8ab7 100644 --- a/interface/web/sites/lib/lang/fr_database.lng +++ b/interface/web/sites/lib/lang/fr_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/fr_database_user.lng b/interface/web/sites/lib/lang/fr_database_user.lng index 6c4ee7c6961d6af78fb0116804561486da511893..66a0718349ba3afad8bc3b50d0da0a5a55318d41 100644 --- a/interface/web/sites/lib/lang/fr_database_user.lng +++ b/interface/web/sites/lib/lang/fr_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/fr_database_user_admin_list.lng b/interface/web/sites/lib/lang/fr_database_user_admin_list.lng index 4c17da126bcf81122bf0e322150bc0314768ce4b..d7f88c4c360e87959fefa5ca1d3678425dbf0ef1 100644 --- a/interface/web/sites/lib/lang/fr_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/fr_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Database User'; +$wb['database_user_txt'] = 'Database user'; +$wb['add_new_record_txt'] = 'Add new User'; +$wb['sys_groupid_txt'] = 'Client'; +?> diff --git a/interface/web/sites/lib/lang/fr_database_user_list.lng b/interface/web/sites/lib/lang/fr_database_user_list.lng index 549374b6aca3bd60f10521d585aee5f51918391b..8c226496a6a06a6b2c70db300f35aaac7619d223 100644 --- a/interface/web/sites/lib/lang/fr_database_user_list.lng +++ b/interface/web/sites/lib/lang/fr_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Database user'; +$wb['database_user_txt'] = 'Database user'; +$wb['add_new_record_txt'] = 'Add new user'; +?> diff --git a/interface/web/sites/lib/lang/fr_web_subdomain.lng b/interface/web/sites/lib/lang/fr_web_subdomain.lng index 94b7fcb2176d8cc62ed04f81ccec02a9b4881fd5..1daf86254934fed9c3e9a7f747a8caac2ce0c8fc 100644 --- a/interface/web/sites/lib/lang/fr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/fr_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'Aucun flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng index 7ebe9e6b2473ee910dcb520a7f61b4ef9954b6ee..b87c788126dbd5785e1b73ac049e6f04b5ee7735 100644 --- a/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 0.'; -$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; @@ -116,4 +115,4 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -?> \ No newline at end of file +?> diff --git a/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng index 8273dbd066713780708f9e2b68f58a4c726dee27..1c16bcda288f146167a5a49221951769017f580b 100644 --- a/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$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/hr.lng b/interface/web/sites/lib/lang/hr.lng index 038ca18a55484ba9133c196fa1ba5c848e59bb99..e267eb3bf9d29db81b160161b37c503d2936180b 100644 --- a/interface/web/sites/lib/lang/hr.lng +++ b/interface/web/sites/lib/lang/hr.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/hr_database.lng b/interface/web/sites/lib/lang/hr_database.lng index 3f8a542a194389c81aa103c1e380031e8453d0c4..381e77a3b6a5cfa237762f92b025cfbc3f8fd4cc 100644 --- a/interface/web/sites/lib/lang/hr_database.lng +++ b/interface/web/sites/lib/lang/hr_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng index 8b4c31cae30d5d26744606dd6b1b9192fd78fd98..652fce64588811e33a10b253a7950c48c829e879 100644 --- a/interface/web/sites/lib/lang/hr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/hr_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'Bez markiranja'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/hu.lng b/interface/web/sites/lib/lang/hu.lng index 00341d740dfd1b1170474540eb425f09753ef0a2..1a3e31d3f9ac49af6bad0367cc40519261a19af3 100644 --- a/interface/web/sites/lib/lang/hu.lng +++ b/interface/web/sites/lib/lang/hu.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/hu_database.lng b/interface/web/sites/lib/lang/hu_database.lng index f6e30c8c4c2c0ebc0dcb0b82d3f60ad8451e1744..676fae2b2d052092b25725996618671411b94c9e 100644 --- a/interface/web/sites/lib/lang/hu_database.lng +++ b/interface/web/sites/lib/lang/hu_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/hu_web_subdomain.lng b/interface/web/sites/lib/lang/hu_web_subdomain.lng index b390baf0d8ea3c2f5feebee62d62f07dc2ce20fe..7e933b9b44e8fff6f992761f0467c4a0425de884 100644 --- a/interface/web/sites/lib/lang/hu_web_subdomain.lng +++ b/interface/web/sites/lib/lang/hu_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for ex $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/id.lng b/interface/web/sites/lib/lang/id.lng index 2303ab0034329dcd615315c68346d71b4fac2e16..4fdae1813f438255d82fb01c877d3abcb9dcc7ea 100644 --- a/interface/web/sites/lib/lang/id.lng +++ b/interface/web/sites/lib/lang/id.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/id_database.lng b/interface/web/sites/lib/lang/id_database.lng index 5b08e4af24a3f8ab4df295e21601104be1f68397..e05990a4599f32781f0a71888456c4da4681b1a8 100644 --- a/interface/web/sites/lib/lang/id_database.lng +++ b/interface/web/sites/lib/lang/id_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/id_web_subdomain.lng b/interface/web/sites/lib/lang/id_web_subdomain.lng index ac0d1e39c5f2592bd90a834a6895043e7d3227b5..4662cc90772b19309e475ed541ea1a51b21a272a 100644 --- a/interface/web/sites/lib/lang/id_web_subdomain.lng +++ b/interface/web/sites/lib/lang/id_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/it.lng b/interface/web/sites/lib/lang/it.lng index 1b2bbeae7b3bed18e0b2caaa45260373b00cd4e7..f4b6c1af2fa81461367c8f25c40e7085f371e055 100644 --- a/interface/web/sites/lib/lang/it.lng +++ b/interface/web/sites/lib/lang/it.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/it_database.lng b/interface/web/sites/lib/lang/it_database.lng index 62117a441653d35eafb220d9fb450571bb161bfd..338ddb99ee53b5871ed6828eb55da6c09e8dd346 100644 --- a/interface/web/sites/lib/lang/it_database.lng +++ b/interface/web/sites/lib/lang/it_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/it_web_subdomain.lng b/interface/web/sites/lib/lang/it_web_subdomain.lng index 0d4773969bb301e13289615233994856084eb76e..34e7e5fe05b2f4c7dbea6fbeeac0bf9261237d7b 100644 --- a/interface/web/sites/lib/lang/it_web_subdomain.lng +++ b/interface/web/sites/lib/lang/it_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ja.lng b/interface/web/sites/lib/lang/ja.lng index 672d1f8c99699f4c52bac6509c2aeb0345cc4497..470ec2baecdd9318193ca9862a420dbb507e44c9 100644 --- a/interface/web/sites/lib/lang/ja.lng +++ b/interface/web/sites/lib/lang/ja.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ja_database.lng b/interface/web/sites/lib/lang/ja_database.lng index bf90ffcc28f4dea73de97bcc7eebd35bee6ac900..7fcdf24fc4f13acfae74ddb61fb612cd068e7091 100644 --- a/interface/web/sites/lib/lang/ja_database.lng +++ b/interface/web/sites/lib/lang/ja_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/ja_web_subdomain.lng b/interface/web/sites/lib/lang/ja_web_subdomain.lng index 3e76b4722b1d17388bc7a03854773a86581075af..cb467f224804bb7264f4ffd886ec7328c2812193 100644 --- a/interface/web/sites/lib/lang/ja_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ja_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/nl.lng b/interface/web/sites/lib/lang/nl.lng index a8e257b28ed893e34a2267e4bcd221964c0609a6..d47212a162ab6143b48d6a54f689e0319347c80f 100644 --- a/interface/web/sites/lib/lang/nl.lng +++ b/interface/web/sites/lib/lang/nl.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng index 479e98f5d7ec18e2401d5b7a27c919f8c53a6cd6..2abfe8acbe423dd0f987e390ed0b475ed9f216cc 100644 --- a/interface/web/sites/lib/lang/nl_database.lng +++ b/interface/web/sites/lib/lang/nl_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng index 86841241065a24a08066abcee83690ca7229277c..915f0d04cd24eb68d9dc5d3bdffeae908d3c8819 100644 --- a/interface/web/sites/lib/lang/nl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/nl_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng index c1fd82215e86e5545ffe42916321a97a46b6c13d..18aac48d857c404f89613093482517e84fbf05e4 100644 --- a/interface/web/sites/lib/lang/pl.lng +++ b/interface/web/sites/lib/lang/pl.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng index 748aff95496da9a2510f210e3a0f443d1591796c..823e854525d9961460f4bc6114c67e0e8eb6df3c 100644 --- a/interface/web/sites/lib/lang/pl_database.lng +++ b/interface/web/sites/lib/lang/pl_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng index 14efd16fc15b98cde64508af4c0cbd28425e8b7b..4cc3865ea7ae06c65bce393aea5f58df0709b53d 100644 --- a/interface/web/sites/lib/lang/pl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'Bez flagi'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/pt.lng b/interface/web/sites/lib/lang/pt.lng index 8804e467054611ac19707144085d562c2ef51dc7..6cd9798fa1d6d65427d405ee6fefec5539aa6464 100644 --- a/interface/web/sites/lib/lang/pt.lng +++ b/interface/web/sites/lib/lang/pt.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/pt_database.lng b/interface/web/sites/lib/lang/pt_database.lng index 053f2f7a2b289b57e541c47e67e15e8e1e33cb31..d99c41a8b08965f9a6d8ec0fd3295546298d6bc4 100644 --- a/interface/web/sites/lib/lang/pt_database.lng +++ b/interface/web/sites/lib/lang/pt_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/pt_web_subdomain.lng b/interface/web/sites/lib/lang/pt_web_subdomain.lng index f83c4ff15ff81b83db621a8bf51143379a3c2075..9ee3ae3d1c17be3f81c0ac73eaeb6f6bd7a13473 100644 --- a/interface/web/sites/lib/lang/pt_web_subdomain.lng +++ b/interface/web/sites/lib/lang/pt_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ro.lng b/interface/web/sites/lib/lang/ro.lng index a201188ff33e9927f6bc1255549b91e707dcaa09..418585ea55b60a2f88ec5c60c28ea52488223fff 100644 --- a/interface/web/sites/lib/lang/ro.lng +++ b/interface/web/sites/lib/lang/ro.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ro_database.lng b/interface/web/sites/lib/lang/ro_database.lng index 256c1245d441d998e39aaafbd74c3cb253c19ece..9dcf25cd8080bd89196f011ac8781b81a977d6a5 100644 --- a/interface/web/sites/lib/lang/ro_database.lng +++ b/interface/web/sites/lib/lang/ro_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/ro_web_subdomain.lng b/interface/web/sites/lib/lang/ro_web_subdomain.lng index 15e95d66b708184be58a2edf79448bf5a3f2fe10..6d4d94b75a7024f4aff579ba720a2613adf1799e 100644 --- a/interface/web/sites/lib/lang/ro_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ro_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ru.lng b/interface/web/sites/lib/lang/ru.lng index 07ed81a0445727fda9859b4b34a2c684c9279b54..cc0eb3d906236f0ec38d42025c25deed382ae93b 100644 --- a/interface/web/sites/lib/lang/ru.lng +++ b/interface/web/sites/lib/lang/ru.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ru_database.lng b/interface/web/sites/lib/lang/ru_database.lng index 20bfba4f251860a17b8d4c0c16c270d09e9b0318..4accbad4f440e69dd14bde911458b0244504232d 100644 --- a/interface/web/sites/lib/lang/ru_database.lng +++ b/interface/web/sites/lib/lang/ru_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/ru_web_subdomain.lng b/interface/web/sites/lib/lang/ru_web_subdomain.lng index 3c3842d14546332fd7ef6c3f2d4a534f38a1066f..c0b4bf57136f1034202a26d1abd8cf252187660d 100644 --- a/interface/web/sites/lib/lang/ru_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ru_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/se.lng b/interface/web/sites/lib/lang/se.lng index 1459b344eb44b556e86d1e6c5c830ef76c2a7963..bfd833292d5f91c8bd278d237677997bebfb2661 100644 --- a/interface/web/sites/lib/lang/se.lng +++ b/interface/web/sites/lib/lang/se.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/se_database.lng b/interface/web/sites/lib/lang/se_database.lng index d27f883e93c23a0f0f1d3bb6d2e32f82b8624493..28d4ae7ffd90f80d08ba0cd30a4dce4f31b513a9 100644 --- a/interface/web/sites/lib/lang/se_database.lng +++ b/interface/web/sites/lib/lang/se_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/se_web_subdomain.lng b/interface/web/sites/lib/lang/se_web_subdomain.lng index f8501c64c90dfb351d90fa630185c8993873de7b..49799b3ca18b662fbd8c9f59380d945f6813e2ed 100644 --- a/interface/web/sites/lib/lang/se_web_subdomain.lng +++ b/interface/web/sites/lib/lang/se_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/sk.lng b/interface/web/sites/lib/lang/sk.lng index 5b66ce228f8b92c0ffe8b86a50a941a10d76c1f4..401ad2c65df5812e09ac4ec20d22cb1a120e695a 100644 --- a/interface/web/sites/lib/lang/sk.lng +++ b/interface/web/sites/lib/lang/sk.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/sk_database.lng b/interface/web/sites/lib/lang/sk_database.lng index b081dcf0f5f9d3951424f0664db918d43fa5680f..bbe0b4117fcaac983100b2dcfbd8684cbf87d3c4 100644 --- a/interface/web/sites/lib/lang/sk_database.lng +++ b/interface/web/sites/lib/lang/sk_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/sk_web_subdomain.lng b/interface/web/sites/lib/lang/sk_web_subdomain.lng index 47cd669341284b96d6538adc79b7c2511b80e5f7..8d601cb26e2c353dce5f18ce3df1cde52cd2aaee 100644 --- a/interface/web/sites/lib/lang/sk_web_subdomain.lng +++ b/interface/web/sites/lib/lang/sk_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/tr.lng b/interface/web/sites/lib/lang/tr.lng index 920b23fea576053ad5e0ae1c25c7fe3faa7169b1..3eaab09ee05cda072b568f7e235635e34e9c0ea4 100644 --- a/interface/web/sites/lib/lang/tr.lng +++ b/interface/web/sites/lib/lang/tr.lng @@ -30,4 +30,6 @@ $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)'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/tr_database.lng b/interface/web/sites/lib/lang/tr_database.lng index 565e6df7ec656706bd5cdbe79fadc09a0a151bfe..e79ca45ad52db75bf0066d222daa66fc6733c561 100644 --- a/interface/web/sites/lib/lang/tr_database.lng +++ b/interface/web/sites/lib/lang/tr_database.lng @@ -42,4 +42,5 @@ $wb['optional_txt'] = 'optional'; $wb['select_dbuser_txt'] = 'Select database user'; $wb['no_dbuser_txt'] = 'None'; $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> diff --git a/interface/web/sites/lib/lang/tr_web_subdomain.lng b/interface/web/sites/lib/lang/tr_web_subdomain.lng index 48eb82bc51da5801c17bf8aea6ebe871d0fe7904..e1870f33d58d465d719f82a3c8f70e5a4335791f 100644 --- a/interface/web/sites/lib/lang/tr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/tr_web_subdomain.lng @@ -42,4 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $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:'; +$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm index 6a6b7d47865f72faf278aca767d7d85717ce07b5..4765f2edefdf591cf504c1da2023b0d4b962287a 100644 --- a/interface/web/sites/templates/aps_packages_list.htm +++ b/interface/web/sites/templates/aps_packages_list.htm @@ -37,6 +37,11 @@   + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm index aaaae8bbedb9a8db9a0712c8ed49d6dd758427ab..42d04e3ce6920d2a951516ac6ae8769ab80bd7d1 100644 --- a/interface/web/sites/templates/cron_list.htm +++ b/interface/web/sites/templates/cron_list.htm @@ -63,6 +63,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm index b5173678fef2d1ff3ac239f1fa3eaec40fdd163d..e44616c135b06e5a37f9e0cff45658e7d0502bf4 100644 --- a/interface/web/sites/templates/database_admin_list.htm +++ b/interface/web/sites/templates/database_admin_list.htm @@ -55,6 +55,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm index 50e450f1d4a20ceb3748aa6ca0a9836d6a90cb99..0e80212c9d40436b043a93f8d7714328f8714cac 100644 --- a/interface/web/sites/templates/database_list.htm +++ b/interface/web/sites/templates/database_list.htm @@ -69,6 +69,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm index 93df0b17471ee4abe478768efbd8a8a4bb5f80d4..d3c3332d8c48b2eac7ec971180d077723bab038e 100644 --- a/interface/web/sites/templates/database_user_admin_list.htm +++ b/interface/web/sites/templates/database_user_admin_list.htm @@ -36,6 +36,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm index 96fc86a5a6a7bd03636ee0c8d4ed1a4d2ba44530..be133f25b586bc602a8b81459f5240479e3f7562 100644 --- a/interface/web/sites/templates/database_user_list.htm +++ b/interface/web/sites/templates/database_user_list.htm @@ -52,6 +52,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm index b5449f854c3c55eae08bf60cf1623a8b0cc66d52..89e81c726692d3517a14276022d595e5ecee765d 100644 --- a/interface/web/sites/templates/ftp_user_list.htm +++ b/interface/web/sites/templates/ftp_user_list.htm @@ -65,6 +65,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm index b713f1eb7c8f9827eee8e0ee56e2747e47fd3c3b..65509cf42f42f1babfe2a6677fc938b7cbf88124 100644 --- a/interface/web/sites/templates/shell_user_list.htm +++ b/interface/web/sites/templates/shell_user_list.htm @@ -62,6 +62,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm index 35df591a7fe280e7f5a4c1bc1b96b52fff8e661c..e20b99123dd4cf0277487aaebcb5d94350349ccd 100644 --- a/interface/web/sites/templates/user_quota_stats_list.htm +++ b/interface/web/sites/templates/user_quota_stats_list.htm @@ -39,6 +39,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm index ba9c92d624c884c2a89e646a718cffbb20341378..e85eed61ca55c494bf3b6d356dfb38638eb5e0ff 100644 --- a/interface/web/sites/templates/web_aliasdomain_list.htm +++ b/interface/web/sites/templates/web_aliasdomain_list.htm @@ -62,6 +62,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm index 46db0adf946cce4b4ccb6ec015a23ba04c1967d2..3248812e8b6ce25d5ffe40b23534efa69468548c 100644 --- a/interface/web/sites/templates/web_backup_list.htm +++ b/interface/web/sites/templates/web_backup_list.htm @@ -33,6 +33,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + +
diff --git a/interface/web/sites/templates/web_domain_admin_list.htm b/interface/web/sites/templates/web_domain_admin_list.htm index bf2cc659a5849872042203efbe172d4d53ae5343..fc280a583c25d9c7617bb3d25b4df338b43e7e26 100644 --- a/interface/web/sites/templates/web_domain_admin_list.htm +++ b/interface/web/sites/templates/web_domain_admin_list.htm @@ -48,6 +48,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm index 570d4626c5e14a3664121efbea9362633f807ce1..25e91b1d72b2d3f2eab729c450f49e68ed886cb6 100644 --- a/interface/web/sites/templates/web_domain_edit.htm +++ b/interface/web/sites/templates/web_domain_edit.htm @@ -242,7 +242,7 @@ } - jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').click(function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); }); + jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').bind('click mousedown', function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); }); jQuery('#dom-edit-submit').click(function() { submitForm('pageForm','sites/web_domain_edit.php'); }); diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm index c66eaf24475c408074aaf90b636c01a8b10d5016..b67b4ca4adf5400f511d73d83b896578f3577069 100644 --- a/interface/web/sites/templates/web_domain_list.htm +++ b/interface/web/sites/templates/web_domain_list.htm @@ -62,6 +62,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/web_folder_list.htm b/interface/web/sites/templates/web_folder_list.htm index 6c8b54c4a489148bcd3c76884d6353634e059d3b..9a274b5abb8d4452508f465781c7931a604dd950 100644 --- a/interface/web/sites/templates/web_folder_list.htm +++ b/interface/web/sites/templates/web_folder_list.htm @@ -61,6 +61,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/web_folder_user_list.htm b/interface/web/sites/templates/web_folder_user_list.htm index 2868ec1265a5bacb17d9c7dd2f2a2e6fe285d75b..500c647466831d9bffc32e21c402b484f968802d 100644 --- a/interface/web/sites/templates/web_folder_user_list.htm +++ b/interface/web/sites/templates/web_folder_user_list.htm @@ -58,6 +58,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm index 381d3ea4fd47ec524059a312599b71030ec91403..2fbf8723ac97b47ffcbbabfaa2ee1d30c40b6e7d 100644 --- a/interface/web/sites/templates/web_sites_stats_list.htm +++ b/interface/web/sites/templates/web_sites_stats_list.htm @@ -29,7 +29,7 @@ - {tmpl_var name="domain"} + {tmpl_var name="domain"} {tmpl_var name="this_month"} MB {tmpl_var name="last_month"} MB {tmpl_var name="this_year"} MB @@ -37,6 +37,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + {tmpl_var name="sum_txt"} {tmpl_var name="sum_this_month"} MB diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm index 3cf21647d978e7cbb2c69c3f95de35557e6151a2..cf3f874295f1e3f950b7783239ddc7dc38a22fd6 100644 --- a/interface/web/sites/templates/web_subdomain_list.htm +++ b/interface/web/sites/templates/web_subdomain_list.htm @@ -62,6 +62,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/web_vhost_subdomain_edit.htm b/interface/web/sites/templates/web_vhost_subdomain_edit.htm index 67c26f32ea0437fe5bdb81a1263667a419a9d358..30745dd15d8303bb39ae5e64596dda619034e8f5 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_edit.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_edit.htm @@ -225,7 +225,7 @@ } - jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').click(function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); }); + jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').bind('click mousedown', function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); }); jQuery('#dom-edit-submit').click(function() { submitForm('pageForm','sites/web_vhost_subdomain_edit.php'); }); diff --git a/interface/web/sites/templates/web_vhost_subdomain_list.htm b/interface/web/sites/templates/web_vhost_subdomain_list.htm index 9c197493c9426d4b920dcc86982d5ab51313495b..4c7a72eef7a4076e67bcdaad79b987b1934454a8 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_list.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_list.htm @@ -60,6 +60,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/templates/webdav_user_list.htm b/interface/web/sites/templates/webdav_user_list.htm index ef17b48db36ed13a896c166658444f23f11df501..b34ce2133d27985739e55ca94ed229f94c715601 100644 --- a/interface/web/sites/templates/webdav_user_list.htm +++ b/interface/web/sites/templates/webdav_user_list.htm @@ -62,6 +62,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/sites/user_quota_stats.php b/interface/web/sites/user_quota_stats.php index bf646b350b8a3d0fddabf6995191bbbfd5005bda..56cc02c5dd2f45c3375557f1dae1639e4c89994c 100644 --- a/interface/web/sites/user_quota_stats.php +++ b/interface/web/sites/user_quota_stats.php @@ -60,7 +60,7 @@ class list_action extends listform_actions { if($rec['used'] > 1024) { $rec['used'] = round($rec['used'] / 1024,2).' MB'; } else { - $rec['used'] .= ' KB'; + if ($rec['used'] != '') $rec['used'] .= ' KB'; } if($rec['soft'] > 1024) { @@ -75,6 +75,8 @@ class list_action extends listform_actions { $rec['hard'] .= ' KB'; } + if($rec['soft'] == " KB") $rec['soft'] = $app->lng('unlimited'); + if($rec['hard'] == " KB") $rec['hard'] = $app->lng('unlimited'); /* diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index c9398b0165c2f3ce68500eff8f32009b6f6028ef..c714fa312a80f24cbb883399e6b9d52313d8676a 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -350,7 +350,7 @@ class page_action extends tform_actions { $php_directive_snippets_txt = ''; if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){ foreach($php_directive_snippets as $php_directive_snippet){ - $php_directive_snippets_txt .= '['.$php_directive_snippet['name'].'] '; + $php_directive_snippets_txt .= '['.$php_directive_snippet['name'].'] '; } } if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------'; @@ -361,7 +361,7 @@ class page_action extends tform_actions { $apache_directive_snippets_txt = ''; if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){ foreach($apache_directive_snippets as $apache_directive_snippet){ - $apache_directive_snippets_txt .= '['.$apache_directive_snippet['name'].'] '; + $apache_directive_snippets_txt .= '['.$apache_directive_snippet['name'].'] '; } } if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------'; @@ -373,7 +373,7 @@ class page_action extends tform_actions { $nginx_directive_snippets_txt = ''; if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){ foreach($nginx_directive_snippets as $nginx_directive_snippet){ - $nginx_directive_snippets_txt .= '['.$nginx_directive_snippet['name'].'] '; + $nginx_directive_snippets_txt .= '['.$nginx_directive_snippet['name'].'] '; } } if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------'; @@ -384,7 +384,7 @@ class page_action extends tform_actions { $proxy_directive_snippets_txt = ''; if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){ foreach($proxy_directive_snippets as $proxy_directive_snippet){ - $proxy_directive_snippets_txt .= '['.$proxy_directive_snippet['name'].'] '; + $proxy_directive_snippets_txt .= '['.$proxy_directive_snippet['name'].'] '; } } if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------'; @@ -806,9 +806,18 @@ class page_action extends tform_actions { unset($rec); //* Update all subdomains and alias domains - $records = $app->db->queryAllRecords("SELECT domain_id FROM web_domain WHERE parent_domain_id = ".$this->id); + $records = $app->db->queryAllRecords("SELECT domain_id, `domain`, `type`, `web_folder` FROM web_domain WHERE parent_domain_id = ".$this->id); foreach($records as $rec) { - $app->db->datalogUpdate('web_domain', "sys_userid = '".$web_rec['sys_userid']."', sys_groupid = '".$web_rec['sys_groupid']."'", 'domain_id', $rec['domain_id']); + $update_columns = "sys_userid = '".$web_rec['sys_userid']."', sys_groupid = '".$web_rec['sys_groupid']."'"; + if($rec['type'] == 'vhostsubdomain') { + $php_open_basedir = str_replace("[website_path]/web",$document_root.'/'.$rec['web_folder'],$web_config["php_open_basedir"]); + $php_open_basedir = str_replace("[website_domain]/web",$rec['domain'].'/'.$rec['web_folder'],$php_open_basedir); + $php_open_basedir = str_replace("[website_path]",$document_root,$php_open_basedir); + $php_open_basedir = $app->db->quote(str_replace("[website_domain]",$rec['domain'],$php_open_basedir)); + + $update_columns .= ", document_root = '".$document_root."', `php_open_basedir` = '".$php_open_basedir."'"; + } + $app->db->datalogUpdate('web_domain', $update_columns, 'domain_id', $rec['domain_id']); } unset($records); unset($rec); diff --git a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng index 59a146cbfd045e45581126f417a2a9ca52d178cf..136f5e2273ccf1022a919fa93ce82962786adf5a 100644 --- a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng @@ -7,4 +7,3 @@ $wb['password_strength_4_txt'] = 'Silné'; $wb['password_strength_5_txt'] = 'Velmi silné'; ?> - diff --git a/interface/web/themes/default-304/templates/admin/users_list.htm b/interface/web/themes/default-304/templates/admin/users_list.htm index d66228162677537a3f3dca5ce8b0909d51462384..3eeee31986aabb5d7ca19555db3f99e5b67e8110 100644 --- a/interface/web/themes/default-304/templates/admin/users_list.htm +++ b/interface/web/themes/default-304/templates/admin/users_list.htm @@ -50,6 +50,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/themes/default-304/templates/client/clients_list.htm b/interface/web/themes/default-304/templates/client/clients_list.htm index 2e906d00be9cfa6a71d761703a78b7f5e3cc2a97..18332477dc24201a19f2477435445adf5a762fe7 100644 --- a/interface/web/themes/default-304/templates/client/clients_list.htm +++ b/interface/web/themes/default-304/templates/client/clients_list.htm @@ -55,6 +55,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/themes/default-304/templates/client/resellers_list.htm b/interface/web/themes/default-304/templates/client/resellers_list.htm index 42a9a0cc9a3cc0d2430d7194a394167391f6cf50..f85850f36ccc8877ecbfa7f91381b8ba30d47596 100644 --- a/interface/web/themes/default-304/templates/client/resellers_list.htm +++ b/interface/web/themes/default-304/templates/client/resellers_list.htm @@ -50,6 +50,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css index a9f3df222ae694f98319cf618856541c1d493071..be6317a471408debbd3f3b5eead4070d4b80f456 100644 --- a/interface/web/themes/default/css/styles.css +++ b/interface/web/themes/default/css/styles.css @@ -444,6 +444,7 @@ table.list { table.list thead th { font-size: 10px; } table.list tbody { border: 1px solid #d3d3d3 !important; } table.list tfoot td { text-align: center; background: #f8f8f8 url("../images/lists_tfoot_bg.png") repeat-x bottom left; padding: 24px 8px 8px 8px; } +table.list .tbl_paging img { vertical-align: top; } table.list .tbl_row_even { background: #fcfcfc; } table.list .tbl_row_uneven { background: #f0f8ff; } table.list tr:hover { background: #fffacd; } @@ -740,7 +741,27 @@ button.negative:hover { .iconstxt.icoRestore { background-position: 6px -1px; } /* Button with icon and without text */ -.icons16 span { display: none; } +.icons16 { position: relative; } +.icons16>span { + opacity: 0; + visibility: hidden; + -webkit-transition: opacity 1s linear; + -moz-transition: opacity 1s linear; + -o-transition: opacity 1s linear; + -ms-transition: opacity 1s linear; + transition: opacity 1s linear; + position: absolute; + right: 23px; + top: -1px; + padding: 1px 2px; + border: 1px solid rgb(155,155,11); + background: rgb(255,255,111); + white-space: nowrap; +} +.icons16:hover>span { + opacity: 1.0; + visibility: visible; +} a.icons16 { height: 18px; width: 18px; diff --git a/interface/web/tools/import_vpopmail.php b/interface/web/tools/import_vpopmail.php new file mode 100644 index 0000000000000000000000000000000000000000..6d223fa82edba9357023e98c9e2b6d910585c642 --- /dev/null +++ b/interface/web/tools/import_vpopmail.php @@ -0,0 +1,267 @@ +auth->check_module_permissions('admin'); + +//* This is only allowed for administrators +if(!$app->auth->is_admin()) die('only allowed for administrators.'); + +$app->uses('tpl,auth'); + +$app->tpl->newTemplate('form.tpl.htm'); +$app->tpl->setInclude('content_tpl', 'templates/import_vpopmail.htm'); +$msg = ''; +$error = ''; + +//* load language file +$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_import_vpopmail.lng'; +include($lng_file); +$app->tpl->setVar($wb); + +if(isset($_POST['db_hostname']) && $_POST['db_hostname'] != '') { + + //* Set external Login details + $conf['imp_db_host'] = $_POST['db_hostname']; + $conf['imp_db_database'] = $_POST['db_name']; + $conf['imp_db_user'] = $_POST['db_user']; + $conf['imp_db_password'] = $_POST['db_password']; + $conf['imp_db_charset'] = 'utf8'; + $conf['imp_db_new_link'] = false; + $conf['imp_db_client_flags'] = 0; + + //* create new db object + $exdb = new db('imp'); + + if($exdb !== false) { + $msg .= 'Databse connection succeeded
'; + + $local_server_id = intval($_POST['local_server_id']); + $tmp = $app->db->queryOneRecord("SELECT mail_server FROM server WHERE server_id = $local_server_id"); + + if($tmp['mail_server'] == 1) { + start_import(); + } else { + $msg .= 'The server with the ID $local_server_id is not a mail server.
'; + } + + } else { + $msg .= 'Database connection failed
'; + } + +} else { + $_POST['local_server_id'] = 1; +} + +$app->tpl->setVar('db_hostname',$_POST['db_hostname']); +$app->tpl->setVar('db_user',$_POST['db_user']); +$app->tpl->setVar('db_password',$_POST['db_password']); +$app->tpl->setVar('db_name',$_POST['db_name']); +$app->tpl->setVar('local_server_id',$_POST['local_server_id']); +$app->tpl->setVar('msg',$msg); +$app->tpl->setVar('error',$error); + +$app->tpl_defaults(); +$app->tpl->pparse(); + +########################################################### + +function start_import() { + global $app, $conf, $msg, $error, $exdb, $local_server_id; + + //* Import the clients + $records = $exdb->queryAllRecords("SELECT * FROM vpopmail WHERE pw_name = 'postmaster'"); + if(is_array($records)) { + foreach($records as $rec) { + $pw_domain = $rec['pw_domain']; + //* Check if we have a client with that username already + $tmp = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client WHERE username = '$pw_domain'"); + if($tmp['number'] == 0) { + $pw_crypt_password = $app->auth->crypt_password($rec['pw_clear_passwd']); + $country = 'FI'; + + //* add client + $sql = "INSERT INTO `client` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `company_name`, `company_id`, `contact_name`, `customer_no`, `vat_id`, `street`, `zip`, `city`, `state`, `country`, `telephone`, `mobile`, `fax`, `email`, `internet`, `icq`, `notes`, `bank_account_owner`, `bank_account_number`, `bank_code`, `bank_name`, `bank_account_iban`, `bank_account_swift`, `default_mailserver`, `limit_maildomain`, `limit_mailbox`, `limit_mailalias`, `limit_mailaliasdomain`, `limit_mailforward`, `limit_mailcatchall`, `limit_mailrouting`, `limit_mailfilter`, `limit_fetchmail`, `limit_mailquota`, `limit_spamfilter_wblist`, `limit_spamfilter_user`, `limit_spamfilter_policy`, `default_webserver`, `limit_web_ip`, `limit_web_domain`, `limit_web_quota`, `web_php_options`, `limit_cgi`, `limit_ssi`, `limit_perl`, `limit_ruby`, `limit_python`, `force_suexec`, `limit_hterror`, `limit_wildcard`, `limit_ssl`, `limit_web_subdomain`, `limit_web_aliasdomain`, `limit_ftp_user`, `limit_shell_user`, `ssh_chroot`, `limit_webdav_user`, `limit_aps`, `default_dnsserver`, `limit_dns_zone`, `limit_dns_slave_zone`, `limit_dns_record`, `default_dbserver`, `limit_database`, `limit_cron`, `limit_cron_type`, `limit_cron_frequency`, `limit_traffic_quota`, `limit_client`, `limit_mailmailinglist`, `limit_openvz_vm`, `limit_openvz_vm_template_id`, `parent_client_id`, `username`, `password`, `language`, `usertheme`, `template_master`, `template_additional`, `created_at`, `id_rsa`, `ssh_rsa`) + VALUES(1, 1, 'riud', 'riud', '', '', '', '$pw_domain', '', '', '', '', '', '', '$country', '', '', '', '', 'http://', '', '', '', '', '', '', '', '', 1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, 0, 0, 0, 1, NULL, -1, -1, 'no,fast-cgi,cgi,mod,suphp', 'n', 'n', 'n', 'n', 'n', 'y', 'n', 'n', 'n', -1, -1, -1, 0, 'no,jailkit', 0, 0, 1, -1, -1, -1, 1, -1, 0, 'url', 5, -1, 0, -1, 0, 0, 0, '$pw_domain', '$pw_crypt_password', '".$conf['language']."', 'default', 0, '', NOW(), '', '')"; + $app->db->query($sql); + $client_id = $app->db->insertID(); + + //* add sys_group + $groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('".$app->db->quote($pw_domain)."','',".$client_id.")", 'groupid'); + $groups = $groupid; + + $username = $app->db->quote($pw_domain); + $password = $pw_crypt_password; + $modules = $conf['interface_modules_enabled']; + $startmodule = 'dashboard'; + $usertheme = $app->db->quote('default'); + $type = 'user'; + $active = 1; + $language = $app->db->quote($conf["language"]); + //$password = $app->auth->crypt_password($password); + + // Create the controlpaneluser for the client + //Generate ssh-rsa-keys + exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""'); + $app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".$app->db->quote(@file_get_contents('/tmp/id_rsa'))."', ssh_rsa = '".$app->db->quote(@file_get_contents('/tmp/id_rsa.pub'))."' WHERE client_id = ".$client_id); + exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub'); + + // Create the controlpaneluser for the client + $sql = "INSERT INTO sys_user (username,passwort,modules,startmodule,app_theme,typ,active,language,groups,default_group,client_id) + VALUES ('$username','$password','$modules','$startmodule','$usertheme','$type','$active','$language',$groups,$groupid,".$client_id.")"; + $app->db->query($sql); + + //* Set the default servers + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE mail_server = 1 AND mirror_server_id = 0 LIMIT 0,1'); + $default_mailserver = $app->functions->intval($tmp['server_id']); + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE web_server = 1 AND mirror_server_id = 0 LIMIT 0,1'); + $default_webserver = $app->functions->intval($tmp['server_id']); + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE dns_server = 1 AND mirror_server_id = 0 LIMIT 0,1'); + $default_dnsserver = $app->functions->intval($tmp['server_id']); + $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE db_server = 1 AND mirror_server_id = 0 LIMIT 0,1'); + $default_dbserver = $app->functions->intval($tmp['server_id']); + + $sql = "UPDATE client SET default_mailserver = $default_mailserver, default_webserver = $default_webserver, default_dnsserver = $default_dnsserver, default_dbserver = $default_dbserver WHERE client_id = ".$client_id; + $app->db->query($sql); + + $msg .= "Added Client $username.
"; + } else { + $msg .= "Client $username exists, skipped.
"; + } + } + } + + //* Import the mail domains + $records = $exdb->queryAllRecords("SELECT DISTINCT pw_domain FROM `vpopmail`"); + if(is_array($records)) { + foreach($records as $rec) { + $domain = $rec['pw_domain']; + + //* Check if domain exists already + $tmp = $app->db->queryOneRecord("SELECT count(domain_id) as number FROM mail_domain WHERE domain = '$domain'"); + if($tmp['number'] == 0) { + $user_rec = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE username = '$domain'"); + $sys_userid = ($user_rec['userid'] > 0)?$user_rec['userid']:1; + $sys_groupid = ($user_rec['default_group'] > 0)?$user_rec['default_group']:1; + + $sql = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `domain`, `active`) + VALUES(".$sys_userid.", ".$sys_groupid.", 'riud', 'riud', '', $local_server_id, '$domain', 'y')"; + $app->db->datalogInsert('mail_domain', $sql, 'domain_id'); + $msg .= "Imported domain $domain
"; + } else { + $msg .= "Skipped domain $domain
"; + } + } + } + + //* Import mailboxes + $records = $exdb->queryAllRecords("SELECT * FROM `vpopmail`"); + if(is_array($records)) { + foreach($records as $rec) { + $domain = $rec['pw_domain']; + $email = $rec['pw_name'].'@'.$rec['pw_domain']; + + //* Check for duplicate mailboxes + $tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE email = '".$app->db->quote($email)."'"); + + if($tmp['number'] == 0) { + + //* get the mail domain for the mailbox + $domain_rec = $app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain = '$domain'"); + + if(is_array($domain_rec)) { + $pw_crypt_password = $app->auth->crypt_password($rec['pw_clear_passwd']); + $maildir_path = "/var/vmail/".$rec['pw_domain']."/".$rec['pw_name']; + + //* Insert the mailbox + $sql = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `email`, `login`, `password`, `name`, `uid`, `gid`, `maildir`, `quota`, `cc`, `homedir`, `autoresponder`, `autoresponder_start_date`, `autoresponder_end_date`, `autoresponder_subject`, `autoresponder_text`, `move_junk`, `custom_mailfilter`, `postfix`, `access`, `disableimap`, `disablepop3`, `disabledeliver`, `disablesmtp`, `disablesieve`, `disablelda`, `disabledoveadm`) + VALUES(".$domain_rec['sys_userid'].", ".$domain_rec['sys_groupid'].", 'riud', 'riud', '', $local_server_id, '$email', '$email', '$pw_crypt_password', '$email', 5000, 5000, '$maildir_path', 0, '', '/var/vmail', 'n', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 'Out of office reply', '', 'n', '', 'y', 'n', 'n', 'n', 'n', 'n', 'n', 'n', 'n')"; + $app->db->datalogInsert('mail_user', $sql, 'mailuser_id'); + $msg .= "Imported mailbox $email
"; + } + }else { + $msg .= "Skipped mailbox $email
"; + } + } + } + + //* Import Aliases + $records = $exdb->queryAllRecords("SELECT * FROM `valias`"); + if(is_array($records)) { + foreach($records as $rec) { + + $email = $rec['alias'].'@'.$rec['domain']; + $target = ''; + + if(stristr($rec['valias_line'],'|')) { + //* Skipped + $msg .= "Skipped $email as target is a script pipe.
"; + } elseif (substr(trim($rec['valias_line']),-9) == '/Maildir/') { + $parts = explode('/',$rec['valias_line']); + $target_user = $parts[count($parts)-3]; + $target_domain = $parts[count($parts)-4]; + $target = $target_user.'@'.$target_domain; + } elseif (substr(trim($rec['valias_line']),0,1) == '&') { + $target = substr(trim($rec['valias_line']),1); + } elseif (stristr($rec['valias_line'],'@')) { + $target = $rec['valias_line']; + } else { + //* Unknown + $msg .= "Skipped $email as format of target ".$rec['valias_line']." is unknown.
"; + } + + //* Check for duplicate forwards + $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE source = '".$app->db->quote($email)."' AND destination = '".$app->db->quote($target)."'"); + + if($tmp['number'] == 0 && $target != '') { + + //* get the mail domain + $domain_rec = $app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain = '".$rec['domain']."'"); + + if(is_array($domain_rec)) { + $sql = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `source`, `destination`, `type`, `active`) + VALUES(".$domain_rec['sys_userid'].", ".$domain_rec['sys_groupid'].", 'riud', 'riud', '', $local_server_id, '".$app->db->quote($email)."', '".$app->db->quote($target)."', 'forward', 'y')"; + $app->db->datalogInsert('mail_forwarding', $sql, 'forwarding_id'); + } + $msg .= "Imported alias $email.
"; + } else { + $msg .= "Skipped alias $email as it exists already.
"; + } + } + } + +} + + +?> \ No newline at end of file diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng index 480434e148268e5bcf605b420d9c7a6b723296c2..2379ffb8e57384e55e8772a7c5101d2931ee1b49 100644 --- a/interface/web/tools/lib/lang/cz.lng +++ b/interface/web/tools/lib/lang/cz.lng @@ -12,4 +12,3 @@ $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 ba24f58f758665a41192c8c71c441ae2e7dd18a7..97d213ad824750852767035387cfbad175e0d065 100644 --- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng +++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng @@ -22,4 +22,3 @@ $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 b1f32ec119ad1a61026ee170c6fe64b66d1fb793..c3db96e19dae363e581dabc3b5153f805bbc40b9 100644 --- a/interface/web/tools/lib/lang/cz_index.lng +++ b/interface/web/tools/lib/lang/cz_index.lng @@ -3,4 +3,3 @@ $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 1125032b1f966e200731da1c7498eb73438ad439..1ac22ec6ca3ca580c9503c4f0ed626a7d7efd7f2 100644 --- a/interface/web/tools/lib/lang/cz_interface.lng +++ b/interface/web/tools/lib/lang/cz_interface.lng @@ -6,4 +6,3 @@ $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 3b53ca06a5f53cea35cf89979fbc8b76603a35eb..ff1e3a586aa665a14caafe83acd63b87df3f00f8 100644 --- a/interface/web/tools/lib/lang/cz_resync.lng +++ b/interface/web/tools/lib/lang/cz_resync.lng @@ -12,4 +12,3 @@ $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 53e9bd84426ad5e634df3f6b05c30e89860e9ad0..fb77e7cb0a745f6cfa3c52d2f372b6d4e66c3bf5 100644 --- a/interface/web/tools/lib/lang/cz_tpl_default.lng +++ b/interface/web/tools/lib/lang/cz_tpl_default.lng @@ -6,4 +6,3 @@ $wb['btn_start_txt'] = 'Uložit'; $wb['btn_cancel_txt'] = 'Zpět'; ?> - diff --git a/interface/web/tools/lib/lang/cz_usersettings.lng b/interface/web/tools/lib/lang/cz_usersettings.lng index 7490e52f98945775198015ef5a892f24566c9924..eb3599b8514f1b66170c37bf2fdb4ca145d6c053 100644 --- a/interface/web/tools/lib/lang/cz_usersettings.lng +++ b/interface/web/tools/lib/lang/cz_usersettings.lng @@ -11,4 +11,3 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> - diff --git a/interface/web/tools/lib/lang/en_import_vpopmail.lng b/interface/web/tools/lib/lang/en_import_vpopmail.lng new file mode 100644 index 0000000000000000000000000000000000000000..d212867479f8b3172e5334257be372f479cde4e7 --- /dev/null +++ b/interface/web/tools/lib/lang/en_import_vpopmail.lng @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/interface/web/tools/templates/import_vpopmail.htm b/interface/web/tools/templates/import_vpopmail.htm new file mode 100644 index 0000000000000000000000000000000000000000..8a786617c29eed6434fc3755c2bb0290fd792c22 --- /dev/null +++ b/interface/web/tools/templates/import_vpopmail.htm @@ -0,0 +1,53 @@ +

+

+ +
+ +
+
{tmpl_var name="legend_txt"} +
+

Database Hostname

+
+ +
+
+
+

Database Name

+
+ +
+
+
+

Database User

+
+ +
+
+
+

Database password

+
+ +
+
+
+

Server ID of local mailserver

+
+ +
+
+
+
+ + +

+ + +

ERROR

+ + + +
+ + +
+
\ No newline at end of file diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng index 21224389a858b483872fa40b83b893650f9ec8be..5c1ab5822999a2616d1b6792b084893848cff580 100644 --- a/interface/web/vm/lib/lang/cz.lng +++ b/interface/web/vm/lib/lang/cz.lng @@ -6,4 +6,3 @@ $wb['IP addresses'] = 'IP addresses'; $wb['OpenVZ'] = 'OpenVZ'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_action.lng b/interface/web/vm/lib/lang/cz_openvz_action.lng index 2930fff65cf4738794991c2b7a8c569b20800826..84682fc15ae12133ce5558c729a149a477ac95e5 100644 --- a/interface/web/vm/lib/lang/cz_openvz_action.lng +++ b/interface/web/vm/lib/lang/cz_openvz_action.lng @@ -15,4 +15,3 @@ $wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that n $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 6afda02718ae432985307e38c8bea32b92b4623a..67f688576ac762561936a46e18120b84d7033f28 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ip.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng @@ -8,4 +8,3 @@ $wb['ip_error_unique'] = 'This IP address does already exist.'; $wb['IP address'] = 'IP address'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng index e392e9c970107b173fa43af39f98af1c40aaab4c..37c1d62e7c2700ef456abcb2398607b9dbda6adc 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng @@ -6,4 +6,3 @@ $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 8fd50e2ed0c372459e402bc0f581484431e7efc1..97741100e483be991f41e7411b2dc7f0bcfa8fa4 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng @@ -1,5 +1,5 @@ - 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 c8be29a4749276ca4b7fdc13aeb9f9697e850047..930b33f5bb2bec395dff0e6f7e05cdc6956bcf29 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng @@ -1,10 +1,9 @@ - diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng index 0acacaf88bedcc96d44f44e8a655ab3ec1dde050..cf926f6b33b0f8ec8831360f9f7ec1288572d54e 100644 --- a/interface/web/vm/lib/lang/cz_openvz_template.lng +++ b/interface/web/vm/lib/lang/cz_openvz_template.lng @@ -25,7 +25,7 @@ $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['template_name_txt'] = 'Název šablony'; $wb['diskspace_txt'] = 'Diskspace'; $wb['ram_txt'] = 'RAM (guaranteed)'; $wb['ram_burst_txt'] = 'RAM (burst)'; @@ -88,8 +88,7 @@ $wb['numsiginfo_error_empty'] = 'Numsiginfo is empty.'; $wb['dcachesize_error_empty'] = 'Dcachesize is empty.'; $wb['numiptent_error_empty'] = 'Numiptent is empty.'; $wb['swappages_error_empty'] = 'Swappages is empty.'; -$wb['Template'] = 'Template'; -$wb['Advanced'] = 'Advanced'; +$wb['Template'] = 'Šablona'; +$wb['Advanced'] = 'Pokročilý'; ?> - 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 813dc6ab96d8397001ad9a1b82bf86d1a3f9ffe7..353e760ea6d9c702349c8df5c0794feb1c2c4256 100644 --- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng @@ -1,7 +1,6 @@ - diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng index b24a14bf2bb64ecf89c36074b9a73210dff4ef1c..b9043e4a95e819cec4d2f71ee7b90363a47485f1 100644 --- a/interface/web/vm/lib/lang/cz_openvz_vm.lng +++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng @@ -11,7 +11,7 @@ $wb['nameserver_desc_txt'] = '(separated by whitespace)'; $wb['capability_txt'] = 'Capability'; $wb['server_id_txt'] = 'Hostserver'; $wb['ostemplate_id_txt'] = 'OSTemplate'; -$wb['template_id_txt'] = 'Template'; +$wb['template_id_txt'] = 'Šablona'; $wb['ip_address_txt'] = 'IP address'; $wb['hostname_txt'] = 'Hostname'; $wb['vm_password_txt'] = 'VM Password'; @@ -36,7 +36,6 @@ $wb['cpu_limit_error_empty'] = 'CPU limit is empty.'; $wb['io_priority_error_empty'] = 'I/O priority is empty.'; $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; -$wb['Advanced'] = 'Advanced'; +$wb['Advanced'] = 'Pokročilý'; ?> - 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 ae49a1bf4b95ffdbb7dc8372afab307ed84ea4a0..9fa15b92eec9eb28a36276fd37299a3a34941eab 100644 --- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng @@ -3,10 +3,9 @@ $wb['list_head_txt'] = 'Virtual server'; $wb['active_txt'] = 'Aktivní'; $wb['server_id_txt'] = 'Hostserver'; $wb['ostemplate_id_txt'] = 'OSTemplate'; -$wb['template_id_txt'] = 'Template'; +$wb['template_id_txt'] = 'Šablona'; $wb['hostname_txt'] = 'Hostname'; $wb['ip_address_txt'] = 'IP address'; $wb['veid_txt'] = 'VEID'; ?> - diff --git a/interface/web/vm/templates/openvz_ip_list.htm b/interface/web/vm/templates/openvz_ip_list.htm index 99e48e2720d6b80d326b952871be6313e6b62998..378bd013e47ee6d954d92d06ca10e4b265299ff2 100644 --- a/interface/web/vm/templates/openvz_ip_list.htm +++ b/interface/web/vm/templates/openvz_ip_list.htm @@ -45,6 +45,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/vm/templates/openvz_ostemplate_list.htm b/interface/web/vm/templates/openvz_ostemplate_list.htm index 679c66599e2b2b226c7f3908b7b6ef8cb07f7c02..a4d0fc3c3895e24e4d9c40744d353a2e86aac4f3 100644 --- a/interface/web/vm/templates/openvz_ostemplate_list.htm +++ b/interface/web/vm/templates/openvz_ostemplate_list.htm @@ -48,6 +48,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/vm/templates/openvz_template_list.htm b/interface/web/vm/templates/openvz_template_list.htm index 7f5ab7130e83eddf9787032da2110959309a0e0b..359af7ccb45dea4cad10388f76c8f385b5bacaf5 100644 --- a/interface/web/vm/templates/openvz_template_list.htm +++ b/interface/web/vm/templates/openvz_template_list.htm @@ -39,6 +39,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/interface/web/vm/templates/openvz_vm_list.htm b/interface/web/vm/templates/openvz_vm_list.htm index 339c9851fa2ff89b6c45523664087b2ff54da0ba..d525f382761b14ca7f2dafc70a66c09a95542e88 100644 --- a/interface/web/vm/templates/openvz_vm_list.htm +++ b/interface/web/vm/templates/openvz_vm_list.htm @@ -55,6 +55,11 @@ + + + {tmpl_var name='globalsearch_noresults_text_txt'} + + diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master index b6ac8c3c28e4c8ce2027ee1275a4b90a6c9ce1b1..bf02a7bc460337cc1f2f60493853a08892c04042 100644 --- a/server/conf/apache_ispconfig.conf.master +++ b/server/conf/apache_ispconfig.conf.master @@ -41,6 +41,24 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m Allow from all +# Allow access to mailman on OpenSuSE + + AllowOverride All + order allow,deny + allow from all + + + + order allow,deny + allow from all + + + + Options +FollowSymLinks + order allow,deny + allow from all + + # allow path to awstats and alias for awstats icons Order allow,deny diff --git a/server/conf/apps_php_fpm_pool.conf.master b/server/conf/apps_php_fpm_pool.conf.master index 2cc72583ce476ec0cf1a707b5a645def55c4330c..ce6a92fcfba48ab25848ab56ce763634fd01544e 100644 --- a/server/conf/apps_php_fpm_pool.conf.master +++ b/server/conf/apps_php_fpm_pool.conf.master @@ -10,9 +10,9 @@ group = {fpm_group} pm = dynamic pm.max_children = 50 -pm.start_servers = 20 -pm.min_spare_servers = 5 -pm.max_spare_servers = 35 +pm.start_servers = 2 +pm.min_spare_servers = 1 +pm.max_spare_servers = 5 chdir = / diff --git a/server/conf/index/robots.txt b/server/conf/index/robots.txt index eb0536286f3081c6c0646817037faf5446e3547d..7d329b1db3f0b9383f111d23fc0c945b7e957017 100644 --- a/server/conf/index/robots.txt +++ b/server/conf/index/robots.txt @@ -1,2 +1 @@ User-agent: * -Disallow: diff --git a/server/conf/mm_cfg.py.master b/server/conf/mm_cfg.py.master index 9ec47a727ea678448d6eaed24fd56fdda2d4c17d..3dcf5a6a6156f50ce3feba2a3518d0ab40853a5d 100644 --- a/server/conf/mm_cfg.py.master +++ b/server/conf/mm_cfg.py.master @@ -102,5 +102,7 @@ POSTFIX_STYLE_VIRTUAL_DOMAINS = [{virtual_domains}] # http://www.jamesh.id.au/articles/mailman-spamassassin/ # GLOBAL_PIPELINE.insert(1, 'SpamAssassin') +POSTFIX_MAP_CMD = '/etc/mailman/virtual_to_transport.sh' + # Note - if you're looking for something that is imported from mm_cfg, but you # didn't find it above, it's probably in /usr/lib/mailman/Mailman/Defaults.py. \ No newline at end of file diff --git a/server/cron_daily.php b/server/cron_daily.php index 6045087aa5ab8f262143215de610b64f672c2bd9..a89468e6560342e1353e3aeaac2dd0e3c1bb35c9 100644 --- a/server/cron_daily.php +++ b/server/cron_daily.php @@ -495,6 +495,13 @@ foreach($records as $rec) { exec('rm -f '.$logfile); } +//* Delete old logfiles in /var/log/ispconfig/httpd/ that were created by vlogger for the hostname of the server +exec('hostname -f', $tmp_hostname); +if($tmp_hostname[0] != '' && is_dir('/var/log/ispconfig/httpd/'.$tmp_hostname[0])) { + exec('cd /var/log/ispconfig/httpd/'.$tmp_hostname[0]."; find . -mtime +30 -name '*.log' | xargs rm > /dev/null 2> /dev/null"); +} +unset($tmp_hostname); + ####################################################################################################### // Rotate the ispconfig.log file ####################################################################################################### diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php index 005bd1abe35ae7f319df0116ee77b068fc22594e..09d6640e11cc18b88ea124a7ce64f6760d6f00de 100644 --- a/server/lib/classes/db_mysql.inc.php +++ b/server/lib/classes/db_mysql.inc.php @@ -45,6 +45,7 @@ class db extends mysqli public $errorMessage = ''; // last error message private $errorLocation = '';// last error location public $show_error_messages = false; // false in server, true in interface + private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor // constructor public function __construct($host = NULL , $user = NULL, $pass = NULL, $database = NULL) { @@ -59,11 +60,20 @@ class db extends mysqli $this->dbClientFlags = $conf['db_client_flags']; parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName); - if ($this->connect_error) { + $try = 0; + while(!is_null($this->connect_error) && $try < 10) { + if($try > 8) sleep(5); + elseif($try > 0) sleep(1); + + $try++; $this->updateError('DB::__construct'); - } else { - $this->setCharacterEncoding(); + + parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName); } + + if(is_null($this->connect_error)) $this->isConnected = true; + + $this->setCharacterEncoding(); } public function __destruct() { @@ -79,7 +89,7 @@ class db extends mysqli public function updateError($location) { global $app; - if($this->connect_error) { + if(!is_null($this->connect_error)) { $this->errorNumber = $this->connect_errno; $this->errorMessage = $this->connect_error; } else { @@ -103,22 +113,24 @@ class db extends mysqli } private function setCharacterEncoding() { + if($this->isConnected == false) return false; 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) { + if($this->isConnected == false) return false; $try = 0; do { $try++; - $ok = parent::ping(); + $ok = $this->ping(); if(!$ok) { - if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) { + if(!$this->real_connect($this->dbHost, $this->dbUser, $this->dbPass, $this->dbName)) { if($try > 9) { $this->updateError('DB::query -> reconnect'); return false; } else { - sleep(1); + sleep(($try > 7 ? 5 : 1)); } } else { $this->setCharacterEncoding(); @@ -468,7 +480,7 @@ public function toLower($record) { // gibt Array mit Tabellennamen zur�ck public function getTables($database_name = '') { - + if($this->isConnected == false) return false; if($database_name == '') $database_name = $this->dbName; $result = parent::query("SHOW TABLES FROM $database_name"); for ($i = 0; $i < $result->num_rows; $i++) { diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php index ce29432b6f2db3d1f6f8294b075fd12123e5291b..57ab22cb31a0ecae778f780aa054fb97e033bc22 100644 --- a/server/lib/classes/modules.inc.php +++ b/server/lib/classes/modules.inc.php @@ -183,13 +183,11 @@ class modules { if($replication_error == false) { if(is_array($data['old']) || is_array($data['new'])) { + $app->db->query("UPDATE server SET updated = ".$d["datalog_id"]." WHERE server_id = ".$conf['server_id']); $this->raiseTableHook($d['dbtable'],$d['action'],$data); } else { $app->log('Data array was empty for datalog_id '.$d['datalog_id'],LOGLEVEL_WARN); } - //$this->raiseTableHook($d["dbtable"],$d["action"],$data); - //$app->dbmaster->query("DELETE FROM sys_datalog WHERE datalog_id = ".$d["datalog_id"]); - //$app->log("Deleting sys_datalog ID ".$d["datalog_id"],LOGLEVEL_DEBUG); $app->dbmaster->query("UPDATE server SET updated = ".$d["datalog_id"]." WHERE server_id = ".$conf['server_id']); $app->log('Processed datalog_id '.$d['datalog_id'],LOGLEVEL_DEBUG); } else { diff --git a/server/lib/classes/tpl_error.inc.php b/server/lib/classes/tpl_error.inc.php index d15b80a2ca183e2c50c4caadf8cfa9edeb445412..171a04f8bfd04591577da5be4b01a7df456e765c 100644 --- a/server/lib/classes/tpl_error.inc.php +++ b/server/lib/classes/tpl_error.inc.php @@ -31,7 +31,7 @@ class vlibTemplateError { | DO NOT TOUCH ANYTHING IN THIS CLASS IT MAY NOT WORK OTHERWISE | \-----------------------------------------------------------------------------*/ - function raiseError ($code, $level = null, $extra=null) { + public static function raiseError ($code, $level = null, $extra=null) { if (!($level & error_reporting())&& $level != KILL) return; // binary AND checks for reporting level $error_codes = array( diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 7c0e7f96194f03290a07fadde7214a4903617a68..1892db178d3367a9c6b4fddcb840dab50c1775a0 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -332,7 +332,17 @@ class apache2_plugin { if(trim($data["new"]["ssl_request"]) != '') $app->system->file_put_contents($csr_file,$data["new"]["ssl_request"]); if(trim($data["new"]["ssl_cert"]) != '') $app->system->file_put_contents($crt_file,$data["new"]["ssl_cert"]); if(trim($data["new"]["ssl_bundle"]) != '') $app->system->file_put_contents($bundle_file,$data["new"]["ssl_bundle"]); - if(trim($data["new"]["ssl_key"]) != '') $app->system->file_put_contents($key_file2,$data["new"]["ssl_key"]); + + //* Write the key file, if field is empty then import the key into the db + if(trim($data["new"]["ssl_key"]) != '') { + $app->system->file_put_contents($key_file2,$data["new"]["ssl_key"]); + } else { + $ssl_key2 = $app->db->quote($app->system->file_get_contents($key_file2)); + /* Update the DB of the (local) Server */ + $app->db->query("UPDATE web_domain SET ssl_key = '$ssl_key2' WHERE domain = '".$data['new']['domain']."'"); + /* Update also the master-DB of the Server-Farm */ + $app->dbmaster->query("UPDATE web_domain SET ssl_key = '$ssl_key2' WHERE domain = '".$data['new']['domain']."'"); + } /* Update the DB of the (local) Server */ $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'"); @@ -509,41 +519,45 @@ class apache2_plugin { //* Remove protection of old folders $app->system->web_folder_protection($data['old']['document_root'],false); - - //* Move the site data - $tmp_docroot = explode('/',$data['new']['document_root']); - unset($tmp_docroot[count($tmp_docroot)-1]); - $new_dir = implode('/',$tmp_docroot); - - $tmp_docroot = explode('/',$data['old']['document_root']); - unset($tmp_docroot[count($tmp_docroot)-1]); - $old_dir = implode('/',$tmp_docroot); - - //* Check if there is already some data in the new docroot and rename it as we need a clean path to move the existing site to the new path - if(@is_dir($data['new']['document_root'])) { - $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d')); - $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d'),LOGLEVEL_DEBUG); - } - - //* Create new base directory, if it does not exist yet - if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir); - exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir)); - //$app->system->rename($data['old']['document_root'],$new_dir); - $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG); - - // Handle the change in php_open_basedir - $data['new']['php_open_basedir'] = str_replace($data['old']['document_root'],$data['new']['document_root'],$data['old']['php_open_basedir']); - - //* Change the owner of the website files to the new website owner - exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir); - - //* Change the home directory and group of the website user - $command = 'usermod'; - $command .= ' --home '.escapeshellcmd($data['new']['document_root']); - $command .= ' --gid '.escapeshellcmd($data['new']['system_group']); - $command .= ' '.escapeshellcmd($data['new']['system_user']); - exec($command); - + + if($data["new"]["type"] != "vhostsubdomain") { + //* Move the site data + $tmp_docroot = explode('/',$data['new']['document_root']); + unset($tmp_docroot[count($tmp_docroot)-1]); + $new_dir = implode('/',$tmp_docroot); + + $tmp_docroot = explode('/',$data['old']['document_root']); + unset($tmp_docroot[count($tmp_docroot)-1]); + $old_dir = implode('/',$tmp_docroot); + + //* Check if there is already some data in the new docroot and rename it as we need a clean path to move the existing site to the new path + if(@is_dir($data['new']['document_root'])) { + $app->system->web_folder_protection($data['new']['document_root'],false); + $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s')); + $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'),LOGLEVEL_DEBUG); + } + + //* Create new base directory, if it does not exist yet + if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir); + $app->system->web_folder_protection($data['old']['document_root'],false); + exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir)); + //$app->system->rename($data['old']['document_root'],$new_dir); + $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG); + + // Handle the change in php_open_basedir + $data['new']['php_open_basedir'] = str_replace($data['old']['document_root'],$data['new']['document_root'],$data['old']['php_open_basedir']); + + //* Change the owner of the website files to the new website owner + exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir); + + //* Change the home directory and group of the website user + $command = 'usermod'; + $command .= ' --home '.escapeshellcmd($data['new']['document_root']); + $command .= ' --gid '.escapeshellcmd($data['new']['system_group']); + $command .= ' '.escapeshellcmd($data['new']['system_user']); + exec($command); + } + if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command); //* Change the log mount @@ -911,6 +925,13 @@ class apache2_plugin { $master_php_ini_path = $web_config['php_ini_path_cgi']; } } + + //* Add php.ini to the path in case that the master_php_ini_path is a directory + if($master_php_ini_path != '' && is_dir($master_php_ini_path) && is_file($master_php_ini_path.'/php.ini')) { + if(substr($master_php_ini_path,-1) == '/') $master_php_ini_path = substr($master_php_ini_path,0,-1); + $master_php_ini_path .= '/php.ini'; + } + if($master_php_ini_path != '' && substr($master_php_ini_path,-7) == 'php.ini' && is_file($master_php_ini_path)) { $php_ini_content .= $app->system->file_get_contents($master_php_ini_path)."\n"; } @@ -1197,6 +1218,7 @@ class apache2_plugin { if(trim($data['new']['fastcgi_php_version']) != ''){ $default_fastcgi_php = false; list($custom_fastcgi_php_name, $custom_fastcgi_php_executable, $custom_fastcgi_php_ini_dir) = explode(':', trim($data['new']['fastcgi_php_version'])); + if(is_file($custom_fastcgi_php_ini_dir)) $custom_fastcgi_php_ini_dir = dirname($custom_fastcgi_php_ini_dir); if(substr($custom_fastcgi_php_ini_dir,-1) != '/') $custom_fastcgi_php_ini_dir .= '/'; } else { $default_fastcgi_php = true; @@ -1506,7 +1528,7 @@ class apache2_plugin { $app->system->web_folder_protection($data['new']['document_root'],false); $app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htpasswd_stats',$htp_file); $app->system->web_folder_protection($data['new']['document_root'],true); - $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0750); + $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0755); unset($htp_file); } } @@ -2743,6 +2765,17 @@ class apache2_plugin { $client_dir = $web_config['website_basedir'].'/clients/client'.$client_id; if(is_dir($client_dir) && !stristr($client_dir,'..')) { + // remove symlinks from $client_dir + $files = array_diff(scandir($client_dir), array('.','..')); + if(is_array($files) && !empty($files)){ + foreach($files as $file){ + if(is_link($client_dir.'/'.$file)){ + unlink($client_dir.'/'.$file); + $app->log('Removed symlink: '.$client_dir.'/'.$file,LOGLEVEL_DEBUG); + } + } + } + @rmdir($client_dir); $app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG); } diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 1c37a5a8101e77701ff654d6564b15685877a13f..7fa3570e36570fab5d498d3410161b0da670fd8b 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -446,12 +446,14 @@ class nginx_plugin { //* Check if there is already some data in the new docroot and rename it as we need a clean path to move the existing site to the new path if(@is_dir($data['new']['document_root'])) { - $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d')); - $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d'),LOGLEVEL_DEBUG); + $app->system->web_folder_protection($data['new']['document_root'],false); + $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s')); + $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'),LOGLEVEL_DEBUG); } //* Create new base directory, if it does not exist yet if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir); + $app->system->web_folder_protection($data['old']['document_root'],false); exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir)); //$app->system->rename($data['old']['document_root'],$new_dir); $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG); @@ -2439,6 +2441,17 @@ class nginx_plugin { $client_dir = $web_config['website_basedir'].'/clients/client'.$client_id; if(is_dir($client_dir) && !stristr($client_dir,'..')) { + // remove symlinks from $client_dir + $files = array_diff(scandir($client_dir), array('.','..')); + if(is_array($files) && !empty($files)){ + foreach($files as $file){ + if(is_link($client_dir.'/'.$file)){ + unlink($client_dir.'/'.$file); + $app->log('Removed symlink: '.$client_dir.'/'.$file,LOGLEVEL_DEBUG); + } + } + } + @rmdir($client_dir); $app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG); } diff --git a/server/server.php b/server/server.php index be710eec66e24118323dd0725b0c230275c6b5ea..e669c6ecc554a541a36c206b8c5002155015fa83 100644 --- a/server/server.php +++ b/server/server.php @@ -45,7 +45,13 @@ if ($app->dbmaster->connect_error == NULL) { if(!is_array($server_db_record)) die('Unable to load the server configuration from database.'); - $conf['last_datalog_id'] = (int) $server_db_record['updated']; + //* Get the number of the last processed datalog_id, if the id of the local server + //* is > then the one of the remote system, then use the local ID as we might not have + //* reached the remote server during the last run then. + $local_server_db_record = $app->db->queryOneRecord("SELECT * FROM server WHERE server_id = " . $conf['server_id']); + $conf['last_datalog_id'] = (int) max($server_db_record['updated'],$local_server_db_record['updated']); + unset($local_server_db_record); + $conf['mirror_server_id'] = (int) $server_db_record['mirror_server_id']; // Load the ini_parser