diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 5ea448a7e62159d9d6158de70a529b8765c967fe..02ad8d3ec1e2dc6787fedb39da13b2b174e690b8 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -61,10 +61,9 @@ class db extends mysqli
     if ($this->connect_error) {
       $this->updateError('DB::__construct');
       return false;
+    } else {
+      $this->setCharacterEncoding();
     }
-    parent::query( 'SET NAMES '.$this->dbCharset); 
-    parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
-
   }
 
   public function __destruct() {
@@ -89,14 +88,36 @@ class db extends mysqli
       // This right here will allow us to use the samefile for server & interface
       if($this->show_error_messages) {
 	echo $error_msg;
-      } else if(method_exists($app, 'log')) {
+      } else if(is_object($app) && method_exists($app, 'log')) {
 	$app->log($error_msg, LOGLEVEL_WARN);
       }
     }
   }
+  
+  private function setCharacterEncoding() {
+    parent::query( 'SET NAMES '.$this->dbCharset); 
+    parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
+  }
 
   public function query($queryString) {
-    parent::ping();
+    $try = 0;
+    do {
+        $try++;
+        $ok = parent::ping();
+        if(!$ok) {
+            if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) {
+                if($try > 9) {
+                    $this->updateError('DB::query -> reconnect');
+                    return false;
+                } else {
+                    sleep(1);
+                }
+            } else {
+                $this->setCharacterEncoding();
+                $ok = true;
+            }
+        }
+    } while($ok == false);
 	$this->queryId = parent::query($queryString);
     $this->updateError('DB::query('.$queryString.') -> mysqli_query');
     if($this->errorNumber) debug_print_backtrace();
@@ -184,10 +205,10 @@ public function toLower($record) {
     if(is_array($record_old) && count($record_old) > 0) {
       foreach($record_old as $key => $val) {
 	// if(!isset($record_new[$key]) || $record_new[$key] != $val) {
-	if($record_new[$key] != $val) {
+	if(@$record_new[$key] != $val) {
 	  // Record has changed
 	  $diffrec_full['old'][$key] = $val;
-	  $diffrec_full['new'][$key] = $record_new[$key];
+	  $diffrec_full['new'][$key] = @$record_new[$key];
 	  $diff_num++;
 	} else {
 	  $diffrec_full['old'][$key] = $val;
diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php
index ff4f3e7ef4a8080f98d20bcfd19e62fd5da80a50..0ccf65cf5f06006eeed30194c28dee7a4843c71d 100644
--- a/interface/lib/classes/listform_tpl_generator.inc.php
+++ b/interface/lib/classes/listform_tpl_generator.inc.php
@@ -94,7 +94,7 @@ class listform_tpl_generator {
 		
 		$html .= "            <td class=\"tbl_col_buttons\">
               <div class=\"buttons icons16\">    
-                <a class=\"icons16 icoDelete\" href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\"><span>{tmpl_var name='delete_txt'}</span></a>
+                <a class=\"button icons16 icoDelete\" href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\"><span>{tmpl_var name='delete_txt'}</span></a>
               </div>
             </td>
           </tr>
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 617250caee42a5d39571d80ecc7b351e8e1fbc21..c636518f6e66e3a1abfcd41da85d550c413ee809 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -681,7 +681,9 @@ class remoting_lib {
 																$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
 																$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
 														} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
-																$sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), ";
+																$tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
+																$record[$key] = $tmp['crypted'];
+																$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
                                                         } else {
                                                                 $record[$key] = md5(stripslashes($record[$key]));
 																$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
@@ -708,7 +710,9 @@ class remoting_lib {
                                                                 $record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
 																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
 														} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
-																$sql_update .= "`$key` = PASSWORD('".$app->db->quote($record[$key])."'), ";
+																$tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
+																$record[$key] = $tmp['crypted'];
+																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
 														} else {
                                                                 $record[$key] = md5(stripslashes($record[$key]));
 																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index c51e3e16f16fea8f7ba4fddce87856eeee1a4e95..bd28db4f3ae0e51e9cba06d398e901d0aba4ab79 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -1057,7 +1057,9 @@ class tform {
 																$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
 																$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
 														} elseif ($field['encryption'] == 'MYSQL') {
-																$sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), ";
+																$tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
+																$record[$key] = $tmp['crypted'];
+																$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
 														} elseif ($field['encryption'] == 'CLEARTEXT') {
 																$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
                                                         } else {
@@ -1084,7 +1086,9 @@ class tform {
                                                                 $record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
 																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
 														} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
-																$sql_update .= "`$key` = PASSWORD('".$app->db->quote($record[$key])."'), ";
+																$tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
+																$record[$key] = $tmp['crypted'];
+																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
 														} elseif (isset($field['encryption']) && $field['encryption'] == 'CLEARTEXT') {
 																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
                                                         } else {
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 0179788277a384ec950d509062b7af009268c836..a0cf367882147075f889ca819eea34f3291130af 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -131,3 +131,5 @@ $wb['datalog_status_i_web_folder_user'] = 'Vytvoření uživatele pro adresáře
 $wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro adresáře chráněné heslem';
 $wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng
index c531b688477d39a677d5243081914a2365e44690..8c80d1292df23d3b0ef4b644253e0bee6e28ecff 100644
--- a/interface/web/admin/lib/lang/cz.lng
+++ b/interface/web/admin/lib/lang/cz.lng
@@ -25,9 +25,9 @@ $wb['Getmail'] = 'Getmail';
 $wb['Web'] = 'Web';
 $wb['FastCGI'] = 'FastCGI';
 $wb['Jailkit'] = 'Jailkit';
-$wb['Rescue'] = 'Monitorování';
+$wb['Rescue'] = 'Zachrána';
 $wb['Server IP addresses'] = 'IP adresy serveru';
-$wb['Additional PHP Versions'] = 'Další PHP verze';
+$wb['Additional PHP Versions'] = 'Další verze PHP';
 $wb['Firewall'] = 'Firewall';
 $wb['Interface'] = 'Rozhraní';
 $wb['Interface Config'] = 'Hlavní konfigurace';
@@ -48,3 +48,5 @@ $wb['Do OS-Update'] = 'Aktualizovat operační systém';
 $wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig';
 $wb['Directive Snippets'] = 'Directive Snippets';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets.lng b/interface/web/admin/lib/lang/cz_directive_snippets.lng
index 2204ff5f73ddd8e939e1dd520e4b8920d9516f69..9a579d25e3b7a687d9b9ec7facc0a9cccbfddee9 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng
@@ -1,9 +1,11 @@
 <?php
 $wb['Directive Snippets'] = 'Directive Snippets';
 $wb['name_txt'] = 'Name of Snippet';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Verze';
 $wb['snippet_txt'] = 'Snippet';
 $wb['active_txt'] = 'Aktivní';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
index 42d45a6f75f1704e350aa6a1c6d0bb54c9b297e7..cf1bb28c772e72033df780efd24d61a186798c98 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
@@ -2,6 +2,8 @@
 $wb['list_head_txt'] = 'Directive Snippets';
 $wb['active_txt'] = 'Aktivní';
 $wb['name_txt'] = 'Name of Snippet';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Verze';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_firewall.lng b/interface/web/admin/lib/lang/cz_firewall.lng
index c6146ae93d5abd8dcd55c348c570a6490aa146fd..df9386ae66d7115a96d5e49b44755f60caaa460d 100644
--- a/interface/web/admin/lib/lang/cz_firewall.lng
+++ b/interface/web/admin/lib/lang/cz_firewall.lng
@@ -9,3 +9,5 @@ $wb['firewall_error_unique'] = 'Pro tento server již existuje záznam firewallu
 $wb['tcp_ports_error_regex'] = 'Znak není povole v definici TCP portu. Povolené symboly jsou čísla, : a ,.';
 $wb['udp_ports_error_regex'] = 'Znak není povole v definici UDP portu. Povolené symboly jsou čísla, : a ,.';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_firewall_list.lng b/interface/web/admin/lib/lang/cz_firewall_list.lng
index aecc4cf06a656efc1e8ca9f3cfc1b22499d56f2c..da1af438deb23ac2f7a8c6e5397b7a8797f04cd1 100644
--- a/interface/web/admin/lib/lang/cz_firewall_list.lng
+++ b/interface/web/admin/lib/lang/cz_firewall_list.lng
@@ -6,3 +6,5 @@ $wb['tcp_port_txt'] = 'Otevřené TCP porty';
 $wb['udp_port_txt'] = 'Otevřené UDP porty';
 $wb['add_new_record_txt'] = 'Přidat záznam';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_groups.lng b/interface/web/admin/lib/lang/cz_groups.lng
index a6281be247dd655b73a2c79aeb4b5a2d78ac5f47..0f1a6be926302278b2257ef58e0e2d132fe08e3e 100644
--- a/interface/web/admin/lib/lang/cz_groups.lng
+++ b/interface/web/admin/lib/lang/cz_groups.lng
@@ -3,3 +3,5 @@ $wb['description_txt'] = 'Popis';
 $wb['name_txt'] = 'Skupina';
 $wb['name_err'] = 'Skupina musí mít min. 1, max. 30 znaků.';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_groups_list.lng b/interface/web/admin/lib/lang/cz_groups_list.lng
index c1d7ef9a8bcb830f5986dcc164f7a189dcd75f81..f285b382b947dc2a29fc1a75f46e9b12014ae6ef 100644
--- a/interface/web/admin/lib/lang/cz_groups_list.lng
+++ b/interface/web/admin/lib/lang/cz_groups_list.lng
@@ -5,3 +5,5 @@ $wb['name_txt'] = 'Skupina';
 $wb['add_new_record_txt'] = 'Přidat skupinu';
 $wb['warning_txt'] = '<b>VAROVÁNÍ:</b> Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_iptables.lng b/interface/web/admin/lib/lang/cz_iptables.lng
index d6f45fedaa687ffc96ca2f7b075b76286628c49f..4e2b8a4a3e76cf37d39e77bc2a8f8297875bf563 100644
--- a/interface/web/admin/lib/lang/cz_iptables.lng
+++ b/interface/web/admin/lib/lang/cz_iptables.lng
@@ -4,10 +4,12 @@ $wb['multiport_txt'] = 'Multi Port';
 $wb['singleport_txt'] = 'Single Port';
 $wb['protocol_txt'] = 'Protocol';
 $wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
+$wb['target_txt'] = 'Cíl';
 $wb['state_txt'] = 'State';
 $wb['destination_ip_txt'] = 'Destination Address';
 $wb['source_ip_txt'] = 'Source Address';
 $wb['active_txt'] = 'Aktivní';
 $wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng
index a823c4ca97d19bb43f494eac5c97c72b12e938fd..99dab0148f17ad4a25a9596288075ceabf4265a1 100644
--- a/interface/web/admin/lib/lang/cz_iptables_list.lng
+++ b/interface/web/admin/lib/lang/cz_iptables_list.lng
@@ -6,10 +6,12 @@ $wb['multiport_txt'] = 'Multi Port';
 $wb['singleport_txt'] = 'Single Port';
 $wb['protocol_txt'] = 'Protocol';
 $wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
+$wb['target_txt'] = 'Cíl';
 $wb['state_txt'] = 'State';
 $wb['destination_ip_txt'] = 'Destination Address';
 $wb['source_ip_txt'] = 'Source Address';
 $wb['active_txt'] = 'Aktivní';
 $wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng
index 285dff276113076fa949e4e91a4346a1320ea61f..d95f12eb35ecf997e55dc41e32c75ca4582a40e5 100644
--- a/interface/web/admin/lib/lang/cz_language_add.lng
+++ b/interface/web/admin/lib/lang/cz_language_add.lng
@@ -6,3 +6,5 @@ $wb['language_new_hint_txt'] = '2 znakové ISO 639-1 jazykové kódy (Viz: http:
 $wb['btn_save_txt'] = 'Vytvořit novou jazykovou sadu souborů';
 $wb['btn_cancel_txt'] = 'Zpět';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_complete.lng b/interface/web/admin/lib/lang/cz_language_complete.lng
index 2967693ae826c21b61e1e2f9f2b9de4630149028..eb222b3bd031ce42e91fbe2089a0b462587e4f52 100644
--- a/interface/web/admin/lib/lang/cz_language_complete.lng
+++ b/interface/web/admin/lib/lang/cz_language_complete.lng
@@ -1,7 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Sloučit jazykový soubor';
-$wb['list_desc_txt'] = 'Sloučit vybraný jazykový soubor s hlavním anglickým jazykovým souborem. <br />Toto přidá chybějící řetězce z anglického hlavního souboru do vybraného jazykového souboru. Odebere také zrušené řetezce. <br /> V nových verzích ISPConfigu vznikají nové moduly a položky, které chybějí ve starších jazykových souborech a takto je doplníte k překladu.';
+$wb['list_desc_txt'] = 'Sloučit vybraný jazykový soubor s hlavním anglickým jazykovým souborem. <br />Toto přidá chybějící řetězce z anglického hlavního souboru do vybraného jazykového souboru. <br /> V nových verzích ISPConfigu vznikají nové moduly a položky, které chybějí ve starších jazykových souborech a takto je doplníte k překladu.';
 $wb['language_select_txt'] = 'Vybrat jazyk k doplnění';
 $wb['btn_save_txt'] = 'Sloučit / doplnit jazykový soubor';
 $wb['btn_cancel_txt'] = 'Zpět';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_edit.lng b/interface/web/admin/lib/lang/cz_language_edit.lng
index 2a71ed0a771290f10827769859574f0c5450aaad..f880e6dbe71644cf41d9e852302867cbbd9e7084 100644
--- a/interface/web/admin/lib/lang/cz_language_edit.lng
+++ b/interface/web/admin/lib/lang/cz_language_edit.lng
@@ -6,3 +6,5 @@ $wb['lang_file_txt'] = 'Jazykový soubor';
 $wb['btn_save_txt'] = 'Uložit';
 $wb['btn_cancel_txt'] = 'Zpět';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_export.lng b/interface/web/admin/lib/lang/cz_language_export.lng
index 7998eea0178696692a810f5e899713bd750358e6..7ffdccf5229e62c2ac1ea2487fdee62b07433b4f 100644
--- a/interface/web/admin/lib/lang/cz_language_export.lng
+++ b/interface/web/admin/lib/lang/cz_language_export.lng
@@ -4,3 +4,5 @@ $wb['language_select_txt'] = 'Vybrat jazykovou sadu';
 $wb['btn_save_txt'] = 'Uložit vybranou jazykovou sadu do souboru';
 $wb['btn_cancel_txt'] = 'Zpět';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_import.lng b/interface/web/admin/lib/lang/cz_language_import.lng
index 838c325f7f5e01a41af5a411529531f5be20db80..17dfa89aafad1c7318c66f0f2431106cfb9679c1 100644
--- a/interface/web/admin/lib/lang/cz_language_import.lng
+++ b/interface/web/admin/lib/lang/cz_language_import.lng
@@ -6,3 +6,5 @@ $wb['language_overwrite_txt'] = 'Přepsat soubor, pokud existuje.';
 $wb['btn_cancel_txt'] = 'Zpět';
 $wb['ignore_version_txt'] = 'Přeskočit kontrolu verze ISPConfigu.';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_list.lng b/interface/web/admin/lib/lang/cz_language_list.lng
index b2a78637155d78161423ec338a12165f86010f68..77810e0a759bcf331ae60e9dfda4073057dd5ace 100644
--- a/interface/web/admin/lib/lang/cz_language_list.lng
+++ b/interface/web/admin/lib/lang/cz_language_list.lng
@@ -5,3 +5,5 @@ $wb['module_txt'] = 'Modul';
 $wb['lang_file_txt'] = 'Jazykový soubor';
 $wb['lang_file_date_txt'] = 'Poslední úprava';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng
index 0d5162eabd8606e98285615f0adb1458826250dd..6f77e49079d71c3b8ad971912aa5868af0523401 100644
--- a/interface/web/admin/lib/lang/cz_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_package_install.lng
@@ -1,7 +1,9 @@
 <?php
-$wb['repo_name_txt'] = 'Skladiště';
+$wb['repo_name_txt'] = 'Repository';
 $wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Uživatel (volitelné)';
-$wb['repo_password_txt'] = 'Heslo (volitelné)';
+$wb['repo_username_txt'] = 'User (optional)';
+$wb['repo_password_txt'] = 'Password (optional)';
 $wb['active_txt'] = 'Aktivní';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng
index 68da1c065db30c362e27992e58b5a53b755d6150..561db1e89c10f41d107fbe24ad19008fa661ecc9 100644
--- a/interface/web/admin/lib/lang/cz_remote_action.lng
+++ b/interface/web/admin/lib/lang/cz_remote_action.lng
@@ -2,11 +2,13 @@
 $wb['select_server_txt'] = 'Zvolit server';
 $wb['btn_do_txt'] = 'Provést akci';
 $wb['do_osupdate_caption'] = 'Aktualizace operačního systému na vzdáleném serveru.';
-$wb['do_osupdate_desc'] = 'Tato akce provede \"aptitude -y\" aktualizaci na vybraném serveru.<br><br><strong>POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !</strong>';
+$wb['do_osupdate_desc'] = 'Tato akce provede \\"aptitude -y\\" aktualizaci na vybraném serveru.<br><br><strong>POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !</strong>';
 $wb['do_ispcupdate_caption'] = 'Provedení ISPConfig 3 - aktualizace na vzdáleném serveru';
-$wb['do_ispcupdate_desc'] = 'Tato akce provede \"ISPConfig 3\" aktualizaci na vašem vybraném serveru.<br><br><strong>POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !</strong>';
+$wb['do_ispcupdate_desc'] = 'Tato akce provede \\"ISPConfig 3\\" aktualizaci na vašem vybraném serveru.<br><br><strong>POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !</strong>';
 $wb['action_scheduled'] = 'Akce je naplánována na provedení';
 $wb['select_all_server'] = 'Všechny servery';
 $wb['ispconfig_update_title'] = 'ISPConfig pokyny k aktualizaci';
 $wb['ispconfig_update_text'] = 'Přihlaste se jako uživatel root na terminal (shell) serveru a proveďte příkaz<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />spustí se ISPConfig aktualizace.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Klikněte zde pro podrobnější informace o provedení aktualizace</a>';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng
index b62526dc83041b27f5ea1c90ad22cb5221b94001..4bb34c4d4aefe29a326dc044bb480299842c0ff4 100644
--- a/interface/web/admin/lib/lang/cz_remote_user.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user.lng
@@ -39,9 +39,11 @@ $wb['DNS ptr functions'] = 'Funkce DNS PTR';
 $wb['DNS rp functions'] = 'Funkce DNS RP';
 $wb['DNS srv functions'] = 'Funkce DNS SRV';
 $wb['DNS txt functions'] = 'Funkce DNS TXT';
-$wb['Mail mailing list functions'] = 'Funkce e-mailové konference (mailinglist)';
+$wb['Mail mailing list functions'] = 'Mail mailinglist functions';
 $wb['generate_password_txt'] = 'Generovat heslo';
 $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_user_list.lng b/interface/web/admin/lib/lang/cz_remote_user_list.lng
index 66b64946e457be5ad87b6b267f31d4c972389e79..1b40308735bbc3df08d0b6dd7488ae11d4196e67 100644
--- a/interface/web/admin/lib/lang/cz_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng
@@ -5,3 +5,5 @@ $wb['add_new_record_txt'] = 'Přidat uživatele';
 $wb['parent_remote_userid_txt'] = 'ID';
 $wb['username_txt'] = 'Uživatel';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server.lng b/interface/web/admin/lib/lang/cz_server.lng
index 337e9ca2e1d3fb483e0774e117c7cad6165e4982..9d44fd27c840ef95abe4fea148e6c93572f5799d 100644
--- a/interface/web/admin/lib/lang/cz_server.lng
+++ b/interface/web/admin/lib/lang/cz_server.lng
@@ -1,15 +1,17 @@
 <?php
 $wb['config_txt'] = 'Konfigurace';
 $wb['server_name_txt'] = 'Název serveru';
-$wb['mail_server_txt'] = 'Poštovní server';
-$wb['web_server_txt'] = 'Webový server';
+$wb['mail_server_txt'] = 'Mail server';
+$wb['web_server_txt'] = 'Web server';
 $wb['dns_server_txt'] = 'DNS server';
 $wb['file_server_txt'] = 'Souborový server';
-$wb['db_server_txt'] = 'Databázový server';
-$wb['vserver_server_txt'] = 'Virtualizační server (Vserver)';
+$wb['db_server_txt'] = 'DB server';
+$wb['vserver_server_txt'] = 'VServer server';
 $wb['active_txt'] = 'Aktivní';
 $wb['mirror_server_id_txt'] = 'Je zrcadlem serveru';
 $wb['- None -'] = '- Žádný -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index 77e3e46e5c804c31df78dd6a6aa7e3cf41159676..3696fedb8f0aaf29dcca53d614b47add02010d82 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'] = '<b>Getmail</b> cesta k adresáři kde jsou umístěny konfigurace';
+$wb['getmail_config_dir_txt'] = 'Getmail config adresář';
 $wb['fastcgi_starter_path_txt'] = 'FastCGI starter cesta';
 $wb['fastcgi_starter_script_txt'] = 'FastCGI starter skript';
 $wb['fastcgi_alias_txt'] = 'FastCGI alias';
-$wb['fastcgi_phpini_path_txt'] = 'FastCGI cesta k adresáři kde je umístěn php.ini';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini cesta';
 $wb['fastcgi_children_txt'] = 'FastCGI děti';
 $wb['fastcgi_max_requests_txt'] = 'FastCGI max. požadavků';
-$wb['fastcgi_bin_txt'] = 'FastCGI cesta k binarnímu balíčku';
+$wb['fastcgi_bin_txt'] = 'FastCGI bin';
 $wb['module_txt'] = 'Modul';
 $wb['maildir_path_txt'] = 'Cesta k mail adresáři';
 $wb['homedir_path_txt'] = 'Cesta k domácímu adresáři';
@@ -32,15 +32,15 @@ $wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
 $wb['ip_address_txt'] = 'IP adresa';
 $wb['netmask_txt'] = 'Maska';
 $wb['gateway_txt'] = 'Brána';
-$wb['hostname_txt'] = 'Název hostitele (hostname)';
-$wb['nameservers_txt'] = 'Jmenné servery (DNS)';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameservers_txt'] = 'Jmenné servery';
 $wb['auto_network_configuration_txt'] = 'Konfigurace sítě';
 $wb['ip_address_error_wrong'] = 'Neplatný formát IP adresy.';
 $wb['netmask_error_wrong'] = 'Neplatný formát síťové masky.';
 $wb['gateway_error_wrong'] = 'Neplatný formát brány.';
-$wb['hostname_error_empty'] = 'Název hostitele (hostname) je prázdný.';
+$wb['hostname_error_empty'] = 'Hostname je prázdný.';
 $wb['nameservers_error_empty'] = 'Jmenný server je prázdný.';
-$wb['config_dir_txt'] = '<b>Vlogger</b> cesta k adresáři kde je umístěna konfigurace';
+$wb['config_dir_txt'] = 'Vlogger config adresář';
 $wb['init_script_txt'] = 'Název cron init skriptu';
 $wb['crontab_dir_txt'] = 'Cesta k individuálním cron tabulkám';
 $wb['wget_txt'] = 'Cesta k wget programu';
@@ -71,23 +71,23 @@ $wb['awstats_data_dir_txt'] = 'awstats data folder';
 $wb['awstats_pl_txt'] = 'awstats.pl script';
 $wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
 $wb['backup_dir_txt'] = 'Adresář pro zálohy';
-$wb['named_conf_local_path_txt'] = 'Cesta k BIND named.conf.local';
-$wb['php_ini_path_cgi_txt'] = 'Cesta k CGI php.ini';
-$wb['php_ini_path_apache_txt'] = 'Cesta k Apache php.ini';
-$wb['check_apache_config_txt'] = 'Provést test konfigurace apache před restartováním';
-$wb['CA_path_txt'] = 'CA cesta';
-$wb['CA_pass_txt'] = 'CA heslo';
-$wb['ufw_enable_txt'] = 'Aktivovat';
-$wb['ufw_manage_builtins_txt'] = 'Správa vestavěných pravidel';
-$wb['ufw_ipv6_txt'] = 'Aktivovat IPv6';
-$wb['ufw_default_input_policy_txt'] = 'Standardní vstupní politika';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
 $wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
 $wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
 $wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
-$wb['ufw_log_level_txt'] = 'Úroveň logování';
+$wb['ufw_log_level_txt'] = 'Log Level';
 $wb['network_config_warning_txt'] = 'Možnost konfigurace sítě je k dispozici pouze pro Debian a Ubuntu servery. Nepoužívejte tuto volbu, pokud vaše síťové rozhraní není eth0.';
 $wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
-$wb['server_type_txt'] = 'Typ serveru';
+$wb['server_type_txt'] = 'Server Type';
 $wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
 $wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
 $wb['nginx_user_txt'] = 'Nginx user';
@@ -143,11 +143,11 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
 $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
 $wb['try_rescue_txt'] = 'Povolit monitorování služeb a restartovat při selhání';
-$wb['do_not_try_rescue_mysql_txt'] = 'Zakázat MySQL monitorování';
-$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail monitorování';
-$wb['rescue_description_txt'] = '<b>Informace:</b> Pokud chcete např. vypnout MySQL zatrhněte políčko \\"Zakázat MySQL monitorování\\" změna se provede do 2-3 minut.<br>Pokud nepočkáte 2-3 minuty, monitorování restartuje mysql!!';
-$wb['enable_sni_txt'] = 'Aktivovat SNI';
-$wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD monitorování';
+$wb['do_not_try_rescue_mysql_txt'] = 'Zakázat MySQL sledování';
+$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail sledování';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD sledování';
 $wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
 $wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
 $wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
@@ -159,18 +159,20 @@ $wb['backup_mode_userzip'] = 'Zálohování všech souborů v adresáři web jak
 $wb['backup_mode_rootgz'] = 'Zálohování všech souborů v adresáři web jako uživatel root';
 $wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
 $wb['realtime_blackhole_list_note_txt'] = '(Samostatná RBL se odděluje čárkou)';
-$wb['ssl_settings_txt'] = 'SSL Nastavení';
-$wb['permissions_txt'] = 'Nastavit oprávnění';
-$wb['php_settings_txt'] = 'PHP Nastavení';
-$wb['apps_vhost_settings_txt'] = 'Apps Vhost Nastavení';
-$wb['awstats_settings_txt'] = 'AWStats Nastavení';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
 $wb['firewall_txt'] = 'Firewall';
 $wb['mailbox_quota_stats_txt'] = 'Statistika kvóty poštovní schránky';
-$wb['enable_ip_wildcard_txt'] = 'Aktivovat IP wildcard (*)';
+$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
-$wb['overtraffic_notify_admin_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení adminovi';
-$wb['overtraffic_notify_client_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení klientovi';
+$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
+$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
 $wb['v6_prefix_txt'] = 'IPv6 Prefix';
 $wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
 $wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_config_list.lng b/interface/web/admin/lib/lang/cz_server_config_list.lng
index 2118c35357cc0b40228eb0153adfda86f36cfdae..8589dbc9d16f2eda14e03769bc6a2ffbc8a42371 100644
--- a/interface/web/admin/lib/lang/cz_server_config_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_config_list.lng
@@ -2,3 +2,5 @@
 $wb['list_head_txt'] = 'Konfigurace serveru';
 $wb['server_name_txt'] = 'Server';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_ip.lng b/interface/web/admin/lib/lang/cz_server_ip.lng
index fa719665bbba66b26ddb5de8576baab859187adb..634898abfcdceffe572aa5caf4340289ba919a17 100644
--- a/interface/web/admin/lib/lang/cz_server_ip.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip.lng
@@ -9,3 +9,5 @@ $wb['ip_type_txt'] = 'Verze';
 $wb['virtualhost_port_txt'] = 'HTTP Ports';
 $wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_ip_list.lng b/interface/web/admin/lib/lang/cz_server_ip_list.lng
index a5b3bf86686286a3fbca8bce687825a9347d26c5..2a47ca75917b4dde544382f9d99a027407c735b9 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng
@@ -6,5 +6,7 @@ $wb['add_new_record_txt'] = 'Přidat IP adresu';
 $wb['client_id_txt'] = 'Klient';
 $wb['virtualhost_txt'] = 'HTTP Vhost';
 $wb['virtualhost_port_txt'] = 'HTTP Ports';
-$wb['ip_type_txt'] = 'Type';
+$wb['ip_type_txt'] = 'Verze';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_list.lng b/interface/web/admin/lib/lang/cz_server_list.lng
index ecddbf28e8433d15def51368252ca6d74e976e50..e7a2efd805ccf0ac030968b53abd6251b3a7faac 100644
--- a/interface/web/admin/lib/lang/cz_server_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_list.lng
@@ -11,3 +11,5 @@ $wb['add_new_record_txt'] = 'Přidat server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
index 2393f31f0f34c8969757943fded3a9052e8a60ca..59cf3c7365046db053b32658451a67f21b2947a1 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -1,16 +1,18 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['client_id_txt'] = 'Klient';
-$wb['name_txt'] = 'Název PHP verze';
-$wb['Name'] = 'Název';
+$wb['name_txt'] = 'Verze PHP';
+$wb['Name'] = 'Jméno';
 $wb['FastCGI Settings'] = 'FastCGI nastavení';
 $wb['PHP-FPM Settings'] = 'PHP-FPM nastavení';
-$wb['Additional PHP Versions'] = 'Additional PHP Versions';
-$wb['Form to edit additional PHP versions'] = 'Form to edit additional PHP versions';
+$wb['Additional PHP Versions'] = 'Další verze PHP';
+$wb['Form to edit additional PHP versions'] = 'Formulář pro úpravu dalších PHP verzí';
 $wb['server_php_name_error_empty'] = 'Název pole nesmí být prázdné.';
-$wb['php_fastcgi_binary_txt'] = 'Cesta k binarnímu balíčku PHP FastCGI';
-$wb['php_fastcgi_ini_dir_txt'] = 'Cesta k adresáři ve kterém je  umístěn php.ini';
-$wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init skriptu';
-$wb['php_fpm_ini_dir_txt'] = 'Cesta k adresáři ve kterém je  umístěn php.ini';
-$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM společnému (pool) adresáři';
+$wb['php_fastcgi_binary_txt'] = 'Cesta k PHP FastCGI binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Cesta k php.ini adresáři';
+$wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
+$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
+$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_php_list.lng b/interface/web/admin/lib/lang/cz_server_php_list.lng
index cc3ae1f22634e0df30dbfc36b93b1dda63542de8..e0b43a4a996b6ebb49c9d231793446ebfcd73abc 100644
--- a/interface/web/admin/lib/lang/cz_server_php_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_php_list.lng
@@ -1,7 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Další PHP verze';
+$wb['list_head_txt'] = 'Další verze PHP';
 $wb['server_id_txt'] = 'Server';
 $wb['add_new_record_txt'] = 'Přidat novou verzi PHP';
 $wb['client_id_txt'] = 'Klient';
-$wb['name_txt'] = 'Název PHP verze';
+$wb['name_txt'] = 'Verze PHP';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..1a9becc5f2465abd9912e903407ae8ce98a27fdf 100644
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_install.lng
@@ -2,5 +2,7 @@
 $wb['head_txt'] = 'Install software package';
 $wb['install_key_txt'] = 'Enter install key';
 $wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['btn_cancel_txt'] = 'Zrušit';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng
index 3936cdb497177e292d6adf8ff28c9631be85e30d..80f729c9d50ddac0b850e5a7e5ba56b8c2651b29 100644
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_list.lng
@@ -8,3 +8,5 @@ $wb['toolsarea_head_txt'] = 'Packages';
 $wb['repoupdate_txt'] = 'Update package list';
 $wb['package_id_txt'] = 'local App-ID';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng
index 64a190d9a1dddf174078dcdfcecb2f3f9c1cd34c..f48a2c4a363aff9694042db16e2ee7b71de90fc1 100644
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo.lng
@@ -5,3 +5,5 @@ $wb['repo_username_txt'] = 'Uživatel (volitelné)';
 $wb['repo_password_txt'] = 'Heslo (volitelné)';
 $wb['active_txt'] = 'Aktivní';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng
index 5c82d4c41f718370b4587752fa636a692fcb7e9f..4ae3c662d86ab872011ea7f14dfd83e77d9468fe 100644
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng
@@ -4,3 +4,5 @@ $wb['active_txt'] = 'Aktivní';
 $wb['repo_name_txt'] = 'Repozitář';
 $wb['repo_url_txt'] = 'URL';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng
index 32671d3823adddea936aa40e64e1de4205536fb6..c1aa17fcdef8880c4521d7f802dd8c12b71283b8 100644
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_update_list.lng
@@ -6,3 +6,5 @@ $wb['update_title_txt'] = 'Aktualizovat';
 $wb['version_txt'] = 'Verze';
 $wb['action_txt'] = 'Akce';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 83dc8694fdee3cabe64e72de9e4ebd99bcb09e59..2b0a31739910c34210a9de8619f9cf673ca2ebdc 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -35,15 +35,17 @@ $wb['smtp_port_txt'] = 'SMTP port';
 $wb['smtp_user_txt'] = 'SMTP uživatel';
 $wb['smtp_pass_txt'] = 'SMTP heslo';
 $wb['smtp_crypt_txt'] = 'Použít SSL/TLS šifrované spojení pro SMTP';
-$wb['smtp_missing_admin_mail_txt'] = 'Zadejte prosím jméno správce a admin e-mailovou adresu, pokud chcete používat poštu SMTP pro odesílání.';
-$wb['tab_change_discard_txt'] = 'Zahodit změny na záložce změny';
+$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
 $wb['tab_change_warning_txt'] = 'Záložka změna varování';
-$wb['tab_change_warning_note_txt'] = 'Zobrazit varování na kartě změny ve formách úprav případné data byla změněna uživatelem.';
-$wb['vhost_subdomains_txt'] = 'Vytvořit subdomény jako webové stránky';
+$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
+$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
 $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
-$wb['phpmyadmin_url_error_regex'] = 'Neplatná phpmyadmin URL';
+$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL';
 $wb['use_combobox_txt'] = 'Use jQuery UI Combobox';
 $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
index 592d5c081a4c83fa74ee48946aa6eb264fa0a6c1..edf66963d4555510e745627e697caedfc887a274 100644
--- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
@@ -1,18 +1,20 @@
 <?php
-$wb['tpl_default_admin_head_txt'] = 'Global Default-Theme Settings';
+$wb['tpl_default_admin_head_txt'] = 'Globální nastavení výchozího grafického téma';
 $wb['tpl_default_admin_desc_txt'] = '';
 $wb['server_id_txt'] = 'Server';
 $wb['client_id_txt'] = 'Klient';
-$wb['name_txt'] = 'Název PHP verze';
-$wb['Name'] = 'Název';
+$wb['name_txt'] = 'Verze PHP';
+$wb['Name'] = 'Jméno';
 $wb['FastCGI Settings'] = 'FastCGI nastavení';
 $wb['PHP-FPM Settings'] = 'PHP-FPM nastavení';
 $wb['Additional PHP Versions'] = 'Další PHP verze';
-$wb['Form to edit additional PHP versions'] = 'Formulář pro úpravu další PHP verzí';
+$wb['Form to edit additional PHP versions'] = 'Formulář pro úpravu dalších PHP verzí';
 $wb['server_php_name_error_empty'] = 'Název pole nesmí být prázdné.';
-$wb['php_fastcgi_binary_txt'] = 'Cesta k binarnímu balíčku PHP FastCGI';
-$wb['php_fastcgi_ini_dir_txt'] = 'Cesta k adresáři ve kterém je  umístěn php.ini';
-$wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init skriptu';
-$wb['php_fpm_ini_dir_txt'] = 'Cesta k adresáři ve kterém je  umístěn php.ini';
-$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM společnému (pool) adresáři';
+$wb['php_fastcgi_binary_txt'] = 'Cesta k PHP FastCGI binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Cesta k php.ini adresáři';
+$wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
+$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
+$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng
index b1ff4b1e12f1e13246cabb60c7f20aec170975fb..28bf9c9b2e396e60d7122d6159db038cd12d9779 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -7,7 +7,7 @@ $wb['passwort_txt'] = 'Heslo';
 $wb['password_strength_txt'] = 'Bezpečnost hesla';
 $wb['modules_txt'] = 'Modul';
 $wb['startmodule_txt'] = 'Výchozí modul';
-$wb['app_theme_txt'] = 'Výchozí grafické téma';
+$wb['app_theme_txt'] = 'Design';
 $wb['typ_txt'] = 'Typ';
 $wb['active_txt'] = 'Aktivní';
 $wb['language_txt'] = 'Jazyk';
@@ -29,5 +29,7 @@ $wb['generate_password_txt'] = 'Generovat heslo';
 $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'Uživatelské jméno nesmí být web nebo web a číslo.\"';
 ?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng
index e5a7d1e4de20f603d4393e733c92a6ff8b060c2b..4e7e34c278476d0aab66310ec2029acf00fca76b 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -1,9 +1,11 @@
 <?php
 $wb['list_head_txt'] = 'Uživatelé';
 $wb['username_txt'] = 'Uživatelské jméno';
-$wb['client_id_txt'] = 'Klient ID';
+$wb['client_id_txt'] = 'Client ID';
 $wb['active_txt'] = 'Aktivní';
 $wb['add_new_record_txt'] = 'Přidat uživatele';
 $wb['warning_txt'] = '<b>VAROVÁNÍ:</b> Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelů nebo skupin zde může způsobit ztrátu dat!';
 $wb['groups_txt'] = 'Skupiny';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng
index d9abdff460c4277fcfecd72d384fd5cc70b65933..9c1d91cc2010a9df662ca6da90746e2f23d4c8e0 100644
--- a/interface/web/client/lib/lang/cz.lng
+++ b/interface/web/client/lib/lang/cz.lng
@@ -1,4 +1,5 @@
 <?php
+$wb['Client'] = 'Klient';
 $wb['Address'] = 'Adresa';
 $wb['Limits'] = 'Limity';
 $wb['Add Client'] = 'Přidat klienta';
@@ -7,19 +8,20 @@ $wb['Clients'] = 'Klienti';
 $wb['Edit Client-Templates'] = 'Upravit klientské šablony';
 $wb['Add Reseller'] = 'Přidat distributora';
 $wb['Edit Reseller'] = 'Upravit distributora';
-$wb['Resellers'] = 'Distributoři';
+$wb['Resellers'] = 'Distributoři (prodejci)';
 $wb['error_has_clients'] = 'Distributor má klienty. Nejdříve smažte tyto klienty.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['Messaging'] = 'Messaging';
-$wb['Send email'] = 'Send Email';
-$wb['Edit Client Circle'] = 'Edit Client Circle';
-$wb['Domains'] = 'Domains';
+$wb['add_additional_template_txt'] = 'Přidat dodatečnou šablonu';
+$wb['delete_additional_template_txt'] = 'Smazat dodatečnou šablonu';
+$wb['Messaging'] = 'Odesílání zpráv';
+$wb['Send email'] = 'Odeslat e-mail';
+$wb['Edit Client Circle'] = 'Upravit skupinu klientů';
+$wb['Domains'] = 'Domény';
 $wb['domain_txt'] = 'Doména';
 $wb['client_txt'] = 'Klient';
-$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';
-$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain';
-$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain';
-$wb['error_client_group_id_empty'] = 'You have to select a customer<br>';
-$wb['Client'] = 'Client';
+$wb['error_domain_in mailuse'] = 'Tato doména nelze odstranit, protože je v používána jako poštovní doména';
+$wb['error_domain_in webuse'] = 'Tato doména nelze odstranit, protože je v používána jako webová doména';
+$wb['error_client_can_not_add_domain'] = 'Nemůžete přidat novou doménu';
+$wb['error_client_group_id_empty'] = 'Musíte vybrat zákazníka<br>';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index eb5e20d45b3c7f88c6618e0b4748a6ae257d26e2..12da7e8da9e36a4ab3cabe46e3f2d5af51215e08 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -8,11 +8,11 @@ $wb['limit_mailcatchall_txt'] = 'Max. počet emailových košů';
 $wb['limit_mailrouting_txt'] = 'Max. počet emailových směrování';
 $wb['limit_mailfilter_txt'] = 'Max. počet emailových filtrů';
 $wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání emailů';
-$wb['limit_mailquota_txt'] = 'Kvóty poštovních schránek';
+$wb['limit_mailquota_txt'] = 'Mailbox kvóta';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů';
 $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
 $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
-$wb['default_mailserver_txt'] = 'Výchozí e-mailserver';
+$wb['default_mailserver_txt'] = 'Výchozí mailserver';
 $wb['company_name_txt'] = 'Název společnosti';
 $wb['contact_name_txt'] = 'Název kontaktu';
 $wb['username_txt'] = 'Uživatelské jméno';
@@ -28,7 +28,7 @@ $wb['country_txt'] = 'Země';
 $wb['telephone_txt'] = 'Telefon';
 $wb['mobile_txt'] = 'Mobilní telefon';
 $wb['fax_txt'] = 'Fax';
-$wb['email_txt'] = 'Kontaktní e-mail na klienta';
+$wb['email_txt'] = 'Kontaktní email na klienta';
 $wb['internet_txt'] = 'WWW stránky klienta';
 $wb['icq_txt'] = 'ICQ';
 $wb['notes_txt'] = 'Poznámky';
@@ -54,7 +54,7 @@ $wb['limit_web_subdomain_txt'] = 'Max. počet webových subdomén';
 $wb['limit_ftp_user_txt'] = 'Max. počet FTP uživatelů';
 $wb['default_dnsserver_txt'] = 'Výchozí DNS server';
 $wb['limit_dns_zone_txt'] = 'Max. počet DNS zón';
-$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
+$wb['limit_dns_slave_zone_txt'] = 'Max. počet sekundárních zón DNS';
 $wb['limit_dns_record_txt'] = 'Max. počet DNS záznamů';
 $wb['limit_shell_user_txt'] = 'Max. počet shell uživatelů';
 $wb['limit_client_txt'] = 'Max. počet klientů';
@@ -88,18 +88,18 @@ $wb['username_error_regex'] = 'Uživatelské jméno obsahuje neplatné znaky.';
 $wb['template_master_txt'] = 'Hlavní šablona';
 $wb['template_additional_txt'] = 'Addon šablona';
 $wb['ssh_chroot_txt'] = 'SSH chroot volby';
-$wb['web_php_options_txt'] = 'PHP  - dostupné volby pro klienta';
-$wb['limit_client_error'] = 'Max. počet klientů dosažen.';
-$wb['limit_web_quota_txt'] = 'Webová kvóta';
+$wb['web_php_options_txt'] = 'PHP volby';
+$wb['limit_client_error'] = 'Max. počet kleintů dosažen.';
+$wb['limit_web_quota_txt'] = 'Web kvóta';
 $wb['limit_traffic_quota_txt'] = 'Přenosová kvóta';
 $wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.';
-$wb['limit_webdav_user_txt'] = 'Max. počet WebDAV uživatelů';
-$wb['limit_webdav_user_error_notint'] = 'Limit pro WebDAV uživatele musí být číslo.';
+$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
+$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
 $wb['customer_no_txt'] = 'Zákaznické číslo';
 $wb['vat_id_txt'] = 'DIČ';
 $wb['required_fields_txt'] = '* Povinná pole';
 $wb['company_id_txt'] = 'IČO';
-$wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailovových konferencí (mailinglist)';
+$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
 $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
 $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
 $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
@@ -107,37 +107,39 @@ $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number
 $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
 $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
 $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
-$wb['add_additional_template_txt'] = 'Přidat další šablonu';
-$wb['delete_additional_template_txt'] = 'Odstranit další šablonu';
-$wb['limit_cgi_txt'] = 'CGI - dostupná volba pro klienta';
-$wb['limit_ssi_txt'] = 'SSI - dostupná volba pro klienta';
-$wb['limit_perl_txt'] = 'Perl - dostupná volba pro klienta';
-$wb['limit_ruby_txt'] = 'Ruby - dostupná volba pro klienta';
-$wb['limit_python_txt'] = 'Python - dostupná volba pro klienta';
-$wb['force_suexec_txt'] = 'SuEXEC - vynucená volba u klienta';
+$wb['add_additional_template_txt'] = 'Přidat dodatečnou šablonu';
+$wb['delete_additional_template_txt'] = 'Smazat dodatečnou šablonu';
+$wb['limit_cgi_txt'] = 'CGI available';
+$wb['limit_ssi_txt'] = 'SSI available';
+$wb['limit_perl_txt'] = 'Perl available';
+$wb['limit_ruby_txt'] = 'Ruby available';
+$wb['limit_python_txt'] = 'Python available';
+$wb['force_suexec_txt'] = 'SuEXEC forced';
 $wb['limit_hterror_txt'] = 'Custom error docs available';
 $wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL - dostupná volba pro klienta';
-$wb['bank_account_number_txt'] = 'Číslo bankovního účtu';
+$wb['limit_ssl_txt'] = 'SSL available';
+$wb['bank_account_number_txt'] = 'Číslo účtu';
 $wb['bank_code_txt'] = 'Kód banky';
 $wb['bank_name_txt'] = 'Název banky';
 $wb['bank_account_iban_txt'] = 'IBAN';
 $wb['bank_account_swift_txt'] = 'BIC / Swift';
-$wb['web_limits_txt'] = 'Web nastavení limitů';
-$wb['email_limits_txt'] = 'E-mail nastavení limitů ';
-$wb['database_limits_txt'] = 'Databáze nastavení limitů';
-$wb['cron_job_limits_txt'] = 'Cron úlohy nastavení limitů';
-$wb['dns_limits_txt'] = 'DNS nastavení limitů';
-$wb['virtualization_limits_txt'] = 'Virtualizace nastavení limitů';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'Email Limits';
+$wb['database_limits_txt'] = 'Database Limits';
+$wb['cron_job_limits_txt'] = 'Cron Job Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualization Limits';
 $wb['generate_password_txt'] = 'Generovat heslo';
 $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 $wb['active_template_additional_txt'] = 'Active Addons';
 $wb['bank_account_owner_txt'] = 'Bankovní účet vlastníka';
-$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
-$wb['customer_no_error_unique'] = 'Číslo zákazníka musí být unikátní (nebo prázdné).';
-$wb['paypal_email_error_isemail'] = 'Zadejte prosím platnou PayPal e-mailovou adresu.';
-$wb['paypal_email_txt'] = 'PayPal E-mail';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
+$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
+$wb['paypal_email_txt'] = 'PayPal Email';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng
index 107b2a559bde6cbb1c2dd8b91f5d3c9c0813705d..cb4b143b114e60231c13db1cf3d87a356df4f1fc 100644
--- a/interface/web/client/lib/lang/cz_client_circle.lng
+++ b/interface/web/client/lib/lang/cz_client_circle.lng
@@ -1,9 +1,11 @@
 <?php
-$wb['Client Circle'] = 'Klient Circle';
-$wb['Circle'] = 'Circle';
-$wb['circle_txt'] = 'Circle';
-$wb['circle_name_txt'] = 'Circle Name';
-$wb['client_ids_txt'] = 'Clients/Resellers';
-$wb['description_txt'] = 'Description';
+$wb['Client Circle'] = 'Skupina klientů';
+$wb['Circle'] = 'Skupina';
+$wb['circle_txt'] = 'Skupina';
+$wb['circle_name_txt'] = 'Název skupiny';
+$wb['client_ids_txt'] = 'Klienti/Distributoři';
+$wb['description_txt'] = 'Popis';
 $wb['active_txt'] = 'Aktivní';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_circle_list.lng b/interface/web/client/lib/lang/cz_client_circle_list.lng
index 2e81e501eac9bddaa20b7743b1a4ff42e424d82c..24025510de0da4c0ceaab32d786f5f6cd745d297 100644
--- a/interface/web/client/lib/lang/cz_client_circle_list.lng
+++ b/interface/web/client/lib/lang/cz_client_circle_list.lng
@@ -1,10 +1,12 @@
 <?php
-$wb['list_head_txt'] = 'Client Circles';
-$wb['circle_id_txt'] = 'Circle ID';
-$wb['circle_name_txt'] = 'Circle Name';
-$wb['description_txt'] = 'Description';
-$wb['add_new_record_txt'] = 'Add new circle';
-$wb['filter_txt'] = 'Filter';
-$wb['delete_txt'] = 'Delete';
+$wb['list_head_txt'] = 'Skupiny klientů';
+$wb['circle_id_txt'] = 'ID skupiny';
+$wb['circle_name_txt'] = 'Název skupiny';
+$wb['description_txt'] = 'Popis';
+$wb['add_new_record_txt'] = 'Přidat novou skupinu';
+$wb['filter_txt'] = 'Filtr';
+$wb['delete_txt'] = 'Smazat';
 $wb['active_txt'] = 'Aktivní';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng
index 4515806be5d944c55947a9b0d91ea307f32cbf8b..a759ab6a94569eb0c497af259e4aec514c85e54c 100644
--- a/interface/web/client/lib/lang/cz_client_del.lng
+++ b/interface/web/client/lib/lang/cz_client_del.lng
@@ -4,3 +4,5 @@ $wb['delete_explanation'] = 'Tato akce smaže následující počet záznamů p
 $wb['btn_save_txt'] = 'Smazat klienta';
 $wb['btn_cancel_txt'] = 'Zrušit bez smazání klienta';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_message.lng b/interface/web/client/lib/lang/cz_client_message.lng
index 476baca09e6f15b5abdcb1a458227d0b45cbe06f..f1c3870bca3595faf7e29e788e4eb23b92c6ea5d 100644
--- a/interface/web/client/lib/lang/cz_client_message.lng
+++ b/interface/web/client/lib/lang/cz_client_message.lng
@@ -5,14 +5,16 @@ $wb['sender_txt'] = 'E-mailová adresa odesílatele';
 $wb['subject_txt'] = 'Předmět';
 $wb['message_txt'] = 'Zpráva';
 $wb['form_legend_client_txt'] = 'Poslat e-mailovou zprávu všem klientům.';
-$wb['form_legend_admin_txt'] = 'Poslat e-mailovou zprávu všem klientům a prodejcům.';
-$wb['sender_invalid_error'] = 'Odesílatel e-mailu je neplatný.';
+$wb['form_legend_admin_txt'] = 'Poslat e-mailovou zprávu všem klientům a distributorům (prodejcům).';
+$wb['sender_invalid_error'] = 'E-mail odesílatele je neplatný.';
 $wb['subject_invalid_error'] = 'Předmět je prázdný.';
-$wb['message_invalid_error'] = 'Zpráva je prázdný.';
-$wb['email_sent_to_txt'] = 'E-mail poslat na adresu:';
-$wb['page_head_txt'] = 'Poslat informace zákazníkovi';
-$wb['recipient_txt'] = 'Příjemce';
-$wb['all_clients_resellers_txt'] = 'Všichni klienti a prodejci';
+$wb['message_invalid_error'] = 'Zpráva je prázdná.';
+$wb['email_sent_to_txt'] = 'E-mail byl odeslán:';
+$wb['page_head_txt'] = 'Poslat informace zákazníkovi (klientovi)';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
+$wb['all_clients_resellers_txt'] = 'Všichni klienti a distributoři (prodejci)';
 $wb['all_clients_txt'] = 'Všichni klienti';
-$wb['variables_txt'] = 'Výběr:';
+$wb['variables_txt'] = 'Výběr (možnosti):';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng
index 1877887e9a9ae145c038a3c5ddb0eb8e1afb3ca0..9f5ad6cff00457e5704a48e85ff78d42c7013ecc 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -9,7 +9,7 @@ $wb['limit_mailcatchall_txt'] = 'Max. počet emailových košů';
 $wb['limit_mailrouting_txt'] = 'Max. počet emailových směrování';
 $wb['limit_mailfilter_txt'] = 'Max. počet emailových filtrů';
 $wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání emailů';
-$wb['limit_mailquota_txt'] = 'Kvóty poštovních schránek';
+$wb['limit_mailquota_txt'] = 'Mailbox kvóta';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů';
 $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
 $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
@@ -25,10 +25,10 @@ $wb['limit_web_aliasdomain_txt'] = 'Max. počet webových alias domén';
 $wb['limit_web_subdomain_txt'] = 'Max. počet webových subdomén';
 $wb['limit_ftp_user_txt'] = 'Max. počet FTP uživatelů';
 $wb['limit_dns_zone_txt'] = 'Max. počet DNS zón';
-$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
+$wb['limit_dns_slave_zone_txt'] = 'Max. počet sekundárních zón DNS';
 $wb['limit_dns_record_txt'] = 'Max. počet DNS záznamů';
 $wb['limit_shell_user_txt'] = 'Max. počet shell uživatelů';
-$wb['limit_client_txt'] = 'Max. počet klient';
+$wb['limit_client_txt'] = 'Max. počet klientů';
 $wb['limit_maildomain_error_notint'] = 'Limit pro email doménu musí být číslo.';
 $wb['limit_mailbox_error_notint'] = 'Limit pro mailboxy musí být číslo.';
 $wb['limit_mailalias_error_notint'] = 'Limit pro emailové aliasy musí být číslo.';
@@ -66,22 +66,24 @@ $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
 $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
 $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
 $wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
-$wb['web_php_options_txt'] = 'PHP - dostupné volby pro klienta';
-$wb['template_type_txt'] = 'Typ šablony';
-$wb['template_name_txt'] = 'Název šablony';
-$wb['limit_cgi_txt'] = 'CGI - dostupná volba pro klienta';
-$wb['limit_ssi_txt'] = 'SSI - dostupná volba pro klienta';
-$wb['limit_perl_txt'] = 'Perl - dostupná volba pro klienta';
-$wb['limit_ruby_txt'] = 'Ruby - dostupná volba pro klienta';
-$wb['limit_python_txt'] = 'Python - dostupná volba pro klienta';
-$wb['force_suexec_txt'] = 'SuEXEC - vynucená volba u klienta';
+$wb['web_php_options_txt'] = 'PHP Options';
+$wb['template_type_txt'] = 'Template type';
+$wb['template_name_txt'] = 'Template name';
+$wb['limit_cgi_txt'] = 'CGI available';
+$wb['limit_ssi_txt'] = 'SSI available';
+$wb['limit_perl_txt'] = 'Perl available';
+$wb['limit_ruby_txt'] = 'Ruby available';
+$wb['limit_python_txt'] = 'Python available';
+$wb['force_suexec_txt'] = 'SuEXEC forced';
 $wb['limit_hterror_txt'] = 'Custom error docs available';
 $wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL - dostupná volba pro klienta';
-$wb['web_limits_txt'] = 'Web nastavení limitů';
-$wb['email_limits_txt'] = 'E-mail nastavení limitů';
-$wb['database_limits_txt'] = 'Databáze nastavení limitů';
-$wb['cron_job_limits_txt'] = 'Cron úlohy nastavení limitů';
-$wb['dns_limits_txt'] = 'DNS nastavení limitů';
-$wb['virtualization_limits_txt'] = 'Virtualizace nastavení limitů';
+$wb['limit_ssl_txt'] = 'SSL available';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'Email Limits';
+$wb['database_limits_txt'] = 'Database Limits';
+$wb['cron_job_limits_txt'] = 'Cron Job Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualization Limits';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_template_list.lng b/interface/web/client/lib/lang/cz_client_template_list.lng
index c3faae17c7100b156f28dbea53c5f43fcb3409d2..7d9e9238d4865d4f0b51de4badc40c8621104f39 100644
--- a/interface/web/client/lib/lang/cz_client_template_list.lng
+++ b/interface/web/client/lib/lang/cz_client_template_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Klientské šablony';
 $wb['template_type_txt'] = 'Typ';
 $wb['template_name_txt'] = 'Název šablony';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng
index f2f92b88ebaef284cd57644a7598dc7a9d5df337..aad49997e4bc1032db38afd437ef70005a3e292b 100644
--- a/interface/web/client/lib/lang/cz_clients_list.lng
+++ b/interface/web/client/lib/lang/cz_clients_list.lng
@@ -6,6 +6,8 @@ $wb['contact_name_txt'] = 'Název kontaktu';
 $wb['city_txt'] = 'Město';
 $wb['country_txt'] = 'Stát';
 $wb['add_new_record_txt'] = 'Přidat klienta';
-$wb['username_txt'] = 'Uživatelské jméno';
+$wb['username_txt'] = 'Username';
 $wb['customer_no_txt'] = 'Customer No.';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng
index 4b1845bc268199e8df1655347c4fbfd65ba6de3a..26117aef5ffb3841ebc4bede418151191ecbd7e4 100644
--- a/interface/web/client/lib/lang/cz_domain.lng
+++ b/interface/web/client/lib/lang/cz_domain.lng
@@ -1,6 +1,8 @@
 <?php
-$wb['domain_error_empty'] = 'Doménové jméno je prázdné';
-$wb['domain_error_unique'] = 'Doména již existuje';
-$wb['domain_error_regex'] = 'Toto doménové jméno není dovoleno';
+$wb['domain_error_empty'] = 'The domain-name is empty';
+$wb['domain_error_unique'] = 'The domain already exists';
+$wb['domain_error_regex'] = 'This domain-name is not allowed';
 $wb['Domain'] = 'Doména';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng
index 6cf7376bd41d7f67d34e59bdc981663a893eb6be..924f5de13ba108ddbf48262e77c37fefa7704d7c 100644
--- a/interface/web/client/lib/lang/cz_domain_list.lng
+++ b/interface/web/client/lib/lang/cz_domain_list.lng
@@ -1,6 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Domény';
-$wb['add_new_record_txt'] = 'Přidat novou doménu';
+$wb['list_head_txt'] = 'Domains';
+$wb['add_new_record_txt'] = 'Add new Domain';
 $wb['domain_txt'] = 'Doména';
 $wb['user_txt'] = 'Klient';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index d8703fbbb547666829f985ee9613325036ea0da1..af56780a3fe98b2526c5868e4f7fa64b36b606f7 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -1,13 +1,13 @@
 <?php
-$wb['limit_maildomain_txt'] = 'Max. počet e-mailových domén';
+$wb['limit_maildomain_txt'] = 'Max. počet emailových domén';
 $wb['limit_mailbox_txt'] = 'Max. počet mailboxů';
-$wb['limit_mailalias_txt'] = 'Max. počet e-mailových aliasů';
-$wb['limit_mailforward_txt'] = 'Max. počet e-mailových předávání';
-$wb['limit_mailcatchall_txt'] = 'Max. počet e-mailových košů';
-$wb['limit_mailrouting_txt'] = 'Max. počet e-mailových směrování';
-$wb['limit_mailfilter_txt'] = 'Max. počet e-mailových filtrů';
+$wb['limit_mailalias_txt'] = 'Max. počet emailových aliasů';
+$wb['limit_mailforward_txt'] = 'Max. počet emailových předávání';
+$wb['limit_mailcatchall_txt'] = 'Max. počet emailových košů';
+$wb['limit_mailrouting_txt'] = 'Max. počet emailových směrování';
+$wb['limit_mailfilter_txt'] = 'Max. počet emailových filtrů';
 $wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání emailů';
-$wb['limit_mailquota_txt'] = 'Kvóty poštovních schránek';
+$wb['limit_mailquota_txt'] = 'Mailbox kvóta';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů';
 $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
 $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
@@ -53,10 +53,10 @@ $wb['limit_web_subdomain_txt'] = 'Max. počet webových subdomén';
 $wb['limit_ftp_user_txt'] = 'Max. počet FTP uživatelů';
 $wb['default_dnsserver_txt'] = 'Výchozí DNS server';
 $wb['limit_dns_zone_txt'] = 'Max. počet DNS zón';
-$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
+$wb['limit_dns_slave_zone_txt'] = 'Max. počet sekundárních zón DNS';
 $wb['limit_dns_record_txt'] = 'Max. počet DNS záznamů';
 $wb['limit_shell_user_txt'] = 'Max. počet shell uživatelů';
-$wb['limit_client_txt'] = 'Max. počet klient';
+$wb['limit_client_txt'] = 'Max. počet klientů';
 $wb['username_error_empty'] = 'Uživatelské jméno je prázdné.';
 $wb['username_error_unique'] = 'Uživatelské jméno musí být unikátní.';
 $wb['limit_maildomain_error_notint'] = 'Limit pro email doménu musí být číslo.';
@@ -96,9 +96,9 @@ $wb['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. počet WebDAV uživatelů';
+$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
 $wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailovových konferencí (mailinglist)';
+$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
 $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
 $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
 $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
@@ -107,8 +107,8 @@ $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number
 $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
 $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
 $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['add_additional_template_txt'] = 'Přidat dodatečnou šablonu';
+$wb['delete_additional_template_txt'] = 'Smazat dodatečnou šablonu';
 $wb['limit_cgi_txt'] = 'CGI available';
 $wb['limit_ssi_txt'] = 'SSI available';
 $wb['limit_perl_txt'] = 'Perl available';
@@ -128,15 +128,17 @@ $wb['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'] = 'Zadejte prosím platnou e-mailovou adresu.';
-$wb['customer_no_error_unique'] = 'Číslo zákazníka musí být unikátní (nebo prázdné).';
-$wb['paypal_email_error_isemail'] = 'Zadejte prosím platnou PayPal e-mailovou adresu.';
-$wb['paypal_email_txt'] = 'PayPal E-mail';
-$wb['company_id_txt'] = 'Firma / podnikatel ID';
-$wb['bank_account_number_txt'] = 'Číslo bankovního účtu';
-$wb['bank_account_owner_txt'] = 'Bankovní účet vlastníka';
-$wb['bank_code_txt'] = 'Kód banky';
-$wb['bank_name_txt'] = 'Název banky';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
+$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
+$wb['paypal_email_txt'] = 'PayPal Email';
+$wb['company_id_txt'] = 'Company/Entrepreneur ID';
+$wb['bank_account_number_txt'] = 'Bank account no.';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['bank_code_txt'] = 'Bank code';
+$wb['bank_name_txt'] = 'Bank name';
 $wb['bank_account_iban_txt'] = 'IBAN';
 $wb['bank_account_swift_txt'] = 'BIC / Swift';
 ?>
+
+
diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng
index c14cee7b9313fbfcc3e6e17d02b16498d70d8bf1..31226ce87a5bd29516f9fa0b2942e42ba0d31483 100644
--- a/interface/web/client/lib/lang/cz_resellers_list.lng
+++ b/interface/web/client/lib/lang/cz_resellers_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Distributoři';
+$wb['list_head_txt'] = 'Distributoři (prodejci)';
 $wb['client_id_txt'] = 'ID';
 $wb['company_name_txt'] = 'Název společnosti';
 $wb['contact_name_txt'] = 'Název kontaktu';
@@ -9,3 +9,5 @@ $wb['add_new_record_txt'] = 'Přidat distributora';
 $wb['customer_no_txt'] = 'Customer No.';
 $wb['username_txt'] = 'Username';
 ?>
+
+
diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng
index 9d2a3211cb0d4cabaade52c01f42a146df72eafb..297b6397facd9c9c6d3e3fa6c5b595e818a8a28f 100644
--- a/interface/web/dashboard/lib/lang/cz.lng
+++ b/interface/web/dashboard/lib/lang/cz.lng
@@ -2,3 +2,5 @@
 $wb['welcome_user_txt'] = 'Vítejte %s';
 $wb['available_modules_txt'] = 'Dostupné moduly';
 ?>
+
+
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
index bedb98f865187d56e29fee51f20ed1ef3b7561d0..9810ba9808fc54c2bc002f28b52bcb753149e1e8 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
@@ -28,3 +28,5 @@ $wb['limit_client_txt'] = 'Počet klientů';
 $wb['limit_database_txt'] = 'Počet databází';
 $wb['limit_mailmailinglist_txt'] = 'Počet e-mailových konferencí';
 ?>
+
+
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
index 66275f1d0573489acd4a185f62b4fbfbecf3f2fd..a25ba21fc3ba9c5ec9144516bf135d40d99644be 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
@@ -1,3 +1,5 @@
 <?php
 $wb['available_modules_txt'] = 'Dostupné moduly';
 ?>
+
+
diff --git a/interface/web/designer/lib/lang/cz.lng b/interface/web/designer/lib/lang/cz.lng
index acb6c3546c6150b4edbafb782d3ed85c499210b5..dd815ad751cd365370e6ef7caec82948b35eba6d 100644
--- a/interface/web/designer/lib/lang/cz.lng
+++ b/interface/web/designer/lib/lang/cz.lng
@@ -1,2 +1,4 @@
 <?php
 ?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng
index 75bf5a5606c2337c3297bca3417f7bed093b7fd5..2b04eb968d0a22ab9d143a8e11f53779f770bd7d 100644
--- a/interface/web/designer/lib/lang/cz_form_edit.lng
+++ b/interface/web/designer/lib/lang/cz_form_edit.lng
@@ -22,3 +22,5 @@ $wb['auth_preset_perm_user_txt'] = 'Opr. Uživatel';
 $wb['auth_preset_perm_group_txt'] = 'Opr. Skupina';
 $wb['auth_preset_perm_other_txt'] = 'Opr. Ostatní';
 ?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_form_list.lng b/interface/web/designer/lib/lang/cz_form_list.lng
index 1e677f2410789f7f520c5efe3211abd97d8d3c0b..46241cfd5e641219b2c899509b9034166a7187fc 100644
--- a/interface/web/designer/lib/lang/cz_form_list.lng
+++ b/interface/web/designer/lib/lang/cz_form_list.lng
@@ -5,3 +5,5 @@ $wb['module_txt'] = 'Modul';
 $wb['title_txt'] = 'Titulek';
 $wb['description_txt'] = 'Popis';
 ?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_form_show.lng b/interface/web/designer/lib/lang/cz_form_show.lng
index 37017fa4a895bcf318bb11deaeb51473ebec49a0..45829d54def7efb5ce158d5d0efe17c9ff416c31 100644
--- a/interface/web/designer/lib/lang/cz_form_show.lng
+++ b/interface/web/designer/lib/lang/cz_form_show.lng
@@ -2,7 +2,7 @@
 $wb['header_txt'] = 'Formeditor';
 $wb['title_txt'] = 'Formtitle';
 $wb['name_txt'] = 'Formname';
-$wb['delete_txt'] = 'Delete';
+$wb['delete_txt'] = 'Smazat';
 $wb['properties_txt'] = 'Properties';
 $wb['new_tab_txt'] = 'Tab new';
 $wb['edit_txt'] = 'Edit';
@@ -11,8 +11,10 @@ $wb['up_txt'] = '^';
 $wb['down_txt'] = 'v';
 $wb['module_txt'] = 'Module';
 $wb['form_txt'] = 'Form';
-$wb['description_txt'] = 'Description';
+$wb['description_txt'] = 'Popis';
 $wb['module_del_txt'] = 'Delete the module and all subdirectories?';
 $wb['menu_del_txt'] = 'Delete menu with all menuitems?';
 $wb['item_del_txt'] = 'Delete menuitem?';
 ?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_edit.lng b/interface/web/designer/lib/lang/cz_module_edit.lng
index 847896d302ec25756e1e58c4fad803084b16feb2..f6da04e2e7b8735594c324bc3d962a125d6991a6 100644
--- a/interface/web/designer/lib/lang/cz_module_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_edit.lng
@@ -20,3 +20,5 @@ $wb['description_txt'] = '
 <b>Rada:</b> Všechny cesty jsou relativně k adresáři web web.
 ';
 ?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_list.lng b/interface/web/designer/lib/lang/cz_module_list.lng
index b568f69d63b2965e2371648651f39211f17a1de7..b37872cedc376f886678982854783efedab79ff1 100644
--- a/interface/web/designer/lib/lang/cz_module_list.lng
+++ b/interface/web/designer/lib/lang/cz_module_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Backend modul';
 $wb['module_txt'] = 'Modul';
 $wb['title_txt'] = 'Titulek';
 ?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_nav_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
index 01f5df68fb16558fb8b97f277125297884434937..8c21ea4a7d09fbb1127603a26cc4f7446dab3623 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
@@ -4,3 +4,5 @@ $wb['header_txt'] = 'Navi vlastnosti';
 $wb['save_txt'] = 'Uložit';
 $wb['cancel_txt'] = 'Zrušit';
 ?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
index 23f7d1592ab86b82a3d29ee7e895fca1f46b26b6..65f6c765a65dce7acd836bd9a23ac8a2fa86aca8 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
@@ -1,8 +1,10 @@
 <?php
 $wb['title_txt'] = 'Title';
-$wb['target_txt'] = 'Target';
+$wb['target_txt'] = 'Cíl';
 $wb['link_txt'] = 'Link';
 $wb['header_txt'] = 'Navi properties';
-$wb['save_txt'] = 'Save';
-$wb['cancel_txt'] = 'Cancel';
+$wb['save_txt'] = 'Uložit';
+$wb['cancel_txt'] = 'Zrušit';
 ?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_show.lng b/interface/web/designer/lib/lang/cz_module_show.lng
index 2cf9b07a80711ae2589b7bf8ba09d3b28a0ce174..605d11de08594039db3432ac85f99be1d27e27fb 100644
--- a/interface/web/designer/lib/lang/cz_module_show.lng
+++ b/interface/web/designer/lib/lang/cz_module_show.lng
@@ -2,7 +2,7 @@
 $wb['header_txt'] = 'Menu editor';
 $wb['title_txt'] = 'Title';
 $wb['name_txt'] = 'Module';
-$wb['delete_txt'] = 'Delete';
+$wb['delete_txt'] = 'Smazat';
 $wb['properties_txt'] = 'Properties';
 $wb['new_menu_txt'] = 'Menu new';
 $wb['edit_txt'] = 'Edit';
@@ -14,3 +14,5 @@ $wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Datei
 $wb['menu_del_txt'] = 'Wollen Sie das Menü mit allen Untereinträgen löschen?';
 $wb['item_del_txt'] = 'Wollen Sie den Menüeintrag löschen?';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng
index f143b0b92266c5bca8bdd4b931f749cee4012c42..876a5751e295c4e553df618c71130b0380eef420 100644
--- a/interface/web/dns/lib/lang/cz.lng
+++ b/interface/web/dns/lib/lang/cz.lng
@@ -20,3 +20,5 @@ $wb['Templates'] = 'Šablony DNS';
 $wb['Secondary Zones'] = 'Sekundární DNS zóny';
 $wb['Import Zone File'] = 'Importovat vybraný DNS zonový soubor';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_a.lng b/interface/web/dns/lib/lang/cz_dns_a.lng
index 8b8c206b637752ecbc9b3c0be7107f66107de556..6d9a24d64c6380ac207025870ab9057d150f7b1d 100644
--- a/interface/web/dns/lib/lang/cz_dns_a.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a.lng
@@ -14,3 +14,5 @@ $wb['data_error_empty'] = 'IP adresa je prázdná';
 $wb['data_error_regex'] = 'IP adresa má chybný formát';
 $wb['data_error_duplicate'] = 'Duplikace A záznamu';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_a_list.lng b/interface/web/dns/lib/lang/cz_dns_a_list.lng
index dd3cdfd2f8f679ba32203693b377b2c842dcb88d..22920c1d5c33741537cd4c09e1a2e9fc36f07b88 100644
--- a/interface/web/dns/lib/lang/cz_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng
@@ -1,15 +1,17 @@
 <?php
-$wb['list_head_txt'] = 'A záznam';
-$wb['active_txt'] = 'Aktivní';
+$wb['list_head_txt'] = 'A záznam';
+$wb['active_txt'] = 'Aktivní­';
 $wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zóna';
-$wb['name_txt'] = 'Název';
+$wb['zone_txt'] = 'Zóna';
+$wb['name_txt'] = 'Název';
 $wb['data_txt'] = 'Data';
 $wb['aux_txt'] = 'Priorita';
 $wb['ttl_txt'] = 'TTL';
 $wb['type_txt'] = 'Typ';
-$wb['add_new_record_txt'] = 'Přidat DNS A záznam';
-$wb['page_txt'] = 'Stránka';
+$wb['add_new_record_txt'] = 'Přidat DNS A záznam';
+$wb['page_txt'] = 'Stránka';
 $wb['page_of_txt'] = 'z';
-$wb['delete_confirmation'] = 'Skute�ně chcete smazat tento záznam?';
+$wb['delete_confirmation'] = 'Skutečně chcete smazat tento záznam?';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_aaaa.lng b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
index 26c6ae90640b8ce342ecb74a2107866a700b80da..143885f969b75638200b997a28bed1c72e87aef0 100644
--- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
 $wb['data_error_empty'] = 'IP adresa je prázdná';
 $wb['data_error_regex'] = 'IP adresa má chybný formát';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_alias.lng b/interface/web/dns/lib/lang/cz_dns_alias.lng
index 572478a98b286753a551afcd6f1123516aaa1878..c25dc7b3ebd51c3d7050bcd784d63d8b78c224d7 100644
--- a/interface/web/dns/lib/lang/cz_dns_alias.lng
+++ b/interface/web/dns/lib/lang/cz_dns_alias.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
 $wb['data_error_empty'] = 'Cílový Hostname je prázdný';
 $wb['data_error_regex'] = 'Cílový Hostname má chybný formát';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_cname.lng b/interface/web/dns/lib/lang/cz_dns_cname.lng
index 0c5ebe21e151b5291efe353defc05cd2eb05add5..ad120c97db53717055040c6268817206610a5de0 100644
--- a/interface/web/dns/lib/lang/cz_dns_cname.lng
+++ b/interface/web/dns/lib/lang/cz_dns_cname.lng
@@ -14,3 +14,5 @@ $wb['data_error_empty'] = 'Cílový hostname je prázdný';
 $wb['data_error_regex'] = 'Cílový hostname má chybný formát';
 $wb['data_error_duplicate'] = 'Duplicate A-Record or CNAME-Record';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_hinfo.lng b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
index 5f67d5e826cc5eef8c92eae607834a856721786f..3633fdb80be22de243ba95843a550a2f8678afd0 100644
--- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
 $wb['data_error_empty'] = 'Informace o hostovi je prázdná';
 $wb['data_error_regex'] = 'Informace o hostovi má chybný formát';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng
index 4020f8a9766212f0aa0e24a2f6e8643de132f241..3986983a93ddcade151fba09946fa9e2cc750f38 100644
--- a/interface/web/dns/lib/lang/cz_dns_import.lng
+++ b/interface/web/dns/lib/lang/cz_dns_import.lng
@@ -12,3 +12,5 @@ $wb['title'] = 'Importovat soubory zón';
 $wb['no_file_uploaded_error'] = 'Nelze odeslat DNS zonový soubor';
 $wb['zone_file_import_txt'] = 'Importovat vybraný DNS zonový soubor';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_mx.lng b/interface/web/dns/lib/lang/cz_dns_mx.lng
index b04bc66a2f3fe220e1089683e194e6979617f44a..c5f97f3f184178f466d0a958676947368d2f8c83 100644
--- a/interface/web/dns/lib/lang/cz_dns_mx.lng
+++ b/interface/web/dns/lib/lang/cz_dns_mx.lng
@@ -1,16 +1,18 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zóna';
-$wb['name_txt'] = 'Název hostitele (hostname)';
+$wb['name_txt'] = 'Hostname';
 $wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Název hostitele (hostname) e-mail serveru';
+$wb['data_txt'] = 'Hostname mailserveru';
 $wb['aux_txt'] = 'Priorita';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktivní';
 $wb['limit_dns_record_txt'] = 'Dosažen maximální počet DNS záznamů pro Váš účet.';
 $wb['no_zone_perm'] = 'Nemáte oprávnění přidat záznam do této zóny.';
-$wb['name_error_empty'] = 'Název hostitele (hostname) je prázdný.';
-$wb['name_error_regex'] = 'Název hostitele (hostname) má chybný formát.';
-$wb['data_error_empty'] = 'Název hostitele (hostname) e-mail serveru je prázdný';
-$wb['data_error_regex'] = 'Název hostitele (hostname) e-mail serveru má chybný formát';
+$wb['name_error_empty'] = 'Hostname je prázdný.';
+$wb['name_error_regex'] = 'Hostname má chybný formát.';
+$wb['data_error_empty'] = 'Hostname mailserveru je prázdný';
+$wb['data_error_regex'] = 'Hostname mailserveru má chybný formát';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng
index ba38e2a65e02170a41d48ac5be7c00381dfeec5b..4b011849f892b74a14eef566ef44be2b89561357 100644
--- a/interface/web/dns/lib/lang/cz_dns_ns.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ns.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Zóna má chybný formát.';
 $wb['data_error_empty'] = 'Jmenný server je prázdný';
 $wb['data_error_regex'] = 'Jmenný server má chybný formát';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_ptr.lng b/interface/web/dns/lib/lang/cz_dns_ptr.lng
index d7b19e523d95731459a5ab4d2598ef75248b25dd..33f116631e0c8b6028536ebc3755d9a286dc1f94 100644
--- a/interface/web/dns/lib/lang/cz_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng
@@ -3,7 +3,7 @@ $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zóna';
 $wb['name_txt'] = 'Název';
 $wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Kanonický Název hostitele (hostname)';
+$wb['data_txt'] = 'Kanonický hostname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktivní';
 $wb['limit_dns_record_txt'] = 'Dosažen maximální počet DNS záznamů pro Váš účet.';
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Název má chybný formát.';
 $wb['data_error_empty'] = 'Kanonický hostname je prázdný';
 $wb['data_error_regex'] = 'Kanonického hostname má chybný formát';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_rp.lng b/interface/web/dns/lib/lang/cz_dns_rp.lng
index 8b1e7e442ebe0e4a71b700f074d043d66dd13b20..bcebed3ef327bfd0b627c0bf286cdc59f3053c47 100644
--- a/interface/web/dns/lib/lang/cz_dns_rp.lng
+++ b/interface/web/dns/lib/lang/cz_dns_rp.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
 $wb['data_error_empty'] = 'Odpovědná osoba je prázdná';
 $wb['data_error_regex'] = 'Odpovědná osoba má chybný formát';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_slave.lng b/interface/web/dns/lib/lang/cz_dns_slave.lng
index 16617f6c595322dbc5e6479bfd5b47bbe24d6897..b8cc5f139fe5cbdcfa1799015560e6d12e3cb344 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave.lng
@@ -15,3 +15,5 @@ $wb['eg_domain_tld'] = 'např. domena.cz';
 $wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4';
 $wb['secondary_zone_txt'] = 'Sekundární DNS zóna';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_slave_list.lng b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
index 1e0a3d0106fd0c3a654292e116a0a3b120382751..eead22a8b7886b36519de41106e3ed44ab81a625 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
@@ -7,3 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['add_new_record_txt'] = 'Přidat sekundární DNS zónu';
 $wb['eg_domain_tld'] = 'např. domena.cz';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng
index 829d5f5b45dd40fd0f3b087cae8484869b5034fd..2b089c252ff0a645e934867b85de73a1da431b8f 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa.lng
@@ -19,8 +19,8 @@ $wb['origin_error_empty'] = 'Zóna je prázdná.';
 $wb['origin_error_unique'] = 'Záznam pro tuto zónu již existuje.';
 $wb['origin_error_regex'] = 'Zóna má chybný formát.';
 $wb['ns_error_regex'] = 'NS má chybný formát.';
-$wb['mbox_error_empty'] = 'Email je prázdný.';
-$wb['mbox_error_regex'] = 'Email má chybný formát.';
+$wb['mbox_error_empty'] = 'E-mail je prázdný.';
+$wb['mbox_error_regex'] = 'E-mail má chybný formát.';
 $wb['also_notify_txt'] = 'Také upozornit';
 $wb['also_notify_error_regex'] = 'Prosím, použijte IP adresu.';
 $wb['update_acl_txt'] = 'Aktualizovat ACL';
@@ -35,3 +35,5 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_soa_list.lng b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
index beba8a22b24da0f51ae36fbfc7d9a98a1e8b63d6..999e5bd68d96fafe9f22bacd83b31514505c5fee 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
@@ -8,3 +8,5 @@ $wb['mbox_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Přidat DNS zónu (SOA záznam)';
 $wb['add_new_record_wizard_txt'] = 'Přidat DNS zónu (dle šablony)';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_srv.lng b/interface/web/dns/lib/lang/cz_dns_srv.lng
index 8ab784a2a070431cb018217e4d26ce12654c5853..60d844ac9b707d5c1c90eb3d9bf78bdd9d9494d3 100644
--- a/interface/web/dns/lib/lang/cz_dns_srv.lng
+++ b/interface/web/dns/lib/lang/cz_dns_srv.lng
@@ -8,7 +8,7 @@ $wb['weight_txt'] = 'Weight';
 $wb['port_txt'] = 'Port';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktivní­';
-$wb['limit_dns_record_txt'] = 'Dosažen maximální­ počet DNS záznamů pro Váš účet.';
+$wb['limit_dns_record_txt'] = 'Dosažen maximální­ počet DNS záznamú pro Váš Účet.';
 $wb['no_zone_perm'] = 'Nemáte oprávnění­ přidat záznam do této zóny.';
 $wb['name_error_empty'] = 'Hostname je prázdný.';
 $wb['name_error_regex'] = 'Hostname má chybný formát.';
@@ -17,3 +17,5 @@ $wb['data_error_regex'] = 'Záznam serveru má chybný formát';
 $wb['srv_error_regex'] = 'Neplatný formát záznamu serveru. Záznam serveru musí­ obsahovat 3 textové řetězce oddělené mezerami.';
 $wb['aux_txt'] = 'Priority';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_template.lng b/interface/web/dns/lib/lang/cz_dns_template.lng
index be4ac0e9491d74bd68c6a744791e4efa4bb47c04..b91b3ae257418df4b24b550f49c12ee9eb4dde51 100644
--- a/interface/web/dns/lib/lang/cz_dns_template.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template.lng
@@ -4,3 +4,5 @@ $wb['fields_txt'] = 'Pole';
 $wb['template_txt'] = 'Šablona';
 $wb['visible_txt'] = 'Viditelný';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_template_list.lng b/interface/web/dns/lib/lang/cz_dns_template_list.lng
index bdd6e182041668c593f2d0ae5861819babc42a02..a7218a497658d3c9e063ae57438f443e14d37111 100644
--- a/interface/web/dns/lib/lang/cz_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng
@@ -4,3 +4,5 @@ $wb['visible_txt'] = 'Viditelný';
 $wb['name_txt'] = 'Název';
 $wb['add_new_record_txt'] = 'Přidat záznam';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_txt.lng b/interface/web/dns/lib/lang/cz_dns_txt.lng
index 76047b0cebcff637301959197c37e902bf140024..8784c7e2b4864ec231cedece16d2017df503b0c3 100644
--- a/interface/web/dns/lib/lang/cz_dns_txt.lng
+++ b/interface/web/dns/lib/lang/cz_dns_txt.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
 $wb['data_error_empty'] = 'Text je prázdný';
 $wb['data_error_regex'] = 'Text má chybný formát';
 ?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng
index dcfc0ba2c8519d73bae09f1a3d0f0bf0ea371bf5..bf462caf94543265155427c95eb271b96e3de54e 100644
--- a/interface/web/dns/lib/lang/cz_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng
@@ -18,21 +18,23 @@ $wb['error_expire_empty'] = 'Expire je prázdný.';
 $wb['error_minimum_empty'] = 'Minimum je prázdný.';
 $wb['error_ttl_empty'] = 'TTL je prázdný.';
 $wb['error_domain_empty'] = 'Doména je prázdná';
-$wb['error_ip_empty'] = 'IP je prázdná.';
+$wb['error_ip_empty'] = 'IP adresa je prázdná.';
 $wb['error_ns1_empty'] = 'NS1 je prázdný.';
 $wb['error_ns2_empty'] = 'NS2 je prázdný.';
-$wb['error_email_empty'] = 'EMail je prázdný.';
+$wb['error_email_empty'] = 'E-mail je prázdný.';
 $wb['error_domain_regex'] = 'Doména obsahuje neplatné znaky.';
 $wb['error_ns1_regex'] = 'NS1 obsahuje neplatné znaky.';
 $wb['error_ns2_regex'] = 'NS2 obsahuje neplatné znaky.';
-$wb['error_email_regex'] = 'Email neobsahuje platnou emailovou adresu.';
-$wb['dns_zone_txt'] = 'DNS Zóna';
+$wb['error_email_regex'] = 'E-mail neobsahuje platnou e-mailovou adresu.';
+$wb['dns_zone_txt'] = 'DNS zóna';
 $wb['globalsearch_resultslimit_of_txt'] = 'z';
 $wb['globalsearch_resultslimit_results_txt'] = 'výsledky';
 $wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.';
 $wb['globalsearch_noresults_limit_txt'] = '0 výsledků';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
 $wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
-$wb['list_head_txt'] = 'DNS Průvodce vytvořením zóny';
-$wb['list_desc_txt'] = 'Vytvoření zóny DNS pomocí průvodce';
+$wb['list_head_txt'] = 'Průvodce vytvořením DNS zóny';
+$wb['list_desc_txt'] = 'Vytvoření DNS zóny pomocí průvodce';
 ?>
+
+
diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng
index 18f8f210b70ab3d2c7835b41a508e44a99a6d319..721aaf388efb3f9f3e0a0d39b3927862df0c5e16 100644
--- a/interface/web/help/lib/lang/cz.lng
+++ b/interface/web/help/lib/lang/cz.lng
@@ -12,3 +12,5 @@ $wb['Manage Sections'] = 'Spravovat sekce';
 $wb['Manage Questions'] = 'Spravovat dotazy';
 $wb['Add a Question & Answer Pair'] = 'Přidat otázku a odpověď';
 ?>
+
+
diff --git a/interface/web/help/lib/lang/cz_faq_form.lng b/interface/web/help/lib/lang/cz_faq_form.lng
index 73feee6955ca1ea13de8f949cc9d7b2a260a4703..dc951a40abc6bde45696720b3fc46a4fedddb0b7 100644
--- a/interface/web/help/lib/lang/cz_faq_form.lng
+++ b/interface/web/help/lib/lang/cz_faq_form.lng
@@ -4,3 +4,5 @@ $wb['faq_question_txt'] = 'Otázka';
 $wb['faq_answer_txt'] = 'Odpověď';
 $wb['faq_section_txt'] = 'Sekce';
 ?>
+
+
diff --git a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
index a9488445ca9a6872e55e18b39be996dab5c82760..ab5d07c4e16fb0433f1a5c4f4bd8a9934f229723 100644
--- a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
@@ -7,3 +7,5 @@ $wb['faq_sections_txt'] = 'Sekce';
 $wb['faq_faq_questions_txt'] = 'Často kladené dotazy';
 $wb['faq_new_question_txt'] = 'Přidat nový dotaz';
 ?>
+
+
diff --git a/interface/web/help/lib/lang/cz_help_faq_list.lng b/interface/web/help/lib/lang/cz_help_faq_list.lng
index 923d9b892a47d9c69baf8943f7b7ff33cd09baf7..15eb20ad58e679247d2e8c40da3ed7fd690c3875 100644
--- a/interface/web/help/lib/lang/cz_help_faq_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_list.lng
@@ -1,3 +1,5 @@
 <?php
-$wb['edit_txt'] = 'Upravit';
+$wb['edit_txt'] = 'Edit';
 ?>
+
+
diff --git a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
index 967b0abfcd017a69309c088df9d07e6ea9ea2395..60906e5d3e3be699958bb760a94fb92c2172b5be 100644
--- a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
@@ -6,3 +6,5 @@ $wb['faq_sections_txt'] = 'Sekce';
 $wb['faq_faq_sections_txt'] = 'Sekce FAQ';
 $wb['faq_new_section_txt'] = 'Přidat novou sekci';
 ?>
+
+
diff --git a/interface/web/help/lib/lang/cz_support_message.lng b/interface/web/help/lib/lang/cz_support_message.lng
index 6c27284432b73dbc9246504a12961fbe11d02620..63bce28898ea2cde84ea366719f23c5ac82181e1 100644
--- a/interface/web/help/lib/lang/cz_support_message.lng
+++ b/interface/web/help/lib/lang/cz_support_message.lng
@@ -6,3 +6,5 @@ $wb['message_txt'] = 'Zpráva';
 $wb['tstamp_txt'] = 'Časové razítko';
 $wb['reply_txt'] = 'Odpovědět';
 ?>
+
+
diff --git a/interface/web/help/lib/lang/cz_support_message_list.lng b/interface/web/help/lib/lang/cz_support_message_list.lng
index 8629a2f8a1ec899b6b411fd00c18960b7201e4b6..3a2c9a90d9a6ca1c489ce0618dba7f813f03262c 100644
--- a/interface/web/help/lib/lang/cz_support_message_list.lng
+++ b/interface/web/help/lib/lang/cz_support_message_list.lng
@@ -4,3 +4,5 @@ $wb['sender_id_txt'] = 'Odesílatel';
 $wb['subject_txt'] = 'Předmět';
 $wb['add_new_record_txt'] = 'Vytvořit zprávu pro podporu';
 ?>
+
+
diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng
index 6b4539e952cd8043e8f2195b68ebaf7eb44304b1..b988a2ec5d9cf82e143c7a9c47a53cb31c5eb253 100644
--- a/interface/web/login/lib/lang/cz.lng
+++ b/interface/web/login/lib/lang/cz.lng
@@ -4,7 +4,7 @@ $wb['error_user_password_incorrect'] = 'Uživatelské jméno nebo heslo je špat
 $wb['error_user_blocked'] = 'Uživatel blokován.';
 $wb['error_user_too_many_logins'] = 'Příliš mnoho nesprávných přihlášení, zkuste to za 15 minut znova';
 $wb['pass_reset_txt'] = 'Bude Vám vygenerováno a zasláno nové heslo na e-mail, pokud Vaše adresa zadaná níže odpovídá adrese ve Vašem klientském nastavení.';
-$wb['pw_reset'] = 'Heslo bylo resetováno a zasláno na Váš email.';
+$wb['pw_reset'] = 'Heslo bylo resetováno a zasláno na Váš e-mail.';
 $wb['pw_error'] = 'Uživatelské jméno nebo e-mail neodpovídá.';
 $wb['pw_error_noinput'] = 'Prosím zadejte uživatelské jméno a e-mail.';
 $wb['pw_reset_mail_msg'] = 'Vaše heslo do ISPConfigu bylo resetováno. Nové heslo je: ';
@@ -22,3 +22,5 @@ $wb['pw_button_txt'] = 'Znovu odeslat heslo';
 $wb['email_txt'] = 'E-mail';
 $wb['theme_not_compatible'] = 'Zvolené téma není kompatibilní s aktuální verzí ISPConfig. Zkontrolujte prosím, zda není nová verze tématu.<br />Výchozí motiv byl aktivován automaticky.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng
index 2b4240ad25ab018e61dd9dc097df1e7c49d6d772..65fb13491648b4387216b19ca7a6e8a23d8745fa 100644
--- a/interface/web/mail/lib/lang/cz.lng
+++ b/interface/web/mail/lib/lang/cz.lng
@@ -1,14 +1,15 @@
 <?php
 $wb['Email Alias'] = 'E-mailový alias';
-$wb['Email Blacklist'] = 'E-mail černá listina';
+$wb['Email Blacklist'] = 'Email černá listina';
 $wb['Blacklist'] = 'Černá listina';
 $wb['Mail Content Filter'] = 'Obsahový filtr';
 $wb['Filter'] = 'Filtr';
 $wb['Mail Domain'] = 'Doména e-mailů';
+$wb['Domain'] = 'Domény';
 $wb['Email Catchall'] = 'E-mailový koš';
 $wb['Email Forward'] = 'Přesměrování e-mailů';
-$wb['Get Email'] = 'Získat e-mail';
-$wb['Spamfilter'] = 'Spamové filtry';
+$wb['Get Email'] = 'Získat externí e-maily';
+$wb['Spamfilter'] = 'Spamfiltr';
 $wb['Email Routing'] = 'Směrování';
 $wb['Email transport'] = 'Transport';
 $wb['Mailbox'] = 'Mailbox';
@@ -18,30 +19,32 @@ $wb['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'] = 'Spamový filter černá listina';
-$wb['Spamfilter Config'] = 'Konfigurace spamového filtru';
+$wb['Spamfilter blacklist'] = 'Spamfiltr černá listina';
+$wb['Spamfilter Config'] = 'Konfigurace spamfiltru';
 $wb['Server'] = 'Server';
-$wb['Spamfilter policy'] = 'Politika spamového filtru';
+$wb['Spamfilter policy'] = 'Spamfiltr politika';
 $wb['Policy'] = 'Politika';
 $wb['Quarantine'] = 'Karanténa';
 $wb['Tag-Level'] = 'Tag úroveň';
 $wb['Other'] = 'Jiný';
-$wb['Spamfilter users'] = 'Uživatelé spamového filtru';
+$wb['Spamfilter users'] = 'Spamfiltr uživatelé';
 $wb['Users'] = 'Uživatelé';
-$wb['Spamfilter Whitelist'] = 'Spamový filtr bílá listina';
+$wb['Spamfilter Whitelist'] = 'Spamfiltr bílá listina';
+$wb['Email'] = 'E-mail';
 $wb['Email Mailbox'] = 'E-mailové schránky';
-$wb['Email Accounts'] = 'Nastavení e-mailů';
+$wb['Email Accounts'] = 'E-mail účty';
 $wb['User / Domain'] = 'Uživatel / Doména';
 $wb['Server Settings'] = 'Nastavení serveru';
-$wb['Fetchmail'] = 'Externí získávání e-mailů';
+$wb['Fetchmail'] = 'Externí získávání emailů';
 $wb['Mailbox traffic'] = 'Přenesená data';
 $wb['Postfix Whitelist'] = 'Postfix bílá listina';
 $wb['Postfix Blacklist'] = 'Postfix černá listina';
 $wb['Content Filter'] = 'Obsahový filtr';
-$wb['Global Filters'] = 'Globální e-mailové filtry';
-$wb['Domain Alias'] = 'Alias e-mailové domény';
+$wb['Global Filters'] = 'Globální filtry';
+$wb['Domain Alias'] = 'Alias domény';
 $wb['Relay Recipients'] = 'Relay adresáti';
 $wb['Statistics'] = 'Statistiky';
-$wb['Domain'] = 'E-mailová doména';
-$wb['Email'] = 'E-mail';
+$wb['Mailbox quota'] = 'Mailbox kvóta';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng
index d5c83e4f9717853225f731b1a02055fabf8fcdc1..414e1023c8eb4739d9c33db2072af0f6db8c5b54 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias.lng
@@ -2,13 +2,15 @@
 $wb['email_txt'] = 'E-mail';
 $wb['destination_txt'] = 'Cíl';
 $wb['active_txt'] = 'Aktivní';
-$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
+$wb['email_error_isemail'] = 'E-mail adresa je chybná.';
 $wb['email_error_unique'] = 'Duplikování e-mail adresy.';
 $wb['no_domain_perm'] = 'Nemáte oprávnění pro tuto doménu.';
 $wb['destination_error_isemail'] = 'Cílová e-mail adresa je chybná.';
 $wb['limit_mailalias_txt'] = 'Dosažen maximální počet e-mail aliasů pro Váš účet.';
-$wb['duplicate_mailbox_txt'] = 'Mailbox s touto e-mail adresou již existuje';
+$wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
 $wb['domain_txt'] = 'Doména';
-$wb['duplicate_email_alias_txt'] = 'Tento e-mailový alias již existuje.';
+$wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.';
 $wb['source_txt'] = 'Alias';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_alias_list.lng b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
index de8cc2ef2ab3f5048883e3ab178a668cacc1fe77..0d8f779c33b3d680a51b9bcef5e17ad0b4fb0c6a 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
@@ -6,3 +6,5 @@ $wb['destination_txt'] = 'Cíl';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Přidat nový e-mailový alias';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
index 0387c18da1de8670f68268b24ce49f81bf94be3b..e0cde683501eaaf17d8e91fbcb449b185f12ed60 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
@@ -3,9 +3,11 @@ $wb['source_txt'] = 'Zdroj';
 $wb['destination_txt'] = 'Cíl';
 $wb['active_txt'] = 'Aktivní';
 $wb['no_domain_perm'] = 'Nemáte oprávnění pro tuto doménu.';
-$wb['limit_mailaliasdomain_txt'] = 'Dosažen maximální počet e-mailových doménových aliasů pro Váš účet.';
+$wb['limit_mailaliasdomain_txt'] = 'Dosažen maximální počet emailových doménových aliasů pro Váš účet.';
 $wb['source_destination_identical_txt'] = 'Zdrojová a cílová doména jsou stejné.';
 $wb['source_error_empty'] = 'Zdrojová doména je prázdná.';
 $wb['source_error_unique'] = 'Duplikování zdrojové domény.';
 $wb['source_error_regex'] = 'Chybná zdrojová doména.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
index fd850d6f5f64d77d64b50febe94ade6cc7962c88..cfc0154d84129c34018493a01e7a37b37619f6bf 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
@@ -5,3 +5,5 @@ $wb['source_txt'] = 'Zdroj';
 $wb['destination_txt'] = 'Cíl';
 $wb['add_new_record_txt'] = 'Přidat doménový alias';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
index 76a60e21812381c78ea8be520ed694668901de93..4719142aff8d261e445dd287c36c971596df93ca 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
@@ -1,9 +1,11 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Adresa černé listiny';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
 $wb['active_txt'] = 'Aktivní';
 $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
-$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet e-mail filtrů pro Váš účet.';
+$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
index 6b2a7086d3aaa637ed76f49ecdf2b3f483800842..fbf6e2d230c57ec73defaa130e372addeddb995e 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
@@ -2,9 +2,11 @@
 $wb['list_head_txt'] = 'E-mail černá listina';
 $wb['active_txt'] = 'Aktivní';
 $wb['server_id_txt'] = 'Server';
-$wb['source_txt'] = 'Adresy na černé listině';
+$wb['source_txt'] = 'Adresy na černé lisitně';
 $wb['type_txt'] = 'Typ';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
 $wb['add_new_record_txt'] = 'Přidat záznam na černou listinu';
 $wb['access_txt'] = 'Přístup';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter.lng b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
index 459ca228a2149d868ea9dfb575253bbb10da261f..1405881fbb1a4c28f6e26b4df2340510fbb96520 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
@@ -7,3 +7,5 @@ $wb['action_txt'] = 'Akce';
 $wb['active_txt'] = 'Aktivní';
 $wb['pattern_error_empty'] = 'Vzor je prázdný.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
index da9709e7f98bb31d63bda148ece2efda717f320b..6e7ebf518677d14f6965b823436c76d165f1e9f7 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
@@ -6,3 +6,5 @@ $wb['pattern_txt'] = 'Vzor';
 $wb['action_txt'] = 'Akce';
 $wb['add_new_record_txt'] = 'Přidat obsahový filtr';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng
index ba67856646a2c420b7d7abda6bf1f05954b6217e..d71c4714f7b1a3ee213ab1dfcb5d4f91ea54ce02 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -4,10 +4,12 @@ $wb['domain_txt'] = 'Doména';
 $wb['type_txt'] = 'Typ';
 $wb['active_txt'] = 'Aktivní';
 $wb['domain_error_empty'] = 'Doména je prázdná.';
-$wb['domain_error_unique'] = 'Duplikování domény.';
+$wb['domain_error_unique'] = 'Dupolikování domény.';
 $wb['domain_error_regex'] = 'Chybný název domény.';
 $wb['client_txt'] = 'Klient';
-$wb['limit_maildomain_txt'] = 'Dosažen maximální počet e-mail domén pro Váš účet.';
-$wb['policy_txt'] = 'Spamový filter';
+$wb['limit_maildomain_txt'] = 'Dosažen maximální počet email domén pro Váš účet.';
+$wb['policy_txt'] = 'Spamfiltr';
 $wb['no_policy'] = '- nepovoleno -';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
index b579d2de088d0995da33586a6f2a0731445daa76..da42190faccc8497d6706ac3a2d189736ea68210 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
@@ -6,3 +6,5 @@ $wb['add_new_record_txt'] = 'Přidat doménu';
 $wb['active_txt'] = 'Aktivní';
 $wb['sys_groupid_txt'] = 'Klient';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
index bfdc509efa089f28dc0878c6f25bed145cd12f8a..75efd562185a0dc212f59148168f2866c8386cc7 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
@@ -1,11 +1,13 @@
 <?php
 $wb['domain_txt'] = 'Doména';
-$wb['destination_txt'] = 'Cílová e-mailová adresa';
+$wb['destination_txt'] = 'Popis';
 $wb['active_txt'] = 'Aktivní';
-$wb['domain_error_unique'] = 'Pro tuto doménu již existuje doménový koš.';
+$wb['domain_error_unique'] = 'Pro tuto doménu již existuje koš.';
 $wb['no_domain_perm'] = 'Nemáte oprávnění pro tuto doménu.';
 $wb['domain_error_regex'] = 'Chybné doménové jméno nebo doména obsahuje chybné znaky.';
-$wb['limit_mailcatchall_txt'] = 'Dosažen maximální počet doménových košů pro Váš účet.';
+$wb['limit_mailcatchall_txt'] = 'Dosažen maximální počet košů účtů pro Váš účet.';
 $wb['source_txt'] = 'Zdroj';
-$wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná e-mailová adresa.';
+$wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
index 3b24645ec88a8dd4a411d33dbb7a8a0c93b48972..aa0b76df8c6faa9189e418da29e03b50a64889c9 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
@@ -7,3 +7,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'E-malová doména';
 $wb['add_new_record_txt'] = 'Přidat e-mailový koš';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
index 2abb05cf74ba4442dedbe96a7720d1fb1035b678..05bb74753064ef9ba1a56e8447e89fb7c80450f7 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
@@ -5,3 +5,5 @@ $wb['domain_txt'] = 'Doména';
 $wb['add_new_record_txt'] = 'Přidat doménu';
 $wb['active_txt'] = 'Aktivní';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_forward.lng b/interface/web/mail/lib/lang/cz_mail_forward.lng
index 7e3ab720ca52bc7bc4c112cd3e5cdd78512ef7e4..ba79e1a2ff653a234c696b840fa42710fcbd28d2 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward.lng
@@ -2,8 +2,10 @@
 $wb['email_txt'] = 'E-mail';
 $wb['destination_txt'] = 'Cílový email';
 $wb['active_txt'] = 'Aktivní';
-$wb['limit_mailforward_txt'] = 'Dosažen maximální počet e-mailových předávání pro Váš účet.';
-$wb['duplicate_mailbox_txt'] = 'Mailbox s touto e-mailovou adresou již existuje';
+$wb['limit_mailforward_txt'] = 'Dosažen maximální počet email předávání pro Váš účet.';
+$wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
 $wb['domain_txt'] = 'Doména';
 $wb['source_txt'] = 'Zdrojový e-mail';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_forward_list.lng b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
index e5381fe5f8c17d2bc90f41340114f025cc4299e6..bdbff701e1b1ef1abc043469f58b6c005ed4fcf0 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
@@ -6,3 +6,5 @@ $wb['destination_txt'] = 'Cíl';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Přidat nové přesměrování';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng
index eb71673065d20c8a59f6fc95c5ee032b5a908a81..6fc9101699e951cc01352a08ca5dbc2ccf8bb9d0 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -7,12 +7,14 @@ $wb['source_password_txt'] = 'Heslo';
 $wb['source_delete_txt'] = 'Smazat e-maily po obdržení';
 $wb['destination_txt'] = 'Cíl';
 $wb['active_txt'] = 'Aktivní';
-$wb['limit_fetchmail_txt'] = 'Dosažen maximální počet záznamů externího získávání emailů pro Váš účet.';
+$wb['limit_fetchmail_txt'] = 'Dosažen maximální počet záznamů externího získávání e-mailů pro Váš účet.';
 $wb['source_server_error_isempty'] = 'Server je prázdný.';
 $wb['source_username_error_isempty'] = 'Uživatelské jméno je prázdné.';
 $wb['source_password_error_isempty'] = 'Heslo je prázdné.';
 $wb['destination_error_isemail'] = 'Nevybrán žádný cíl.';
 $wb['source_server_error_regex'] = 'POP3/IMAP server není validní doménový název.';
-$wb['source_read_all_txt'] = 'Načíst všechny e-maily (vč. přečtených)';
+$wb['source_read_all_txt'] = 'Načíst všechny e-maily (včetně již přečtené pošty)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_get_list.lng b/interface/web/mail/lib/lang/cz_mail_get_list.lng
index 9ca8b86dcb258320aee7376ca5a9bc06dc9cc9e4..daeae8db4575d37847fb35ac41ebb4240cf34a49 100644
--- a/interface/web/mail/lib/lang/cz_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Získávat e-maily z externích POP3 / IMAP serverů';
+$wb['list_head_txt'] = 'Získávat emaily z externích POP3 / IMAP serverů';
 $wb['active_txt'] = 'Aktivní';
 $wb['server_id_txt'] = 'Server';
 $wb['source_server_txt'] = 'Externí server';
@@ -7,3 +7,5 @@ $wb['source_username_txt'] = 'Uživatelské jméno';
 $wb['destination_txt'] = 'Cíl';
 $wb['add_new_record_txt'] = 'Přidat účet';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
index 2a392986182c539333f0f745209522b6ef1f5238..b44112a11f023518598c5acb0ce7a70124d614f5 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['limit_mailmailinglist_txt'] = 'Limit dosažen';
-$wb['domain_error_empty'] = 'Doména je prázdná.';
-$wb['listname_error_empty'] = 'Název seznamu je prázdný.';
-$wb['domain_error_regex'] = 'Neplatný název domény.';
-$wb['email_in_use_txt'] = 'E-mail je již použit';
+$wb['limit_mailmailinglist_txt'] = 'Limit reached';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['listname_error_empty'] = 'Listname is empty.';
+$wb['domain_error_regex'] = 'Invalid domain name.';
+$wb['email_in_use_txt'] = 'Email is in use';
 $wb['no_domain_perm'] = 'You have no permission for this domain.';
 $wb['password_strength_txt'] = 'Síla hesla';
 $wb['server_id_txt'] = 'Server';
@@ -19,3 +19,5 @@ $wb['password_match_txt'] = 'Hesla se shodují.';
 $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
 $wb['email_error_isemail'] = 'Email address is invalid.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
index 6dedb190d08d8186bba3c22acf3d2a01255e3672..b3e2cf85ac4a46a3b6a7f6b2a1041bb649f9638b 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
@@ -1,5 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'E-mailové konference (mailinglist)';
+$wb['list_head_txt'] = 'E-mailové konference';
 $wb['domain_txt'] = 'Doména';
 $wb['listname_txt'] = 'Název seznamu';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
index b4d867d771970b742326007d63f23bfe5285e288..b64c3113bc11a8a52802b521e0a167948728f202 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
@@ -1,9 +1,11 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Relay adresát';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
 $wb['active_txt'] = 'Aktivní';
 $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
-$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet e-mailových filtrů pro Váš účet.';
+$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
index 261ea38c560914abc3f2ac932ca277badeb7abdb..bf34af6ec33b4c61372f84fa1abd6d58cca328c4 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
@@ -3,7 +3,9 @@ $wb['list_head_txt'] = 'Relay adresáti';
 $wb['active_txt'] = 'Aktivní';
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Adresa adresáta';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
 $wb['add_new_record_txt'] = 'Přidat relay adresáta';
 $wb['access_txt'] = 'Přístup';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
index 280fac94bb4e1c74b3603bb18512389765e8ece7..f19706dc3a292714bbb26395ce2993f2112ae4db 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
@@ -6,12 +6,14 @@ $wb['spam_delete_score_int_txt'] = 'Mazací skóre';
 $wb['spam_rewrite_subject_txt'] = 'Přepisovací předmět';
 $wb['spam_redirect_maildir_txt'] = 'Přesměrovací mailbox';
 $wb['active_txt'] = 'Aktivní';
-$wb['spam_rewrite_txt'] = 'Přepsat předmět e-mailu nad toto skóre.';
-$wb['spam_redirect_txt'] = 'Přesměrovat e-mail nad toto skóre do vybraného mailboxu.';
-$wb['spam_delete_txt'] = 'Smazat e-mail nad toto skóre.';
+$wb['spam_rewrite_txt'] = 'Přepsat předmět emailu nad toto skóre.';
+$wb['spam_redirect_txt'] = 'Přesměrovat email nad toto skóre do vybraného mailboxu.';
+$wb['spam_delete_txt'] = 'Smazat email nad toto skóre.';
 $wb['disable_txt'] = 'Rada: Pro zrušení filtrování nastavte skóre na 0.00.';
-$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
-$wb['email_error_unique'] = 'Pro tuto e-mail adresu již existuje filtrovací záznam.';
+$wb['email_error_isemail'] = 'Email adresa je chybná.';
+$wb['email_error_unique'] = 'Pro tuto email adresu již existuje filtrovací záznam.';
 $wb['spam_redirect_maildir_purge_txt'] = 'Vyčistit poté mailový adresář';
 $wb['days_txt'] = 'Dny.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
index fa3c763981e43e88bff6b3d411500f217050d489..1271765c638b7c45cebb3f0302c9492e94daefe6 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
@@ -1,8 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Spamový filter';
+$wb['list_head_txt'] = 'Spamfiltr';
 $wb['active_txt'] = 'Aktivní';
 $wb['server_id_txt'] = 'Server';
 $wb['server_name_txt'] = 'server_name';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Přidat nový záznam spamfiltru';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_transport.lng b/interface/web/mail/lib/lang/cz_mail_transport.lng
index 508ca764b6b189a1bf0df8206b388787aae2991e..710e577ecae0f6686d0aca3a459287a40eaf37a4 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport.lng
@@ -6,6 +6,8 @@ $wb['type_txt'] = 'Typ';
 $wb['mx_txt'] = 'Neprovádět MX lookup';
 $wb['sort_order_txt'] = 'Třídit podle';
 $wb['active_txt'] = 'Aktivní';
-$wb['limit_mailrouting_txt'] = 'Dosažen maximální počet e-mail směrování pro Váš účet.';
+$wb['limit_mailrouting_txt'] = 'Dosažen maximální počet email směrování pro Váš účet.';
 $wb['transport_txt'] = 'Transport';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_transport_list.lng b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
index f8d9323215318652a5b712632fb22620090d9749..de6292b8dc2a63098eea44baf63b6f333e0bccc3 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
@@ -7,3 +7,5 @@ $wb['transport_txt'] = 'Transport';
 $wb['sort_order_txt'] = 'Třídit podle';
 $wb['add_new_record_txt'] = 'Přidat transport';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index 4a2322e094737ddcde5d527e732b1b2849c758a9..d8805f0fab289d1215b93ea61bb67e87144f4368 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -4,7 +4,7 @@ $wb['email_txt'] = 'E-mail';
 $wb['cryptpwd_txt'] = 'Heslo';
 $wb['password_strength_txt'] = 'Bezpečnost hesla';
 $wb['active_txt'] = 'Aktivní';
-$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
+$wb['email_error_isemail'] = 'E-mail adresa je chybná.';
 $wb['email_error_unique'] = 'Duplikování email adresy.';
 $wb['autoresponder_text_txt'] = 'Text';
 $wb['autoresponder_txt'] = 'Aktivní';
@@ -48,3 +48,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter.lng b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
index ec91e223eacd32026385295541cbba85269263a5..097385684379b95c6ee6f3b293361b0c93b1d00e 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
@@ -10,7 +10,7 @@ $wb['target_error_regex'] = 'Cíl může obsahovat jen tyto znaky: a-z, 0-9, -,
 $wb['limit_mailfilter_txt'] = 'Byl dosažen max. počet e-mailový filtrovacích pravidel.';
 $wb['subject_txt'] = 'Předmět';
 $wb['from_txt'] = 'Odesílatel';
-$wb['to_txt'] = 'Adresát';
+$wb['to_txt'] = 'Příjemce (adresát)';
 $wb['contains_txt'] = 'Obsahuje';
 $wb['is_txt'] = 'Je';
 $wb['begins_with_txt'] = 'Začíná na';
@@ -18,3 +18,5 @@ $wb['ends_with_txt'] = 'Končí na';
 $wb['move_to_txt'] = 'Přesunout do';
 $wb['delete_txt'] = 'Smazat';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
index 1d1b1f37a8ac1119811ad7fc3c9012968c8864d2..d9f6748c192900ff90f556ee3bcca982ea33e1fa 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
@@ -3,5 +3,7 @@ $wb['rulename_txt'] = 'Název';
 $wb['add_new_record_txt'] = 'Přidat filtr';
 $wb['page_txt'] = 'Stránka';
 $wb['page_of_txt'] = 'z';
-$wb['delete_confirmation'] = 'Opravdu smazat e-mailový filtr?';
+$wb['delete_confirmation'] = 'Opravdu smazat mailový filtr?';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_list.lng b/interface/web/mail/lib/lang/cz_mail_user_list.lng
index e6dfd006ed2aee86054be10320bdd4174221d846..08d28fbc026f00168d85d59eaa837e141244fec1 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng
@@ -6,3 +6,5 @@ $wb['add_new_record_txt'] = 'Přidat e-mailovou schránku';
 $wb['name_txt'] = 'Skutečný název';
 $wb['login_txt'] = 'Přihlášení';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
index 50cbc31d5c21e1ffa2609b178d33432146db6468..92600a17d982c680c84f9284aa097e20b6950c4c 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
@@ -6,3 +6,5 @@ $wb['last_month_txt'] = 'Minulý měsíc';
 $wb['this_year_txt'] = 'Tento rok';
 $wb['last_year_txt'] = 'Minulý rok';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
index a1cede7f35652ef87fef98051efee2943bcc51ce..cd5d03295360d6ef84798362bb64c02f77644e99 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
@@ -1,9 +1,11 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Adresa bílé listiny';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
 $wb['active_txt'] = 'Aktivní';
 $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
-$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet e-mail filtrů pro Váš účet.';
+$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
index 0025c48cea6b81dfac7afc2cb34f1783482a1cc6..042cd71c5787412c547db5d454c187a1ccb63aef 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
@@ -1,10 +1,12 @@
 <?php
-$wb['list_head_txt'] = 'E-mail bílá listina';
+$wb['list_head_txt'] = 'Email bílá listina';
 $wb['active_txt'] = 'Aktivní';
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Adresy na bílé listině';
 $wb['type_txt'] = 'Typ';
-$wb['recipient_txt'] = 'Adresát';
+$wb['recipient_txt'] = 'Příjemce (adresát)';
 $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu';
 $wb['access_txt'] = 'Přístup';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
index 5e0c6b779909284280bdc5a4278a01c005e471d5..98e7649ba5f5c2839206913e82725073d4b0ab62 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
@@ -7,3 +7,5 @@ $wb['priority_txt'] = 'Priorita';
 $wb['active_txt'] = 'Aktivní';
 $wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximální počet záznamů pro bílou / černou listinu pro Váš účet.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
index d0e89ed5bd442624eb6a4815c8f7b429568444f7..194aeb9b920e2e56724cbd7c079646e2996a1178 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
@@ -7,3 +7,5 @@ $wb['rid_txt'] = 'Uživatel';
 $wb['email_txt'] = 'Emaily na černé listině';
 $wb['add_new_record_txt'] = 'Přidat záznam na černou listinu';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config.lng b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
index a4b913d1535210b9e8bcf141a36c374dfffebad4..d0ebcc4bf63f5419424425f63759f20b8c03918f 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
@@ -4,7 +4,7 @@ $wb['ip_address_txt'] = 'IP adresa';
 $wb['netmask_txt'] = 'Maska';
 $wb['gateway_txt'] = 'Brána';
 $wb['hostname_txt'] = 'Hostname';
-$wb['nameservers_txt'] = 'Jmenné servery (DNS)';
+$wb['nameservers_txt'] = 'Jmenné servery';
 $wb['module_txt'] = 'Modul serveru';
 $wb['maildir_path_txt'] = 'Cesta k mail adresáři';
 $wb['homedir_path_txt'] = 'Cesta k domácímu adresáři';
@@ -18,3 +18,5 @@ $wb['relayhost_password_txt'] = 'Relayhost heslo';
 $wb['mailbox_size_limit_txt'] = 'Limit velikosti e-mailové schránky';
 $wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
index fe2ee8d51ce0b3e2afd8f5c25403b1c27ff23832..8b5b1e758dcef47798d09499d66777f29ab59bf8 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Konfigurace serveru';
 $wb['server_name_txt'] = 'Server';
 $wb['server_id_txt'] = 'server_id';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
index 54d0155d74a932b732f763488dd5f9ac3046d909..1a778301ebc7e8f3e96bd65ebd2fbfd4a084ce38 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
@@ -36,3 +36,5 @@ $wb['spam_admin_txt'] = 'SPAM admin';
 $wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
 $wb['banned_rulenames_txt'] = 'Název pravidel zabanované';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
index 9a0c3619972097537f5e8847b27e24d9df73be74..37f41d3ace6a31a75190f259d4d2553c38214275 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
@@ -7,3 +7,5 @@ $wb['banned_files_lover_txt'] = 'Zabanované soubory';
 $wb['bad_header_lover_txt'] = 'Špatné hlavičky';
 $wb['add_new_record_txt'] = 'Přidat záznam politiky';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users.lng b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
index 8c19e9f3019282a90bc00b899a9c4fe14ea81298..d795af11df1ce93035e3fdef021260965177b8eb 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
@@ -2,7 +2,9 @@
 $wb['server_id_txt'] = 'Server';
 $wb['priority_txt'] = 'Priorita';
 $wb['policy_id_txt'] = 'Politika';
-$wb['email_txt'] = 'E-mail (vzor)';
+$wb['email_txt'] = 'Email (vzor)';
 $wb['fullname_txt'] = 'Název';
 $wb['local_txt'] = 'Lokální';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
index d2faf5a9719a2a9bb162892089b02b3ab62b27d3..26c4df143f870448039261886145c39c259234c3 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
@@ -1,10 +1,12 @@
 <?php
-$wb['list_head_txt'] = 'Uživatelé spamového filtru';
+$wb['list_head_txt'] = 'Spamfiltr uživatelé';
 $wb['local_txt'] = 'Lokální';
 $wb['server_id_txt'] = 'Server';
 $wb['priority_txt'] = 'Priorita';
 $wb['policy_id_txt'] = 'Politika';
 $wb['fullname_txt'] = 'Jméno';
 $wb['email_txt'] = 'E-mail';
-$wb['add_new_record_txt'] = 'Přidat spamový filter uživatele';
+$wb['add_new_record_txt'] = 'Přidat spamfiltr uživatele';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
index 5e0c6b779909284280bdc5a4278a01c005e471d5..98e7649ba5f5c2839206913e82725073d4b0ab62 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
@@ -7,3 +7,5 @@ $wb['priority_txt'] = 'Priorita';
 $wb['active_txt'] = 'Aktivní';
 $wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximální počet záznamů pro bílou / černou listinu pro Váš účet.';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
index 176d5ab9e9cac02dace7dd38446c7d5776082c4b..e437fc70f3efbdacc82bdd8471464cd01c20f77b 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
@@ -1,9 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Spamový filter bílá listina';
+$wb['list_head_txt'] = 'Spamfiltr bílá listina';
 $wb['active_txt'] = 'Aktivní';
 $wb['server_id_txt'] = 'Server';
 $wb['priority_txt'] = 'Priorita';
 $wb['rid_txt'] = 'Uživatel';
-$wb['email_txt'] = 'E-maily na bílé listině';
+$wb['email_txt'] = 'Emaily na bílé listině';
 $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu';
 ?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
index 13abef37f247109ea96395ded9a6b7717bc9b49d..0c30e7574e14f7d251ae8095041dbb9adbbcf8b2 100755
--- a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
@@ -1,7 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Kvóty poštovních schránek';
+$wb['list_head_txt'] = 'Mailbox kvóta';
 $wb['quota_txt'] = 'Kvóta';
-$wb['name_txt'] = 'Název';
+$wb['name_txt'] = 'Jméno';
 $wb['email_txt'] = 'E-mailová adresa';
 $wb['used_txt'] = 'Využité místo';
 ?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng
index 1c16fb2e59aa4b47356d8fa30ae26203e1c4e119..8740216ff9cfdf0565345aa554924b1ac3a11a07 100644
--- a/interface/web/mailuser/lib/lang/cz.lng
+++ b/interface/web/mailuser/lib/lang/cz.lng
@@ -1,9 +1,11 @@
 <?php
 $wb['Email Account'] = 'E-mailový účet';
 $wb['Overview'] = 'Přehled';
+$wb['Password'] = 'Heslo';
 $wb['Autoresponder'] = 'Automatická odpověď';
 $wb['Send copy'] = 'Poslat kopii na e-mail';
 $wb['Spamfilter'] = 'Spamový filter';
 $wb['Email Filters'] = 'E-mailové filtry';
-$wb['Password'] = 'Heslo';
 ?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_index.lng b/interface/web/mailuser/lib/lang/cz_index.lng
index 45af56ee8d59e90adadad4c5a7f15a430ba56371..9b820cdee63a4bab4a442448d1c5c3358eef4b75 100644
--- a/interface/web/mailuser/lib/lang/cz_index.lng
+++ b/interface/web/mailuser/lib/lang/cz_index.lng
@@ -10,3 +10,5 @@ $wb['unlimited_txt'] = 'Neomezený';
 $wb['mb_txt'] = 'MB';
 $wb['none_txt'] = 'Nenastaveno';
 ?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
index ef3aeb42da522378dbd954257bc39bd9b13f3c34..f8d331b55732af9b1448a44da275ee46d3d4ed9e 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
@@ -11,3 +11,5 @@ $wb['autoresponder_active'] = 'Povolit automatický odpovídač';
 $wb['now_txt'] = 'Nyní';
 $wb['autoresponder_subject_txt'] = 'Předmět e-mailu';
 ?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
index 36f11a9baa9fd9b8894ee181bd89a1d7d957cf2a..fc8a0f9df6f195e8ee6cfdca9b8b1ca01386b627 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
@@ -5,3 +5,5 @@ $wb['email_txt'] = 'E-mail';
 $wb['cc_error_isemail'] = 'Vyplněná e-mailová adresa neplatná';
 $wb['email_is_cc_error'] = 'Vyplněná e-mailová adresa a poslat kopii na e-mail adresu, nemůžou být stejné.';
 ?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
index 57b9d61c017ea5d2c891f2adf854f441495b2314..65300b6d9505e63b0dfec314bc759fa08b12b2cb 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
@@ -10,7 +10,7 @@ $wb['target_error_regex'] = 'Cíl může obsahovat jen tyto znaky: a-z, 0-9, -,
 $wb['limit_mailfilter_txt'] = 'Byl dosažen max. počet e-mailový filtrovacích pravidel.';
 $wb['subject_txt'] = 'Předmět';
 $wb['from_txt'] = 'Odesílatel';
-$wb['to_txt'] = 'Adresát';
+$wb['to_txt'] = 'Příjemce (adresát)';
 $wb['contains_txt'] = 'Obsahuje';
 $wb['is_txt'] = 'Je';
 $wb['begins_with_txt'] = 'Začíná na';
@@ -18,3 +18,5 @@ $wb['ends_with_txt'] = 'Končí na';
 $wb['move_to_txt'] = 'Přesunout do';
 $wb['delete_txt'] = 'Smazat';
 ?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
index 3c2593d6d420f4a987e58faa2ac0ce0e8a53fc98..4b64af9205937b240559b209a779a04d91e95eb2 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
@@ -6,3 +6,5 @@ $wb['page_txt'] = 'Stránka';
 $wb['page_of_txt'] = 'z';
 $wb['delete_confirmation'] = 'Opravdu chcete odstranit e-mail filter?';
 ?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
index 36555a20304678f88ef4b5b8038d7e89edd9b04d..44815399ddda812c941bf18bc9a2fb0084a43313 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
@@ -8,3 +8,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
index f0f5bb52a63f75d9775bd5102681951cb4388e5a..92828ee60ece20d96b2c9dcea9dc17cf110dfc87 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
@@ -5,3 +5,5 @@ $wb['email_txt'] = 'E-mail';
 $wb['no_policy'] = '- nepovoleno -';
 $wb['policy_txt'] = 'Politika';
 ?>
+
+
diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng
index 587409cf842c00d3bad4bd507e45090796a9b2af..1fee3c03b13e19b1067e34fecafd988fc8b8ff1c 100644
--- a/interface/web/monitor/lib/lang/cz.lng
+++ b/interface/web/monitor/lib/lang/cz.lng
@@ -134,16 +134,18 @@ $wb['monitor_title_raidstate_txt'] = 'Stav pole RAID';
 $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter log';
 $wb['monitor_title_fail2ban_txt'] = 'Fail2Ban log';
 $wb['monitor_updates_nosupport_txt'] = 'Vaše distribuce nepodporuje toto monitorování';
-$wb['monitor_nosupportedraid1_txt'] = 'V současné době, podporujeme nástroje mdadm nebo MPT-stav pro sledování sofwarových RAID polí.<br>Nemůžeme najít žádné z nich na serveru.<br><br>To znamená, že nemůžeme monitorovat váš RAID.';
-$wb['monitor_serverstate_beancounterok_txt'] = 'Soubor čítačů (limitů) je v pořádku';
+$wb['monitor_nosupportedraid1_txt'] = 'At the moment, we support mdadm or mpt-status for monitoring the RAID.<br>We cant find any of them at your server.<br><br>This means we can not support your RAID yet.';
+$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok';
 $wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter';
-$wb['monitor_serverstate_beancounterwarning_txt'] = 'Některé čítače (limity) vykazují selhání.';
-$wb['monitor_serverstate_beancountercritical_txt'] = 'Existuje mnoho selhání čítačů (limitů)';
-$wb['monitor_serverstate_beancountererror_txt'] = 'Existuje příliš mnoho selhání čítačů (limitů)';
-$wb['monitor_title_beancounter_txt'] = 'OpenVz VE čítače (limity)';
+$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter';
+$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter';
+$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter';
+$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter';
 $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information';
 $wb['monitor_title_iptables_txt'] = 'IPTables Pravidla';
 $wb['Show fail2ban-Log'] = 'Zobrazit Fail2Ban Log';
 $wb['Show IPTables'] = 'Zobrazit IPTables pravidla';
-$wb['Show OpenVz VE BeanCounter'] = 'Ukázat OpenVz VE čítače (limity)';
+$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter';
 ?>
+
+
diff --git a/interface/web/monitor/lib/lang/cz_datalog_list.lng b/interface/web/monitor/lib/lang/cz_datalog_list.lng
index c9e9a8655510279e3282bd10839cac4b6fc3e011..70adcad1abbc69fd737747fa997e6c4ce912c68d 100644
--- a/interface/web/monitor/lib/lang/cz_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng
@@ -6,3 +6,5 @@ $wb['dbtable_txt'] = 'DB tabulka';
 $wb['action_txt'] = 'Akce';
 $wb['status_txt'] = 'Stav';
 ?>
+
+
diff --git a/interface/web/monitor/lib/lang/cz_syslog_list.lng b/interface/web/monitor/lib/lang/cz_syslog_list.lng
index 990662552b3a8daac4655d14be078819fe6b6b44..85cd4b3b01cfd8a0eab279a97fd323850924ae07 100644
--- a/interface/web/monitor/lib/lang/cz_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng
@@ -5,3 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['loglevel_txt'] = 'Logovací úroveň';
 $wb['message_txt'] = 'Zpráva';
 ?>
+
+
diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php
index aa28bf135b2058b4e113623268b3bd41c81df431..b7255c0cf87452f20df2e7c20d8ed9116f01a465 100644
--- a/interface/web/sites/form/web_aliasdomain.tform.php
+++ b/interface/web/sites/form/web_aliasdomain.tform.php
@@ -122,7 +122,7 @@ $form["tabs"]['domain'] = array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
+														'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
 														'errmsg'=> 'redirect_error_regex'),
 									),
 			'default'	=> '',
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index 86bc116b98f69113420b067a3014c28577c0178f..fcbd8d831df0c97825778fb2c95970ba6c8beb79 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -297,7 +297,7 @@ $form["tabs"]['redirect'] = array (
 		'redirect_path' => array (
 			'datatype'	=> 'VARCHAR',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
+														'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
 														'errmsg'=> 'redirect_error_regex'),
 									),
 			'formtype'	=> 'TEXT',
diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php
index 20c5b14d7f364bde06970cd7f57226bdc60d5620..0205c56d40e6a60f9205d74de26bf54148016880 100644
--- a/interface/web/sites/form/web_subdomain.tform.php
+++ b/interface/web/sites/form/web_subdomain.tform.php
@@ -123,7 +123,7 @@ $form["tabs"]['domain'] = array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
+														'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
 														'errmsg'=> 'redirect_error_regex'),
 									),
 			'default'	=> '',
diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php
index 9c6bfa6a639d67a2ad33dfdce15b7c93e2800424..bb12974c8b61e512ce271b0eff4cbd42c55a0e35 100644
--- a/interface/web/sites/form/web_vhost_subdomain.tform.php
+++ b/interface/web/sites/form/web_vhost_subdomain.tform.php
@@ -149,7 +149,7 @@ $form["tabs"]['domain'] = array (
 		'web_folder' => array (
 			'datatype'	=> 'VARCHAR',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '@^([\w/_\.\-]{1,100})$@',
+														'regex' => '@^((?!.*\.\.)[\w/_\.\-]{1,100})$@',
 														'errmsg'=> 'web_folder_error_regex'),
 									),
 			'formtype'	=> 'TEXT',
@@ -296,7 +296,7 @@ $form["tabs"]['redirect'] = array (
 		'redirect_path' => array (
 			'datatype'	=> 'VARCHAR',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
+														'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
 														'errmsg'=> 'redirect_error_regex'),
 									),
 			'formtype'	=> 'TEXT',
diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng
index 8d3f7b013c608dfcb3988a36ea56a3c741add287..6d6ba6ba32d73084c557802b88953b37c68e46cf 100644
--- a/interface/web/sites/lib/lang/cz.lng
+++ b/interface/web/sites/lib/lang/cz.lng
@@ -21,13 +21,16 @@ $wb['Shell'] = 'Shell';
 $wb['Webdav'] = 'WebDAV';
 $wb['FTP'] = 'FTP';
 $wb['Options'] = 'Volby';
+$wb['Domain'] = 'Doména';
 $wb['Redirect'] = 'Přesměrování';
 $wb['SSL'] = 'SSL';
 $wb['Sites'] = 'Stránky';
 $wb['Database User'] = 'Uživatelé databáze';
-$wb['APS Installer'] = 'APS instalátor';
-$wb['Available packages'] = 'Dostupné balíčky';
-$wb['Installed packages'] = 'Nainstalované balíčky';
-$wb['Update Packagelist'] = 'Aktualizace seznamu balíčků';
-$wb['Domain'] = 'Domain';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
+$wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng
index 1ed9e616dddcfc61b53d04892b278e1303489355..3c32316be87a13da16daa9621cb184ea2acec8fc 100644
--- a/interface/web/sites/lib/lang/cz_aps.lng
+++ b/interface/web/sites/lib/lang/cz_aps.lng
@@ -55,3 +55,5 @@ $wb['packagelist_update_finished_txt'] = 'APS aktualizace balíčku dokončena.'
 $wb['btn_install_txt'] = 'Instalovat';
 $wb['btn_cancel_txt'] = 'Zrušit';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_aps_instances_list.lng b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
index 961ecbac67d723b187bc49e8195da2b60bbc1990..0ff26acaf69ed3e45c9806aa37743591ec8bacda 100644
--- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
@@ -1,13 +1,15 @@
 <?php
-$wb['list_head_txt'] = 'Nainstalované balíčky';
-$wb['name_txt'] = 'Název';
-$wb['version_txt'] = 'Verze';
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Jméno';
+$wb['version_txt'] = 'Version';
 $wb['customer_txt'] = 'Klient';
 $wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Umístění instalace';
-$wb['pkg_delete_confirmation'] = 'Opravdu chcete smazat tuto instalaci ?';
-$wb['pkg_reinstall_confirmation'] = 'Opravdu chcete přeinstalovat tento balíček se stejným nastavením ?';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
 $wb['filter_txt'] = 'Hledat';
-$wb['delete_txt'] = 'Vymazat';
-$wb['reinstall_txt'] = 'Přeinstalovat';
+$wb['delete_txt'] = 'Smazat';
+$wb['reinstall_txt'] = 'Reinstall';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_aps_packages_list.lng b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
index 2c83eac21bb0bbacb907c51ed4301fe220836018..973e70ca57710ea5002d5ecec5c02733a8a61537 100644
--- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
@@ -1,8 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Dostupné balíčky';
-$wb['name_txt'] = 'Název';
-$wb['version_txt'] = 'Verze';
-$wb['category_txt'] = 'Kategorie';
-$wb['status_txt'] = 'Odemčený';
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Jméno';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
 $wb['filter_txt'] = 'Hledat';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng
index d4e6c1767c3ca833ea85b194916f2ac0b7ddaaef..5ea9bb5b7b20f1864baed0afb2acad407eb04111 100644
--- a/interface/web/sites/lib/lang/cz_cron.lng
+++ b/interface/web/sites/lib/lang/cz_cron.lng
@@ -19,3 +19,5 @@ $wb['run_wday_error_format'] = 'Chybný formát pro dny týdne.';
 $wb['command_error_format'] = 'Chybná formát příkazu. V případě URL je povoleno volání pouze http/https.';
 $wb['unknown_fieldtype_error'] = 'Bylp použito pole neznámého typu.';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_cron_list.lng b/interface/web/sites/lib/lang/cz_cron_list.lng
index f50dee2faf4b467db288bc4e4f1a0c94fba7a66b..05b41634ea68b13fbb2192db8fd59e877862999e 100644
--- a/interface/web/sites/lib/lang/cz_cron_list.lng
+++ b/interface/web/sites/lib/lang/cz_cron_list.lng
@@ -9,5 +9,7 @@ $wb['run_month_txt'] = 'Měsíce';
 $wb['run_wday_txt'] = 'Dny týdne';
 $wb['command_txt'] = 'Příkaz';
 $wb['add_new_cron_txt'] = 'Přidat novou cron úlohu';
-$wb['parent_domain_id_txt'] = 'Webové stránky';
+$wb['parent_domain_id_txt'] = 'Website';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng
index 7c41fbfce6d71cdd2dde2f39fe3a4d16eb784ceb..8187ee03b192da450d04801a6515af48b054d2f6 100644
--- a/interface/web/sites/lib/lang/cz_database.lng
+++ b/interface/web/sites/lib/lang/cz_database.lng
@@ -31,10 +31,10 @@ $wb['generate_password_txt'] = 'Generovat heslo';
 $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
+$wb['globalsearch_resultslimit_of_txt'] = 'z';
+$wb['globalsearch_resultslimit_results_txt'] = 'výsledky';
+$wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.';
+$wb['globalsearch_noresults_limit_txt'] = '0 výsledků';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
 $wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
 $wb['database_ro_user_txt'] = 'Uživatel databáze - jen právo ke čtení';
@@ -43,3 +43,5 @@ $wb['select_dbuser_txt'] = 'Vyberte uživatele databáze';
 $wb['no_dbuser_txt'] = 'Žádný';
 $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_admin_list.lng b/interface/web/sites/lib/lang/cz_database_admin_list.lng
index a0069404d8b2dd755e2d0af7494d1e5516cd19d2..4eb24c99cac1a8f2ac002f0fb8f6437c8517cebd 100644
--- a/interface/web/sites/lib/lang/cz_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng
@@ -8,3 +8,5 @@ $wb['database_name_txt'] = 'Jméno databáze';
 $wb['add_new_record_txt'] = 'Přidat nové databáze';
 $wb['sys_groupid_txt'] = 'Klient';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_list.lng b/interface/web/sites/lib/lang/cz_database_list.lng
index 9bb80dd94580668c61d602253b8f63747ed899e9..269dc2114da3d4e04e71c8cd7e8b5c85f17f9bc4 100644
--- a/interface/web/sites/lib/lang/cz_database_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_list.lng
@@ -7,3 +7,5 @@ $wb['database_user_txt'] = 'Uživatel databáze';
 $wb['database_name_txt'] = 'Název databáze';
 $wb['add_new_record_txt'] = 'Přidat databázi';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_user.lng b/interface/web/sites/lib/lang/cz_database_user.lng
index 3b5dea58fdad9cd420d734aa73810e59243412f4..4621087b5ba0a10baa8f8c7f679fa93db9d85cc6 100644
--- a/interface/web/sites/lib/lang/cz_database_user.lng
+++ b/interface/web/sites/lib/lang/cz_database_user.lng
@@ -14,10 +14,12 @@ $wb['generate_password_txt'] = 'Generovat heslo';
 $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['globalsearch_resultslimit_of_txt'] = 'z';
+$wb['globalsearch_resultslimit_results_txt'] = 'výsledky';
+$wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.';
+$wb['globalsearch_noresults_limit_txt'] = '0 výsledků';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
+$wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
index 8703e713e17c340021f19853a5da6f26411a113a..db76d1099e271a1952506b1ea74ad9e4166c563f 100644
--- a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
@@ -4,3 +4,5 @@ $wb['database_user_txt'] = 'Uživatel databáze';
 $wb['add_new_record_txt'] = 'Vytvořit nového uživatele databáze';
 $wb['sys_groupid_txt'] = 'Klient';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_user_list.lng b/interface/web/sites/lib/lang/cz_database_user_list.lng
index 42cf36d70322b873e1a7d73203a6fa0d695683f4..68cd34d2e4897e3703636d95d0af358b558b421e 100644
--- a/interface/web/sites/lib/lang/cz_database_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Uživatelé databáze';
 $wb['database_user_txt'] = 'Uživatelé databáze';
 $wb['add_new_record_txt'] = 'Přidat nového uživatele databáze';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_ftp_user.lng b/interface/web/sites/lib/lang/cz_ftp_user.lng
index 876ad5108c3713f00ba4c7c570de339593cfd927..2b9dd545055b5f4694f0b7a47291f5a1cf577dc6 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user.lng
@@ -32,3 +32,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_ftp_user_list.lng b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
index 41649df7f9b48c2302dea4af5ac2526548e95c1e..6f6f5021ee9b5bd717c85d53d2eb1d1fa816a2b7 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
@@ -6,3 +6,5 @@ $wb['parent_domain_id_txt'] = 'Webová stránka';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['add_new_record_txt'] = 'Přidat FTP uživatele';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_shell_user.lng b/interface/web/sites/lib/lang/cz_shell_user.lng
index 97b8a0d08843c50c3954d36534c5fe755e3bc05f..234b7a592107858571bafd3175c9203788f4b7d3 100644
--- a/interface/web/sites/lib/lang/cz_shell_user.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user.lng
@@ -27,3 +27,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_shell_user_list.lng b/interface/web/sites/lib/lang/cz_shell_user_list.lng
index 1d6bc198d7ded8db6f17a45dbdc9625288828d83..6d4a8fe52abe0092a5c496261091958aa51e447d 100644
--- a/interface/web/sites/lib/lang/cz_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user_list.lng
@@ -6,3 +6,5 @@ $wb['parent_domain_id_txt'] = 'Stránka';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['add_new_record_txt'] = 'Přidat shell uživatele';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
index 2c9625ad43656e406f3e93105cf7580e394cd5fd..3324ca2e94edf97eabc3bce5a715c628c0f38003 100644
--- a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
@@ -5,5 +5,7 @@ $wb['system_user_txt'] = 'Linuxový uživatel';
 $wb['used_txt'] = 'Využité místo';
 $wb['hard_txt'] = 'Tvrdý limit';
 $wb['soft_txt'] = 'Měkký limit';
-$wb['files_txt'] = 'Počet souborů';
+$wb['files_txt'] = 'Single files';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
index 964151136da27a0e7dacb20d402502f75785f7cb..afdb030805b207fa3c7ddf9f2bf47ed9e02a2b4f 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
@@ -1,3 +1,5 @@
 <?php
-$wb['domain_txt'] = 'Alias domény';
+$wb['domain_txt'] = 'Aliasdomain';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
index 22a4ffe32f01bfe50afa072238b92ec51c76c77f..6cf247f995f6790cce8490a16e6e1fb88c677106 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
@@ -12,3 +12,5 @@ $wb['no_redirect_txt'] = 'Žádné přesměrování';
 $wb['no_flag_txt'] = 'Žádný příznak';
 $wb['none_txt'] = 'Žádná';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_backup_list.lng b/interface/web/sites/lib/lang/cz_web_backup_list.lng
index 9a10ca6d07c27791935d9c0b47cb7357fa4e170a..d2b6dcb3ca6ba6a5ef77a1480838185f206b44b6 100644
--- a/interface/web/sites/lib/lang/cz_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng
@@ -1,7 +1,7 @@
 <?php
 $wb['list_head_txt'] = 'Existing backups';
 $wb['date_txt'] = 'Date';
-$wb['backup_type_txt'] = 'Type';
+$wb['backup_type_txt'] = 'Verze';
 $wb['filename_txt'] = 'Backup file';
 $wb['restore_backup_txt'] = 'Restore backup';
 $wb['download_backup_txt'] = 'Download backup';
@@ -13,3 +13,5 @@ $wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng
index 33134ac0ed4f906f9f92507e193bf293618654c6..c5beed5e8a55dd98d3c38787f1c45eb2405b3a73 100644
--- a/interface/web/sites/lib/lang/cz_web_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain.lng
@@ -112,3 +112,5 @@ $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snipp
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
index e52a794428607d6356db8ef73830fde64926d4a4..c79a51beb90871c2ceb79529714727465dd108fb 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
@@ -7,3 +7,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Doména';
 $wb['add_new_record_txt'] = 'Přidat webovou stránku';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_domain_list.lng b/interface/web/sites/lib/lang/cz_web_domain_list.lng
index cbf025e79b48bd76195551f87ca3b9d821127023..af0947c9fcb657c2137f3ac724f7701cbfb89eee 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_list.lng
@@ -6,3 +6,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Doména';
 $wb['add_new_record_txt'] = 'Přidat webovou stránku';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder.lng b/interface/web/sites/lib/lang/cz_web_folder.lng
index fcf9e0453e691876a95bb7bd0b339323fb36cf67..e5756a74a164cdbd48f44eb3bf58a0ea9d71e4eb 100644
--- a/interface/web/sites/lib/lang/cz_web_folder.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder.lng
@@ -5,3 +5,5 @@ $wb['path_txt'] = 'Path';
 $wb['active_txt'] = 'Aktivní';
 $wb['path_error_regex'] = 'Invalid folder path.';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder_list.lng b/interface/web/sites/lib/lang/cz_web_folder_list.lng
index 8702d5d6a74edf4b49d42ed9cdaf7ad3c952bd1c..3b43fb452b5b8e071c70459037422540f299ecb5 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng
@@ -5,3 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['path_txt'] = 'Cesta';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder_user.lng b/interface/web/sites/lib/lang/cz_web_folder_user.lng
index d3dc99d105cc1d1581b1b885a14704cf24f05b2b..805eb51e7171fc41c7917051ae58aa34d1f14a1a 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng
@@ -10,3 +10,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
index 14bec62c88a2a5f9288868e5bd98d808ecb1ad01..6cc0cc99c553d8270e9aa120cd1fe0c0870dac2f 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
@@ -4,3 +4,5 @@ $wb['active_txt'] = 'Aktivní';
 $wb['web_folder_id_txt'] = 'Folder';
 $wb['username_txt'] = 'Username';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
index ed93596824f107eac7a12df5256a86e02c81a06a..ffab544669c282d411db1319b38b6368c5a4c5b8 100644
--- a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
@@ -7,3 +7,5 @@ $wb['this_year_txt'] = 'Tento rok';
 $wb['last_year_txt'] = 'Minulý rok';
 $wb['sum_txt'] = 'Součet';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng
index c4820176e284379e888b53cd8acc7bff5a4448ca..a0d4a4f496f16a5d75da2f2fad4cbfa4de5a8a38 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng
@@ -43,3 +43,5 @@ $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
index 8a0bafe0f92de7e18017a39057ff7512eff20a7b..1eab4a8aa41ed47b426c1975a0648a2ec8200d79 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
@@ -6,3 +6,5 @@ $wb['parent_domain_id_txt'] = 'Webová stránka';
 $wb['domain_txt'] = 'Subdoména';
 $wb['add_new_record_txt'] = 'Přidat subdoménu';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
index a13aea822ae26551ae352ebc4e01845d34cd9047..3077ca7216ea6836a7e78e9a53454ae27a821a2b 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
@@ -20,7 +20,7 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Doména';
 $wb['host_txt'] = 'Hostname';
 $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
+$wb['type_txt'] = 'Verze';
 $wb['redirect_type_txt'] = 'Redirect Type';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Aktivní';
@@ -116,3 +116,5 @@ $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snipp
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
index 36d7b8669ef5206712aae2cf4c1ed8de1e979d3d..4afe0218d8893c5af2afd1c7fd1f1df56eaa65a4 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
@@ -6,3 +6,5 @@ $wb['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Subdomain';
 $wb['add_new_record_txt'] = 'Add new subdomain';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng
index 35dae3bb97c1ddb9c17c467cbf5beb0d2da8c8bb..57ac9308a799226207639fcf44ade7b802e1ccde 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user.lng
@@ -19,3 +19,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_webdav_user_list.lng b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
index 791710e8ddda4e4cf73b3adfe81ab2b0789874cf..2f480fd0a7801d989216d376f8425ec128d3222a 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
@@ -6,3 +6,5 @@ $wb['parent_domain_id_txt'] = 'Website';
 $wb['username_txt'] = 'Username';
 $wb['add_new_record_txt'] = 'Add new Webdav-User';
 ?>
+
+
diff --git a/interface/web/sites/lib/lang/de.lng b/interface/web/sites/lib/lang/de.lng
index 3d260c0a6686ade6c190f48b652fe6e5e75e35e8..aa244c1aa8f70ef5510e0dc49a39356b2b09ea85 100644
--- a/interface/web/sites/lib/lang/de.lng
+++ b/interface/web/sites/lib/lang/de.lng
@@ -30,4 +30,5 @@ $wb['APS Installer'] = 'APS Installationsassistent';
 $wb['Available packages'] = 'Verfügbare Pakete';
 $wb['Installed packages'] = 'Installierte Pakete';
 $wb['Update Packagelist'] = 'Paketliste aktualisieren';
+$wb['error_proxy_requires_url'] = 'Weiterleitungstyp "proxy" erfordert eine URL als Weiterleitungspfad.';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng
index a913291724e6d46c9774f374b2291bb91c8b3622..41c6df57a8b42ec90ce0dea1fe2c4019a0128baa 100644
--- a/interface/web/sites/lib/lang/de_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_subdomain.lng
@@ -42,4 +42,5 @@ $wb['no_redirect_txt'] = 'Kein Redirect';
 $wb['no_flag_txt'] = 'Kein Flag';
 $wb['proxy_directives_txt'] = 'Proxy Direktiven';
 $wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
+$wb['error_proxy_requires_url'] = 'Weiterleitungstyp "proxy" erfordert eine URL als Weiterleitungspfad.';
 ?>
diff --git a/interface/web/sites/lib/lang/en.lng b/interface/web/sites/lib/lang/en.lng
index 7160dacfb8ccda1ddb6e3435192d0e044128bdfb..81010a651d65ebc8d1a0b54b78305d87955ebbbd 100644
--- a/interface/web/sites/lib/lang/en.lng
+++ b/interface/web/sites/lib/lang/en.lng
@@ -31,4 +31,5 @@ $wb['Available packages'] = 'Available packages';
 $wb['Installed packages'] = 'Installed packages';
 $wb['Update Packagelist'] = 'Update Packagelist';
 $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)';
+$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
 ?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_subdomain.lng b/interface/web/sites/lib/lang/en_web_subdomain.lng
index 72059a48c796dfd2371c63b0e1a357a4e50299cb..cd1c1fbfac6ad97cf3b3d1a811024d03063895e4 100644
--- a/interface/web/sites/lib/lang/en_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/en_web_subdomain.lng
@@ -42,4 +42,5 @@ $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
 ?>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index c415066e335f6fdf8573d2ebeb4bacc7ed2a40b0..570d4626c5e14a3664121efbea9362633f807ce1 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -195,11 +195,13 @@
             if(data.servertype == "nginx"){
                 var selected = jQuery('#php').val();
                 jQuery('.apache').hide();
+                if(selected != "no" && selected != "php-fpm") {
+                    jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
+                }
                 jQuery('#php option[value="fast-cgi"]').hide();
                 jQuery('#php option[value="cgi"]').hide();
                 jQuery('#php option[value="mod"]').hide();
                 jQuery('#php option[value="suphp"]').hide();
-                if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected');
             } else {
                 jQuery('.apache').show();
                 jQuery('#php option[value="fast-cgi"]').show();
@@ -207,8 +209,13 @@
                 jQuery('#php option[value="mod"]').show();
                 jQuery('#php option[value="suphp"]').show();
             }
-            if(noFormChange) resetFormChanged();
-            else jQuery('#php').change();
+            if(noFormChange) {
+                resetFormChanged();
+                jQuery('#php').addClass('no-page-form-change').change();
+                jQuery('#php').removeClass('no-page-form-change');
+            } else {
+                jQuery('#php').change();
+            }
         });
     }
 		
diff --git a/interface/web/sites/templates/web_vhost_subdomain_edit.htm b/interface/web/sites/templates/web_vhost_subdomain_edit.htm
index 5212b5d86652baebc9a64eaaf1a111e709f4e9c9..67c26f32ea0437fe5bdb81a1263667a419a9d358 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_edit.htm
@@ -140,8 +140,7 @@
             reloadFastcgiPHPVersions();
         });
     }
-    adjustForm();
-    reloadFastcgiPHPVersions();
+    reloadServerId(true);
 		
     jQuery('#client_group_id').change(function(){
         clientGroupId = $(this).val();
@@ -161,17 +160,31 @@
             jQuery('.fastcgi_php_version:visible').hide();
         }
     });
-		
-    function adjustForm(){
+    jQuery('#parent_domain_id').change(function() {
+        reloadServerId(false);
+    });
+    
+    function reloadServerId(noFormChange) {
+        var parentWebId = jQuery('#parent_domain_id').val();
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : parentWebId, type : "getserverid"}, function(data) {
+            if(data.serverid) serverId = data.serverid;
+            adjustForm(noFormChange);
+            if(noFormChange) reloadFastcgiPHPVersions(noFormChange);
+        });
+    }
+    
+    function adjustForm(noFormChange){
         jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
             if(data.servertype == "nginx"){
                 var selected = jQuery('#php').val();
                 jQuery('.apache').hide();
+                if(selected != "no" && selected != "php-fpm") {
+                    jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
+                }
                 jQuery('#php option[value="fast-cgi"]').hide();
                 jQuery('#php option[value="cgi"]').hide();
                 jQuery('#php option[value="mod"]').hide();
                 jQuery('#php option[value="suphp"]').hide();
-                if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected');
             } else {
                 jQuery('.apache').show();
                 jQuery('#php option[value="fast-cgi"]').show();
@@ -179,7 +192,13 @@
                 jQuery('#php option[value="mod"]').show();
                 jQuery('#php option[value="suphp"]').show();
             }
-            jQuery('#php').change();
+            if(noFormChange) {
+                resetFormChanged();
+                jQuery('#php').addClass('no-page-form-change').change();
+                jQuery('#php').removeClass('no-page-form-change');
+            } else {
+                jQuery('#php').change();
+            }
         });
     }
 		
@@ -188,7 +207,7 @@
         loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
     }
 		
-    function reloadFastcgiPHPVersions() {
+    function reloadFastcgiPHPVersions(noFormChange) {
         jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) {
             var options = '<option value="">Default</option>';
             var phpfastcgiselected = '';
@@ -201,6 +220,7 @@
                 options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
             });
             $('#fastcgi_php_version').html(options).change();
+            if(noFormChange) resetFormChanged();
         });
     }
     
diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php
index 901cb3525f81803ec4080219c00008b81685b10b..150cb36a4468184f951f0b27ae64f4082d505edb 100644
--- a/interface/web/sites/web_aliasdomain_edit.php
+++ b/interface/web/sites/web_aliasdomain_edit.php
@@ -136,6 +136,11 @@ class page_action extends tform_actions {
                 $this->dataRecord['domain'] = $domain_check;
             }
         }
+		
+		// nginx: if redirect type is proxy and redirect path is no URL, display error
+		if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'],0,1) == '/'){
+			$app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
+		}
         
 		// Get the record of the parent domain
 		$parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 72be72a3d7d5e86875e95ed1ae8e47f17f670f17..c9398b0165c2f3ce68500eff8f32009b6f6028ef 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -474,6 +474,11 @@ class page_action extends tform_actions {
                 }
             }
         }
+		
+		// nginx: if redirect type is proxy and redirect path is no URL, display error
+		//if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'],0,1) == '/'){
+		//	$app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
+		//}
 
 		// Set a few fixed values
 		$this->dataRecord["parent_domain_id"] = 0;
diff --git a/interface/web/sites/web_subdomain_edit.php b/interface/web/sites/web_subdomain_edit.php
index a4246800507b002d7553ee56ddede4409ac55635..ae9ee074e784531284cf0033892e6131ff6beed8 100644
--- a/interface/web/sites/web_subdomain_edit.php
+++ b/interface/web/sites/web_subdomain_edit.php
@@ -147,6 +147,11 @@ class page_action extends tform_actions {
         } else {
             $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
         }
+		
+		// nginx: if redirect type is proxy and redirect path is no URL, display error
+		if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'],0,1) == '/'){
+			$app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
+		}
         
 		// Set a few fixed values
 		$this->dataRecord["type"] = 'subdomain';
diff --git a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
index cff29d541a9a25397d54f9ef3d50cf8856997aed..59a146cbfd045e45581126f417a2a9ca52d178cf 100644
--- a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
@@ -6,3 +6,5 @@ $wb['password_strength_3_txt'] = 'Dobré';
 $wb['password_strength_4_txt'] = 'Silné';
 $wb['password_strength_5_txt'] = 'Velmi silné';
 ?>
+
+
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index ce7440618c91dda5437f6e09618a7a0adfa7ac88..f80193a05267d5500f985f6f48a303b24cdac09a 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -57,8 +57,10 @@
                     jQuery(".panel #Filter").trigger('click');
                 }
                 if(elName == 'select' || elName == 'input' || elName == 'textarea') {
-                    // set marker that something was changed
-                    pageFormChanged = true;
+                    if(jQuery(event.target).hasClass('no-page-form-change') == false) {
+                        // set marker that something was changed
+                        pageFormChanged = true;
+                    }
                 }
             });
             
diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng
index 66bcaf49ae1aca04f3c85100ce9bf0a87f1c74c9..480434e148268e5bcf605b420d9c7a6b723296c2 100644
--- a/interface/web/tools/lib/lang/cz.lng
+++ b/interface/web/tools/lib/lang/cz.lng
@@ -11,3 +11,5 @@ $wb['ISPConfig 3 mail'] = 'ISPConfig 3 vzdalený e-mail server';
 $wb['PDNS Tupa'] = 'PowerDNS Tupa';
 $wb['Interface'] = 'Rozhraní';
 ?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_import_ispconfig.lng b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
index 8ebf71795c1cdf46acba844e8389337533d3163c..ba24f58f758665a41192c8c71c441ae2e7dd18a7 100644
--- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
@@ -21,3 +21,5 @@ $wb['import_forward_txt'] = 'Import forward';
 $wb['import_user_filter_txt'] = 'Importovat uživatelský filter';
 $wb['import_spamfilter_txt'] = 'Importovat spamový filter';
 ?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_index.lng b/interface/web/tools/lib/lang/cz_index.lng
index 5ebf1ec341c14fab8c44a4b2313f80041839eb1f..b1f32ec119ad1a61026ee170c6fe64b66d1fb793 100644
--- a/interface/web/tools/lib/lang/cz_index.lng
+++ b/interface/web/tools/lib/lang/cz_index.lng
@@ -2,3 +2,5 @@
 $wb['page_head_txt'] = 'ISPConfig nástroje';
 $wb['page_desc_txt'] = 'Změna uživatelského nastavení';
 ?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_interface.lng b/interface/web/tools/lib/lang/cz_interface.lng
index 507b7c3cbeda904058d89d4929dfed78d349fa87..1125032b1f966e200731da1c7498eb73438ad439 100644
--- a/interface/web/tools/lib/lang/cz_interface.lng
+++ b/interface/web/tools/lib/lang/cz_interface.lng
@@ -5,3 +5,5 @@ $wb['language_txt'] = 'Jazyk';
 $wb['startmodule_txt'] = 'Výchozí modul po přihlášení';
 $wb['app_theme_txt'] = 'Výchozí grafické téma';
 ?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng
index 96d622e28ab2441253a5cc1885ef280fae89cc93..3b53ca06a5f53cea35cf89979fbc8b76603a35eb 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -11,3 +11,5 @@ $wb['resync_dns_txt'] = 'Resynchronizovat DNS záznamy';
 $wb['btn_start_txt'] = 'Zahájit';
 $wb['btn_cancel_txt'] = 'Zrušit';
 ?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_tpl_default.lng b/interface/web/tools/lib/lang/cz_tpl_default.lng
index c06246304d016300490b28f50eb168cff4cdbc4e..53e9bd84426ad5e634df3f6b05c30e89860e9ad0 100644
--- a/interface/web/tools/lib/lang/cz_tpl_default.lng
+++ b/interface/web/tools/lib/lang/cz_tpl_default.lng
@@ -1,7 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Default Theme settings';
-$wb['list_desc_txt'] = 'Modify default-theme specific options';
-$wb['no_settings_txt'] = 'There are no settings for the default theme.';
-$wb['btn_start_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['list_head_txt'] = 'Výchozí nastavení motivu';
+$wb['list_desc_txt'] = 'Upravit výchozí téma - specifické volby';
+$wb['no_settings_txt'] = 'Nejsou žádné nastavení pro výchozí motiv.';
+$wb['btn_start_txt'] = 'Uložit';
+$wb['btn_cancel_txt'] = 'Zpět';
 ?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_usersettings.lng b/interface/web/tools/lib/lang/cz_usersettings.lng
index dec46b7a06de801c358648cd73bdb30c8370e482..7490e52f98945775198015ef5a892f24566c9924 100644
--- a/interface/web/tools/lib/lang/cz_usersettings.lng
+++ b/interface/web/tools/lib/lang/cz_usersettings.lng
@@ -10,3 +10,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
+
+
diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng
index b666d6fe5517d79b5d2d11a2c1ad3fbaf84a1db9..21224389a858b483872fa40b83b893650f9ec8be 100644
--- a/interface/web/vm/lib/lang/cz.lng
+++ b/interface/web/vm/lib/lang/cz.lng
@@ -1,7 +1,9 @@
 <?php
-$wb['Virtual Servers'] = 'Virtuální server';
-$wb['OS Templates'] = 'Šablona OS';
-$wb['VM Templates'] = 'Šablona VM';
-$wb['IP addresses'] = 'IP adresy';
+$wb['Virtual Servers'] = 'Virtual Servers';
+$wb['OS Templates'] = 'OS Templates';
+$wb['VM Templates'] = 'VM Templates';
+$wb['IP addresses'] = 'IP addresses';
 $wb['OpenVZ'] = 'OpenVZ';
 ?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_action.lng b/interface/web/vm/lib/lang/cz_openvz_action.lng
index 52f73285824f2d6c4107d8c9eec5980a251d505c..2930fff65cf4738794991c2b7a8c569b20800826 100644
--- a/interface/web/vm/lib/lang/cz_openvz_action.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_action.lng
@@ -6,7 +6,7 @@ $wb['restart_txt'] = 'Restart virtual server';
 $wb['ostemplate_txt'] = 'Create OSTemplate';
 $wb['ostemplate_desc_txt'] = '(example: debian-6.0-i386-custom)';
 $wb['btn_save_txt'] = 'Execute selected action';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['btn_cancel_txt'] = 'Zrušit';
 $wb['start_exec_txt'] = 'Start command has been sent to the VM host server. It may take a minute until the VM is started.';
 $wb['stop_exec_txt'] = 'Stop command has been sent to the VM host server. It may take a minute until the VM is stopped.';
 $wb['restart_exec_txt'] = 'Restart command has been sent to the VM host server. It may take a minute until the VM is restarted.';
@@ -14,3 +14,5 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte
 $wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.';
 $wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.';
 ?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ip.lng b/interface/web/vm/lib/lang/cz_openvz_ip.lng
index 84c42ceeb22cac2a539a21ae48fdd84e13814491..6afda02718ae432985307e38c8bea32b92b4623a 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng
@@ -1,9 +1,11 @@
 <?php
-$wb['server_id_txt'] = 'Hostitelský server';
-$wb['ip_address_txt'] = 'IP adresa';
-$wb['vm_id_txt'] = 'Virtuální server';
-$wb['reserved_txt'] = 'Rezervováno';
-$wb['ip_error_wrong'] = 'Prosím, vyplňte platné IPv4 adresy.';
-$wb['ip_error_unique'] = 'Tato IP adresa již existuje.';
-$wb['IP address'] = 'IP adresa';
+$wb['server_id_txt'] = 'Hostserver';
+$wb['ip_address_txt'] = 'IP address';
+$wb['vm_id_txt'] = 'Virtual server';
+$wb['reserved_txt'] = 'Reserved';
+$wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
+$wb['ip_error_unique'] = 'This IP address does already exist.';
+$wb['IP address'] = 'IP address';
 ?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
index e6a3a68c2c3b9cad34982f035b86d4446ea68439..e392e9c970107b173fa43af39f98af1c40aaab4c 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
@@ -5,3 +5,5 @@ $wb['ip_address_txt'] = 'IP address';
 $wb['reserved_txt'] = 'Reserved';
 $wb['vm_id_txt'] = 'VM';
 ?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
index 458877dcaefba7014cfbb4abd864a4e5b581f19f..8fd50e2ed0c372459e402bc0f581484431e7efc1 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
@@ -4,8 +4,10 @@ $wb['template_file_txt'] = 'Template filename';
 $wb['server_id_txt'] = 'Server';
 $wb['allservers_txt'] = 'Exists on all servers';
 $wb['active_txt'] = 'Aktivní';
-$wb['description_txt'] = 'Description';
+$wb['description_txt'] = 'Popis';
 $wb['template_name_error_empty'] = 'Template name is empty.';
 $wb['template_file_error_empty'] = 'Template filename is empty.';
 $wb['Template'] = 'Template';
 ?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
index 76cab8cce89d5ca691ca29b8b9f0a4f4e56a43fd..c8be29a4749276ca4b7fdc13aeb9f9697e850047 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
@@ -1,8 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'OpenVZ šablona OS';
+$wb['list_head_txt'] = 'OpenVZ OSTemplate';
 $wb['active_txt'] = 'Aktivní';
-$wb['template_name_txt'] = 'Název šablony';
+$wb['template_name_txt'] = 'Template name';
 $wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Existuje na všech serverech';
+$wb['allservers_txt'] = 'Exists on all servers';
 $wb['ostemplate_id_txt'] = 'ID';
 ?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng
index 8b07949a63e4920d62a96f6b4ae864a49438a8a2..0acacaf88bedcc96d44f44e8a655ab3ec1dde050 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template.lng
@@ -21,20 +21,20 @@ $wb['numsiginfo_txt'] = 'Numsiginfo';
 $wb['dcachesize_txt'] = 'Dcachesize';
 $wb['numiptent_txt'] = 'Numiptent';
 $wb['swappages_txt'] = 'Swappages';
-$wb['hostname_txt'] = 'Název hostitele (hostname)';
-$wb['nameserver_txt'] = 'Jmený server(y)';
-$wb['nameserver_desc_txt'] = '(oddělené mezerou)';
-$wb['capability_txt'] = 'Schopnost';
-$wb['template_name_txt'] = 'Název šablony';
-$wb['diskspace_txt'] = 'Velikost disku';
-$wb['ram_txt'] = 'RAM (garantovaná)';
+$wb['hostname_txt'] = 'Hostname';
+$wb['nameserver_txt'] = 'Nameserver(s)';
+$wb['nameserver_desc_txt'] = '(separated by whitespace)';
+$wb['capability_txt'] = 'Capability';
+$wb['template_name_txt'] = 'Template name';
+$wb['diskspace_txt'] = 'Diskspace';
+$wb['ram_txt'] = 'RAM (guaranteed)';
 $wb['ram_burst_txt'] = 'RAM (burst)';
 $wb['cpu_units_txt'] = 'CPU units';
 $wb['cpu_num_txt'] = 'CPU cores';
 $wb['cpu_limit_txt'] = 'CPU limit %';
 $wb['io_priority_txt'] = 'I/O priority';
 $wb['active_txt'] = 'Aktivní';
-$wb['description_txt'] = 'Description';
+$wb['description_txt'] = 'Popis';
 $wb['numproc_desc_txt'] = 'Number of processes and threads.';
 $wb['numtcpsock_desc_txt'] = 'Number of TCP sockets.';
 $wb['numothersock_desc_txt'] = 'Number of sockets other than TCP.';
@@ -91,3 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 ?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_template_list.lng b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
index d1e8e5e92e38e89b11bab97dbd416aa430312efd..813dc6ab96d8397001ad9a1b82bf86d1a3f9ffe7 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
 $wb['active_txt'] = 'Aktivní';
 $wb['template_name_txt'] = 'Template name';
 ?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng
index 36f0b427430e91817fae52baabf22bc54c4ca2cd..b24a14bf2bb64ecf89c36074b9a73210dff4ef1c 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng
@@ -1,40 +1,42 @@
 <?php
-$wb['diskspace_txt'] = 'Velikost disku';
-$wb['ram_txt'] = 'RAM (garantovaná)';
+$wb['diskspace_txt'] = 'Diskspace';
+$wb['ram_txt'] = 'RAM (guaranteed)';
 $wb['ram_burst_txt'] = 'RAM (burst)';
-$wb['cpu_units_txt'] = 'CPU jednotka';
-$wb['cpu_num_txt'] = 'Počet CPU';
+$wb['cpu_units_txt'] = 'CPU units';
+$wb['cpu_num_txt'] = 'CPU number';
 $wb['cpu_limit_txt'] = 'CPU limit';
-$wb['io_priority_txt'] = 'I/O priorita';
-$wb['nameserver_txt'] = 'Jmený server(y)';
+$wb['io_priority_txt'] = 'I/O priority';
+$wb['nameserver_txt'] = 'Nameserver(s)';
 $wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Schopnost';
-$wb['server_id_txt'] = 'Hostitelský server';
-$wb['ostemplate_id_txt'] = 'Šablona OS';
-$wb['template_id_txt'] = 'Šablona';
-$wb['ip_address_txt'] = 'IP adresa';
-$wb['hostname_txt'] = 'Název hostitele (hostname)';
-$wb['vm_password_txt'] = 'VM Heslo';
-$wb['start_boot_txt'] = 'Spuštění při startu';
+$wb['capability_txt'] = 'Capability';
+$wb['server_id_txt'] = 'Hostserver';
+$wb['ostemplate_id_txt'] = 'OSTemplate';
+$wb['template_id_txt'] = 'Template';
+$wb['ip_address_txt'] = 'IP address';
+$wb['hostname_txt'] = 'Hostname';
+$wb['vm_password_txt'] = 'VM Password';
+$wb['start_boot_txt'] = 'Start at boot';
 $wb['active_txt'] = 'Aktivní';
 $wb['description_txt'] = 'Popis';
 $wb['client_group_id_txt'] = 'Klient';
 $wb['veid_txt'] = 'VEID';
-$wb['create_dns_txt'] = 'Vytvořte DNS pro hostitele';
-$wb['active_until_date_txt'] = 'Aktivní do data';
-$wb['ip_address_error_empty'] = 'IP adresa nebyla vyplněna.';
-$wb['hostname_error_empty'] = 'Název hostitele (hostname) nebylo zadáno.';
-$wb['vm_password_error_empty'] = 'VM Heslo nebylo zadáno.';
-$wb['veid_error_empty'] = 'VEID nebylo vyplněno.';
-$wb['veid_error_unique'] = 'VEID již existuje.';
+$wb['create_dns_txt'] = 'Create DNS for hostname';
+$wb['active_until_date_txt'] = 'Active until date';
+$wb['ip_address_error_empty'] = 'IP address is empty.';
+$wb['hostname_error_empty'] = 'Hostname is empty.';
+$wb['vm_password_error_empty'] = 'VM Password is empty.';
+$wb['veid_error_empty'] = 'VEID is empty.';
+$wb['veid_error_unique'] = 'VEID does already exist.';
 $wb['diskspace_error_empty'] = 'Diskspace is empty.';
 $wb['ram_error_empty'] = 'RAM (guaranteed) is empty.';
 $wb['ram_burst_error_empty'] = 'RAM (burst) is empty.';
 $wb['cpu_units_error_empty'] = 'CPU units is empty.';
-$wb['cpu_num_error_empty'] = 'Počet CPU nebyl vyplněn.';
-$wb['cpu_limit_error_empty'] = 'CPU limit nebyl vyplněn.';
-$wb['io_priority_error_empty'] = 'I/O priorita nebyla vyplněna.';
-$wb['template_nameserver_error_empty'] = 'Jmený server(y) nebyl vyplněn.';
-$wb['Virtual server'] = 'Virtuální server';
-$wb['Advanced'] = 'Pokročilé nastavení';
+$wb['cpu_num_error_empty'] = 'CPU number is empty.';
+$wb['cpu_limit_error_empty'] = 'CPU limit is empty.';
+$wb['io_priority_error_empty'] = 'I/O priority is empty.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
+$wb['Virtual server'] = 'Virtual server';
+$wb['Advanced'] = 'Advanced';
 ?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
index d9c7e4d05ea29919ad4922388f433c4f4d594a34..ae49a1bf4b95ffdbb7dc8372afab307ed84ea4a0 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
@@ -1,10 +1,12 @@
 <?php
-$wb['list_head_txt'] = 'Virtuální server';
+$wb['list_head_txt'] = 'Virtual server';
 $wb['active_txt'] = 'Aktivní';
-$wb['server_id_txt'] = 'Hostitelský server';
-$wb['ostemplate_id_txt'] = 'Šablona OS';
-$wb['template_id_txt'] = 'Šablona';
-$wb['hostname_txt'] = 'Název hostitele (hostname)';
-$wb['ip_address_txt'] = 'IP adresa';
+$wb['server_id_txt'] = 'Hostserver';
+$wb['ostemplate_id_txt'] = 'OSTemplate';
+$wb['template_id_txt'] = 'Template';
+$wb['hostname_txt'] = 'Hostname';
+$wb['ip_address_txt'] = 'IP address';
 $wb['veid_txt'] = 'VEID';
 ?>
+
+
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index c8b4d06e8458fcc5e3a7b1c709d8fb4da34cb26e..7217636d1798ca0a9f581682f691cbbc13728647 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -27,15 +27,20 @@ server {
             rewrite ^ $scheme://<tmpl_var name='alias_seo_redirect_target_domain'>$request_uri? permanent;
         }
 </tmpl_loop>
+<tmpl_loop name="local_redirects">
+        if ($http_host <tmpl_var name='local_redirect_operator'> "<tmpl_var name='local_redirect_origin_domain'>") {
+            rewrite ^<tmpl_var name='local_redirect_exclude'>(.*)$ <tmpl_var name='local_redirect_target'>$2 <tmpl_var name='local_redirect_type'>;
+        }
+</tmpl_loop>
 
 <tmpl_loop name="own_redirects">
 <tmpl_if name='use_rewrite'>
-        rewrite ^<tmpl_var name='rewrite_exclude'>(.*)$ <tmpl_var name='rewrite_target'>$2 <tmpl_var name='rewrite_type'>;
+        <tmpl_if name='exclude_own_hostname'>if ($http_host != "<tmpl_var name='exclude_own_hostname'>") { </tmpl_if>rewrite ^<tmpl_var name='rewrite_exclude'>(.*)$ <tmpl_var name='rewrite_target'>$2 <tmpl_var name='rewrite_type'>;<tmpl_if name='exclude_own_hostname'> }</tmpl_if>
 </tmpl_if>
 <tmpl_if name='use_proxy'>
         location / {
             proxy_pass <tmpl_var name='rewrite_target'>;
-            rewrite ^/<tmpl_var name='rewrite_subdir'>/(.*) /$1;
+            <tmpl_if name='rewrite_subdir'>rewrite ^/<tmpl_var name='rewrite_subdir'>(.*) /$1;</tmpl_if>
 <tmpl_loop name="proxy_directives">
         <tmpl_var name='proxy_directive'>
 </tmpl_loop>
@@ -143,7 +148,7 @@ server {
 </tmpl_if>
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_param PATH_INFO $fastcgi_script_name;
+            #fastcgi_param PATH_INFO $fastcgi_script_name;
             fastcgi_intercept_errors on;
         }
 </tmpl_else>
@@ -212,7 +217,7 @@ server {
 <tmpl_if name='use_proxy'>
         location / {
             proxy_pass <tmpl_var name='rewrite_target'>;
-            rewrite ^/<tmpl_var name='rewrite_subdir'>/(.*) /$1;
+            <tmpl_if name='rewrite_subdir'>rewrite ^/<tmpl_var name='rewrite_subdir'>(.*) /$1;</tmpl_if>
 <tmpl_loop name="proxy_directives">
         <tmpl_var name='proxy_directive'>
 </tmpl_loop>
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 4c75e62bc8ebf54cf12e5e650fcdf7b85851612a..005bd1abe35ae7f319df0116ee77b068fc22594e 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -61,9 +61,9 @@ class db extends mysqli
     parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
     if ($this->connect_error) {
       $this->updateError('DB::__construct');
+    } else {
+      $this->setCharacterEncoding();
     }
-    parent::query( 'SET NAMES '.$this->dbCharset); 
-    parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
   }
 
   public function __destruct() {
@@ -101,9 +101,31 @@ class db extends mysqli
       }
     }
   }
+  
+  private function setCharacterEncoding() {
+    parent::query( 'SET NAMES '.$this->dbCharset); 
+    parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
+  }
 
   public function query($queryString) {
-    parent::ping();
+    $try = 0;
+    do {
+        $try++;
+        $ok = parent::ping();
+        if(!$ok) {
+            if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) {
+                if($try > 9) {
+                    $this->updateError('DB::query -> reconnect');
+                    return false;
+                } else {
+                    sleep(1);
+                }
+            } else {
+                $this->setCharacterEncoding();
+                $ok = true;
+            }
+        }
+    } while($ok == false);
 	$this->queryId = parent::query($queryString);
     $this->updateError('DB::query('.$queryString.') -> mysqli_query');
     if(!$this->queryId) {
@@ -152,6 +174,10 @@ class db extends mysqli
   public function numRows() {
     return $this->queryId->num_rows;
   }
+  
+  public function affectedRows() {
+	return $this->queryId->affected_rows;
+  }
 
   // returns mySQL insert id
   public function insertID() {
@@ -181,44 +207,6 @@ public function toLower($record) {
     return $out;
   }
 
-  /*
-  //* These functions are deprecated and will be removed.
-  function insert($tablename,$form,$debug = 0)
-  {
-  if(is_array($form)){
-  foreach($form as $key => $value) 
-  {
-  $sql_key .= "$key, ";
-  $sql_value .= "'".$this->check($value)."', ";
-  }
-  $sql_key = substr($sql_key,0,strlen($sql_key) - 2);
-  $sql_value = substr($sql_value,0,strlen($sql_value) - 2);
-
-  $sql = "INSERT INTO $tablename (" . $sql_key . ") VALUES (" . $sql_value .")";
-
-  if($debug == 1) echo "SQL-Statement: ".$sql."<br><br>";
-  $this->query($sql);
-  if($debug == 1) echo "mySQL Error Message: ".$this->errorMessage;
-  }
-  }
-
-  function update($tablename,$form,$bedingung,$debug = 0)
-  {
-
-  if(is_array($form)){
-  foreach($form as $key => $value) 
-  {
-  $insql .= "$key = '".$this->check($value)."', ";
-  }
-  $insql = substr($insql,0,strlen($insql) - 2);
-  $sql = "UPDATE $tablename SET " . $insql . " WHERE $bedingung";
-  if($debug == 1) echo "SQL-Statement: ".$sql."<br><br>";
-  $this->query($sql);
-  if($debug == 1) echo "mySQL Error Message: ".$this->errorMessage;
-  }
-  }
-   */
-
   public function diffrec($record_old, $record_new) {
     $diffrec_full = array();
     $diff_num = 0;
@@ -253,9 +241,9 @@ public function toLower($record) {
       return array('diff_num' => $diff_num, 'diff_rec' => $diffrec_full);
 
     }
-	
-	//** Function to fill the datalog with a full differential record.
-    public function datalogSave($db_table, $action, $primary_field, $primary_id, $record_old, $record_new) {
+
+    //** Function to fill the datalog with a full differential record.
+    public function datalogSave($db_table, $action, $primary_field, $primary_id, $record_old, $record_new, $force_update = false) {
       global $app,$conf;
 
       // Insert backticks only for incomplete table names.
@@ -265,10 +253,17 @@ public function toLower($record) {
 	$escape = '`';
       }
 
-      $tmp = $this->diffrec($record_old, $record_new);
-      $diffrec_full = $tmp['diff_rec'];
-      $diff_num = $tmp['diff_num'];
-      unset($tmp);
+		if($force_update == true) {
+			//* We force a update even if no record has changed
+			$diffrec_full = array('new' => $record_new,'old' => $record_old);
+			$diff_num = count($record_new);
+		} else {
+			//* get the difference record between old and new record
+			$tmp = $this->diffrec($record_old, $record_new);
+			$diffrec_full = $tmp['diff_rec'];
+			$diff_num = $tmp['diff_num'];
+			unset($tmp);
+		}
 
       // Insert the server_id, if the record has a server_id
       $server_id = (isset($record_old['server_id']) && $record_old['server_id'] > 0)?$record_old['server_id']:0;
@@ -297,9 +292,23 @@ public function toLower($record) {
     //** Inserts a record and saves the changes into the datalog
     public function datalogInsert($tablename, $insert_data, $index_field) {
       global $app;
+	  
+	  if(is_array($insert_data)) {
+			$key_str = '';
+			$val_str = '';
+			foreach($insert_data as $key => $val) {
+				$key_str .= "`".$key ."`,";
+				$val_str .= "'".$this->quote($val)."',";
+			}
+			$key_str = substr($key_str,0,-1);
+			$val_str = substr($val_str,0,-1);
+			$insert_data_str = '('.$key_str.') VALUES ('.$val_str.')';
+		} else {
+			$insert_data_str = $insert_data;
+		}
 
       $old_rec = array();
-      $this->query("INSERT INTO $tablename $insert_data");
+      $this->query("INSERT INTO $tablename $insert_data_str");
       $index_value = $this->insertID();
       $new_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
       $this->datalogSave($tablename, 'INSERT', $index_field, $index_value, $old_rec, $new_rec);
@@ -308,13 +317,24 @@ public function toLower($record) {
     }
 
     //** Updates a record and saves the changes into the datalog
-    public function datalogUpdate($tablename, $update_data, $index_field, $index_value) {
-      global $app;
-
-      $old_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
-      $this->query("UPDATE $tablename SET $update_data WHERE $index_field = '$index_value'");
+    public function datalogUpdate($tablename, $update_data, $index_field, $index_value, $force_update = false) {
+		global $app;
+      
+	  $old_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
+	  
+	  if(is_array($update_data)) {
+			$update_data_str = '';
+			foreach($update_data as $key => $val) {
+				$update_data_str .= "`".$key ."` = '".$this->quote($val)."',";
+			}
+			$update_data_str = substr($update_data_str,0,-1);
+		} else {
+			$update_data_str = $update_data;
+		}
+		
+      $this->query("UPDATE $tablename SET $update_data_str WHERE $index_field = '$index_value'");
       $new_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
-      $this->datalogSave($tablename, 'UPDATE', $index_field, $index_value, $old_rec, $new_rec);
+      $this->datalogSave($tablename, 'UPDATE', $index_field, $index_value, $old_rec, $new_rec, $force_update);
 
       return true;
     }
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index afcafef7244b5c3337a834b3bfad93962e5c3130..7c0e7f96194f03290a07fadde7214a4903617a68 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -210,8 +210,14 @@ class apache2_plugin {
 			$this->ssl_certificate_changed = true;
 			
 			//* Rename files if they exist
-			if(file_exists($key_file)) $app->system->rename($key_file,$key_file.'.bak');
-			if(file_exists($key_file2)) $app->system->rename($key_file2,$key_file2.'.bak');
+			if(file_exists($key_file)){
+				$app->system->rename($key_file,$key_file.'.bak');
+				$app->system->chmod($key_file.'.bak',0400);
+			}
+			if(file_exists($key_file2)){
+				$app->system->rename($key_file2,$key_file2.'.bak');
+				$app->system->chmod($key_file2.'.bak',0400);
+			}
 			if(file_exists($csr_file)) $app->system->rename($csr_file,$csr_file.'.bak');
 			if(file_exists($crt_file)) $app->system->rename($crt_file,$crt_file.'.bak');
 			
@@ -283,6 +289,7 @@ class apache2_plugin {
 			
 			}
 
+			$app->system->chmod($key_file,0400);
 			$app->system->chmod($key_file2,0400);
 			@$app->system->unlink($config_file);
 			@$app->system->unlink($rand_file);
@@ -309,8 +316,14 @@ class apache2_plugin {
 			$bundle_file = $ssl_dir.'/'.$domain.".bundle";
 			
 			//* Backup files
-			if(file_exists($key_file)) $app->system->copy($key_file,$key_file.'~');
-			if(file_exists($key_file2)) $app->system->copy($key_file2,$key_file2.'~');
+			if(file_exists($key_file)){
+				$app->system->copy($key_file,$key_file.'~');
+				$app->system->chmod($key_file.'~',0400);
+			}
+			if(file_exists($key_file2)){
+				$app->system->copy($key_file2,$key_file2.'~');
+				$app->system->chmod($key_file2.'~',0400);
+			}
 			if(file_exists($csr_file)) $app->system->copy($csr_file,$csr_file.'~');
 			if(file_exists($crt_file)) $app->system->copy($crt_file,$crt_file.'~');
 			if(file_exists($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'~');
@@ -1543,8 +1556,14 @@ class apache2_plugin {
 					$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
 					
 					//* Backup the files that might have caused the error
-					if(is_file($key_file)) $app->system->copy($key_file,$key_file.'.err');
-					if(is_file($key_file2)) $app->system->copy($key_file2,$key_file2.'.err');
+					if(is_file($key_file)){
+						$app->system->copy($key_file,$key_file.'.err');
+						$app->system->chmod($key_file.'.err',0400);
+					}
+					if(is_file($key_file2)){
+						$app->system->copy($key_file2,$key_file2.'.err');
+						$app->system->chmod($key_file2.'.err',0400);
+					}
 					if(is_file($csr_file)) $app->system->copy($csr_file,$csr_file.'.err');
 					if(is_file($crt_file)) $app->system->copy($crt_file,$crt_file.'.err');
 					if(is_file($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'.err');
diff --git a/server/plugins-available/cron_jailkit_plugin.inc.php b/server/plugins-available/cron_jailkit_plugin.inc.php
index 41669b5f8b1c831c921a006b827525415f24712d..8df854a31da9dd80d8af59b078a6df8a49108aad 100644
--- a/server/plugins-available/cron_jailkit_plugin.inc.php
+++ b/server/plugins-available/cron_jailkit_plugin.inc.php
@@ -262,6 +262,8 @@ class cron_jailkit_plugin {
 	
 	function _add_jailkit_programs()
 	{
+		global $app;
+		
 		//copy over further programs and its libraries
 		$command = '/usr/local/ispconfig/server/scripts/create_jailkit_programs.sh';
 		$command .= ' '.escapeshellcmd($this->parent_domain['document_root']);
@@ -280,6 +282,8 @@ class cron_jailkit_plugin {
 	
 	function _add_jailkit_user()
 	{
+			global $app;
+			
 			//add the user to the chroot
             $jailkit_chroot_userhome = $this->_get_home_dir($this->parent_domain['system_user']);
 			
diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
index e4825c8e9f722dba653bad89975a37aa7321db81..ce6bb5ab193ae5bbb7ff569538de42922997c6dd 100644
--- a/server/plugins-available/mysql_clientdb_plugin.inc.php
+++ b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -393,7 +393,7 @@ class mysql_clientdb_plugin {
 			}
 
 			if($data['new']['database_password'] != $data['old']['database_password'] && $data['new']['database_password'] != '') {
-				$link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = PASSWORD('".$link->escape_string($data['new']['database_password'])."');"); // is contained in clear text so PASSWORD() func is needed
+				$link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = '".$link->escape_string($data['new']['database_password'])."';");
 				$app->log('Changing MySQL user password for: '.$data['new']['database_user'].'@'.$db_host,LOGLEVEL_DEBUG);
 			}
         }
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 854320e08899b4f330fbec56e07b0bfa386c05fc..1c37a5a8101e77701ff654d6564b15685877a13f 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -120,8 +120,14 @@ class nginx_plugin {
 			$this->ssl_certificate_changed = true;
 			
 			//* Rename files if they exist
-			if(file_exists($key_file)) $app->system->rename($key_file,$key_file.'.bak');
-			if(file_exists($key_file2)) $app->system->rename($key_file2,$key_file2.'.bak');
+			if(file_exists($key_file)){
+				$app->system->rename($key_file,$key_file.'.bak');
+				$app->system->chmod($key_file.'.bak',0400);
+			}
+			if(file_exists($key_file2)){
+				$app->system->rename($key_file2,$key_file2.'.bak');
+				$app->system->chmod($key_file2.'.bak',0400);
+			}
 			if(file_exists($csr_file)) $app->system->rename($csr_file,$csr_file.'.bak');
 			if(file_exists($crt_file)) $app->system->rename($crt_file,$crt_file.'.bak');
 			
@@ -193,6 +199,7 @@ class nginx_plugin {
 			
 			}
 
+			$app->system->chmod($key_file,0400);
 			$app->system->chmod($key_file2,0400);
 			@$app->system->unlink($config_file);
 			@$app->system->unlink($rand_file);
@@ -219,8 +226,14 @@ class nginx_plugin {
 			//$bundle_file = $ssl_dir.'/'.$domain.".bundle";
 			
 			//* Backup files
-			if(file_exists($key_file)) $app->system->copy($key_file,$key_file.'~');
-			if(file_exists($key_file2)) $app->system->copy($key_file2,$key_file2.'~');
+			if(file_exists($key_file)){
+				$app->system->copy($key_file,$key_file.'~');
+				$app->system->chmod($key_file.'~',0400);
+			}
+			if(file_exists($key_file2)){
+				$app->system->copy($key_file2,$key_file2.'~');
+				$app->system->chmod($key_file2.'~',0400);
+			}
 			if(file_exists($csr_file)) $app->system->copy($csr_file,$csr_file.'~');
 			if(file_exists($crt_file)) $app->system->copy($crt_file,$crt_file.'~');
 			//if(file_exists($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'~');
@@ -969,6 +982,7 @@ class nginx_plugin {
 		// Rewrite rules
 		$own_rewrite_rules = array();
 		$rewrite_rules = array();
+		$local_rewrite_rules = array();
 		if($data['new']['redirect_type'] != '' && $data['new']['redirect_path'] != '') {
 			if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
 			if(substr($data['new']['redirect_path'],0,8) == '[scheme]'){
@@ -998,6 +1012,7 @@ class nginx_plugin {
 
 			switch($data['new']['subdomain']) {
 				case 'www':
+					$exclude_own_hostname = '';
 					if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
 						if($data['new']['redirect_type'] == 'proxy'){
 							$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
@@ -1020,6 +1035,7 @@ class nginx_plugin {
 								break;
 							} else {
 								$rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+								$exclude_own_hostname = $tmp_redirect_path_parts['host'];
 							}
 						} else {
 							// external URL
@@ -1028,7 +1044,8 @@ class nginx_plugin {
 								$vhost_data['use_proxy'] = 'y';
 								$rewrite_subdir = $tmp_redirect_path_parts['path'];
 								if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
-								if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+								if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+								if($rewrite_subdir == '/') $rewrite_subdir = '';
 							}
 						}
 						unset($tmp_redirect_path);
@@ -1039,11 +1056,13 @@ class nginx_plugin {
 						'rewrite_target' 	=> $data['new']['redirect_path'],
 						'rewrite_exclude'	=> $rewrite_exclude,
 						'rewrite_subdir'	=> $rewrite_subdir,
+						'exclude_own_hostname' => $exclude_own_hostname,
 						'proxy_directives'	=> $final_proxy_directives,
 						'use_rewrite'	=> ($data['new']['redirect_type'] == 'proxy' ? false:true),
 						'use_proxy'	=> ($data['new']['redirect_type'] == 'proxy' ? true:false));
 					break;
 				case '*':
+					$exclude_own_hostname = '';
 					if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
 						if($data['new']['redirect_type'] == 'proxy'){
 							$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
@@ -1068,6 +1087,7 @@ class nginx_plugin {
 								break;
 							} else {
 								$rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+								$exclude_own_hostname = $tmp_redirect_path_parts['host'];
 							}
 						} else {
 							// external URL
@@ -1076,7 +1096,8 @@ class nginx_plugin {
 								$vhost_data['use_proxy'] = 'y';
 								$rewrite_subdir = $tmp_redirect_path_parts['path'];
 								if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
-								if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+								if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+								if($rewrite_subdir == '/') $rewrite_subdir = '';
 							}
 						}
 						unset($tmp_redirect_path);
@@ -1087,12 +1108,14 @@ class nginx_plugin {
 						'rewrite_target' 	=> $data['new']['redirect_path'],
 						'rewrite_exclude'	=> $rewrite_exclude,
 						'rewrite_subdir'	=> $rewrite_subdir,
+						'exclude_own_hostname' => $exclude_own_hostname,
 						'proxy_directives'	=> $final_proxy_directives,
 						'use_rewrite'	=> ($data['new']['redirect_type'] == 'proxy' ? false:true),
 						'use_proxy'	=> ($data['new']['redirect_type'] == 'proxy' ? true:false));
 					break;
 				default:
 					if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
+						$exclude_own_hostname = '';
 						if($data['new']['redirect_type'] == 'proxy'){
 							$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
 							$vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
@@ -1114,6 +1137,7 @@ class nginx_plugin {
 								break;
 							} else {
 								$rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+								$exclude_own_hostname = $tmp_redirect_path_parts['host'];
 							}
 						} else {
 							// external URL
@@ -1122,7 +1146,8 @@ class nginx_plugin {
 								$vhost_data['use_proxy'] = 'y';
 								$rewrite_subdir = $tmp_redirect_path_parts['path'];
 								if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
-								if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
+								if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+								if($rewrite_subdir == '/') $rewrite_subdir = '';
 							}
 						}
 						unset($tmp_redirect_path);
@@ -1133,6 +1158,7 @@ class nginx_plugin {
 						'rewrite_target' 	=> $data['new']['redirect_path'],
 						'rewrite_exclude'	=> $rewrite_exclude,
 						'rewrite_subdir'	=> $rewrite_subdir,
+						'exclude_own_hostname' => $exclude_own_hostname,
 						'proxy_directives'	=> $final_proxy_directives,
 						'use_rewrite'	=> ($data['new']['redirect_type'] == 'proxy' ? false:true),
 						'use_proxy'	=> ($data['new']['redirect_type'] == 'proxy' ? true:false));
@@ -1189,7 +1215,7 @@ class nginx_plugin {
 					$final_proxy_directives = false;
 				}
 			
-				if($alias['redirect_type'] == '' || $alias['redirect_path'] == '') {
+				if($alias['redirect_type'] == '' || $alias['redirect_path'] == '' || substr($alias['redirect_path'],0,1) == '/') {
 					switch($alias['subdomain']) {
 						case 'www':
 							$server_alias[] = 'www.'.$alias['domain'].' '.$alias['domain'].' ';
@@ -1212,8 +1238,44 @@ class nginx_plugin {
 					}
 				}
 				
-				// Rewriting
-				if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
+				// Local Rewriting (inside vhost server {} container)
+				if($alias['redirect_type'] != '' && substr($alias['redirect_path'],0,1) == '/' && $alias['redirect_type'] != 'proxy') {  // proxy makes no sense with local path
+					if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
+					$rewrite_exclude = '(?!/\b('.substr($alias['redirect_path'],1,-1).(substr($alias['redirect_path'],1,-1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
+					switch($alias['subdomain']) {
+						case 'www':
+							// example.com
+							$local_rewrite_rules[] = array(	'local_redirect_origin_domain' 	=> $alias['domain'],
+								'local_redirect_operator'	=> '=',
+								'local_redirect_exclude' => $rewrite_exclude,
+								'local_redirect_target' => $alias['redirect_path'],
+								'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
+
+							// www.example.com
+							$local_rewrite_rules[] = array(	'local_redirect_origin_domain' 	=> 'www.'.$alias['domain'],
+								'local_redirect_operator'	=> '=',
+								'local_redirect_exclude' => $rewrite_exclude,
+								'local_redirect_target' => $alias['redirect_path'],
+								'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
+							break;
+						case '*':
+							$local_rewrite_rules[] = array(	'local_redirect_origin_domain' 	=> '^('.str_replace('.', '\.', $alias['domain']).'|.+\.'.str_replace('.', '\.', $alias['domain']).')$',
+								'local_redirect_operator'	=> '~*',
+								'local_redirect_exclude' => $rewrite_exclude,
+								'local_redirect_target' => $alias['redirect_path'],
+								'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
+							break;
+						default:
+							$local_rewrite_rules[] = array(	'local_redirect_origin_domain' 	=> $alias['domain'],
+								'local_redirect_operator'	=> '=',
+								'local_redirect_exclude' => $rewrite_exclude,
+								'local_redirect_target' => $alias['redirect_path'],
+								'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
+					}
+				}
+				
+				// External Rewriting (extra server {} containers)
+				if($alias['redirect_type'] != '' && $alias['redirect_path'] != '' && substr($alias['redirect_path'],0,1) != '/') {
 					if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
 					if(substr($alias['redirect_path'],0,8) == '[scheme]'){
 						if($alias['redirect_type'] != 'proxy'){
@@ -1225,21 +1287,15 @@ class nginx_plugin {
 					
 					switch($alias['subdomain']) {
 						case 'www':
-							if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
-								if($alias['redirect_type'] == 'proxy'){
-									$rewrite_subdir = substr($alias['redirect_path'],1);
-									if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
-								}
-								$alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
-							} else {
-								if($alias['redirect_type'] == 'proxy'){
-									$tmp_redirect_path = $alias['redirect_path'];
-									$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
-									$rewrite_subdir = $tmp_redirect_path_parts['path'];
-									if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
-									if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
-								}
+							if($alias['redirect_type'] == 'proxy'){
+								$tmp_redirect_path = $alias['redirect_path'];
+								$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+								$rewrite_subdir = $tmp_redirect_path_parts['path'];
+								if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+								if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+								if($rewrite_subdir == '/') $rewrite_subdir = '';
 							}
+							
 							if($alias['redirect_type'] != 'proxy'){
 								if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
 							}
@@ -1259,26 +1315,7 @@ class nginx_plugin {
 								'use_rewrite'	=> ($alias['redirect_type'] == 'proxy' ? false:true),
 								'use_proxy'	=> ($alias['redirect_type'] == 'proxy' ? true:false),
 								'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
-								
-								
-							if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
-								if($alias['redirect_type'] == 'proxy'){
-									$rewrite_subdir = substr($alias['redirect_path'],1);
-									if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
-								}
-								$alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
-							} else {
-								if($alias['redirect_type'] == 'proxy'){
-									$tmp_redirect_path = $alias['redirect_path'];
-									$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
-									$rewrite_subdir = $tmp_redirect_path_parts['path'];
-									if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
-									if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
-								}
-							}
-							if($alias['redirect_type'] != 'proxy'){
-								if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
-							}
+
 							// Add SEO redirects for alias domains
 							$alias_seo_redirects2 = array();
 							if($alias['seo_redirect'] != ''){
@@ -1297,21 +1334,15 @@ class nginx_plugin {
 								'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
 							break;
 						case '*':
-							if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
-								if($alias['redirect_type'] == 'proxy'){
-									$rewrite_subdir = substr($alias['redirect_path'],1);
-									if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
-								}
-								$alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
-							} else {
-								if($alias['redirect_type'] == 'proxy'){
-									$tmp_redirect_path = $alias['redirect_path'];
-									$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
-									$rewrite_subdir = $tmp_redirect_path_parts['path'];
-									if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
-									if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
-								}
+							if($alias['redirect_type'] == 'proxy'){
+								$tmp_redirect_path = $alias['redirect_path'];
+								$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+								$rewrite_subdir = $tmp_redirect_path_parts['path'];
+								if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+								if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+								if($rewrite_subdir == '/') $rewrite_subdir = '';
 							}
+							
 							if($alias['redirect_type'] != 'proxy'){
 								if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
 							}
@@ -1333,21 +1364,15 @@ class nginx_plugin {
 								'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
 							break;
 						default:
-							if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
-								if($alias['redirect_type'] == 'proxy'){
-									$rewrite_subdir = substr($alias['redirect_path'],1);
-									if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
-								}
-								$alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
-							} else {
-								if($alias['redirect_type'] == 'proxy'){
-									$tmp_redirect_path = $alias['redirect_path'];
-									$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
-									$rewrite_subdir = $tmp_redirect_path_parts['path'];
-									if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
-									if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
-								}
+							if($alias['redirect_type'] == 'proxy'){
+								$tmp_redirect_path = $alias['redirect_path'];
+								$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+								$rewrite_subdir = $tmp_redirect_path_parts['path'];
+								if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
+								if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
+								if($rewrite_subdir == '/') $rewrite_subdir = '';
 							}
+							
 							if($alias['redirect_type'] != 'proxy'){
 								if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
 							}
@@ -1399,6 +1424,9 @@ class nginx_plugin {
 		if(count($own_rewrite_rules) > 0) {
 			$tpl->setLoop('own_redirects',$own_rewrite_rules);
 		}
+		if(count($local_rewrite_rules) > 0) {
+			$tpl->setLoop('local_redirects',$local_rewrite_rules);
+		}
 		if(count($alias_seo_redirects) > 0) {
 			$tpl->setLoop('alias_seo_redirects',$alias_seo_redirects);
 		}
@@ -1523,8 +1551,14 @@ class nginx_plugin {
 					//$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
 					
 					//* Backup the files that might have caused the error
-					if(is_file($key_file)) $app->system->copy($key_file,$key_file.'.err');
-					if(is_file($key_file2)) $app->system->copy($key_file2,$key_file2.'.err');
+					if(is_file($key_file)){
+						$app->system->copy($key_file,$key_file.'.err');
+						$app->system->chmod($key_file.'.err',0400);
+					}
+					if(is_file($key_file2)){
+						$app->system->copy($key_file2,$key_file2.'.err');
+						$app->system->chmod($key_file2.'.err',0400);
+					}
 					if(is_file($csr_file)) $app->system->copy($csr_file,$csr_file.'.err');
 					if(is_file($crt_file)) $app->system->copy($crt_file,$crt_file.'.err');
 					//if(is_file($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'.err');
@@ -2294,8 +2328,35 @@ class nginx_plugin {
 
 		$lines = explode("\n", $vhost_conf);
 		
+		// if whole location block is in one line, split it up into multiple lines
 		if(is_array($lines) && !empty($lines)){
+			$linecount = sizeof($lines);
+			for($h=0;$h<$linecount;$h++){
+				$lines[$h] = rtrim($lines[$h]);
+				if(substr(ltrim($lines[$h]), 0, 8) == 'location' && strpos($lines[$h], '{') !== false && strpos($lines[$h], ';') !== false){
+					$lines[$h] = str_replace("{", "{\n", $lines[$h]);
+					$lines[$h] = str_replace(";", ";\n", $lines[$h]);
+					if(strpos($lines[$h], '##merge##') !== false){
+						$lines[$h] = str_replace('##merge##', '', $lines[$h]);
+						$lines[$h] = substr($lines[$h],0,strpos($lines[$h], '{')).' ##merge##'.substr($lines[$h],strpos($lines[$h], '{')+1);
+					}
+				}
+				if(substr(ltrim($lines[$h]), 0, 8) == 'location' && strpos($lines[$h], '{') !== false && strpos($lines[$h], '}') !== false && strpos($lines[$h], ';') === false){
+					$lines[$h] = str_replace("{", "{\n", $lines[$h]);
+					if(strpos($lines[$h], '##merge##') !== false){
+						$lines[$h] = str_replace('##merge##', '', $lines[$h]);
+						$lines[$h] = substr($lines[$h],0,strpos($lines[$h], '{')).' ##merge##'.substr($lines[$h],strpos($lines[$h], '{')+1);
+					}
+				}
+			}
+		}
+		$vhost_conf = implode("\n", $lines);
+		unset($lines);
+		unset($linecount);
 		
+		$lines = explode("\n", $vhost_conf);
+			
+		if(is_array($lines) && !empty($lines)){	
 			$locations = array();
 			$islocation = false;
 			$linecount = sizeof($lines);
@@ -2364,7 +2425,7 @@ class nginx_plugin {
 			$vhost_conf = implode("\n", $lines);
 		}
 		
-		return $vhost_conf;
+		return trim($vhost_conf);
 	}
 	
 	function client_delete($event_name,$data) {