diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 69937821813b409da11dc0604b9a8272a011505e..aa83141c646bebfe2e3c8d2bafd84d0481148d28 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -59,22 +59,8 @@ class installer_dist extends installer_base {
 			}
 		}
 		
-		$config_dir = $conf['mailman']['config_dir'].'/';
-		$full_file_name = $config_dir.'virtual_to_transport.sh';
-		
-		//* Backup exiting virtual_to_transport.sh script
-		if(is_file($full_file_name)) {
-			copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
-		}
-		
-		copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
-		chgrp($full_file_name,'mailman');
-		chmod($full_file_name,0750);
-		
 		if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
 		exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
-		
-		exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
 
 		$virtual_domains = '';
 		if($status == 'update')
@@ -101,6 +87,25 @@ class installer_dist extends installer_base {
 		$content = str_replace('{virtual_domains}', $virtual_domains, $content);
 
 		wf($full_file_name, $content);
+		
+		//* Write virtual_to_transport.sh script
+		$config_dir = $conf['mailman']['config_dir'].'/';
+		$full_file_name = $config_dir.'virtual_to_transport.sh';
+		
+		//* Backup exiting virtual_to_transport.sh script
+		if(is_file($full_file_name)) {
+			copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
+		}
+		
+		if(is_dir('/etc/mailman')) {
+			copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
+			chgrp($full_file_name,'mailman');
+			chmod($full_file_name,0750);
+		}
+		
+		//* Create aliasaes
+		exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
+		
 	}
 	
 	function configure_postfix($options = '')
@@ -204,6 +209,16 @@ class installer_dist extends installer_base {
 		touch($config_dir.'/nested_header_checks');
 		touch($config_dir.'/body_checks');
 		
+		//* Create the mailman files
+		if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
+		//if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
+		if(is_file('/var/lib/mailman/data/aliases')) unlink('/var/lib/mailman/data/aliases');
+		if(!is_link('/var/lib/mailman/data/aliases')) symlink('/etc/mailman/aliases','/var/lib/mailman/data/aliases');
+		exec('postalias /var/lib/mailman/data/aliases');
+		if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
+		exec('postmap /var/lib/mailman/data/virtual-mailman');
+		if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
+		exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
 		
 		//* Make a backup copy of the main.cf file
 		copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 0a16f483aa4a55f2f6e26ad2758b8f970c9aefc3..197aa15322920abef921b3a838bad1c2e92a5887 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -59,22 +59,8 @@ class installer_dist extends installer_base {
 			}
 		}
 		
-		$config_dir = $conf['mailman']['config_dir'].'/';
-		$full_file_name = $config_dir.'virtual_to_transport.sh';
-		
-		//* Backup exiting virtual_to_transport.sh script
-		if(is_file($full_file_name)) {
-			copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
-		}
-		
-		copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
-		chgrp($full_file_name,'mailman');
-		chmod($full_file_name,0750);
-		
 		if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
 		exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
-		
-		exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
 
 		$virtual_domains = '';
 		if($status == 'update')
@@ -101,6 +87,24 @@ class installer_dist extends installer_base {
 		$content = str_replace('{virtual_domains}', $virtual_domains, $content);
 
 		wf($full_file_name, $content);
+		
+		//* Write virtual_to_transport.sh script
+		$config_dir = $conf['mailman']['config_dir'].'/';
+		$full_file_name = $config_dir.'virtual_to_transport.sh';
+		
+		//* Backup exiting virtual_to_transport.sh script
+		if(is_file($full_file_name)) {
+			copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
+		}
+		
+		if(is_dir('/etc/mailman')) {
+			copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
+			chgrp($full_file_name,'mailman');
+			chmod($full_file_name,0750);
+		}
+		
+		//* Create aliasaes
+		exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
 	}
 	
 	function configure_postfix($options = '')
@@ -218,6 +222,14 @@ class installer_dist extends installer_base {
 		touch($config_dir.'/nested_header_checks');
 		touch($config_dir.'/body_checks');
 		
+		//* Create the mailman files
+		if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
+		if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
+		exec('postalias /var/lib/mailman/data/aliases');
+		if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
+		exec('postmap /var/lib/mailman/data/virtual-mailman');
+		if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
+		exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
 		
 		//* Make a backup copy of the main.cf file
 		copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
diff --git a/install/sql/incremental/upd_0050.sql b/install/sql/incremental/upd_0050.sql
new file mode 100644
index 0000000000000000000000000000000000000000..d0caf4273aed6796f3278c91b694b9f9e09b712d
--- /dev/null
+++ b/install/sql/incremental/upd_0050.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `dns_slave` DROP INDEX `origin`;
+ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);
\ No newline at end of file
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 6849418823aefc8be25d386012ec7c110e9f42b4..a159ba67e745b49d87319dfd387734576988a7fc 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -418,7 +418,7 @@ CREATE TABLE `dns_slave` (
   `active` enum('N','Y') NOT NULL,
   `xfer` varchar(255) NOT NULL,
   PRIMARY KEY  (`id`),
-  UNIQUE KEY `origin` (`origin`),
+  UNIQUE KEY `slave` (`origin`,`server_id`),
   KEY `active` (`active`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
@@ -2169,6 +2169,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
 -- Dumping data for table `sys_config`
 --
 
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.1');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.2');
 
 SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index f5b2a91d8eea01e3900e5542a8db29904ca3ccf9..0745c28aa917c84d3aaa6fc4291ede065859e494 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -51,4 +51,4 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
 Alias /awstats-icon "/usr/share/awstats/icon"
 
 NameVirtualHost *:80
-NameVirtualHost *:443
\ No newline at end of file
+NameVirtualHost *:443
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 4410b8533d1f6c002c3ea8a20fb678a91309079d..15b2956032e65d296f17ca4fba433574b8144828 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -26,6 +26,7 @@ NameVirtualHost *:{vhost_port}
       Allow from all
     </Directory>
     IPCCommTimeout  7200
+	MaxRequestLen 15728640
   </IfModule>
   
   <IfModule mpm_itk_module>
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 2af243d92d6f3cc2409c8f0d1e3a5e2427cc35b7..1c967327b59834db312157710e3f226e8cfd3532 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.5.1');
+define('ISPC_APP_VERSION', '3.0.5.2');
 define('DEVSYSTEM', 0);
 
 
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 03e7bd8269213424fa37296e239c88de6e5d45a1..185b7fb0041a764ca7521966d2e7f2fc48e8a5aa 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -132,5 +132,3 @@ $wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro
 $wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem';
 $wb['login_as_txt'] = 'Přihlaste se jako';
 ?>
-
-
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index 5d8ec6f790ae0fa8b3e9c025e3a6f24b3c39a74d..7374ab6b886db0c4d6df20ade178a69ea061b9bc 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -132,4 +132,3 @@ $wb['datalog_status_u_web_folder_user'] = 'Edytuj konto zabezpieczonego folderu'
 $wb['datalog_status_d_web_folder_user'] = 'Usuń konto zabezpieczonego folderu';
 $wb['login_as_txt'] = 'Zaloguj jako';
 ?>
-
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 0d64014cf0c9c7060c792e0240817f19719bfef7..d44b6ad736f8c4fd17523cc9e5e1fda8c1fa5e87 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -214,7 +214,7 @@ $form["tabs"]['mail'] = array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
-                                                                'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
+                                                                'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}(\?.+)?$/',
                                                                 'errmsg'=> 'webmail_url_error_regex'),
                                                 ),
 			'default'	=> '',
diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php
index 5c071a38032ae4b488733a489a9b386ab9fd7f76..75343bd82db785f7dea62ee8c19af71248e60d9d 100644
--- a/interface/web/admin/language_complete.php
+++ b/interface/web/admin/language_complete.php
@@ -138,7 +138,7 @@ function merge_langfile($langfile,$masterfile) {
 		$file_content = "<?php\n";
 		foreach($wb as $key => $val) {
 			$val = str_replace("'","\\'",$val);
-			$val = str_replace('"','\\"',$val);
+			$val = str_replace('"','\"',$val);
 			$file_content .= '$wb['."'$key'".'] = '."'$val';\n";
 		}
 		$file_content .= "?>\n";
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index ef609bb052cb6930a767f124bef92ea0472e19f5..618b69e47ace7f5ec9e069db39c55e5409eac2bd 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 5c2b5f6c5dc86a859578ec88e9001ef6182d40f7..18cae752594c2128953766ba55afcac2beacdede 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -170,4 +170,5 @@ $wb['website_autoalias_txt'] = 'Website auto alias';
 $wb['website_autoalias_note_txt'] = 'Placeholders:';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index c7237996be76bf3f537b84ba23ac358110dce585..1f8e3f7622cfeb9029bd61a77a865e171902afa3 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng
index 8c80d1292df23d3b0ef4b644253e0bee6e28ecff..bc1c9bb83f5b6d25a2eec2a5070dbe154d8b5515 100644
--- a/interface/web/admin/lib/lang/cz.lng
+++ b/interface/web/admin/lib/lang/cz.lng
@@ -48,5 +48,3 @@ $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 9a579d25e3b7a687d9b9ec7facc0a9cccbfddee9..c6a89099c6bb941d2d31ba4d5bf5e6c8c33909ea 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng
@@ -7,5 +7,3 @@ $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 cf1bb28c772e72033df780efd24d61a186798c98..c6f444b660ee68e3c5254f9ff2ad2f71fe74efdf 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
@@ -5,5 +5,3 @@ $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Verze';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_firewall.lng b/interface/web/admin/lib/lang/cz_firewall.lng
index df9386ae66d7115a96d5e49b44755f60caaa460d..c6146ae93d5abd8dcd55c348c570a6490aa146fd 100644
--- a/interface/web/admin/lib/lang/cz_firewall.lng
+++ b/interface/web/admin/lib/lang/cz_firewall.lng
@@ -9,5 +9,3 @@ $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 da1af438deb23ac2f7a8c6e5397b7a8797f04cd1..aecc4cf06a656efc1e8ca9f3cfc1b22499d56f2c 100644
--- a/interface/web/admin/lib/lang/cz_firewall_list.lng
+++ b/interface/web/admin/lib/lang/cz_firewall_list.lng
@@ -6,5 +6,3 @@ $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 0f1a6be926302278b2257ef58e0e2d132fe08e3e..a6281be247dd655b73a2c79aeb4b5a2d78ac5f47 100644
--- a/interface/web/admin/lib/lang/cz_groups.lng
+++ b/interface/web/admin/lib/lang/cz_groups.lng
@@ -3,5 +3,3 @@ $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 f285b382b947dc2a29fc1a75f46e9b12014ae6ef..c1d7ef9a8bcb830f5986dcc164f7a189dcd75f81 100644
--- a/interface/web/admin/lib/lang/cz_groups_list.lng
+++ b/interface/web/admin/lib/lang/cz_groups_list.lng
@@ -5,5 +5,3 @@ $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 6a57b7ce8ea675db88d4561589e4985ba1c2e92c..a40fc0490f86c20e3c38f874633659306ae192e4 100644
--- a/interface/web/admin/lib/lang/cz_iptables.lng
+++ b/interface/web/admin/lib/lang/cz_iptables.lng
@@ -11,5 +11,3 @@ $wb['source_ip_txt'] = 'Zdrojové adresy';
 $wb['active_txt'] = 'Aktivní';
 $wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng
index 3dbc9061a5e3f2207cc3b31c58530e344acc2d2c..65cef7507eeda94dd43925ee61cfb70c455a3690 100644
--- a/interface/web/admin/lib/lang/cz_iptables_list.lng
+++ b/interface/web/admin/lib/lang/cz_iptables_list.lng
@@ -13,5 +13,3 @@ $wb['source_ip_txt'] = 'Zdrojové adresy';
 $wb['active_txt'] = 'Aktivní';
 $wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng
index d95f12eb35ecf997e55dc41e32c75ca4582a40e5..285dff276113076fa949e4e91a4346a1320ea61f 100644
--- a/interface/web/admin/lib/lang/cz_language_add.lng
+++ b/interface/web/admin/lib/lang/cz_language_add.lng
@@ -6,5 +6,3 @@ $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 eb222b3bd031ce42e91fbe2089a0b462587e4f52..f1e6f4924e2a1f870032bef6265dc41576465384 100644
--- a/interface/web/admin/lib/lang/cz_language_complete.lng
+++ b/interface/web/admin/lib/lang/cz_language_complete.lng
@@ -5,5 +5,3 @@ $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 f880e6dbe71644cf41d9e852302867cbbd9e7084..2a71ed0a771290f10827769859574f0c5450aaad 100644
--- a/interface/web/admin/lib/lang/cz_language_edit.lng
+++ b/interface/web/admin/lib/lang/cz_language_edit.lng
@@ -6,5 +6,3 @@ $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 7ffdccf5229e62c2ac1ea2487fdee62b07433b4f..7998eea0178696692a810f5e899713bd750358e6 100644
--- a/interface/web/admin/lib/lang/cz_language_export.lng
+++ b/interface/web/admin/lib/lang/cz_language_export.lng
@@ -4,5 +4,3 @@ $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 17dfa89aafad1c7318c66f0f2431106cfb9679c1..838c325f7f5e01a41af5a411529531f5be20db80 100644
--- a/interface/web/admin/lib/lang/cz_language_import.lng
+++ b/interface/web/admin/lib/lang/cz_language_import.lng
@@ -6,5 +6,3 @@ $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 77810e0a759bcf331ae60e9dfda4073057dd5ace..b2a78637155d78161423ec338a12165f86010f68 100644
--- a/interface/web/admin/lib/lang/cz_language_list.lng
+++ b/interface/web/admin/lib/lang/cz_language_list.lng
@@ -5,5 +5,3 @@ $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_login_as.lng b/interface/web/admin/lib/lang/cz_login_as.lng
index dd409d358d24f4527b05cdc41f00b318e44f0f9f..3f8e8491fc0aa2ebcb3336d30b96a37d633639d2 100644
--- a/interface/web/admin/lib/lang/cz_login_as.lng
+++ b/interface/web/admin/lib/lang/cz_login_as.lng
@@ -9,5 +9,3 @@ $wb['firewall_error_unique'] = 'There is already a firewall record for this serv
 $wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
 $wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng
index f48a2c4a363aff9694042db16e2ee7b71de90fc1..64a190d9a1dddf174078dcdfcecb2f3f9c1cd34c 100644
--- a/interface/web/admin/lib/lang/cz_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_package_install.lng
@@ -5,5 +5,3 @@ $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_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng
index 11747ab9ce38ba3b0a11f7d9c1a81f5c8746f49a..68da1c065db30c362e27992e58b5a53b755d6150 100644
--- a/interface/web/admin/lib/lang/cz_remote_action.lng
+++ b/interface/web/admin/lib/lang/cz_remote_action.lng
@@ -2,13 +2,11 @@
 $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 a34b3d74dee39106675e8ddba70b46ef535481ba..17c4f05b5627f710aae5d2d114ce88149c2906d4 100644
--- a/interface/web/admin/lib/lang/cz_remote_user.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user.lng
@@ -45,5 +45,3 @@ $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 1b40308735bbc3df08d0b6dd7488ae11d4196e67..66b64946e457be5ad87b6b267f31d4c972389e79 100644
--- a/interface/web/admin/lib/lang/cz_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng
@@ -5,5 +5,3 @@ $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 9d44fd27c840ef95abe4fea148e6c93572f5799d..a087656a1c391d0f1c0b6b1d191c1e4723d26392 100644
--- a/interface/web/admin/lib/lang/cz_server.lng
+++ b/interface/web/admin/lib/lang/cz_server.lng
@@ -13,5 +13,3 @@ $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 0e58bf2bacea18709fec1a28dce81399307f29dc..c0e42402e34b3570234270a948234822bf2b4525 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -170,6 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Aktivovat 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['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_config_list.lng b/interface/web/admin/lib/lang/cz_server_config_list.lng
index 8589dbc9d16f2eda14e03769bc6a2ffbc8a42371..2118c35357cc0b40228eb0153adfda86f36cfdae 100644
--- a/interface/web/admin/lib/lang/cz_server_config_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_config_list.lng
@@ -2,5 +2,3 @@
 $wb['list_head_txt'] = 'Konfigurace serveru';
 $wb['server_name_txt'] = 'Server';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_ip.lng b/interface/web/admin/lib/lang/cz_server_ip.lng
index a948939fe2026dac467ca800f9b7aeddfdcf0a53..43a382a64609539c266810b73f30a2ce4a3c6878 100644
--- a/interface/web/admin/lib/lang/cz_server_ip.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip.lng
@@ -9,5 +9,3 @@ $wb['ip_type_txt'] = 'Verze';
 $wb['virtualhost_port_txt'] = 'HTTP Porty';
 $wb['error_port_syntax'] = 'Neplatné znaky ve volbě HTTP Portů. Prosím, zadejte pouze číselné hodnoty oddělené čárkami. Příklad: 80,443';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_ip_list.lng b/interface/web/admin/lib/lang/cz_server_ip_list.lng
index 2a47ca75917b4dde544382f9d99a027407c735b9..93b0b77c9b07006918807364085af28604b05ce7 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng
@@ -8,5 +8,3 @@ $wb['virtualhost_txt'] = 'HTTP Vhost';
 $wb['virtualhost_port_txt'] = 'HTTP Ports';
 $wb['ip_type_txt'] = 'Verze';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_list.lng b/interface/web/admin/lib/lang/cz_server_list.lng
index e7a2efd805ccf0ac030968b53abd6251b3a7faac..ecddbf28e8433d15def51368252ca6d74e976e50 100644
--- a/interface/web/admin/lib/lang/cz_server_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_list.lng
@@ -11,5 +11,3 @@ $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 59cf3c7365046db053b32658451a67f21b2947a1..10aba05dd76089c892ff4ee5fe88a7f4bce5e210 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -14,5 +14,3 @@ $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 e0b43a4a996b6ebb49c9d231793446ebfcd73abc..36b28fe4118f509767f2153601de8e9085ad86ed 100644
--- a/interface/web/admin/lib/lang/cz_server_php_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_php_list.lng
@@ -5,5 +5,3 @@ $wb['add_new_record_txt'] = 'Přidat novou verzi PHP';
 $wb['client_id_txt'] = 'Klient';
 $wb['name_txt'] = 'Verze PHP';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng
index 83440257f27b7f9456aa708b73e72b6ee6100a14..0d079ef6d38552240273b77c39b91bc86fd541fd 100644
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_install.lng
@@ -4,5 +4,3 @@ $wb['install_key_txt'] = 'Enter install key';
 $wb['btn_save_txt'] = 'Spustit instalaci';
 $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 1a59b58e10dc5855e3c67f5571b509142c951685..7df837f0c1c11d61f8f9343fcde6d9f79fc3d14a 100644
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_list.lng
@@ -9,5 +9,3 @@ $wb['repoupdate_txt'] = 'Aktualizace seznamu balíků';
 $wb['package_id_txt'] = 'místní App-ID';
 $wb['no_packages_txt'] = 'Žádné balíčky nejsou k dispozici';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng
index f48a2c4a363aff9694042db16e2ee7b71de90fc1..64a190d9a1dddf174078dcdfcecb2f3f9c1cd34c 100644
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo.lng
@@ -5,5 +5,3 @@ $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 4ae3c662d86ab872011ea7f14dfd83e77d9468fe..5c82d4c41f718370b4587752fa636a692fcb7e9f 100644
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng
@@ -4,5 +4,3 @@ $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 4e7d161bbe23908bd07855d80717e2aad5901940..c48ad8ce30ec1b6fd8a643204e52cfa503501edd 100644
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_update_list.lng
@@ -7,5 +7,3 @@ $wb['version_txt'] = 'Verze';
 $wb['action_txt'] = 'Akce';
 $wb['no_updates_txt'] = 'Žádné aktualizace nejsou k dispozici';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 67253c63d8f21eee1a866e283be65f793a091702..8073830ebd6c500e70012ee2a4e60f9508c616c6 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -50,5 +50,3 @@ $wb['mailbox_show_autoresponder_tab_txt'] = 'Show Autoresponder tab in Mailbox d
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show Mail Filter tab in Mailbox detail';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show Custom Rules tab in Mailbox detail';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
index edf66963d4555510e745627e697caedfc887a274..480d5044215ccee6020d840bf403e3cc11a616bf 100644
--- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
@@ -16,5 +16,3 @@ $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 1f3cb59e876349a4a992205e696ce9de53779295..16f4812d68397788cadac99a3a838ad54a9805b4 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -31,5 +31,3 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 $wb['username_error_collision'] = 'Uživatelské jméno nesmí být web nebo web a číslo.\\"';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng
index a4915a4ca048f863ec1853ca0e6f7356c691a193..e5a7d1e4de20f603d4393e733c92a6ff8b060c2b 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -7,5 +7,3 @@ $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/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 2c852ede07b7c3c4afd6815a25cd4f19c654dfc5..361196973302587974cf76193a48f8ed7695e982 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -170,6 +170,7 @@ $wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren';
 $wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)';
 $wb['overtraffic_notify_admin_txt'] = 'Ãœberschreiten des Transfer Limits an den Administrator senden';
 $wb['overtraffic_notify_client_txt'] = 'Ãœberschreiten des Transfer Limits an den Kunden senden';
+$wb['rbl_error_regex'] = 'Bitte geben Sie gültige RBL-Hostnamen an.';
 $wb['php_ini_check_minutes_txt'] = 'Pr&uuml;fe System php.ini Dateien auf &Auml;nderungen alle';
 $wb['php_ini_check_minutes_info_txt'] = 'Minute(n) (0 deaktiviert diese Funktion)';
 $wb['php_ini_check_minutes_error_empty'] = 'Der Wert f&uuml;r die Einstellung der php.ini Pr&uuml;fung ist ung&uuml;ltig.';
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index a3cd4a90fd2672f4f63804eced6d0fc4202f9de8..ca37e07f67c71ebc1f29ca72e1d2051602065ec4 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -48,6 +48,6 @@ $wb['phpmyadmin_url_error_regex'] = 'Falsche phpMyAdmin URL';
 $wb['client_username_web_check_disabled_txt'] = 'Deaktiviere die Kunden Benutzernamen Überprüfung für den Begriff <b>web<b>.';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Zeige Autoresponder Reiter in E-Mail Kontodetails';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Zeige E-Mail Filter Reiter in E-Mail Kontodetails';
-$wb['mailbox_show_custom_rules_tab_txt'] = 'Zeige Benutzerregel Reiter in E-Mail Kontodetails';
+$wb['mailbox_show_custom_rules_tab_txt'] = 'Zeige Benutzerregel Reiter in E-Mail Kontodetails';$wb['webmail_url_error_regex'] = 'Falsche Webmail URL';
 $wb['reseller_can_use_options_txt'] = 'Reseller können den Optionen Reiter bei Webseiten verwenden';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 5768d3f79ce723603c35b1c77d2cf86117990727..b9913e65eee075ab3aa94cc87cb9b099eb1031c1 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index ba061de90a784ba71c6d7efed7b04ec95d6f3c94..a6bf4cb90275f616b69a7976d6ac3abcc1857701 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -52,5 +52,6 @@ $wb['client_username_web_check_disabled_txt'] = 'Disable client username check f
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
+$wb['webmail_url_error_regex'] = 'Invalid webmail URL';
 $wb['reseller_can_use_options_txt'] = 'Reseller can use options tab in web sites config';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 431076408815e39bbb64031b548af42ab5e13d78..92d9b45bd851e90a5436f8102938f9d6affc2f9f 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index d56ca7508dd69dc16c6430c7f6538c39448ad1b4..0bddcc7d8639547380e7160fbf209ca797a06566 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index 595596c60a9022f2049206fb828a33b0ce1e4e0d..c74d89ec1cd92f9858d483843e9656ca29732b68 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index 5c9e7d0ed9fc2bf07d91bb6af40058f68070e517..27168f2c4dba3049699e8ef3eb761ca8e385126b 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index c3a6806a84a29fd5ecb0b38bca647037f66846e8..53496080fbc2fec4ad4f5f737e4b08683283d09a 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 34ea127fe85f82957fc0d617c7bdbd5f2693cbd3..39217c392ff885e079ba0a1b5a6e4dce95f95211 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 9a32425b42486727067cd0160d7b690fbf4ab2d1..6bea4d2ecfb6e215518b60ed85200faf52d9a6c7 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 2cd8c38a313481f65abc1731461de722861ae7cf..ce8803643eab0f374d19522c8e34831a2beaf7f2 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index 4cb30925626acbf046cd805f9d641d2db976c899..c3b3ce0499c7bd101537d15bd3d97dfca6174eca 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng
index 40c35945aa4ebdf3b376cc8015db537dc39e6948..e06fba34e85fc3aa859d6784e08f89524564a926 100644
--- a/interface/web/admin/lib/lang/pl.lng
+++ b/interface/web/admin/lib/lang/pl.lng
@@ -48,4 +48,3 @@ $wb['Interface'] = 'Interfejs';
 $wb['Domains'] = 'Domeny';
 $wb['Misc'] = 'Różne';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets.lng b/interface/web/admin/lib/lang/pl_directive_snippets.lng
index e4c5572293ecf15ff5837907be6793d438e645f7..acd64511074fc71bbc11643032cd067c3f200533 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets.lng
@@ -7,4 +7,3 @@ $wb['active_txt'] = 'Aktywne';
 $wb['directive_snippets_name_empty'] = 'Wybierz nazwÄ™ dla zestawu dyrektyw';
 $wb['directive_snippets_name_error_unique'] = 'Istnieje już zestaw dyrektyw o podanej nazwie';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
index 41c6364f97ad164f5f7b6ddfa7bf88b277512fb9..8d731021bb9c676f57f9cb49064dc0969bcbdc91 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Nazwa zestawu';
 $wb['type_txt'] = 'Rodzaj';
 $wb['add_new_record_txt'] = 'Dodaj nowy zestaw dyrektyw';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_firewall.lng b/interface/web/admin/lib/lang/pl_firewall.lng
index 8098fcc61b9697600d573217bc9dddf3d1c0ae0b..56817895060e4d3c89e5c903539f040088fa34e2 100644
--- a/interface/web/admin/lib/lang/pl_firewall.lng
+++ b/interface/web/admin/lib/lang/pl_firewall.lng
@@ -9,4 +9,3 @@ $wb['firewall_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
 $wb['tcp_ports_error_regex'] = 'Znak nie jest dozwolony w formacie portu TCP. Dozwolone znaki to liczby, : oraz ,.';
 $wb['udp_ports_error_regex'] = 'Znak nie jest dozwolony w formacie portu UDP. Dozwolone znaki to liczby, : oraz ,.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_firewall_list.lng b/interface/web/admin/lib/lang/pl_firewall_list.lng
index fe80e430ca0a09157464290d7b0b94e31c27b8b6..6a4b8388f71dcd5b7a5acb5fbe4d5fcf1a8527c6 100644
--- a/interface/web/admin/lib/lang/pl_firewall_list.lng
+++ b/interface/web/admin/lib/lang/pl_firewall_list.lng
@@ -6,4 +6,3 @@ $wb['tcp_port_txt'] = 'Otwarte porty TCP';
 $wb['udp_port_txt'] = 'Otwarte porty UDP';
 $wb['add_new_record_txt'] = 'Dodaj wpis Firewalla';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_groups.lng b/interface/web/admin/lib/lang/pl_groups.lng
index a97ac3f301a6f53d1d101382624892c7c8300b99..b3c8b9ca777f58387a7713ceb9e0170b03b39f77 100644
--- a/interface/web/admin/lib/lang/pl_groups.lng
+++ b/interface/web/admin/lib/lang/pl_groups.lng
@@ -3,4 +3,3 @@ $wb['description_txt'] = 'Opis';
 $wb['name_txt'] = 'Grupa';
 $wb['name_err'] = 'Nazwa grupy musi mieć od 1 do 30 znaków.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_groups_list.lng b/interface/web/admin/lib/lang/pl_groups_list.lng
index 9409d32c9c5cd073d5d3fa77c380df6953f39033..75756bca7b6f316664eadf9399eaed1cdad636b8 100644
--- a/interface/web/admin/lib/lang/pl_groups_list.lng
+++ b/interface/web/admin/lib/lang/pl_groups_list.lng
@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Grupa';
 $wb['add_new_record_txt'] = 'Dodaj nowÄ… grupÄ™';
 $wb['warning_txt'] = '<b>OSTRZEŻENIE:</b> Nie modyfikuj żadnych ustawień użytkownika w tym miejscu. Użyj ustawień Klienta lub Resellera w module Klient. Modyfikacja ustawień użytkownika lub grupy tutaj grozi utratą danych!';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_iptables.lng b/interface/web/admin/lib/lang/pl_iptables.lng
index 8073e5d00861aaf17a806e22930cc1e4ab0ed770..f6be566c4fa69a0cc3cf7ca98bbd4ea52a5cf607 100644
--- a/interface/web/admin/lib/lang/pl_iptables.lng
+++ b/interface/web/admin/lib/lang/pl_iptables.lng
@@ -11,4 +11,3 @@ $wb['source_ip_txt'] = 'Adres źródłowy';
 $wb['active_txt'] = 'Aktywny';
 $wb['iptables_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_iptables_list.lng b/interface/web/admin/lib/lang/pl_iptables_list.lng
index 255a82925ccf4aa2ec0d4015b9ca5a4c33804ebd..2f74b180c62f160292b3bf9a0628e739906c5e68 100644
--- a/interface/web/admin/lib/lang/pl_iptables_list.lng
+++ b/interface/web/admin/lib/lang/pl_iptables_list.lng
@@ -13,4 +13,3 @@ $wb['source_ip_txt'] = 'Adres źródłowy';
 $wb['active_txt'] = 'Aktywny';
 $wb['iptables_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_language_add.lng b/interface/web/admin/lib/lang/pl_language_add.lng
index df1a5f31fcb2edf1deab8eacd5a1044d8187c9d0..82e42ef720eea1c0c5e7387249693933b41b68bc 100644
--- a/interface/web/admin/lib/lang/pl_language_add.lng
+++ b/interface/web/admin/lib/lang/pl_language_add.lng
@@ -6,4 +6,3 @@ $wb['language_new_hint_txt'] = '2 znakowe kodowanie języka ISO 639-1 (Zobacz ht
 $wb['btn_save_txt'] = 'Utwórz nowy zbiór plików z językami';
 $wb['btn_cancel_txt'] = 'Wróć';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_language_complete.lng b/interface/web/admin/lib/lang/pl_language_complete.lng
index 6d6d8ec36d74e512d453df9b474c8ea18caf8b3d..0096c69efabccd5775ca0bc4e739e21156cae4c4 100644
--- a/interface/web/admin/lib/lang/pl_language_complete.lng
+++ b/interface/web/admin/lib/lang/pl_language_complete.lng
@@ -5,4 +5,3 @@ $wb['language_select_txt'] = 'Wybierz język';
 $wb['btn_save_txt'] = 'Połącz pliki teraz';
 $wb['btn_cancel_txt'] = 'Wróć';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_language_edit.lng b/interface/web/admin/lib/lang/pl_language_edit.lng
index b4ec35d9b4d3674bc7f2bfce0053155b50b9687a..3a5e7069393b0af5a2da2b080b3b55d0673f62a9 100644
--- a/interface/web/admin/lib/lang/pl_language_edit.lng
+++ b/interface/web/admin/lib/lang/pl_language_edit.lng
@@ -6,4 +6,3 @@ $wb['lang_file_txt'] = 'Plik języka';
 $wb['btn_save_txt'] = 'Zapisz';
 $wb['btn_cancel_txt'] = 'Wróć';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_language_export.lng b/interface/web/admin/lib/lang/pl_language_export.lng
index 0b38a48701a569ef2f26c812e82172994ac30701..e58dbf072ab7dff6683ef371ba5f1a17b493211b 100644
--- a/interface/web/admin/lib/lang/pl_language_export.lng
+++ b/interface/web/admin/lib/lang/pl_language_export.lng
@@ -4,4 +4,3 @@ $wb['language_select_txt'] = 'Wybierz język';
 $wb['btn_save_txt'] = 'Eksportuj pliki wybranego języka';
 $wb['btn_cancel_txt'] = 'Wróć';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_language_import.lng b/interface/web/admin/lib/lang/pl_language_import.lng
index e78238adaa6a6bd0807bd3283ce598fc7513dee4..077d0c00ea68d567ff4324219a28ea2ca7e164b6 100644
--- a/interface/web/admin/lib/lang/pl_language_import.lng
+++ b/interface/web/admin/lib/lang/pl_language_import.lng
@@ -6,4 +6,3 @@ $wb['language_overwrite_txt'] = 'Nadpisz plik jeśli istnieje.';
 $wb['btn_cancel_txt'] = 'Wróć';
 $wb['ignore_version_txt'] = 'Pomiń sprawdzanie wersji ISPConfig';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_language_list.lng b/interface/web/admin/lib/lang/pl_language_list.lng
index 14b7cdb5076fa513986b06ff3d01cb381aee2663..05fd6e39ac17ea189fca50230d8258822a50af79 100644
--- a/interface/web/admin/lib/lang/pl_language_list.lng
+++ b/interface/web/admin/lib/lang/pl_language_list.lng
@@ -5,4 +5,3 @@ $wb['module_txt'] = 'Moduł';
 $wb['lang_file_txt'] = 'Plik języka';
 $wb['lang_file_date_txt'] = 'Ostatnia modyfikacja';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_login_as.lng b/interface/web/admin/lib/lang/pl_login_as.lng
index a50549449423cb540753b9983a0e0fcd2a446665..f00e042478e938e14cac73691456ea6e64846605 100644
--- a/interface/web/admin/lib/lang/pl_login_as.lng
+++ b/interface/web/admin/lib/lang/pl_login_as.lng
@@ -9,4 +9,3 @@ $wb['firewall_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
 $wb['tcp_ports_error_regex'] = 'Niedozwolony znam w definicji portu TCP. Dozwolone sÄ… liczby, dwukropek i przecinek (: i ,)';
 $wb['udp_ports_error_regex'] = 'Niedozwolony znam w definicji portu UDP. Dozwolone sÄ… liczby, dwukropek i przecinek (: i ,)';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_package_install.lng b/interface/web/admin/lib/lang/pl_package_install.lng
index ce5c73c8147b31f68433f37d28aca5bf9efc94fc..30439086ab83191dc21d44e30ad7ff6db2ba0e01 100644
--- a/interface/web/admin/lib/lang/pl_package_install.lng
+++ b/interface/web/admin/lib/lang/pl_package_install.lng
@@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'Użytkownik (opcjonalnie)';
 $wb['repo_password_txt'] = 'Hasło (opcjonalnie)';
 $wb['active_txt'] = 'Aktywne';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_remote_action.lng b/interface/web/admin/lib/lang/pl_remote_action.lng
index 36b0383c4ef230c45ebad35a74c0ee9b6aa3b1b1..83fbc9e282a01a83ca99b4b1d15d6395af0613ed 100644
--- a/interface/web/admin/lib/lang/pl_remote_action.lng
+++ b/interface/web/admin/lib/lang/pl_remote_action.lng
@@ -10,4 +10,3 @@ $wb['select_all_server'] = 'Wszystkie serwery';
 $wb['ispconfig_update_title'] = 'ISPConfig update instructions';
 $wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructions</a>';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_remote_user.lng b/interface/web/admin/lib/lang/pl_remote_user.lng
index 6c55771f6c56dfe6afe585ea4225f8329e8280b8..b456de8401f966ade356988aeeb9714b24e0f189 100644
--- a/interface/web/admin/lib/lang/pl_remote_user.lng
+++ b/interface/web/admin/lib/lang/pl_remote_user.lng
@@ -45,4 +45,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
 $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
 $wb['password_match_txt'] = 'Hasła pasują';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_remote_user_list.lng b/interface/web/admin/lib/lang/pl_remote_user_list.lng
index 976e3130addadd0e3b621c8cccacb020f382207e..6dd12ae97c1cd8a59f02d95b2ee37cb0108e7ea4 100644
--- a/interface/web/admin/lib/lang/pl_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/pl_remote_user_list.lng
@@ -5,4 +5,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika';
 $wb['parent_remote_userid_txt'] = 'ID';
 $wb['username_txt'] = 'Nazwa użytkownika';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_server.lng b/interface/web/admin/lib/lang/pl_server.lng
index 2ebbeb2198f3b663f8de18f7e85b756ef05188e8..5e9c4117203ab9d18971262250a972399c70e58e 100644
--- a/interface/web/admin/lib/lang/pl_server.lng
+++ b/interface/web/admin/lib/lang/pl_server.lng
@@ -13,4 +13,3 @@ $wb['- None -'] = '- Żaden -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index 05836f62f609c8d3140720b104d3f5ec4bea9c2a..175c9bedc31993892ce23add683ad4c88e6d137b 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -170,5 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Prześlij informacje o przekroczeniu transferu do admina';
 $wb['overtraffic_notify_client_txt'] = 'Prześlij informacje o przekroczeniu transferu do klienta';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_config_list.lng b/interface/web/admin/lib/lang/pl_server_config_list.lng
index e700889bf85c147522cb4775fbe6bd5367bca825..f9e8dcf1b559349ac491040e4920bec5fa38a7e6 100644
--- a/interface/web/admin/lib/lang/pl_server_config_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_config_list.lng
@@ -2,4 +2,3 @@
 $wb['list_head_txt'] = 'Konfiguracja serwera';
 $wb['server_name_txt'] = 'Serwer';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_ip.lng b/interface/web/admin/lib/lang/pl_server_ip.lng
index 2c107d05a94c53a4b06ee7d4414985cf46b23975..cb16e104d5822d4b794b1a0d6410dd666545de8c 100644
--- a/interface/web/admin/lib/lang/pl_server_ip.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip.lng
@@ -9,4 +9,3 @@ $wb['ip_type_txt'] = 'Typ';
 $wb['virtualhost_port_txt'] = 'Porty HTTP';
 $wb['error_port_syntax'] = 'Nieprawidłowe wartości w polu portów, proszę wpisać tylko liczby oddzielone przecinkiem. Przykładowo: 80,443';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_ip_list.lng b/interface/web/admin/lib/lang/pl_server_ip_list.lng
index dcf8951ac9641b014cc0a6efc366a816382752f1..64b004dc7822cf83ef3d7bcc0f6f5248497b42f6 100644
--- a/interface/web/admin/lib/lang/pl_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip_list.lng
@@ -8,4 +8,3 @@ $wb['virtualhost_txt'] = 'HTTP Vhost';
 $wb['virtualhost_port_txt'] = 'Porty HTTP';
 $wb['ip_type_txt'] = 'Typ';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_list.lng b/interface/web/admin/lib/lang/pl_server_list.lng
index 9ca9eb87151c9691d3a10f10b18dbf774994d68d..81356acf77024414ccc676ef7e516d5fac226528 100644
--- a/interface/web/admin/lib/lang/pl_server_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_list.lng
@@ -11,4 +11,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowy serwer';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng
index 54d0ef277582221996f29a3542daba2b6b27adce..298eca65115f1a8c192353c7e1da4aeca3ecbfc0 100644
--- a/interface/web/admin/lib/lang/pl_server_php.lng
+++ b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -14,4 +14,3 @@ $wb['php_fpm_init_script_txt'] = 'Ścieżka do skryptu inicjującego PHP-FPM';
 $wb['php_fpm_ini_dir_txt'] = 'Ścieżka do katalogu php.ini';
 $wb['php_fpm_pool_dir_txt'] = 'Ścieżka do katalogu pool PHP-FPM';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_server_php_list.lng b/interface/web/admin/lib/lang/pl_server_php_list.lng
index dc697ae1fffd70f2304bcea429df5a4fa4eb6ae6..b402fd1ed19978b32027a9ed16e7b44f241db93e 100644
--- a/interface/web/admin/lib/lang/pl_server_php_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_php_list.lng
@@ -5,4 +5,3 @@ $wb['add_new_record_txt'] = 'Add new PHP version';
 $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_software_package_install.lng b/interface/web/admin/lib/lang/pl_software_package_install.lng
index ea9290bd39a9d9920584063ae6e348bbeb6137d9..fd2f2930dde345143a239e3755d6c6e0bfe32470 100644
--- a/interface/web/admin/lib/lang/pl_software_package_install.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_install.lng
@@ -4,4 +4,3 @@ $wb['install_key_txt'] = 'Podaj klucz instalacyjny';
 $wb['btn_save_txt'] = 'Start instalacji';
 $wb['btn_cancel_txt'] = 'Przerwij';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_software_package_list.lng b/interface/web/admin/lib/lang/pl_software_package_list.lng
index e1ffd2c3dfa61aea32bb6b9b3eaebf212924aa40..78c412c344818c823ee8e5d9b4fff8111b0e3782 100644
--- a/interface/web/admin/lib/lang/pl_software_package_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_list.lng
@@ -9,4 +9,3 @@ $wb['repoupdate_txt'] = 'Aktualizuj listę pakietów';
 $wb['package_id_txt'] = 'lokalny App-ID';
 $wb['no_packages_txt'] = 'Brak dostępnych pakietów';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng
index 84d9c9e61b53a5388a246f9d92823f726e1d43ea..d11a1b3b330d331c507e129f195f3f6ada2874f5 100644
--- a/interface/web/admin/lib/lang/pl_software_repo.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo.lng
@@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'Użytkownik (Opcjonalnie)';
 $wb['repo_password_txt'] = 'Hasło (Opcjonalnie)';
 $wb['active_txt'] = 'Aktywny';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_software_repo_list.lng b/interface/web/admin/lib/lang/pl_software_repo_list.lng
index 85a54b06b46466dd170cc6579514f7638b191fb4..7ca6af9f9f43559891103a0c50ebd189da3f795b 100644
--- a/interface/web/admin/lib/lang/pl_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo_list.lng
@@ -4,4 +4,3 @@ $wb['active_txt'] = 'Aktywny';
 $wb['repo_name_txt'] = 'Repozytoria';
 $wb['repo_url_txt'] = 'URL';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_software_update_list.lng b/interface/web/admin/lib/lang/pl_software_update_list.lng
index 31a3dd0131cc873b6e86e9ae1a0bbe96ba17a0d0..aa49fba4e72ce46c22c3ca7a2d0a23ee6728a8f9 100644
--- a/interface/web/admin/lib/lang/pl_software_update_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_update_list.lng
@@ -7,4 +7,3 @@ $wb['version_txt'] = 'Wersja';
 $wb['action_txt'] = 'Akcja';
 $wb['no_updates_txt'] = 'Nie ma dostępnych aktualizacji';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index 42da3d1357339272a2d2598a5975d413b0e9501c..dbcd61ffa193d5b8f618c9f296dc44746a4d2f4a 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -50,4 +50,3 @@ $wb['mailbox_show_autoresponder_tab_txt'] = 'Pokaż zakładkę autorespondera w
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Pokaż zakładkę filtra email w szczegółach konta email.';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Pokaż zakładkę własnych filtrów email w szczegółach konta email.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_tpl_default_admin.lng b/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
index ed5fe515422f22c908fd97808d240be11e07c351..eee3af5fe4e30c2f22bfa5742d902ce678cfa830 100644
--- a/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
@@ -16,4 +16,3 @@ $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
 $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
 $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng
index f645401a263c8b186ce58c457760fa8aa179425d..586e9ff66a2e1d17100727c8490cef7455b2ec40 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -31,4 +31,3 @@ $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
 $wb['password_match_txt'] = 'Hasła pasują';
 $wb['username_error_collision'] = 'Nazwa użytkownika nie może być web lub web z numerem.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pl_users_list.lng b/interface/web/admin/lib/lang/pl_users_list.lng
index 16e1804a069949154e5a1bd88cae286b6d978b34..7def4022bfc54f4a4a233ab7dac438e4f659f446 100644
--- a/interface/web/admin/lib/lang/pl_users_list.lng
+++ b/interface/web/admin/lib/lang/pl_users_list.lng
@@ -7,4 +7,3 @@ $wb['client_id_txt'] = 'User ID';
 $wb['active_txt'] = 'Aktywny';
 $wb['groups_txt'] = 'Grupy';
 ?>
-
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 3470e28a722ce57ce2a86f6620948299ad80e6da..25d19f302b9f0f858aeb6537b44cea01f419c0c2 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index 56ce46cc5a3c1c8636694784301fbb41bf57baf5..d3247ac82cbf4e53a0385dbf77c3ec0565afe665 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index fd76bf6db6f590f7753bb83c6006b09fa7fd3176..f9cea0ca262cf1fc47f1b939a31e6a0aad6b5fad 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index 0d16cedb90447ce3a59e4e6f1d8158d5df8adbb4..df557e206979b59cd1cf44cf2c73b2b690d9e55b 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index d2f27c7cbe6d9cecbb6192e19388d02685582295..0ea3647f2438eb6b72c2a102847aa6d346e3a107 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -170,4 +170,5 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 ?>
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index 713e1e97bc9a67cbcb38decb8fed3f6dde526b67..d83724c19f585972d14077f318325d8d711d4b0b 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -18,7 +18,7 @@
                 <thead>
                     <tr class="caption">
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_ip_type" scope="col"><tmpl_var name="ip_type_txt"></th>
                         <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
                         <th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
@@ -27,7 +27,7 @@
                     </tr>
                     <tr class="filter">
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
-                        <td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+                        <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
                         <td class="tbl_col_ip_type"><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
                         <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
                         <td class="tbl_col_virtualhost"><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
@@ -41,7 +41,7 @@
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_server_id"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-                            <td class="tbl_col_client_pid"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_id"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_ip_type"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_type"}</a></td>
                             <td class="tbl_col_ip_address"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
                             <td class="tbl_col_virtualhost"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost"}</a></td>
diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng
index 9c1d91cc2010a9df662ca6da90746e2f23d4c8e0..8efa987cfac80c8eabe601ffb11adabede36b865 100644
--- a/interface/web/client/lib/lang/cz.lng
+++ b/interface/web/client/lib/lang/cz.lng
@@ -23,5 +23,3 @@ $wb['error_domain_in webuse'] = 'Tato doména nelze odstranit, protože je v pou
 $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 bb885e966d2017745a22d57af4de65456c0497e4..eb1273fdef858e5a63b2ab748ce7cb0b7476bb99 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -144,5 +144,3 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
 $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng
index cb4b143b114e60231c13db1cf3d87a356df4f1fc..f26e2d6d4b790622e0ba7809095d7063205bfe03 100644
--- a/interface/web/client/lib/lang/cz_client_circle.lng
+++ b/interface/web/client/lib/lang/cz_client_circle.lng
@@ -7,5 +7,3 @@ $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 24025510de0da4c0ceaab32d786f5f6cd745d297..e827605400f5165230b2a7fa5d9570ca13475cf3 100644
--- a/interface/web/client/lib/lang/cz_client_circle_list.lng
+++ b/interface/web/client/lib/lang/cz_client_circle_list.lng
@@ -8,5 +8,3 @@ $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 a759ab6a94569eb0c497af259e4aec514c85e54c..4515806be5d944c55947a9b0d91ea307f32cbf8b 100644
--- a/interface/web/client/lib/lang/cz_client_del.lng
+++ b/interface/web/client/lib/lang/cz_client_del.lng
@@ -4,5 +4,3 @@ $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 f1c3870bca3595faf7e29e788e4eb23b92c6ea5d..d980d55012ca859cd2cfd6ac3fe32d891ce47077 100644
--- a/interface/web/client/lib/lang/cz_client_message.lng
+++ b/interface/web/client/lib/lang/cz_client_message.lng
@@ -16,5 +16,3 @@ $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 (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 94ee886d72d7beeb563be4352ba97ffe916b33e7..5c8406915e2bac5d06963b1b66f799b5194881ee 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -88,5 +88,3 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
 $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_template_list.lng b/interface/web/client/lib/lang/cz_client_template_list.lng
index 7d9e9238d4865d4f0b51de4badc40c8621104f39..c3faae17c7100b156f28dbea53c5f43fcb3409d2 100644
--- a/interface/web/client/lib/lang/cz_client_template_list.lng
+++ b/interface/web/client/lib/lang/cz_client_template_list.lng
@@ -3,5 +3,3 @@ $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 ffd1b8e82ad59040e3d1c5f8dcb67472c142c514..9657cb71e892610822ea3a9ff9ec797d2c3381db 100644
--- a/interface/web/client/lib/lang/cz_clients_list.lng
+++ b/interface/web/client/lib/lang/cz_clients_list.lng
@@ -9,5 +9,3 @@ $wb['add_new_record_txt'] = 'Přidat klienta';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['customer_no_txt'] = 'Zákaznické číslo';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng
index 26117aef5ffb3841ebc4bede418151191ecbd7e4..34ba70c11edbe7cac85311d43bbe0db6ec921b15 100644
--- a/interface/web/client/lib/lang/cz_domain.lng
+++ b/interface/web/client/lib/lang/cz_domain.lng
@@ -4,5 +4,3 @@ $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 9b52d04ddd36d6e6c7d556349596ce03ce72323b..6cf7376bd41d7f67d34e59bdc981663a893eb6be 100644
--- a/interface/web/client/lib/lang/cz_domain_list.lng
+++ b/interface/web/client/lib/lang/cz_domain_list.lng
@@ -4,5 +4,3 @@ $wb['add_new_record_txt'] = 'Přidat novou doménu';
 $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 53f079edb0f27eeb560eed5415f4145f48096381..6e7fec6c0221809a31e5c9a388bd81c037033270 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -143,5 +143,3 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
 $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng
index fb23672a888ebd36a6db688036b641895bf6cac9..8e72797b4df843d80f27ea6f7e8e583a24f08319 100644
--- a/interface/web/client/lib/lang/cz_resellers_list.lng
+++ b/interface/web/client/lib/lang/cz_resellers_list.lng
@@ -9,5 +9,3 @@ $wb['add_new_record_txt'] = 'Přidat distributora';
 $wb['customer_no_txt'] = 'Zákaznické číslo';
 $wb['username_txt'] = 'Uživatelské jméno';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 8cf55223e70ee538f3e9a84a96426779e86cf53b..46afed5f874be5ce934f7e5173f434c6b8ef55d8 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -143,4 +143,4 @@ $wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert,
 $wb['aps_limits_txt'] = 'APS Installationsassistent Limits';
 $wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen';
 $wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index fa38a8e4ab1f75384117961bfb096b32dd6174ab..14cd58a0c4d36736a2bed8b91715fc73d076ac94 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -142,4 +142,4 @@ $wb['bank_account_swift_txt'] = 'BIC';
 $wb['aps_limits_txt'] = 'APS Installationsassistent Limits';
 $wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen';
 $wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/client/lib/lang/pl.lng b/interface/web/client/lib/lang/pl.lng
index 7ecf6400ffdec3761c72b3688fdad0aa9b6512da..272743515496a4347635abf786fe034f099529ea 100644
--- a/interface/web/client/lib/lang/pl.lng
+++ b/interface/web/client/lib/lang/pl.lng
@@ -23,4 +23,3 @@ $wb['error_domain_in webuse'] = 'Ta domena nie może zostać usunięta ponieważ
 $wb['error_client_can_not_add_domain'] = 'Nie możesz dodać nowej domeny';
 $wb['error_client_group_id_empty'] = 'Musisz wybrać klienta<br>';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index 8cda7bd5d4715ed741005d5e3952cfb94c2aa30a..3607bff1712a17ee5e5507d8eb2dbc64cad9fc53 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -144,4 +144,3 @@ $wb['aps_limits_txt'] = 'Limity Instalatora APS';
 $wb['limit_aps_txt'] = 'Maks. liczba instalacji APS';
 $wb['limit_aps_error_notint'] = 'Limit instalacji APS musi być liczbą';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_client_circle.lng b/interface/web/client/lib/lang/pl_client_circle.lng
index 061276809cc59e9b9da003831176b966c8fc6cb2..f98a1447fc75bfe3b4968c02c51b20266d826505 100644
--- a/interface/web/client/lib/lang/pl_client_circle.lng
+++ b/interface/web/client/lib/lang/pl_client_circle.lng
@@ -7,4 +7,3 @@ $wb['client_ids_txt'] = 'Clients/Resellers';
 $wb['description_txt'] = 'Description';
 $wb['active_txt'] = 'Active';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_client_circle_list.lng b/interface/web/client/lib/lang/pl_client_circle_list.lng
index b4244484c62552c15b963c98bcbfdab08fce3e42..00fd0b3998912555116db17c2963578096503f45 100644
--- a/interface/web/client/lib/lang/pl_client_circle_list.lng
+++ b/interface/web/client/lib/lang/pl_client_circle_list.lng
@@ -8,4 +8,3 @@ $wb['filter_txt'] = 'Filter';
 $wb['delete_txt'] = 'Delete';
 $wb['active_txt'] = 'Active';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_client_del.lng b/interface/web/client/lib/lang/pl_client_del.lng
index aab69a43b3eb6154e6f390e9f7454fd80759afab..666e12a24c4b9ab7fdd9bb55307ab138071bf818 100644
--- a/interface/web/client/lib/lang/pl_client_del.lng
+++ b/interface/web/client/lib/lang/pl_client_del.lng
@@ -4,4 +4,3 @@ $wb['delete_explanation'] = 'Ta akcja usunie następującą liczbę rekordów po
 $wb['btn_save_txt'] = 'Usuń klienta';
 $wb['btn_cancel_txt'] = 'Anuluj bez usuwania klienta';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_client_message.lng b/interface/web/client/lib/lang/pl_client_message.lng
index 726f388cc6a39cde4f6ebca62d1ed9ca3188b7f6..d156f318d03687406fe3f3529ec780a2bc74a49b 100644
--- a/interface/web/client/lib/lang/pl_client_message.lng
+++ b/interface/web/client/lib/lang/pl_client_message.lng
@@ -16,4 +16,3 @@ $wb['all_clients_resellers_txt'] = 'Wszyscy klienci i resellerzy';
 $wb['all_clients_txt'] = 'Wszyscy klienci';
 $wb['variables_txt'] = 'Zmienne:';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng
index cd017fb8288790012c299725111d8a035afebce6..cbcf1a3f9297ef8f4ecb2a65240e5974e5bf99f2 100644
--- a/interface/web/client/lib/lang/pl_client_template.lng
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -88,4 +88,3 @@ $wb['aps_limits_txt'] = 'Limit Instalatora APS';
 $wb['limit_aps_txt'] = 'Maks. liczba instancji APS';
 $wb['limit_aps_error_notint'] = 'Limit instancji APS musi być liczbą';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_client_template_list.lng b/interface/web/client/lib/lang/pl_client_template_list.lng
index 76204419e60a73a209353a6a55615354da948b7b..06a39761f9af7d4a0191b4ed73b0b3a22b0d5541 100644
--- a/interface/web/client/lib/lang/pl_client_template_list.lng
+++ b/interface/web/client/lib/lang/pl_client_template_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Szablon klienta';
 $wb['template_type_txt'] = 'Typ';
 $wb['template_name_txt'] = 'Nazwa szablonu';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_clients_list.lng b/interface/web/client/lib/lang/pl_clients_list.lng
index aa0767164133c12880675aa27333b248755ce72f..c790271f5ac32397debbecf20a0542edeb2f2498 100644
--- a/interface/web/client/lib/lang/pl_clients_list.lng
+++ b/interface/web/client/lib/lang/pl_clients_list.lng
@@ -9,4 +9,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowego klienta';
 $wb['username_txt'] = 'Login';
 $wb['customer_no_txt'] = 'Nr klienta';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_domain.lng b/interface/web/client/lib/lang/pl_domain.lng
index 9854e8904f51c67a1d7cfaf338df2f6520f6800e..9f3e80ff6458666aa19d3888ceb68af2a0875cdf 100644
--- a/interface/web/client/lib/lang/pl_domain.lng
+++ b/interface/web/client/lib/lang/pl_domain.lng
@@ -4,4 +4,3 @@ $wb['domain_error_unique'] = 'Domena o podanej nazwie już istnieje';
 $wb['domain_error_regex'] = 'Nazwa domeny jest niedopuszczalna';
 $wb['Domain'] = 'Domena';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_domain_list.lng b/interface/web/client/lib/lang/pl_domain_list.lng
index d31e7dfdccf0721489123519fe1de8c00e80d0de..e2cac3b934284d15c7099223f8172b1a26b92c94 100644
--- a/interface/web/client/lib/lang/pl_domain_list.lng
+++ b/interface/web/client/lib/lang/pl_domain_list.lng
@@ -4,4 +4,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowÄ… domenÄ™';
 $wb['domain_txt'] = 'Domena';
 $wb['user_txt'] = 'Client';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index 8c2dd696f8b5e995db64ed25bed67f39574ce158..64bd81325336f65fd2e19d57fb5a18de928fd3b8 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -143,4 +143,3 @@ $wb['aps_limits_txt'] = 'Limit instalacji APS';
 $wb['limit_aps_txt'] = 'Maks. liczba instancji APS';
 $wb['limit_aps_error_notint'] = 'Limit instancji APS musi być liczbą';
 ?>
-
diff --git a/interface/web/client/lib/lang/pl_resellers_list.lng b/interface/web/client/lib/lang/pl_resellers_list.lng
index 6b277bfdd39e27c2a93399e72261983d06701f1c..176c73e415aad70b783c848fea5539b006de79a0 100644
--- a/interface/web/client/lib/lang/pl_resellers_list.lng
+++ b/interface/web/client/lib/lang/pl_resellers_list.lng
@@ -9,4 +9,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowego resellera';
 $wb['customer_no_txt'] = 'Nr klienta';
 $wb['username_txt'] = 'Login';
 ?>
-
diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng
index 297b6397facd9c9c6d3e3fa6c5b595e818a8a28f..9d2a3211cb0d4cabaade52c01f42a146df72eafb 100644
--- a/interface/web/dashboard/lib/lang/cz.lng
+++ b/interface/web/dashboard/lib/lang/cz.lng
@@ -2,5 +2,3 @@
 $wb['welcome_user_txt'] = 'Vítejte %s';
 $wb['available_modules_txt'] = 'Dostupné moduly';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
index 9810ba9808fc54c2bc002f28b52bcb753149e1e8..bedb98f865187d56e29fee51f20ed1ef3b7561d0 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
@@ -28,5 +28,3 @@ $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 a25ba21fc3ba9c5ec9144516bf135d40d99644be..66275f1d0573489acd4a185f62b4fbfbecf3f2fd 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
@@ -1,5 +1,3 @@
 <?php
 $wb['available_modules_txt'] = 'Dostupné moduly';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/pl.lng b/interface/web/dashboard/lib/lang/pl.lng
index 9a8b6694f16c70eb82108b8cf2e987b8ada36b39..5ef320a86ece666580ef419b0ac34c084e5c81f4 100644
--- a/interface/web/dashboard/lib/lang/pl.lng
+++ b/interface/web/dashboard/lib/lang/pl.lng
@@ -2,4 +2,3 @@
 $wb['welcome_user_txt'] = 'Witaj %s';
 $wb['available_modules_txt'] = 'Dostępne moduły';
 ?>
-
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
index b0c28ec7e20b346810f853424d6e84a6d8a36310..d69a551bd072bc71bcf4ba4c5aa1fe4c53f5707a 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
@@ -28,4 +28,3 @@ $wb['limit_client_txt'] = 'Liczba klientów';
 $wb['limit_database_txt'] = 'Liczba baz danych';
 $wb['limit_mailmailinglist_txt'] = 'Liczba list mailingowych';
 ?>
-
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
index e329a2517d7ec70e22a4c23a4ef88d5227646bc0..fafcc61480d5019acd02cbc99485e0ea14c2ff1f 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
@@ -1,4 +1,3 @@
 <?php
 $wb['available_modules_txt'] = 'Dostępne moduły';
 ?>
-
diff --git a/interface/web/designer/lib/lang/cz.lng b/interface/web/designer/lib/lang/cz.lng
index dd815ad751cd365370e6ef7caec82948b35eba6d..acb6c3546c6150b4edbafb782d3ed85c499210b5 100644
--- a/interface/web/designer/lib/lang/cz.lng
+++ b/interface/web/designer/lib/lang/cz.lng
@@ -1,4 +1,2 @@
 <?php
 ?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng
index 2b04eb968d0a22ab9d143a8e11f53779f770bd7d..75bf5a5606c2337c3297bca3417f7bed093b7fd5 100644
--- a/interface/web/designer/lib/lang/cz_form_edit.lng
+++ b/interface/web/designer/lib/lang/cz_form_edit.lng
@@ -22,5 +22,3 @@ $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 46241cfd5e641219b2c899509b9034166a7187fc..1e677f2410789f7f520c5efe3211abd97d8d3c0b 100644
--- a/interface/web/designer/lib/lang/cz_form_list.lng
+++ b/interface/web/designer/lib/lang/cz_form_list.lng
@@ -5,5 +5,3 @@ $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 45829d54def7efb5ce158d5d0efe17c9ff416c31..381414bdf0848cdc1fd1984a29d308fb0733cd58 100644
--- a/interface/web/designer/lib/lang/cz_form_show.lng
+++ b/interface/web/designer/lib/lang/cz_form_show.lng
@@ -16,5 +16,3 @@ $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 f6da04e2e7b8735594c324bc3d962a125d6991a6..847896d302ec25756e1e58c4fad803084b16feb2 100644
--- a/interface/web/designer/lib/lang/cz_module_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_edit.lng
@@ -20,5 +20,3 @@ $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 b37872cedc376f886678982854783efedab79ff1..b568f69d63b2965e2371648651f39211f17a1de7 100644
--- a/interface/web/designer/lib/lang/cz_module_list.lng
+++ b/interface/web/designer/lib/lang/cz_module_list.lng
@@ -3,5 +3,3 @@ $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 8c21ea4a7d09fbb1127603a26cc4f7446dab3623..01f5df68fb16558fb8b97f277125297884434937 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
@@ -4,5 +4,3 @@ $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 65f6c765a65dce7acd836bd9a23ac8a2fa86aca8..17e31319d7a7dbd750a52a6d5434bb7a8d3a7aca 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
@@ -6,5 +6,3 @@ $wb['header_txt'] = 'Navi properties';
 $wb['save_txt'] = 'Uložit';
 $wb['cancel_txt'] = 'Zrušit';
 ?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_module_show.lng b/interface/web/designer/lib/lang/cz_module_show.lng
index 605d11de08594039db3432ac85f99be1d27e27fb..95c2d85723cec55e4fc46f284511fa79530b9706 100644
--- a/interface/web/designer/lib/lang/cz_module_show.lng
+++ b/interface/web/designer/lib/lang/cz_module_show.lng
@@ -14,5 +14,3 @@ $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/designer/lib/lang/pl.lng b/interface/web/designer/lib/lang/pl.lng
index 29f4a51efebb370aeb04c5144a604ca2c04e02be..acb6c3546c6150b4edbafb782d3ed85c499210b5 100644
--- a/interface/web/designer/lib/lang/pl.lng
+++ b/interface/web/designer/lib/lang/pl.lng
@@ -1,3 +1,2 @@
 <?php
 ?>
-
diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng
index cff6b51b22cdca8068c9d34e929b02e686589354..ee4f4c4100e9e738dc9b2f5c7f5594484ee56437 100644
--- a/interface/web/designer/lib/lang/pl_form_edit.lng
+++ b/interface/web/designer/lib/lang/pl_form_edit.lng
@@ -22,4 +22,3 @@ $wb['auth_preset_perm_user_txt'] = 'Stały użytkownik';
 $wb['auth_preset_perm_group_txt'] = 'Stała grupa';
 $wb['auth_preset_perm_other_txt'] = 'Stała inna';
 ?>
-
diff --git a/interface/web/designer/lib/lang/pl_form_list.lng b/interface/web/designer/lib/lang/pl_form_list.lng
index a0aacc35bd8a934c15afdf671e98178bbe755ef1..ac8572277cb0fbbd23843e783026585f5e1f2007 100644
--- a/interface/web/designer/lib/lang/pl_form_list.lng
+++ b/interface/web/designer/lib/lang/pl_form_list.lng
@@ -5,4 +5,3 @@ $wb['module_txt'] = 'Moduł';
 $wb['title_txt'] = 'Tytuł';
 $wb['description_txt'] = 'Opis';
 ?>
-
diff --git a/interface/web/designer/lib/lang/pl_form_show.lng b/interface/web/designer/lib/lang/pl_form_show.lng
index fbb82a426b46c51000c605f9c4004e39911ded00..db62af16b9cf666744f2013b0e99fb698e1f62d2 100644
--- a/interface/web/designer/lib/lang/pl_form_show.lng
+++ b/interface/web/designer/lib/lang/pl_form_show.lng
@@ -16,4 +16,3 @@ $wb['module_del_txt'] = 'Usunąć moduł i wszystkie podkatalogi?';
 $wb['menu_del_txt'] = 'Usunąć menu i wszystkie jego elementy?';
 $wb['item_del_txt'] = 'UsunÄ…c element menu?';
 ?>
-
diff --git a/interface/web/designer/lib/lang/pl_module_edit.lng b/interface/web/designer/lib/lang/pl_module_edit.lng
index d05cb9fadf4fe23b5b4794a4d39ced5be65311c1..b87d04b1828c503410535d550a6b0cfb1d438000 100644
--- a/interface/web/designer/lib/lang/pl_module_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_edit.lng
@@ -20,4 +20,3 @@ $wb['description_txt'] = '
 <b>Podpowiedź:</b> Wszystkie ścieżki są względne według strony www..
 ';
 ?>
-
diff --git a/interface/web/designer/lib/lang/pl_module_list.lng b/interface/web/designer/lib/lang/pl_module_list.lng
index 2751633fa2955244842c832217b1f1d9f2f65261..308d1c688bc14a1cf611cb4c876126a5c2e4a43c 100644
--- a/interface/web/designer/lib/lang/pl_module_list.lng
+++ b/interface/web/designer/lib/lang/pl_module_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Nazwa modułu';
 $wb['module_txt'] = 'Moduł';
 $wb['title_txt'] = 'Tytuł';
 ?>
-
diff --git a/interface/web/designer/lib/lang/pl_module_nav_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_edit.lng
index 54095f906d2cc0ab5b1446e8de67a940bdd2391c..fe8edabf660378d2cea342a83dfdf65cdbbe8692 100644
--- a/interface/web/designer/lib/lang/pl_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_nav_edit.lng
@@ -4,4 +4,3 @@ $wb['header_txt'] = 'Parametry nawigacyjne';
 $wb['save_txt'] = 'Zapisz';
 $wb['cancel_txt'] = 'Usuń';
 ?>
-
diff --git a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
index 1e2fde46f0626e244417586e80ba4b9c4eaad8e8..779b3b4b3b418efa60072e2a7d9480b68a80606c 100644
--- a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
@@ -6,4 +6,3 @@ $wb['header_txt'] = 'Parametry nawigacyjne';
 $wb['save_txt'] = 'Zapisz';
 $wb['cancel_txt'] = 'Usuń';
 ?>
-
diff --git a/interface/web/designer/lib/lang/pl_module_show.lng b/interface/web/designer/lib/lang/pl_module_show.lng
index 6daf82e396d9512b0efd9668dad541f4755bb35c..9b98c4948239a2b8d5717ade5e90a2d8e2ca10ec 100644
--- a/interface/web/designer/lib/lang/pl_module_show.lng
+++ b/interface/web/designer/lib/lang/pl_module_show.lng
@@ -14,4 +14,3 @@ $wb['module_del_txt'] = 'Czy na pewno chcesz usunąć moduł wraz z wszystkimi p
 $wb['menu_del_txt'] = 'Czy na pewno chcesz usunąć menu z wszystkimi wpisami?';
 $wb['item_del_txt'] = 'Czy na pewno chcesz usunąć wpis w menu?';
 ?>
-
diff --git a/interface/web/dns/dns_mx_edit.php b/interface/web/dns/dns_mx_edit.php
index 73483f7ca3908cd28e6406c220426b0a44c760d4..8ce9b872b53bffa61a052cec3ffff4ee0b7128b6 100644
--- a/interface/web/dns/dns_mx_edit.php
+++ b/interface/web/dns/dns_mx_edit.php
@@ -119,6 +119,17 @@ class page_action extends tform_actions {
 		parent::onInsert();
 	}
 	
+	function onUpdate() {
+		global $app, $conf;
+		
+		// Check if record is existing already
+		$duplicate_mx = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ".$app->functions->intval($this->dataRecord["zone"])." AND name = '".$this->dataRecord["name"]."' AND type = '".$this->dataRecord["type"]."' AND data = '".$this->dataRecord["data"]."' AND id != ".$app->functions->intval($this->dataRecord["id"])." AND ".$app->tform->getAuthSQL('r'));
+		
+		if(is_array($duplicate_mx) && !empty($duplicate_mx)) $app->error($app->tform->wordbook["duplicate_mx_record_txt"]);
+		
+		parent::onUpdate();
+	}
+	
 	function onAfterInsert() {
 		global $app, $conf;
 		
diff --git a/interface/web/dns/dns_slave_edit.php b/interface/web/dns/dns_slave_edit.php
index 82d62b401a6ee526ce541b47f83a3a837b4e3647..2a5247a4c697a6d5bf30aa32343d35f4d67f0a7e 100644
--- a/interface/web/dns/dns_slave_edit.php
+++ b/interface/web/dns/dns_slave_edit.php
@@ -158,6 +158,17 @@ class page_action extends tform_actions {
 		parent::onSubmit();
 	}
 	
+	function onInsert() {
+		global $app, $conf;
+		
+		// Check if record is existing already
+		$duplicate_slave = $app->db->queryOneRecord("SELECT * FROM dns_slave WHERE origin = '".$this->dataRecord["origin"]."' AND server_id = ".$app->functions->intval($this->dataRecord["server_id"])." AND ".$app->tform->getAuthSQL('r'));
+		
+		if(is_array($duplicate_slave) && !empty($duplicate_slave)) $app->error($app->tform->wordbook["origin_error_unique"]);
+		
+		parent::onInsert();
+	}
+	
 	function onAfterInsert() {
 		global $app, $conf;
 		
diff --git a/interface/web/dns/form/dns_slave.tform.php b/interface/web/dns/form/dns_slave.tform.php
index 744aa87f994fd5c12e1eedd919aeaab13a2f49c3..0ff6a5e941c5649ad61dd8a4814a102a5a86390a 100644
--- a/interface/web/dns/form/dns_slave.tform.php
+++ b/interface/web/dns/form/dns_slave.tform.php
@@ -91,9 +91,11 @@ $form["tabs"]['dns_slave'] = array (
                                 ),
 			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
 														'errmsg'=> 'origin_error_empty'),
+										/*
 										1 => array (	'type'	=> 'UNIQUE',
 														'errmsg'=> 'origin_error_unique'),
-										2 => array (	'type'	=> 'REGEX',
+										*/
+										1 => array (	'type'	=> 'REGEX',
 														'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,10}[\.]{0,1}$/',
 														'errmsg'=> 'origin_error_regex'),
 									),
diff --git a/interface/web/dns/lib/lang/ar_dns_mx.lng b/interface/web/dns/lib/lang/ar_dns_mx.lng
index 648827f04e34cb5e980ef95e06fbc29c9c39593e..68bf48a5e4fc6605a0476c5cb3ddda693fcd7384 100644
--- a/interface/web/dns/lib/lang/ar_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ar_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'The hostname is empty.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Mailserver hostname empty';
 $wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/bg_dns_mx.lng b/interface/web/dns/lib/lang/bg_dns_mx.lng
index 5f61437a7926b6e1090219f0144dfd99f492309c..f5369c7a4ae5767e4d830a66f2e51ff029a357f2 100644
--- a/interface/web/dns/lib/lang/bg_dns_mx.lng
+++ b/interface/web/dns/lib/lang/bg_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Полето с имейла е празно.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Mailserver hostname empty';
 $wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_mx.lng b/interface/web/dns/lib/lang/br_dns_mx.lng
index 0dfd536a2781e485bc32d1e2e24f8bc6901d72bb..0f173a7c01fbcbe1aabe7e7922fd0363baf99acf 100644
--- a/interface/web/dns/lib/lang/br_dns_mx.lng
+++ b/interface/web/dns/lib/lang/br_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Hostname em branco.';
 $wb['name_error_regex'] = 'Hostname tem um formato inválido.';
 $wb['data_error_empty'] = 'Hostname do servidor de correio em branco';
 $wb['data_error_regex'] = 'Hostname do servidor de correio formato inválido';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng
index 876a5751e295c4e553df618c71130b0380eef420..f143b0b92266c5bca8bdd4b931f749cee4012c42 100644
--- a/interface/web/dns/lib/lang/cz.lng
+++ b/interface/web/dns/lib/lang/cz.lng
@@ -20,5 +20,3 @@ $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 6d9a24d64c6380ac207025870ab9057d150f7b1d..8b8c206b637752ecbc9b3c0be7107f66107de556 100644
--- a/interface/web/dns/lib/lang/cz_dns_a.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a.lng
@@ -14,5 +14,3 @@ $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 9f16d3c36c8102759955e8daa59d57eca7333e90..a61265a595057b58b5f362f428b572ff99f28b45 100644
--- a/interface/web/dns/lib/lang/cz_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng
@@ -13,5 +13,3 @@ $wb['page_txt'] = 'Stránka';
 $wb['page_of_txt'] = 'z';
 $wb['delete_confirmation'] = 'Skutečně chcete smazat tento záznam ?';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_aaaa.lng b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
index 143885f969b75638200b997a28bed1c72e87aef0..26c6ae90640b8ce342ecb74a2107866a700b80da 100644
--- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
@@ -13,5 +13,3 @@ $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 c25dc7b3ebd51c3d7050bcd784d63d8b78c224d7..572478a98b286753a551afcd6f1123516aaa1878 100644
--- a/interface/web/dns/lib/lang/cz_dns_alias.lng
+++ b/interface/web/dns/lib/lang/cz_dns_alias.lng
@@ -13,5 +13,3 @@ $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 29587c8b154e3468a147596175be38566b74b442..8494b7c293a0c35dff4456020e19a252e53479e1 100644
--- a/interface/web/dns/lib/lang/cz_dns_cname.lng
+++ b/interface/web/dns/lib/lang/cz_dns_cname.lng
@@ -14,5 +14,3 @@ $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'] = 'Duplikace A záznamu nebo CNAME-záznamu';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_hinfo.lng b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
index 3633fdb80be22de243ba95843a550a2f8678afd0..5f67d5e826cc5eef8c92eae607834a856721786f 100644
--- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
@@ -13,5 +13,3 @@ $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 9734b3e94751ec8fe7cca0503ab0b1a2d9d42df9..8b25ebac2db7ad37089096c62f923bb22042aecc 100644
--- a/interface/web/dns/lib/lang/cz_dns_import.lng
+++ b/interface/web/dns/lib/lang/cz_dns_import.lng
@@ -12,5 +12,3 @@ $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 e0e475bf14a68e70d622eeb2a124068f92ced215..228d9d6cc6400641711ca38d6f3bde60c64f353e 100644
--- a/interface/web/dns/lib/lang/cz_dns_mx.lng
+++ b/interface/web/dns/lib/lang/cz_dns_mx.lng
@@ -13,6 +13,5 @@ $wb['name_error_empty'] = 'Hostname je prázdný.';
 $wb['name_error_regex'] = 'Hostname má chybný formát.';
 $wb['data_error_empty'] = 'Hostname e-mailového serveru je prázdný';
 $wb['data_error_regex'] = 'Hostname e-mailového serveru má chybný formát';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng
index 4b011849f892b74a14eef566ef44be2b89561357..ba38e2a65e02170a41d48ac5be7c00381dfeec5b 100644
--- a/interface/web/dns/lib/lang/cz_dns_ns.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ns.lng
@@ -13,5 +13,3 @@ $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 33f116631e0c8b6028536ebc3755d9a286dc1f94..9617ea58529a1a339700588144c5e6057dfc6471 100644
--- a/interface/web/dns/lib/lang/cz_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng
@@ -13,5 +13,3 @@ $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 bcebed3ef327bfd0b627c0bf286cdc59f3053c47..8b1e7e442ebe0e4a71b700f074d043d66dd13b20 100644
--- a/interface/web/dns/lib/lang/cz_dns_rp.lng
+++ b/interface/web/dns/lib/lang/cz_dns_rp.lng
@@ -13,5 +13,3 @@ $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 b8cc5f139fe5cbdcfa1799015560e6d12e3cb344..16617f6c595322dbc5e6479bfd5b47bbe24d6897 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave.lng
@@ -15,5 +15,3 @@ $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 eead22a8b7886b36519de41106e3ed44ab81a625..1e0a3d0106fd0c3a654292e116a0a3b120382751 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
@@ -7,5 +7,3 @@ $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 8bc1eb8c536bda4586128ee97723e1a6fd151889..c98cb6d3bd58a57a5c3e82cc37fbbedd598de164 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa.lng
@@ -36,5 +36,3 @@ $wb['minimum_range_error'] = 'Minimální doba je 60 sekund.';
 $wb['ttl_range_error'] = 'Min. TTL čas je 60 sekund.';
 $wb['xfer_error_regex'] = 'Také oznámí: Prosím, použijte IP adresu.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_soa_list.lng b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
index 999e5bd68d96fafe9f22bacd83b31514505c5fee..beba8a22b24da0f51ae36fbfc7d9a98a1e8b63d6 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
@@ -8,5 +8,3 @@ $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 60d844ac9b707d5c1c90eb3d9bf78bdd9d9494d3..6b6708fc010b637889a28a595d2210b0ba9e3aa9 100644
--- a/interface/web/dns/lib/lang/cz_dns_srv.lng
+++ b/interface/web/dns/lib/lang/cz_dns_srv.lng
@@ -17,5 +17,3 @@ $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 b91b3ae257418df4b24b550f49c12ee9eb4dde51..be4ac0e9491d74bd68c6a744791e4efa4bb47c04 100644
--- a/interface/web/dns/lib/lang/cz_dns_template.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template.lng
@@ -4,5 +4,3 @@ $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 a7218a497658d3c9e063ae57438f443e14d37111..bdd6e182041668c593f2d0ae5861819babc42a02 100644
--- a/interface/web/dns/lib/lang/cz_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng
@@ -4,5 +4,3 @@ $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 8784c7e2b4864ec231cedece16d2017df503b0c3..76047b0cebcff637301959197c37e902bf140024 100644
--- a/interface/web/dns/lib/lang/cz_dns_txt.lng
+++ b/interface/web/dns/lib/lang/cz_dns_txt.lng
@@ -13,5 +13,3 @@ $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 2c54eaf228d358cdfcfcb2f1beacf8d65305f3e4..1b2e5f76003b4d72883e40f2e9127698a179312b 100644
--- a/interface/web/dns/lib/lang/cz_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng
@@ -36,5 +36,3 @@ $wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
 $wb['list_head_txt'] = 'Průvodce vytvořením DNS zóny';
 $wb['list_desc_txt'] = 'Vytvoření DNS zóny pomocí průvodce';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng
index de5e1e9bf477b1f9c30d1dba9d6d2110dbd5ec7f..822fcd6a796f3b2a8235a001c972f1ce49c5dcc3 100644
--- a/interface/web/dns/lib/lang/de.lng
+++ b/interface/web/dns/lib/lang/de.lng
@@ -17,6 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT';
 $wb['DNS Wizard'] = 'DNS Assistent';
 $wb['Add DNS Zone'] = 'DNS Zone hinzufügen';
 $wb['Templates'] = 'Vorlagen';
-$wb['Secondary Zones'] = 'Zweiter DNS Zonen';
-$wb['Import Zone File'] = 'Zonen Datei Import';
+$wb['Secondary Zones'] = 'Slave DNS-Zonen';
+$wb['Import Zone File'] = 'Zonen-Datei-Import';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_mx.lng b/interface/web/dns/lib/lang/de_dns_mx.lng
index f229c2cc6e3b8480ffc565e027a3ddbd70341ed0..4920806ad523faaf043df0db0b398e54032574dc 100644
--- a/interface/web/dns/lib/lang/de_dns_mx.lng
+++ b/interface/web/dns/lib/lang/de_dns_mx.lng
@@ -13,5 +13,5 @@ $wb['name_error_empty'] = 'Der Hostname ist leer.';
 $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
 $wb['data_error_empty'] = 'Mailserver Hostname ist leer';
 $wb['data_error_regex'] = 'Mailserver Hostname Format ist ungültig';
-$wb["duplicate_mx_record_txt"] = 'Doppelter MX-Eintrag.';
+$wb['duplicate_mx_record_txt'] = 'Doppelter MX-Eintrag.';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_slave.lng b/interface/web/dns/lib/lang/de_dns_slave.lng
index a1677b6b7f34213398fffaa73d73a38ed7f124e8..1b58088317e764ae3b6d92a651bbf14b4819db7b 100644
--- a/interface/web/dns/lib/lang/de_dns_slave.lng
+++ b/interface/web/dns/lib/lang/de_dns_slave.lng
@@ -1,7 +1,7 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'DNS Zone';
-$wb['secondary_zone_txt'] = 'Zweiter DNS Zone';
+$wb['origin_txt'] = 'DNS-Zone';
+$wb['secondary_zone_txt'] = 'Slave DNS-Zone';
 $wb['ns_txt'] = 'NS (IP Adresse)';
 $wb['active_txt'] = 'Aktiv';
 $wb['limit_dns_slave_zone_txt'] = 'Die maximale Anzahl an Zweiter DNS Zonen für Ihr Konto wurde erreicht.';
diff --git a/interface/web/dns/lib/lang/de_dns_slave_list.lng b/interface/web/dns/lib/lang/de_dns_slave_list.lng
index f06b45197e0d6257a0872b8bbbac38cd1bc6c48c..dc60207d98edfe8012ee69bcf05e225ea7399b76 100644
--- a/interface/web/dns/lib/lang/de_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_slave_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Zweiter DNS Zonen';
+$wb['list_head_txt'] = 'Slave DNS-Zonen';
 $wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
 $wb['origin_txt'] = 'Zone';
 $wb['ns_txt'] = 'NS';
-$wb['add_new_record_txt'] = 'Neue Zweiter DNS Zone hinzufügen';
+$wb['add_new_record_txt'] = 'Neue Slave DNS-Zone hinzufügen';
 $wb['eg_domain_tld'] = 'Format: domain.tld.';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng
index 890cfc921fc37e2d977412b087449d107a6415a7..37c967bda47909331a6ae0c98ed4158932a51c77 100644
--- a/interface/web/dns/lib/lang/el_dns_mx.lng
+++ b/interface/web/dns/lib/lang/el_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Το hostname δεν έχει οριστεί.';
 $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοποίηση.';
 $wb['data_error_empty'] = 'Το hostname Mailserver δεν έχει οριστεί';
 $wb['data_error_regex'] = 'Mailserver hostname με μη έγκυρη μορφοποίηση';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/es_dns_mx.lng b/interface/web/dns/lib/lang/es_dns_mx.lng
index e7c377d66591ab9d7cc4261f79a99dfcc8719a90..f51a325630da1f162c9f93f19f59cade7dcc6a4c 100644
--- a/interface/web/dns/lib/lang/es_dns_mx.lng
+++ b/interface/web/dns/lib/lang/es_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'El nombre de la máquina está vacío.';
 $wb['name_error_regex'] = 'El formato del nombre de la máquina es incorrecto.';
 $wb['data_error_empty'] = 'El nombre del servidor de correo está vacío.';
 $wb['data_error_regex'] = 'El nombre del servidor de correo no es válido.';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/fi_dns_mx.lng b/interface/web/dns/lib/lang/fi_dns_mx.lng
index e4b4a60d56741f7b40c09f324705df47944cb1e8..14640711add9f3af396cf0e5fb41df1b6e42aef4 100755
--- a/interface/web/dns/lib/lang/fi_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fi_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Verkkotunnus on tyhjä.';
 $wb['name_error_regex'] = 'Verkkotunnus on väärän muotoinen.';
 $wb['data_error_empty'] = 'Tekstikenttä on tyhjä';
 $wb['data_error_regex'] = 'Tekstikenttä on vääränlainen';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_mx.lng b/interface/web/dns/lib/lang/fr_dns_mx.lng
index b625c124cffac53f5fae8cb09ddf73b8fb4fba6f..4db35675115e486cbee06489e7ce7af9a63123c9 100644
--- a/interface/web/dns/lib/lang/fr_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fr_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
 $wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
 $wb['data_error_empty'] = 'Le nom d\'hôte du serveur mail est vide';
 $wb['data_error_regex'] = 'Le format du nom d\'hôte du serveur mail est invalide';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/hr_dns_mx.lng b/interface/web/dns/lib/lang/hr_dns_mx.lng
index 8375fe82a1f62f49a65c786577611648580d0c32..9667adb0a021a3f9be1e0e0b5c631deb31f921f0 100644
--- a/interface/web/dns/lib/lang/hr_dns_mx.lng
+++ b/interface/web/dns/lib/lang/hr_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Naziv hosta nije upisan.';
 $wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
 $wb['data_error_empty'] = 'Naziv mail hosta polje je prazno';
 $wb['data_error_regex'] = 'Neispravan format naziva mail host zapisa';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/hu_dns_mx.lng b/interface/web/dns/lib/lang/hu_dns_mx.lng
index 67232f3e552a451f8efc7ee88d3d3f7b5151c1b2..4de9b34bedbee990c806d5c071821e60b17a17e9 100644
--- a/interface/web/dns/lib/lang/hu_dns_mx.lng
+++ b/interface/web/dns/lib/lang/hu_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'The hostname is empty.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Mailserver hostname empty';
 $wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/id_dns_mx.lng b/interface/web/dns/lib/lang/id_dns_mx.lng
index e483d77e731982c9739d9ca5ef269008cc851069..e085e271503ce2865e9f8c7ccbdc0b3ce677898f 100644
--- a/interface/web/dns/lib/lang/id_dns_mx.lng
+++ b/interface/web/dns/lib/lang/id_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Nama Host kosong.';
 $wb['name_error_regex'] = 'Format Nama Host salah.';
 $wb['data_error_empty'] = 'Nama Host Server Mail kosong';
 $wb['data_error_regex'] = 'Format Nama Host Server Mail tidak valid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_mx.lng b/interface/web/dns/lib/lang/it_dns_mx.lng
index 648827f04e34cb5e980ef95e06fbc29c9c39593e..68bf48a5e4fc6605a0476c5cb3ddda693fcd7384 100644
--- a/interface/web/dns/lib/lang/it_dns_mx.lng
+++ b/interface/web/dns/lib/lang/it_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'The hostname is empty.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Mailserver hostname empty';
 $wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/ja_dns_mx.lng b/interface/web/dns/lib/lang/ja_dns_mx.lng
index 648827f04e34cb5e980ef95e06fbc29c9c39593e..68bf48a5e4fc6605a0476c5cb3ddda693fcd7384 100644
--- a/interface/web/dns/lib/lang/ja_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ja_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'The hostname is empty.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Mailserver hostname empty';
 $wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/nl_dns_mx.lng b/interface/web/dns/lib/lang/nl_dns_mx.lng
index a1482325d07dcd46ae3b349e5f19e17586000a31..86be0856ed86753c4a169a2a9bc9ce998ab54443 100644
--- a/interface/web/dns/lib/lang/nl_dns_mx.lng
+++ b/interface/web/dns/lib/lang/nl_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'De hostnaam is niet ingvuld.';
 $wb['name_error_regex'] = 'De hostnaam heeft een onjuist formaat.';
 $wb['data_error_empty'] = 'Mailserver hostnaam is niet ingvuld';
 $wb['data_error_regex'] = 'Mailserver hostnaam formaat ongeldig';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng
index 6fca5921ab1956f9844de8f8d505759e67aeac65..46f691ea39096b1b739ad4b5468bdf34ee1092dd 100644
--- a/interface/web/dns/lib/lang/pl.lng
+++ b/interface/web/dns/lib/lang/pl.lng
@@ -20,4 +20,3 @@ $wb['Templates'] = 'Szablony';
 $wb['Secondary Zones'] = 'Strefy Zapasowe';
 $wb['Import Zone File'] = 'Import pliku Strefy';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_a.lng b/interface/web/dns/lib/lang/pl_dns_a.lng
index 3aa2d6855ed57eac706289348f245db2f96fd5b3..f9b09977319e1392ec3c81fd950c8003c0ab11bd 100644
--- a/interface/web/dns/lib/lang/pl_dns_a.lng
+++ b/interface/web/dns/lib/lang/pl_dns_a.lng
@@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'Adres IP jest pusty.';
 $wb['data_error_regex'] = 'Adres IP ma niepoprawny format.';
 $wb['data_error_duplicate'] = 'Duplikat wpisu A.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_a_list.lng b/interface/web/dns/lib/lang/pl_dns_a_list.lng
index 2fe8fbd6c73f26cf97b87da0e1f46ba147d10320..63a4df49da8e873158b1d72d3bcf511f41e8c841 100644
--- a/interface/web/dns/lib/lang/pl_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_a_list.lng
@@ -13,4 +13,3 @@ $wb['page_of_txt'] = 'z';
 $wb['delete_confirmation'] = 'Czy jesteś pewny, że chcesz usunąć ten wpis?';
 $wb['ttl_txt'] = 'TTL';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_aaaa.lng b/interface/web/dns/lib/lang/pl_dns_aaaa.lng
index 8c90e3fe5fb257f30723e04bd81abda2acf4e0de..f8e44e58f30b1e03febb2c0ed09f53973370db25 100644
--- a/interface/web/dns/lib/lang/pl_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_aaaa.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.';
 $wb['data_error_empty'] = 'Adres IP jest pusty.';
 $wb['data_error_regex'] = 'Adres IP ma niepoprawny format.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_alias.lng b/interface/web/dns/lib/lang/pl_dns_alias.lng
index 44c377e38f9910aa11793a18f753d2c1f46d4873..a950805e3b4378caa7b4d4162242f4580ace4909 100644
--- a/interface/web/dns/lib/lang/pl_dns_alias.lng
+++ b/interface/web/dns/lib/lang/pl_dns_alias.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
 $wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta.';
 $wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_cname.lng b/interface/web/dns/lib/lang/pl_dns_cname.lng
index 5fbe69356680c2fa439d633aab19fdfc4b449fde..c007ea6f4c1ae0df2d432a6777b232079581677c 100644
--- a/interface/web/dns/lib/lang/pl_dns_cname.lng
+++ b/interface/web/dns/lib/lang/pl_dns_cname.lng
@@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta.';
 $wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format.';
 $wb['data_error_duplicate'] = 'Zdublowany rekord A lub CNAME.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_hinfo.lng b/interface/web/dns/lib/lang/pl_dns_hinfo.lng
index 18f3b9f4f6c247ca249ce5c3db9251c0ec047866..d408e14328ce0c90e7b588b9a45d333be99d4c57 100644
--- a/interface/web/dns/lib/lang/pl_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/pl_dns_hinfo.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.';
 $wb['data_error_empty'] = 'Informacje o serwerze sÄ… puste.';
 $wb['data_error_regex'] = 'Informacje o serwerze majÄ… niepoprawny format.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_import.lng b/interface/web/dns/lib/lang/pl_dns_import.lng
index b6941851c0a2bbfd3bc9c2565687ff091c0a8137..62cfb4f8cd96e83f377d8ad5bd496d18c912a424 100644
--- a/interface/web/dns/lib/lang/pl_dns_import.lng
+++ b/interface/web/dns/lib/lang/pl_dns_import.lng
@@ -12,4 +12,3 @@ $wb['title'] = 'Importuj pliki strefy';
 $wb['no_file_uploaded_error'] = 'Nie załadowany żaden plik';
 $wb['zone_file_import_txt'] = 'Import pliku strefy';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_mx.lng b/interface/web/dns/lib/lang/pl_dns_mx.lng
index d244013dec926fd4eb1ceb3ae2403b1f4d94095a..8c612a5dab59e91ac37599f9547b3b3907083d84 100644
--- a/interface/web/dns/lib/lang/pl_dns_mx.lng
+++ b/interface/web/dns/lib/lang/pl_dns_mx.lng
@@ -13,5 +13,5 @@ $wb['name_error_empty'] = 'Nazwa serwera jest pusta.';
 $wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
 $wb['data_error_empty'] = 'Nazwa serwera poczty e-mail jest pusta.';
 $wb['data_error_regex'] = 'Nazwa serwera poczty e-mail ma niepoprawny format.';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_ns.lng b/interface/web/dns/lib/lang/pl_dns_ns.lng
index d82dc4887f8680feed9a19a35b1f18b8db2ba0bd..18d7efd6cd3d6310b129234e6e2152d24b540602 100644
--- a/interface/web/dns/lib/lang/pl_dns_ns.lng
+++ b/interface/web/dns/lib/lang/pl_dns_ns.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Strefa ma zły format.';
 $wb['data_error_empty'] = 'Nazwa serwera jest pusta.';
 $wb['data_error_regex'] = 'Nazwa serwera ma zły format.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_ptr.lng b/interface/web/dns/lib/lang/pl_dns_ptr.lng
index eeb03d6524ba0bc13b5642c06d52375b915f80f9..eae39817a0b36242ea5805da88414b963054eb7d 100644
--- a/interface/web/dns/lib/lang/pl_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/pl_dns_ptr.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa ma zły format.';
 $wb['data_error_empty'] = 'Standardowa nazwa serwera jest pusta';
 $wb['data_error_regex'] = 'Standardowa nazwa serwera ma zły format';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_rp.lng b/interface/web/dns/lib/lang/pl_dns_rp.lng
index 587c7353a7bec8fb4b3e9e71687e677413107f91..43cbc51225df11cf2bf59a45216ad7ba429eff6c 100644
--- a/interface/web/dns/lib/lang/pl_dns_rp.lng
+++ b/interface/web/dns/lib/lang/pl_dns_rp.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
 $wb['data_error_empty'] = 'Musisz podać osobę odpowiedzialna.';
 $wb['data_error_regex'] = 'Nazwa osoby odpowiedzialnej ma niepoprawny format.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_slave.lng b/interface/web/dns/lib/lang/pl_dns_slave.lng
index 115dfc6215dc9587a210ec5a6b497728e95f33ef..42dea7cd196215a6f0eb20df6d234e1e4086768c 100644
--- a/interface/web/dns/lib/lang/pl_dns_slave.lng
+++ b/interface/web/dns/lib/lang/pl_dns_slave.lng
@@ -15,4 +15,3 @@ $wb['eg_domain_tld'] = 'np. domena.pl.';
 $wb['ipv4_form_txt'] = 'notacja IPv4 - np. 127.0.0.1';
 $wb['secondary_zone_txt'] = 'Zapasowa Strefa DNS';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_slave_list.lng b/interface/web/dns/lib/lang/pl_dns_slave_list.lng
index 010d78f36ebf10544c4e63738e37be5d3ba345bf..bbdb368f1d4590b1becc36c1174e39652d4144ad 100644
--- a/interface/web/dns/lib/lang/pl_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_slave_list.lng
@@ -7,4 +7,3 @@ $wb['ns_txt'] = 'NS';
 $wb['add_new_record_txt'] = 'Dodaj nowÄ… zapasowÄ… strefÄ™ DNS';
 $wb['eg_domain_tld'] = 'np. domena.pl.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng
index c30b17be58d68394a3c5ac8b30211d46811395de..b5471dbb9efaa58442120dd6cc46a6453bf6ec85 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa.lng
@@ -36,4 +36,3 @@ $wb['expire_range_error'] = 'Min. czas przedawnienia wynosi 60 sekund';
 $wb['minimum_range_error'] = 'Min. czas minimalny wynosi 60 sekund';
 $wb['ttl_range_error'] = 'Min. czas TTL wynosi 60 sekund';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_soa_list.lng b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
index 0b17c903f11baca4ecfde4d320d9af93a433fa71..d440e05469af6c0fe2831c2da79e465212af6616 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
@@ -8,4 +8,3 @@ $wb['mbox_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Dodaj nowÄ… strefÄ™ DNS (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Dodaj nowÄ… strefÄ™ DNS za pomocÄ… Kreatora';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_srv.lng b/interface/web/dns/lib/lang/pl_dns_srv.lng
index 228df530f38afa6e660d52d1ee5c9773c1114015..eec182bf5235314bd66592b962d281ad7f11d69e 100644
--- a/interface/web/dns/lib/lang/pl_dns_srv.lng
+++ b/interface/web/dns/lib/lang/pl_dns_srv.lng
@@ -17,4 +17,3 @@ $wb['target_txt'] = 'Cel';
 $wb['weight_txt'] = 'Waga';
 $wb['port_txt'] = 'Port';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_template.lng b/interface/web/dns/lib/lang/pl_dns_template.lng
index fc7a0d6f92e15d74ffaff6fbcedf2e734f5eaf74..f3e756357728ab5538d7c01600bc25c23439c1bc 100644
--- a/interface/web/dns/lib/lang/pl_dns_template.lng
+++ b/interface/web/dns/lib/lang/pl_dns_template.lng
@@ -4,4 +4,3 @@ $wb['fields_txt'] = 'Pola';
 $wb['template_txt'] = 'Szablon';
 $wb['visible_txt'] = 'Widoczność';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_template_list.lng b/interface/web/dns/lib/lang/pl_dns_template_list.lng
index a74e0c52f47999829fb8b0b7fc8f2eed9a4ac101..7deac3b2fa01cc7f62d7b9865abe0b969912a5d0 100644
--- a/interface/web/dns/lib/lang/pl_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_template_list.lng
@@ -4,4 +4,3 @@ $wb['visible_txt'] = 'Widoczność';
 $wb['name_txt'] = 'Nazwa';
 $wb['add_new_record_txt'] = 'Dodaj nowy wpis';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_txt.lng b/interface/web/dns/lib/lang/pl_dns_txt.lng
index 324bf06aa166b95c71b0eaaa6aa49ec9c56e19a6..f84620ed3ab8a052fe7983763a55e3c64aa017ac 100644
--- a/interface/web/dns/lib/lang/pl_dns_txt.lng
+++ b/interface/web/dns/lib/lang/pl_dns_txt.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
 $wb['data_error_empty'] = 'Tekst jest pusty.';
 $wb['data_error_regex'] = 'Tekst ma zły format.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_wizard.lng b/interface/web/dns/lib/lang/pl_dns_wizard.lng
index 8bf1cfa254f1c3f44e45e90e4cc76811372bda48..52ab37d40310d1b51f44c671cd4ee005cf8f1548 100644
--- a/interface/web/dns/lib/lang/pl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng
@@ -36,4 +36,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 wyników';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
 $wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
 ?>
-
diff --git a/interface/web/dns/lib/lang/pt_dns_mx.lng b/interface/web/dns/lib/lang/pt_dns_mx.lng
index 723f9d0947967ff9e4d54eca685e2520bff049c2..bd00da36613711a15f22f04d37ea9bb649760e4e 100644
--- a/interface/web/dns/lib/lang/pt_dns_mx.lng
+++ b/interface/web/dns/lib/lang/pt_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Hostname em branco.';
 $wb['name_error_regex'] = 'Hostname tem um formato inválido.';
 $wb['data_error_empty'] = 'Hostname do servidor de correio em branco';
 $wb['data_error_regex'] = 'Hostname do servidor de correio formato inválido';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/ro_dns_mx.lng b/interface/web/dns/lib/lang/ro_dns_mx.lng
index 3c5b54892718fb30487dd43410e1e2e7f10041c3..b04e8f1168c5559d3aae3ed76a4f28f79a4b0e47 100644
--- a/interface/web/dns/lib/lang/ro_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ro_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Hostname este vid';
 $wb['name_error_regex'] = 'Hostname  format gresit.';
 $wb['data_error_empty'] = 'Mailserver hostname necompletat.';
 $wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_mx.lng b/interface/web/dns/lib/lang/ru_dns_mx.lng
index d4ec0ade4fa98a7a65ca8a0d1d3685e4849baf14..f82e6d22804e842c1ae8d5d85ad67459f3ff539b 100644
--- a/interface/web/dns/lib/lang/ru_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ru_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Имя узла пустое';
 $wb['name_error_regex'] = 'Имя узла имеет неправильный формат.';
 $wb['data_error_empty'] = 'Mailserver имя узла пустое';
 $wb['data_error_regex'] = 'Mailserver имя узла в неправильном формате';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/se_dns_mx.lng b/interface/web/dns/lib/lang/se_dns_mx.lng
index 648827f04e34cb5e980ef95e06fbc29c9c39593e..68bf48a5e4fc6605a0476c5cb3ddda693fcd7384 100644
--- a/interface/web/dns/lib/lang/se_dns_mx.lng
+++ b/interface/web/dns/lib/lang/se_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'The hostname is empty.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Mailserver hostname empty';
 $wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/dns/lib/lang/sk_dns_mx.lng b/interface/web/dns/lib/lang/sk_dns_mx.lng
index 3647ee966a1e8f60b01ced1a6d674d0af95c87cf..488a8aa1d843d67cef0b2c124ba661d04347645d 100644
--- a/interface/web/dns/lib/lang/sk_dns_mx.lng
+++ b/interface/web/dns/lib/lang/sk_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Hostname je prázdny.';
 $wb['name_error_regex'] = 'Hostname má zlý formát.';
 $wb['data_error_empty'] = 'Hostname mailserveru je prázdny';
 $wb['data_error_regex'] = 'Hostname mailserveru má neplatný formát';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 ?>
diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng
index 721aaf388efb3f9f3e0a0d39b3927862df0c5e16..18f8f210b70ab3d2c7835b41a508e44a99a6d319 100644
--- a/interface/web/help/lib/lang/cz.lng
+++ b/interface/web/help/lib/lang/cz.lng
@@ -12,5 +12,3 @@ $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 dc951a40abc6bde45696720b3fc46a4fedddb0b7..73feee6955ca1ea13de8f949cc9d7b2a260a4703 100644
--- a/interface/web/help/lib/lang/cz_faq_form.lng
+++ b/interface/web/help/lib/lang/cz_faq_form.lng
@@ -4,5 +4,3 @@ $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 ab5d07c4e16fb0433f1a5c4f4bd8a9934f229723..a9488445ca9a6872e55e18b39be996dab5c82760 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,5 +7,3 @@ $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 15eb20ad58e679247d2e8c40da3ed7fd690c3875..b6c7b460b9ecab5767e64a0b73350772e5a7027b 100644
--- a/interface/web/help/lib/lang/cz_help_faq_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_list.lng
@@ -1,5 +1,3 @@
 <?php
 $wb['edit_txt'] = 'Edit';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
index 60906e5d3e3be699958bb760a94fb92c2172b5be..967b0abfcd017a69309c088df9d07e6ea9ea2395 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,5 +6,3 @@ $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 63bce28898ea2cde84ea366719f23c5ac82181e1..6c27284432b73dbc9246504a12961fbe11d02620 100644
--- a/interface/web/help/lib/lang/cz_support_message.lng
+++ b/interface/web/help/lib/lang/cz_support_message.lng
@@ -6,5 +6,3 @@ $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 3a2c9a90d9a6ca1c489ce0618dba7f813f03262c..8629a2f8a1ec899b6b411fd00c18960b7201e4b6 100644
--- a/interface/web/help/lib/lang/cz_support_message_list.lng
+++ b/interface/web/help/lib/lang/cz_support_message_list.lng
@@ -4,5 +4,3 @@ $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/help/lib/lang/pl.lng b/interface/web/help/lib/lang/pl.lng
index 3120f36cb8b087738b0acc5bb25897832675d073..5f4ec6d3acf84fd356298e2912a53a8dafcabc7a 100644
--- a/interface/web/help/lib/lang/pl.lng
+++ b/interface/web/help/lib/lang/pl.lng
@@ -12,4 +12,3 @@ $wb['Manage Sections'] = 'ZarzÄ…dzaj sekcjami';
 $wb['Add a Question & Answer Pair'] = 'Dodaj nowe pytanie i odpowiedź';
 $wb['Manage Questions'] = 'ZarzÄ…dzaj pytaniami';
 ?>
-
diff --git a/interface/web/help/lib/lang/pl_faq_form.lng b/interface/web/help/lib/lang/pl_faq_form.lng
index 6495e6352d15c9b82c884053b41527f4b5bebc87..a39383e99eaf60231714223bf113e242fac7e1ee 100644
--- a/interface/web/help/lib/lang/pl_faq_form.lng
+++ b/interface/web/help/lib/lang/pl_faq_form.lng
@@ -4,4 +4,3 @@ $wb['faq_question_txt'] = 'Pytanie';
 $wb['faq_answer_txt'] = 'Odpowiedź';
 $wb['faq_section_txt'] = 'Sekcja';
 ?>
-
diff --git a/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng b/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
index c50ff019ace371555c6694117405668ab09098f9..4c07503eee8361e65a78d6f9333b3791f274d81f 100644
--- a/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
@@ -7,4 +7,3 @@ $wb['faq_sections_txt'] = 'Sekcja';
 $wb['faq_faq_questions_txt'] = 'Pomoc Techniczna';
 $wb['faq_new_question_txt'] = 'Dodaj nowe pytanie i odpowiedź';
 ?>
-
diff --git a/interface/web/help/lib/lang/pl_faq_sections_form.lng b/interface/web/help/lib/lang/pl_faq_sections_form.lng
index 21615bd07c2ef4f81112f5685e975f75ebedc954..d4bb7ef9444cba484c961255458eb01bf2e1544b 100644
--- a/interface/web/help/lib/lang/pl_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/pl_faq_sections_form.lng
@@ -1,4 +1,3 @@
 <?php
 $wb['faq_section_name_txt'] = 'Nazwa sekcji';
 ?>
-
diff --git a/interface/web/help/lib/lang/pl_help_faq_list.lng b/interface/web/help/lib/lang/pl_help_faq_list.lng
index 10a98c50cfe59d1f0de7c1c98181270b4b16e65d..072e3edbd23e81cbb724d696df64d7e274370d73 100644
--- a/interface/web/help/lib/lang/pl_help_faq_list.lng
+++ b/interface/web/help/lib/lang/pl_help_faq_list.lng
@@ -1,4 +1,3 @@
 <?php
 $wb['edit_txt'] = 'Edycja';
 ?>
-
diff --git a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng
index 53a56a9289cdccddfc2ee1e35dc6c3f09a6df390..e21792dfd726bc4b3bf2813ca4459036595c7aa9 100644
--- a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng
@@ -6,4 +6,3 @@ $wb['faq_sections_txt'] = 'Sekcje';
 $wb['faq_faq_sections_txt'] = 'Sekcje FAQ';
 $wb['faq_new_section_txt'] = 'Dodaj nowÄ… sekcjÄ™';
 ?>
-
diff --git a/interface/web/help/lib/lang/pl_support_message.lng b/interface/web/help/lib/lang/pl_support_message.lng
index 63f2feb2ae3161134fc7870f8ce1afe98b3bf21e..7482e3515c1f1c77ca1d0bdc066deac72e3b9419 100644
--- a/interface/web/help/lib/lang/pl_support_message.lng
+++ b/interface/web/help/lib/lang/pl_support_message.lng
@@ -6,4 +6,3 @@ $wb['message_txt'] = 'Wiadomość';
 $wb['tstamp_txt'] = 'Kalendarz';
 $wb['reply_txt'] = 'Odpowiedź';
 ?>
-
diff --git a/interface/web/help/lib/lang/pl_support_message_list.lng b/interface/web/help/lib/lang/pl_support_message_list.lng
index 13c678e3b98482cae8cd51f15bb5ed1eacfb48b4..bc3285694b816cdfd17997548828a5f1c9225b8a 100644
--- a/interface/web/help/lib/lang/pl_support_message_list.lng
+++ b/interface/web/help/lib/lang/pl_support_message_list.lng
@@ -4,4 +4,3 @@ $wb['sender_id_txt'] = 'Nadawca';
 $wb['subject_txt'] = 'Temat';
 $wb['add_new_record_txt'] = 'Wyślij wiadomość';
 ?>
-
diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js
index 735d72eeb7e9c68fc662753f572d75683ec84210..1484a01b47eeb7e7ae971723685ca173735b17ff 100644
--- a/interface/web/js/jquery.tipsy.js
+++ b/interface/web/js/jquery.tipsy.js
@@ -352,9 +352,6 @@
                         return;
                     }
 
-                    // work around a bug (likely same cause as #5265)
-                    $( this ).blur();
-
                     // pass empty string as value to search for, displaying all results
                     input.autocomplete( "search", "" );
                     input.focus();
diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng
index a65862acc0c892afb832fdde1cbd2179171f1234..cf659346a9af257a5db71fce32412ee0bbc01ffe 100644
--- a/interface/web/login/lib/lang/cz.lng
+++ b/interface/web/login/lib/lang/cz.lng
@@ -22,5 +22,3 @@ $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/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng
index 109af558f2260dd3113f9b63bf361fcb62e15f12..29bd8b2298a3c1e9d09198f2a5d91134a3883a1e 100644
--- a/interface/web/login/lib/lang/pl.lng
+++ b/interface/web/login/lib/lang/pl.lng
@@ -22,4 +22,3 @@ $wb['email_txt'] = 'E-mail';
 $wb['error_maintenance_mode'] = 'Ta instalacja ISPConfig jest aktualnie w trakcje modernizacji. Wracamy niebawem - proszę o cierpliwość.';
 $wb['theme_not_compatible'] = 'Wybrany temat nie jest kompatybilny z aktualną wersją ISPConfig. Proszę wybrać nową wersję tematu.<br />Został aktywowany automatycznie domyślny temat.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng
index 6b5f3fc131d7d441b57d711ec8a2a142c600a288..6a5afe06856be3ac43164c395a138a43f45946bb 100644
--- a/interface/web/mail/lib/lang/cz.lng
+++ b/interface/web/mail/lib/lang/cz.lng
@@ -46,5 +46,3 @@ $wb['Relay Recipients'] = 'Relay adresáti';
 $wb['Statistics'] = 'Statistiky';
 $wb['Mailbox quota'] = 'Mailbox kvóta';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng
index 414e1023c8eb4739d9c33db2072af0f6db8c5b54..605e06b3c875fb13d96cf8ca19343684f6067166 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias.lng
@@ -12,5 +12,3 @@ $wb['domain_txt'] = 'Doména';
 $wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.';
 $wb['source_txt'] = 'Alias';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_alias_list.lng b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
index 0d8f779c33b3d680a51b9bcef5e17ad0b4fb0c6a..de8cc2ef2ab3f5048883e3ab178a668cacc1fe77 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
@@ -6,5 +6,3 @@ $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 e0cde683501eaaf17d8e91fbcb449b185f12ed60..74611c2de0a0416931bc96d5859bccedfbf974e5 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
@@ -9,5 +9,3 @@ $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 cfc0154d84129c34018493a01e7a37b37619f6bf..fd850d6f5f64d77d64b50febe94ade6cc7962c88 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
@@ -5,5 +5,3 @@ $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 4719142aff8d261e445dd287c36c971596df93ca..e1e6dab48f04bee0ad53d9a296d84527f9b3fce6 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
index fbf6e2d230c57ec73defaa130e372addeddb995e..0ef1d3417c1dbfa1ce022d39093fafbe48613851 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
@@ -8,5 +8,3 @@ $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 1405881fbb1a4c28f6e26b4df2340510fbb96520..459ca228a2149d868ea9dfb575253bbb10da261f 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
@@ -7,5 +7,3 @@ $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 6e7ebf518677d14f6965b823436c76d165f1e9f7..da9709e7f98bb31d63bda148ece2efda717f320b 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,5 +6,3 @@ $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 be20bce450b46fc14d5d1e1925f06457df28a7a2..026a2f1d277da942abe985f003a8a81f57069647 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -11,5 +11,3 @@ $wb['limit_maildomain_txt'] = 'Dosažen maximální počet email domén pro Vá
 $wb['policy_txt'] = 'Spamový filtr';
 $wb['no_policy'] = '- nepovoleno -';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
index da42190faccc8497d6706ac3a2d189736ea68210..b579d2de088d0995da33586a6f2a0731445daa76 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,5 +6,3 @@ $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 75efd562185a0dc212f59148168f2866c8386cc7..488d0d5176a4c441e3b9ca94ab6793f3f7d3ecbf 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
@@ -9,5 +9,3 @@ $wb['limit_mailcatchall_txt'] = 'Dosažen maximální počet košů účtů pro
 $wb['source_txt'] = 'Zdroj';
 $wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
index aa0b76df8c6faa9189e418da29e03b50a64889c9..3b24645ec88a8dd4a411d33dbb7a8a0c93b48972 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,5 +7,3 @@ $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 05bb74753064ef9ba1a56e8447e89fb7c80450f7..2abb05cf74ba4442dedbe96a7720d1fb1035b678 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
@@ -5,5 +5,3 @@ $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 ba79e1a2ff653a234c696b840fa42710fcbd28d2..a59bd9b52baa1cdbded7bdb71f601e631d3d32dd 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward.lng
@@ -7,5 +7,3 @@ $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 bdbff701e1b1ef1abc043469f58b6c005ed4fcf0..e5381fe5f8c17d2bc90f41340114f025cc4299e6 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
@@ -6,5 +6,3 @@ $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 6fc9101699e951cc01352a08ca5dbc2ccf8bb9d0..51b9f3403edb2cb37c835192860658706fc45e34 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -16,5 +16,3 @@ $wb['source_server_error_regex'] = 'POP3/IMAP server není validní doménový n
 $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 824205f00a077efbbe4f4effa8b0ce516dcb6b89..9ca8b86dcb258320aee7376ca5a9bc06dc9cc9e4 100644
--- a/interface/web/mail/lib/lang/cz_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get_list.lng
@@ -7,5 +7,3 @@ $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 406df72ad9ef9a95c54b7d7b42ba2f6551a798e7..2d2278526e9ea34004ce9b52972c98a61d08123e 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
@@ -20,5 +20,3 @@ $wb['listname_error_unique'] = 'Na serveru je již shodný \\"název seznamu\\".
 $wb['email_error_isemail'] = 'E-mailová adresa je neplatná.';
 $wb['mailinglist_txt'] = 'Mailing list';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
index b3e2cf85ac4a46a3b6a7f6b2a1041bb649f9638b..db31273f594bd45eed82a9364a984d7101fc8990 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
@@ -3,5 +3,3 @@ $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 b64c3113bc11a8a52802b521e0a167948728f202..0c07059c3408449422b4c1b23f9502a4c3a08aa4 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
index bf34af6ec33b4c61372f84fa1abd6d58cca328c4..1af959966c2dcf172cbdac4485f490fc6c9ecbab 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
@@ -7,5 +7,3 @@ $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 f19706dc3a292714bbb26395ce2993f2112ae4db..4b6cc2b5d8586f9843044622806ada40cf79f7f3 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
@@ -15,5 +15,3 @@ $wb['email_error_unique'] = 'Pro tuto email adresu již existuje filtrovací zá
 $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 f6170c635514b7846c90743aae014d146570dedc..7560b570da284998e11f0c8a6ff99ecc1ecfac1f 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
@@ -6,5 +6,3 @@ $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 710e577ecae0f6686d0aca3a459287a40eaf37a4..dfe185508436062eb14cffcfb755528e9a4a2072 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport.lng
@@ -9,5 +9,3 @@ $wb['active_txt'] = 'Aktivní';
 $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 9fb61fd886062c538f0856ebac14e00c504d9421..e833293a2fd89e00d54885eaec530793beb5e15c 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
@@ -7,5 +7,3 @@ $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 d8805f0fab289d1215b93ea61bb67e87144f4368..2c441f2abaafc7eae0f89a4255a18a2e95026ad3 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -48,5 +48,3 @@ $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 097385684379b95c6ee6f3b293361b0c93b1d00e..6cd8ed7e8987780343352e22a55b721075afe4f4 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
@@ -18,5 +18,3 @@ $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 d9f6748c192900ff90f556ee3bcca982ea33e1fa..60229ce3b599091aa8e52bb8bd7452b5495ce5ca 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
@@ -5,5 +5,3 @@ $wb['page_txt'] = 'Stránka';
 $wb['page_of_txt'] = 'z';
 $wb['delete_confirmation'] = 'Opravdu smazat mailový filtr?';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user_list.lng b/interface/web/mail/lib/lang/cz_mail_user_list.lng
index 08d28fbc026f00168d85d59eaa837e141244fec1..e6dfd006ed2aee86054be10320bdd4174221d846 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng
@@ -6,5 +6,3 @@ $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 92600a17d982c680c84f9284aa097e20b6950c4c..50cbc31d5c21e1ffa2609b178d33432146db6468 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,5 +6,3 @@ $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 cd5d03295360d6ef84798362bb64c02f77644e99..db55c18a0bb1606df3ea8a5eaab8087eee23481f 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
index 042cd71c5787412c547db5d454c187a1ccb63aef..7fae3689995265473944ebefcf08893a8ae523d0 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
@@ -8,5 +8,3 @@ $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 98e7649ba5f5c2839206913e82725073d4b0ab62..5e0c6b779909284280bdc5a4278a01c005e471d5 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
@@ -7,5 +7,3 @@ $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 76ab17ec17586034391068a39a43bc3d85d41308..83a732d6f3d2cc4d1ed67050dbf125903f285e48 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
@@ -7,5 +7,3 @@ $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 d0ebcc4bf63f5419424425f63759f20b8c03918f..0f878cc7d8b3a0b45c521a97956a246588db6d7c 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
@@ -18,5 +18,3 @@ $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 8b5b1e758dcef47798d09499d66777f29ab59bf8..fe2ee8d51ce0b3e2afd8f5c25403b1c27ff23832 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
@@ -3,5 +3,3 @@ $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 1a778301ebc7e8f3e96bd65ebd2fbfd4a084ce38..54d0155d74a932b732f763488dd5f9ac3046d909 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
@@ -36,5 +36,3 @@ $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 37f41d3ace6a31a75190f259d4d2553c38214275..9a0c3619972097537f5e8847b27e24d9df73be74 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
@@ -7,5 +7,3 @@ $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 d795af11df1ce93035e3fdef021260965177b8eb..914304c58b9e854c30aadcd60cda1593aaca05d3 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
@@ -6,5 +6,3 @@ $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 26c4df143f870448039261886145c39c259234c3..36bf3409e368f4941552e6803305c4da6c86d9b7 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
@@ -8,5 +8,3 @@ $wb['fullname_txt'] = 'Jméno';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Přidat spamfiltr uživatele';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
index 98e7649ba5f5c2839206913e82725073d4b0ab62..5e0c6b779909284280bdc5a4278a01c005e471d5 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
@@ -7,5 +7,3 @@ $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 3b74159b99dfd8fbc416db575a12420368e64b53..ad13897004c305fbb7a6133ba447a60c39c3668e 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
@@ -7,5 +7,3 @@ $wb['rid_txt'] = 'Uživatel';
 $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 0c30e7574e14f7d251ae8095041dbb9adbbcf8b2..c8b73a9e8e8a85152632b9c3c5b3edf752ee97db 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
@@ -5,5 +5,3 @@ $wb['name_txt'] = 'Jméno';
 $wb['email_txt'] = 'E-mailová adresa';
 $wb['used_txt'] = 'Využité místo';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng
index afa99d7d4ed00ec0f5802dc219f7f268fe5cbfd7..93861b784d051e3bf1f0136b7d2b611ab517c327 100644
--- a/interface/web/mail/lib/lang/pl.lng
+++ b/interface/web/mail/lib/lang/pl.lng
@@ -46,4 +46,3 @@ $wb['Domain Alias'] = 'Alias domeny';
 $wb['Relay Recipients'] = 'Odbiorcy przekierowania';
 $wb['Mailbox quota'] = 'Użycie skrzynek email';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng
index bf8e41e28f66979bfd071b841a4abd77f2d14138..ee50d0fccc2130cb83f6c50d510b2c7420a15225 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias.lng
@@ -12,4 +12,3 @@ $wb['domain_txt'] = 'Domena';
 $wb['duplicate_email_alias_txt'] = 'Istnieje już taki alias email.';
 $wb['source_txt'] = 'Alias';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_alias_list.lng b/interface/web/mail/lib/lang/pl_mail_alias_list.lng
index f5567ce92a0162ff849bfb24f3ad3fad2ec6c7fe..b6ce95d0c77a8a73e4ba729f13dd0f105a1c85f4 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias_list.lng
@@ -6,4 +6,3 @@ $wb['destination_txt'] = 'Element docelowy';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Dodaj nowy alias e-mail';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
index ebbc0d02033f6ac04b8c26f12013e0ee1e7ad755..7735a4e87d27f68fe80c10a4266c091d44a6a2b2 100644
--- a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
@@ -9,4 +9,3 @@ $wb['source_error_empty'] = 'Domena źródłowa jest pusta.';
 $wb['source_error_unique'] = 'Duplikat źródłowej domeny.';
 $wb['source_error_regex'] = 'Nieprawidłowa nazwa domeny źródłowej.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
index bdccec7d67b2cd4a88922c55f8e4edd308581945..ba2e3b957584c38a178005398140d6ec9b9af58b 100644
--- a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
@@ -5,4 +5,3 @@ $wb['source_txt'] = 'Źródło';
 $wb['destination_txt'] = 'Cel';
 $wb['add_new_record_txt'] = 'Dodaj nowy alias domeny';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
index 448658d8320f4bf727c471f2e8ae1647b8d7cbee..528f2f741aee3944e1f99f015010dee5fc0a140a 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
@@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Adres jest pusty.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów dla Twojego konta została przekroczona.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
index 8351885ca0a456124f7e759d953f8e629e7c537c..ebef66657b51451a74459325416366ceaec7e4e6 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
@@ -8,4 +8,3 @@ $wb['recipient_txt'] = 'Odbiorca';
 $wb['add_new_record_txt'] = 'Dodaj nowy wpis czarnej listy';
 $wb['access_txt'] = 'dostęp';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter.lng b/interface/web/mail/lib/lang/pl_mail_content_filter.lng
index 6ca25bccd1d4c3302a4e7f3f9ce2192a048ea095..54efa4fed020b24309cff19e25bde14247741d56 100644
--- a/interface/web/mail/lib/lang/pl_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_content_filter.lng
@@ -7,4 +7,3 @@ $wb['action_txt'] = 'Akcja';
 $wb['active_txt'] = 'Aktywny';
 $wb['pattern_error_empty'] = 'Wzór jest pusty.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
index fe5a78fd65a118fc5971eb405255b5ff53cbdb2b..9fc964cf5715be255d8f5edb7040a389864eba5b 100644
--- a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
@@ -6,4 +6,3 @@ $wb['pattern_txt'] = 'Wzór';
 $wb['action_txt'] = 'Akcja';
 $wb['add_new_record_txt'] = 'Dodaj nowy zbiór filtrów';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng
index 0e76cd0f01c36d2f8e4a948a44a3090c93b1f6fb..6f9c68cdc64ba0a55299d1c645e395bc4ef41557 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -11,4 +11,3 @@ $wb['limit_maildomain_txt'] = 'Maksymalna ilość domen e-mail dla Twojego konta
 $wb['policy_txt'] = 'Filtr spamu';
 $wb['no_policy'] = '-nie używane-';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
index de3a6654f435abc3e669bfa0fc5c466045963033..e214d92a92139df9c511c0e0b8b00c386a7c5079 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
@@ -6,4 +6,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowÄ… domenÄ™';
 $wb['active_txt'] = 'Aktywne';
 $wb['sys_groupid_txt'] = 'Klient';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
index c9667c519a1cdebc2da54958d73163fcaaa3ea30..3630b954bfe00f3dccaeb2b8d61e9cb53ea7de6d 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
@@ -9,4 +9,3 @@ $wb['limit_mailcatchall_txt'] = 'Maksymalna ilość kont e-mail catchall dla Two
 $wb['source_txt'] = 'Źródło';
 $wb['destination_error_isemail'] = 'Cel nie jest poprawnym adresem email.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
index 304bc3d9a4e57b085e55a458a0e2cf0380e4f93e..1f0aad197d337e0f1f57cc44fa09336cd3e5d687 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
@@ -7,4 +7,3 @@ $wb['server_id_txt'] = 'Serwer';
 $wb['domain_txt'] = 'Domena';
 $wb['add_new_record_txt'] = 'Dodaj nowy Catchall';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_list.lng
index e14f2f0889a377acf3273d85825686fb14722cf7..ec51e2cdb569c89bdac5328c67bea293e847194f 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_list.lng
@@ -5,4 +5,3 @@ $wb['domain_txt'] = 'Domena';
 $wb['add_new_record_txt'] = 'Dodaj nowÄ… domenÄ™';
 $wb['active_txt'] = 'Aktywny';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_forward.lng b/interface/web/mail/lib/lang/pl_mail_forward.lng
index cc84d34b8b2b35712bdbc65517fc18a61156406c..d975d5e81aa9a27a6d4050ccb9e0943a13f7c504 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward.lng
@@ -7,4 +7,3 @@ $wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa o podanym adresi
 $wb['domain_txt'] = 'Domena';
 $wb['source_txt'] = 'E-mail źródłowy';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_forward_list.lng b/interface/web/mail/lib/lang/pl_mail_forward_list.lng
index 3f27975cf714efeb27fac42dfa46a47b946b40d0..1044bd51210f9056a1c7f41ccde185fa4df35ed5 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward_list.lng
@@ -6,4 +6,3 @@ $wb['destination_txt'] = 'Element docelowy';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Dodaj nowe przekierowanie E-mail';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng
index ca27711e98693bb2d5ffc661db17458db610c94c..fdac040bf9b6957c0c37f765372ff02f7492b83c 100644
--- a/interface/web/mail/lib/lang/pl_mail_get.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get.lng
@@ -16,4 +16,3 @@ $wb['source_server_error_regex'] = 'Serwer Pop3/Imap nie jest poprawnÄ… nazwÄ… d
 $wb['source_read_all_txt'] = 'Pobierz wszystkie maile (razem z przeczytanymi)';
 $wb['error_delete_read_all_combination'] = 'Nieprawidłowa kombinacja opcji. Nie możesz użyć jednocześnie opcji Delete emails after retrieval = no razem z Retrieve all emails = yes';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_get_list.lng b/interface/web/mail/lib/lang/pl_mail_get_list.lng
index cf5844f0d6bc9a7dab1a05e7dcfb3df33e6b496b..cd473d9ded2ecbd9802e267807e96fea4498aea9 100644
--- a/interface/web/mail/lib/lang/pl_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get_list.lng
@@ -7,4 +7,3 @@ $wb['source_username_txt'] = 'Nazwa użytkownika';
 $wb['destination_txt'] = 'Element docelowy';
 $wb['add_new_record_txt'] = 'Dodaj nowe konto';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
index 774da1802e308b10bde6146db878b2f6e728b911..f285b1eaea9164178d4092601d30d4390f27abd2 100644
--- a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
@@ -20,4 +20,3 @@ $wb['password_match_txt'] = 'Hasła pasują';
 $wb['listname_error_unique'] = 'Isnieje już lista mailingowa o tej nazwie, wybierz inną nazwę listy.';
 $wb['email_error_isemail'] = 'Adres e-mail jest nieprawidłowy';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
index 96cd9604d75736fc813b587406cb317f01cf97f2..649db47bd0d101b393e0954dc2df0308e025fbdd 100644
--- a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Lista mailingowa';
 $wb['domain_txt'] = 'Domena';
 $wb['listname_txt'] = 'Nazwa listy';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
index ab7926f8991b589e352c19cea87fd5e9ebac0a94..594aba1f2a75fe036089a4dffb80006df0fecffb 100644
--- a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
@@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Adres jest pusty.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta została przekroczona.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
index 84d08ba619ad0b19c51d9a9c9dbe82c30239ae9e..310e27ca307ced9bb1be262e90e83433219a7707 100644
--- a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
@@ -7,4 +7,3 @@ $wb['recipient_txt'] = 'Odbiorca';
 $wb['add_new_record_txt'] = 'Dodaj nowego odbiorcÄ™ przekierowania';
 $wb['access_txt'] = 'dostęp';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
index 2849430c6dcf16e65dd5b54c29bfe21273e0ca93..3879f24247c4576d814349c4b6de7c58bbb5fa57 100644
--- a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
@@ -15,4 +15,3 @@ $wb['email_error_unique'] = 'Istnieje już wpis z filtrem spamu dla tego adresu
 $wb['spam_redirect_maildir_purge_txt'] = 'Wyczyść później Maildir';
 $wb['days_txt'] = 'Dni.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
index a6959a26e2d735f616998a54543bdee51a2e8344..d6097bb3365c2352e7b55185c6f9235f4354e516 100644
--- a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
@@ -6,4 +6,3 @@ $wb['server_name_txt'] = 'nazwa_serwera';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Dodaj nowy wpis z filtrem spamu';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_transport.lng b/interface/web/mail/lib/lang/pl_mail_transport.lng
index 364eba944549f6a3e4e98607b4ac7b0b1446d6b5..514fc263a5353673f867df8295eb240e16340983 100644
--- a/interface/web/mail/lib/lang/pl_mail_transport.lng
+++ b/interface/web/mail/lib/lang/pl_mail_transport.lng
@@ -9,4 +9,3 @@ $wb['active_txt'] = 'Aktywny';
 $wb['limit_mailrouting_txt'] = 'Maksymalna ilość ścieżek dla Twojego konta została przekroczona.';
 $wb['transport_txt'] = 'Transport';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_transport_list.lng b/interface/web/mail/lib/lang/pl_mail_transport_list.lng
index 837972c4f286d55934f911217863cdd02149685b..fa5c584318b4d5a0588b7c8046102bb5e2ee3a31 100644
--- a/interface/web/mail/lib/lang/pl_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_transport_list.lng
@@ -7,4 +7,3 @@ $wb['transport_txt'] = 'PrzenieÅ›';
 $wb['sort_order_txt'] = 'Sortuj według';
 $wb['add_new_record_txt'] = 'Dodaj nowe przeniesienie';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng
index 4ccab2e93ecccaec86f466b6d50e31cbfe756958..5fc7a38cf9de3503ddb5dd8b473ed8ce50ecc849 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -48,4 +48,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
 $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
 $wb['password_match_txt'] = 'Hasła pasują';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter.lng b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
index 1e1a7fd8957b79a8b0d25e539ea18d9a1fced47d..99ac6a9e78a7bb2f5e8c1a4f4711b11ee510623e 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
@@ -18,4 +18,3 @@ $wb['ends_with_txt'] = 'Kończy się na';
 $wb['move_to_txt'] = 'PrzenieÅ› do';
 $wb['delete_txt'] = 'Usuń';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
index 4d45c5d23bf7b481a0b95cf24299665b425e23cb..ce235b892fe918ccc7aba13902de1928022a1626 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
@@ -5,4 +5,3 @@ $wb['page_txt'] = 'Strona';
 $wb['page_of_txt'] = 'z';
 $wb['delete_confirmation'] = 'Czy na pewno chcesz skasować filtr?';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_user_list.lng b/interface/web/mail/lib/lang/pl_mail_user_list.lng
index 8e47f96dcb6ca466630dbbbe2834ea30b752f701..7c13db38d1d24c226d9c93e713e24abf91087e4b 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng
@@ -6,4 +6,3 @@ $wb['add_new_record_txt'] = 'Dodaj nowÄ… skrzynkÄ™ pocztowÄ…';
 $wb['name_txt'] = 'Nazwa rzeczywista';
 $wb['login_txt'] = 'Login';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
index 9e876805ba81f90b68ca1de5e0f6cbc3193c9517..b9780687d79ba053a6e07842b3079e35716b4002 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
@@ -6,4 +6,3 @@ $wb['last_month_txt'] = 'Ostatni miesiÄ…c';
 $wb['this_year_txt'] = 'Ten rok';
 $wb['last_year_txt'] = 'Ostatni rok';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist.lng b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
index 4aa2f05609a05fbd400caf4907adc02fd4dfeddb..203c5bae73b49489f47af28011cae1646f4880fd 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
@@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Adres jest pusty.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta zosała przekroczona.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
index a7239ca95cdd169af0720d2362432095886b040b..10e6dfcf0bb03424f92c145e3582481e6bc8e2a9 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
@@ -8,4 +8,3 @@ $wb['recipient_txt'] = 'odbiorca';
 $wb['add_new_record_txt'] = 'Dodaj nowy wpis białej listy';
 $wb['access_txt'] = 'dostęp';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
index 6c4c8d78fd6e86622ca5a074b91518578c1ef18c..6da8ddc9d97080df44893b5c4d23aadb859215b5 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
@@ -7,4 +7,3 @@ $wb['priority_txt'] = 'Priorytet';
 $wb['active_txt'] = 'Aktywny';
 $wb['limit_spamfilter_wblist_txt'] = 'Maksymalna ilość wpisów do białej i czarnej listy dla Twojego konta została przekroczona.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
index 65a9d37fda0105a224bd4ec8c49c474f375f8693..c237a7a778821b6d5b19a3669848325bef0ca392 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
@@ -7,4 +7,3 @@ $wb['rid_txt'] = 'Użytkownik';
 $wb['email_txt'] = 'E-mail dodany do czarnej listy';
 $wb['add_new_record_txt'] = 'Dodaj wpis czarnej listy';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config.lng b/interface/web/mail/lib/lang/pl_spamfilter_config.lng
index 43fab4d4f3f03c231fae2e175136b00b88ff3056..c750d9593773b8362f19dd6ab18885a76516acc9 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config.lng
@@ -18,4 +18,3 @@ $wb['relayhost_password_txt'] = 'Hasło Relayhost';
 $wb['mailbox_size_limit_txt'] = 'Limit wielkości skrzynki pocztowej';
 $wb['message_size_limit_txt'] = 'Limit wielkości wiadomości';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
index d31d7857ebef3878b1713b63fd46e2871bed3187..45b3f315cdf378a9bfffb77c7b64fd031de9bd90 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Konfiguracja serwer';
 $wb['server_name_txt'] = 'Serwer';
 $wb['server_id_txt'] = 'id_serwera';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
index b7bc37de8befe80326adf9e65cd14011ca23c3f5..8a825b55946b39c68fb62b2fd44339a978b00561 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
@@ -36,4 +36,3 @@ $wb['spam_admin_txt'] = 'Admin obsługi spamu';
 $wb['message_size_limit_txt'] = 'Limit wielkości wiadomości';
 $wb['banned_rulenames_txt'] = 'Zabronione nazwy zasad';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
index 906006e75fec3320ebe33954b42f5a0a461be8a9..43d9d414d6d48636df7802aebcfed05e6469c69e 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
@@ -7,4 +7,3 @@ $wb['banned_files_lover_txt'] = 'Przyjmuj zablokowane pliki';
 $wb['bad_header_lover_txt'] = 'Przyjmuj złe nagłowki';
 $wb['add_new_record_txt'] = 'Dodaj wpis plityki';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users.lng b/interface/web/mail/lib/lang/pl_spamfilter_users.lng
index 8529e455c4db3f39f4a1954651ca4697edb7e846..656c29ea1abcd2c31a10fe63326f8bca88737182 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users.lng
@@ -6,4 +6,3 @@ $wb['email_txt'] = 'E-mail (wzór)';
 $wb['fullname_txt'] = 'Nazwa';
 $wb['local_txt'] = 'Lokalne';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
index 0951df528fe615193d9c8586c25c4e37bfc7cb45..dde2a62c6ae1ca99ed1b7ae9a49d28989a82644b 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
@@ -8,4 +8,3 @@ $wb['fullname_txt'] = 'Nazwa';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Dodaj filtr spamu użytkownika';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
index a6f2e4306dbb2b4ee031117afcc0cabe9d87c6b8..be836015dbccef70847b84d7199f6e7d7ad55fc4 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
@@ -7,4 +7,3 @@ $wb['priority_txt'] = 'Priorytet';
 $wb['active_txt'] = 'Aktywny';
 $wb['limit_spamfilter_wblist_txt'] = 'Maksymalna liczba wpisów białej lub czarnej listy została przekroczona.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
index 425a6fe35af7e760e8872247a27382db80157d24..6517cf41a1e86272d49ab38f544fa4975d78f280 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
@@ -7,4 +7,3 @@ $wb['rid_txt'] = 'Użytkownik';
 $wb['email_txt'] = 'Adres e-mail dodany do białej listy';
 $wb['add_new_record_txt'] = 'Dodaj wpis do białej listy';
 ?>
-
diff --git a/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng b/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
index 2cffcf1d165c788cf0400c3344f5f1ac9f21ed0f..2b33b10402539b33fae61de14ea19898a8a0d6c1 100755
--- a/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Nazwa';
 $wb['email_txt'] = 'Adres e-mail';
 $wb['used_txt'] = 'Użycie dysku';
 ?>
-
diff --git a/interface/web/mail/mail_domain_del.php b/interface/web/mail/mail_domain_del.php
index 0f00dd919c105d40d7ee10876a9ff1390b445f99..806996aa312585155e13df4e348efbe41682510c 100644
--- a/interface/web/mail/mail_domain_del.php
+++ b/interface/web/mail/mail_domain_del.php
@@ -59,8 +59,8 @@ class page_action extends tform_actions {
 		// Before we delete the email domain,
 		// we will delete all depending records.
 		
-		// Delete all forwardings where the osurce or destination belongs to this domain
-		$records = $app->db->queryAllRecords("SELECT forwarding_id as id FROM mail_forwarding WHERE source like '%@".$app->db->quote($domain)."' OR (destination like '%@".$app->db->quote($domain)."' AND type != 'forward'");
+		// Delete all forwardings where the source or destination belongs to this domain
+		$records = $app->db->queryAllRecords("SELECT forwarding_id as id FROM mail_forwarding WHERE source like '%@".$app->db->quote($domain)."' OR (destination like '%@".$app->db->quote($domain)."' AND type != 'forward')");
 		foreach($records as $rec) {
 			$app->db->datalogDelete('mail_forwarding','forwarding_id',$rec['id']);
 		}
diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng
index 12f1bd72cced2c39e185a81495e62b288131273e..8b4b58bc42bdb302369d5a59ebc26ca7a0e1fcbe 100644
--- a/interface/web/mailuser/lib/lang/cz.lng
+++ b/interface/web/mailuser/lib/lang/cz.lng
@@ -7,5 +7,3 @@ $wb['Send copy'] = 'Poslat kopii na e-mail';
 $wb['Spamfilter'] = 'Spamový filtr';
 $wb['Email Filters'] = 'E-mailové filtry';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_index.lng b/interface/web/mailuser/lib/lang/cz_index.lng
index 9b820cdee63a4bab4a442448d1c5c3358eef4b75..45af56ee8d59e90adadad4c5a7f15a430ba56371 100644
--- a/interface/web/mailuser/lib/lang/cz_index.lng
+++ b/interface/web/mailuser/lib/lang/cz_index.lng
@@ -10,5 +10,3 @@ $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 f8d331b55732af9b1448a44da275ee46d3d4ed9e..ef3aeb42da522378dbd954257bc39bd9b13f3c34 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
@@ -11,5 +11,3 @@ $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 fc8a0f9df6f195e8ee6cfdca9b8b1ca01386b627..36f11a9baa9fd9b8894ee181bd89a1d7d957cf2a 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
@@ -5,5 +5,3 @@ $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 65300b6d9505e63b0dfec314bc759fa08b12b2cb..3df9d38c7246f7dbbf4522ff73d26d812c266e2c 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
@@ -18,5 +18,3 @@ $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 4b64af9205937b240559b209a779a04d91e95eb2..3c2593d6d420f4a987e58faa2ac0ce0e8a53fc98 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,5 +6,3 @@ $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 44815399ddda812c941bf18bc9a2fb0084a43313..36555a20304678f88ef4b5b8038d7e89edd9b04d 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
@@ -8,5 +8,3 @@ $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 c6345567b049e88c45ba89624d0589416becc518..2a53036be6267f69d2f15db97ab7b2087e026eb2 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
@@ -5,5 +5,3 @@ $wb['email_txt'] = 'E-mail';
 $wb['no_policy'] = '- nepovoleno -';
 $wb['policy_txt'] = 'Politika';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/pl.lng b/interface/web/mailuser/lib/lang/pl.lng
index 5d7166ada315168f2b5f780c4c1ccc5c98328508..4002670b615ab9147ecef77b0dcd97e65ba71351 100644
--- a/interface/web/mailuser/lib/lang/pl.lng
+++ b/interface/web/mailuser/lib/lang/pl.lng
@@ -7,4 +7,3 @@ $wb['Send copy'] = 'Wyślij kopię';
 $wb['Spamfilter'] = 'Filtr spamu';
 $wb['Email Filters'] = 'Fitry e-mail';
 ?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_index.lng b/interface/web/mailuser/lib/lang/pl_index.lng
index 368276036a317d0a8882a346a9e8508671ff98f8..0774a65bd5e178e78ed4f8e06ea3c726082ad082 100644
--- a/interface/web/mailuser/lib/lang/pl_index.lng
+++ b/interface/web/mailuser/lib/lang/pl_index.lng
@@ -10,4 +10,3 @@ $wb['unlimited_txt'] = 'Bez limitu';
 $wb['mb_txt'] = 'MB';
 $wb['none_txt'] = 'Brak';
 ?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
index c6f3ed67dde4fb7acded473d71f768995b8f122d..7a28409e5f440ea40a35f110191fc5d5f105aff4 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
@@ -11,4 +11,3 @@ $wb['autoresponder_active'] = 'WÅ‚Ä…cz autoresponder';
 $wb['now_txt'] = 'Teraz';
 $wb['autoresponder_subject_txt'] = 'Temat';
 ?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng b/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
index a3b48179b9c09e30da8cc99db8b012ca53418a8d..70becda5bd13d384d6dec4d0a58fdad47a11ca06 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
@@ -5,4 +5,3 @@ $wb['email_txt'] = 'E-mail';
 $wb['cc_error_isemail'] = 'Adres e-mail jest niepoprawny w polu -Wyślij kopię do-';
 $wb['email_is_cc_error'] = 'Adres e-mail i adres do wysyłki kopii nie mogą być takie same.';
 ?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
index 9ac57b53cba10cde4b2e44cae3270f0cc1fa6f22..2e74ffd4f748764a60687b3378f87cdf1bab01c3 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
@@ -18,4 +18,3 @@ $wb['ends_with_txt'] = 'Ends with';
 $wb['move_to_txt'] = 'Move to';
 $wb['delete_txt'] = 'Delete';
 ?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
index 8bea987f519b3dbf382736ee9bfc51718ff5b7a6..882d601e7c90f1014355696e4903b948e7b820b9 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
@@ -6,4 +6,3 @@ $wb['page_txt'] = 'Strona';
 $wb['page_of_txt'] = 'z';
 $wb['delete_confirmation'] = 'Na pewno chcesz skasować ten filtr poczty?';
 ?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_password.lng b/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
index 08fd7405dc8c8293b76203c2d610c31526b323fc..48dfd26d949f45707b5d7138ac7a84f6d8973e22 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
@@ -8,4 +8,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
 $wb['password_mismatch_txt'] = 'Błąd, hasła nie pasują';
 $wb['password_match_txt'] = 'OK, hasła są jednakowe';
 ?>
-
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
index ed18053d8016383a9efe785f7921985bda4dc9c4..b371f3ea75110524e3387db7708d06df87426121 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
@@ -5,4 +5,3 @@ $wb['email_txt'] = 'E-mail';
 $wb['no_policy'] = '- nie włączony -';
 $wb['policy_txt'] = 'Polityka';
 ?>
-
diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng
index 763b7f5cfd3dea0630911baaad5d5c26856e9c73..36647b72ab3dce5404c4d554b8cf05c6f7e0867f 100644
--- a/interface/web/monitor/lib/lang/cz.lng
+++ b/interface/web/monitor/lib/lang/cz.lng
@@ -147,5 +147,3 @@ $wb['Show fail2ban-Log'] = 'Zobrazit Fail2Ban Log';
 $wb['Show IPTables'] = 'Zobrazit IPTables pravidla';
 $wb['Show OpenVz VE BeanCounter'] = 'Ukázat OpenVz VE BeanCounter';
 ?>
-
-
diff --git a/interface/web/monitor/lib/lang/cz_datalog_list.lng b/interface/web/monitor/lib/lang/cz_datalog_list.lng
index 70adcad1abbc69fd737747fa997e6c4ce912c68d..c9e9a8655510279e3282bd10839cac4b6fc3e011 100644
--- a/interface/web/monitor/lib/lang/cz_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng
@@ -6,5 +6,3 @@ $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 85cd4b3b01cfd8a0eab279a97fd323850924ae07..990662552b3a8daac4655d14be078819fe6b6b44 100644
--- a/interface/web/monitor/lib/lang/cz_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng
@@ -5,5 +5,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['loglevel_txt'] = 'Logovací úroveň';
 $wb['message_txt'] = 'Zpráva';
 ?>
-
-
diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng
index 533d8f6fefd210d390595ac26a3fea2e49c9cca1..f1ce82191c083b01151988f6a9d839c17b5744dd 100644
--- a/interface/web/monitor/lib/lang/pl.lng
+++ b/interface/web/monitor/lib/lang/pl.lng
@@ -147,4 +147,3 @@ $wb['Show fail2ban-Log'] = 'Pokaż log fail2ban';
 $wb['Show IPTables'] = 'Pokaż reguły IPTables';
 $wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter';
 ?>
-
diff --git a/interface/web/monitor/lib/lang/pl_datalog_list.lng b/interface/web/monitor/lib/lang/pl_datalog_list.lng
index 0b969b1332fb1b05ecb8eb31f44b6052047e1339..398ca51eddc2d3e6b5f98259a57a6f0f315f4dd7 100644
--- a/interface/web/monitor/lib/lang/pl_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/pl_datalog_list.lng
@@ -6,4 +6,3 @@ $wb['dbtable_txt'] = 'Tabele DB';
 $wb['action_txt'] = 'Akcja';
 $wb['status_txt'] = 'Status';
 ?>
-
diff --git a/interface/web/monitor/lib/lang/pl_syslog_list.lng b/interface/web/monitor/lib/lang/pl_syslog_list.lng
index f5e0645fe0f998860ab052be18a851e5b8b6aad1..e37799c4749129e4ff2e372ce82257cbbf046d4a 100644
--- a/interface/web/monitor/lib/lang/pl_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/pl_syslog_list.lng
@@ -5,4 +5,3 @@ $wb['server_id_txt'] = 'Serwer';
 $wb['loglevel_txt'] = 'Poziom logowania';
 $wb['message_txt'] = 'Wiadomość';
 ?>
-
diff --git a/interface/web/sites/lib/lang/ar_web_domain.lng b/interface/web/sites/lib/lang/ar_web_domain.lng
index c749fb50286afdf05db4bc411dfb1e076dc95d4c..f10cc422523c5757706f85b1192f6c3b0e24593e 100644
--- a/interface/web/sites/lib/lang/ar_web_domain.lng
+++ b/interface/web/sites/lib/lang/ar_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_web_domain.lng b/interface/web/sites/lib/lang/bg_web_domain.lng
index 2b2fa97056cde229a7ac70540b7411b2a47b095f..c2816ad35080eeab3c66b121fe1c3fe7cbae4025 100644
--- a/interface/web/sites/lib/lang/bg_web_domain.lng
+++ b/interface/web/sites/lib/lang/bg_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng
index dc75b80693608ef44049d442ad3a5b3ad16a63c9..623bc0b2109637fe95dca47719cbccb7ba34ad57 100644
--- a/interface/web/sites/lib/lang/br_web_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng
index d96c4d546aa67fb1666723109da5b44f1902d592..71ccd165f62b6d489a07934ce5859ca8a23df407 100644
--- a/interface/web/sites/lib/lang/cz.lng
+++ b/interface/web/sites/lib/lang/cz.lng
@@ -33,5 +33,3 @@ $wb['Update Packagelist'] = 'Aktualizace seznamu balíčků';
 $wb['Subdomain (Vhost)'] = 'Subdoména (Vhost)';
 $wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng
index 97bc6700134efbcc02cbc928704d313095577309..176d76da5a21e64a153a921e06b5280dae0e3feb 100644
--- a/interface/web/sites/lib/lang/cz_aps.lng
+++ b/interface/web/sites/lib/lang/cz_aps.lng
@@ -56,5 +56,3 @@ $wb['btn_install_txt'] = 'Instalovat';
 $wb['btn_cancel_txt'] = 'Zrušit';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
 ?>
-
-
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 3d5d3d8650f7713a7e8d75c3c95e3e7c455e8f36..7b7b6dd6f030ae84c78204b515540d2e06fdc11b 100644
--- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
@@ -11,5 +11,3 @@ $wb['filter_txt'] = 'Hledat';
 $wb['delete_txt'] = 'Smazat';
 $wb['reinstall_txt'] = 'Přeinstalovat';
 ?>
-
-
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 b74dfc8882c9b6d69626377a81af59b3008c6b88..52ef6ebcd9c42dc0bf3862a419ce9f1654a1583c 100644
--- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
@@ -6,5 +6,3 @@ $wb['category_txt'] = 'Kategorie';
 $wb['status_txt'] = 'Odemčený';
 $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 5ea9bb5b7b20f1864baed0afb2acad407eb04111..d4e6c1767c3ca833ea85b194916f2ac0b7ddaaef 100644
--- a/interface/web/sites/lib/lang/cz_cron.lng
+++ b/interface/web/sites/lib/lang/cz_cron.lng
@@ -19,5 +19,3 @@ $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 0ca6dc3b871205fa21d5974c8a6db3d23bfc657e..f50dee2faf4b467db288bc4e4f1a0c94fba7a66b 100644
--- a/interface/web/sites/lib/lang/cz_cron_list.lng
+++ b/interface/web/sites/lib/lang/cz_cron_list.lng
@@ -11,5 +11,3 @@ $wb['command_txt'] = 'Příkaz';
 $wb['add_new_cron_txt'] = 'Přidat novou cron úlohu';
 $wb['parent_domain_id_txt'] = 'Webové stránky';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng
index cb7e4ebbe43e3d033bb6c4ba52369bd5c18f9e2d..c316f0ac97db44907706b35b7d4c8d8e24b45d08 100644
--- a/interface/web/sites/lib/lang/cz_database.lng
+++ b/interface/web/sites/lib/lang/cz_database.lng
@@ -44,5 +44,3 @@ $wb['no_dbuser_txt'] = 'Žádný';
 $wb['database_client_differs_txt'] = 'Klient mateřského webu a databáze se neshodují.';
 $wb['database_user_missing_txt'] = 'Please select a database user for this database.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_admin_list.lng b/interface/web/sites/lib/lang/cz_database_admin_list.lng
index 4eb24c99cac1a8f2ac002f0fb8f6437c8517cebd..a0069404d8b2dd755e2d0af7494d1e5516cd19d2 100644
--- a/interface/web/sites/lib/lang/cz_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng
@@ -8,5 +8,3 @@ $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 269dc2114da3d4e04e71c8cd7e8b5c85f17f9bc4..9bb80dd94580668c61d602253b8f63747ed899e9 100644
--- a/interface/web/sites/lib/lang/cz_database_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_list.lng
@@ -7,5 +7,3 @@ $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 4621087b5ba0a10baa8f8c7f679fa93db9d85cc6..8a64cb5225008a2babc9ba876ce6c72fd524ebae 100644
--- a/interface/web/sites/lib/lang/cz_database_user.lng
+++ b/interface/web/sites/lib/lang/cz_database_user.lng
@@ -21,5 +21,3 @@ $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 db76d1099e271a1952506b1ea74ad9e4166c563f..8703e713e17c340021f19853a5da6f26411a113a 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,5 +4,3 @@ $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 68cd34d2e4897e3703636d95d0af358b558b421e..42cf36d70322b873e1a7d73203a6fa0d695683f4 100644
--- a/interface/web/sites/lib/lang/cz_database_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_list.lng
@@ -3,5 +3,3 @@ $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 2b9dd545055b5f4694f0b7a47291f5a1cf577dc6..876ad5108c3713f00ba4c7c570de339593cfd927 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user.lng
@@ -32,5 +32,3 @@ $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 6f6f5021ee9b5bd717c85d53d2eb1d1fa816a2b7..41649df7f9b48c2302dea4af5ac2526548e95c1e 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
@@ -6,5 +6,3 @@ $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 234b7a592107858571bafd3175c9203788f4b7d3..97b8a0d08843c50c3954d36534c5fe755e3bc05f 100644
--- a/interface/web/sites/lib/lang/cz_shell_user.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user.lng
@@ -27,5 +27,3 @@ $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 6d4a8fe52abe0092a5c496261091958aa51e447d..1d6bc198d7ded8db6f17a45dbdc9625288828d83 100644
--- a/interface/web/sites/lib/lang/cz_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user_list.lng
@@ -6,5 +6,3 @@ $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 dabb73b888490c1f6cacec311d926409c86db5e3..453194454957d2ea596b3d18134c1cd8db9af464 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
@@ -7,5 +7,3 @@ $wb['hard_txt'] = 'Tvrdý limit';
 $wb['soft_txt'] = 'Měkký limit';
 $wb['files_txt'] = 'Jednotlivé soubory';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
index 10b7eee7c59a299ad86c66ea7eca1a419eff4ea7..3a5d1504067dc74f0005ddff8522a31d7f16f1e7 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
@@ -113,5 +113,3 @@ $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
index 6cf247f995f6790cce8490a16e6e1fb88c677106..22a4ffe32f01bfe50afa072238b92ec51c76c77f 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
@@ -12,5 +12,3 @@ $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 88e110f75fb2c42fec66faed2fdaa5d9c5206ef6..3c9cfc8ef57812ae5ed2712a78ccc89088c40f1b 100644
--- a/interface/web/sites/lib/lang/cz_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng
@@ -13,5 +13,3 @@ $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 4f5df2935b9b96db39a7580ecd96cada2742b466..f3e31d39a4524fbccdf3ee9b7550ded57a54be76 100644
--- a/interface/web/sites/lib/lang/cz_web_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain.lng
@@ -111,6 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
index c79a51beb90871c2ceb79529714727465dd108fb..e52a794428607d6356db8ef73830fde64926d4a4 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,5 +7,3 @@ $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 af0947c9fcb657c2137f3ac724f7701cbfb89eee..cbf025e79b48bd76195551f87ca3b9d821127023 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_list.lng
@@ -6,5 +6,3 @@ $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 108f7c95271fbb1eafff570823f1f3a717c43df5..f9f623dc2baff896a65372ffc39d960d719b44aa 100644
--- a/interface/web/sites/lib/lang/cz_web_folder.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder.lng
@@ -5,5 +5,3 @@ $wb['path_txt'] = 'Cesta';
 $wb['active_txt'] = 'Aktivní';
 $wb['path_error_regex'] = 'Neplatná cesta ke složce.';
 ?>
-
-
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 2aaaf4c98c55fe9c0c20619b94ef75e496af379e..b75c0e80dae76086394ab8ecf416a2522ffdf473 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng
@@ -5,5 +5,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Webové stránky';
 $wb['path_txt'] = 'Cesta';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_folder_user.lng b/interface/web/sites/lib/lang/cz_web_folder_user.lng
index a1c6ccf4111d2446edcfcb34940454c9f9ca6cc5..48f426089a38842e9c7c87d4d2849fe1cad32614 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng
@@ -10,5 +10,3 @@ $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 0b3f9648d4aa406356208749cf77b1463c48be12..99fe62051c1e83cb715f1ba4ff4de3110b2e5107 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,5 +4,3 @@ $wb['active_txt'] = 'Aktivní';
 $wb['web_folder_id_txt'] = 'Složka';
 $wb['username_txt'] = 'Uživatelské jméno';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
index ffab544669c282d411db1319b38b6368c5a4c5b8..ed93596824f107eac7a12df5256a86e02c81a06a 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,5 +7,3 @@ $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 4547f9188dfa83ae28b53248e2b437697117ac3b..de1445f5decccff456327198bca37de856d49c90 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng
@@ -44,5 +44,3 @@ $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
 $wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
index 1eab4a8aa41ed47b426c1975a0648a2ec8200d79..8a0bafe0f92de7e18017a39057ff7512eff20a7b 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
@@ -6,5 +6,3 @@ $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 3ed649f760af1889333e5ff2358082d7e4f9a9d9..c76dffd07c64d1ea39573631a88e5ac5c2a99866 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
@@ -116,5 +116,3 @@ $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 bf8a1710bc2bc17e99104c83aefbe97c81e3e2f2..a54e19a5ad5b1befcac58b8499111722851038ab 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,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webové stránky';
 $wb['domain_txt'] = 'Subdoména';
 $wb['add_new_record_txt'] = 'Přidat novou poddoménu';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng
index 523b79f80cafcf25a300352b0ee6fd95ec06a5a4..3e89a1e62508597aa2d890c17ff6042a9821f1de 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user.lng
@@ -19,5 +19,3 @@ $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 c74be89691bcc1d4b00dce8fc7742b9d55d5654f..0c1148b53e70ce53581c9ccd9a911599d5ce9bfc 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webové stránky';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['add_new_record_txt'] = 'Přidat nového WebDAV uživatele';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
index 3c64f65c060dd8ebc126ed55dc597b8e8afd0805..dab184fe4d9f097f1cf78ef1416c15e92ede6a62 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache Direktiven
 $wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx Direktiven Schnipsel:';
 $wb['proxy_directives_txt'] = 'Proxy Direktiven';
 $wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng
index b77cd8a5dbc7d9c8b568f704a7ffa458437d81a2..e13af5060e80c432f32623dbd92dc8de3d186e01 100644
--- a/interface/web/sites/lib/lang/el_web_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_domain.lng b/interface/web/sites/lib/lang/es_web_domain.lng
index 3ba7ab9739cb464595bb4b4e54aa245d7361d77d..db0a0b6bf7879323ea8ada02483b65b91f7ede69 100644
--- a/interface/web/sites/lib/lang/es_web_domain.lng
+++ b/interface/web/sites/lib/lang/es_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_domain.lng
index e7129e1a2f7e5da4d9964e73d486e6219f102746..7c31eeb544c69c2d2c23b3cba5696ea03c02a8b6 100755
--- a/interface/web/sites/lib/lang/fi_web_domain.lng
+++ b/interface/web/sites/lib/lang/fi_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_domain.lng b/interface/web/sites/lib/lang/fr_web_domain.lng
index 05b27ce7aecdd24f88e88324891fadc5119ef612..d0029908dccbadafe92e0298f5b8dc8b3047b254 100644
--- a/interface/web/sites/lib/lang/fr_web_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/hr_web_domain.lng b/interface/web/sites/lib/lang/hr_web_domain.lng
index ca300d63b14e0d057de9c420ddbe861ff73c4241..37bed82f70f0c255287f994cfedcfb357117d2a0 100644
--- a/interface/web/sites/lib/lang/hr_web_domain.lng
+++ b/interface/web/sites/lib/lang/hr_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_domain.lng b/interface/web/sites/lib/lang/hu_web_domain.lng
index 2659f9aba164c268141e39153ddb8132e8d5384f..2bf0127a58d84ffe086b7db15cf9b73eaed85257 100644
--- a/interface/web/sites/lib/lang/hu_web_domain.lng
+++ b/interface/web/sites/lib/lang/hu_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/id_web_domain.lng b/interface/web/sites/lib/lang/id_web_domain.lng
index 012583e74e3d6ae6a421c3cf51b57b31ee935421..6c464398f5865c4cdcd813f6b17dd674186ba209 100644
--- a/interface/web/sites/lib/lang/id_web_domain.lng
+++ b/interface/web/sites/lib/lang/id_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_domain.lng
index a34c576a0ee1a2e8fa61be0570bb8a2a8c998e7c..084b4acf22c7919ca21e56f7736e117309590392 100644
--- a/interface/web/sites/lib/lang/it_web_domain.lng
+++ b/interface/web/sites/lib/lang/it_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_web_domain.lng b/interface/web/sites/lib/lang/ja_web_domain.lng
index 9a0eb0eb8eaf17a885983ea93e965d88341c1805..43162ef3d7f8839f5850f707b89704dac0323317 100644
--- a/interface/web/sites/lib/lang/ja_web_domain.lng
+++ b/interface/web/sites/lib/lang/ja_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng
index 3319f46865d1aac6cea9f9822865211a083c1abc..785471dce559d77d059fa2b4bbaec72b792fc7c7 100644
--- a/interface/web/sites/lib/lang/nl_web_domain.lng
+++ b/interface/web/sites/lib/lang/nl_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng
index 6d26fb675777c8615b20e504cee28a6f509183eb..22bbad3ec16dc186c8c069d54bb974e2f91d5ca3 100644
--- a/interface/web/sites/lib/lang/pl.lng
+++ b/interface/web/sites/lib/lang/pl.lng
@@ -33,4 +33,3 @@ $wb['Update Packagelist'] = 'Uaktualnij listę pakietów';
 $wb['Subdomain (Vhost)'] = 'Subdomena (Vhost)';
 $wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_aps.lng b/interface/web/sites/lib/lang/pl_aps.lng
index aa791fc4326e7db7396231211b86b360cb800a7b..1a2ffad688a4b1f36d0216a7e38326a7b0b0c35f 100644
--- a/interface/web/sites/lib/lang/pl_aps.lng
+++ b/interface/web/sites/lib/lang/pl_aps.lng
@@ -56,4 +56,3 @@ $wb['btn_install_txt'] = 'Instaluj';
 $wb['btn_cancel_txt'] = 'Anuluj';
 $wb['limit_aps_txt'] = 'Maksymalna liczba instancji APS dla Twojego konta została wyczerpana.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_aps_instances_list.lng b/interface/web/sites/lib/lang/pl_aps_instances_list.lng
index f4b849921bea8e1f05ee9781a82aba0f25b76519..186dc7dc1a965f8af22f9627e4efa70ba6d27f61 100644
--- a/interface/web/sites/lib/lang/pl_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/pl_aps_instances_list.lng
@@ -11,4 +11,3 @@ $wb['filter_txt'] = 'Szukaj';
 $wb['delete_txt'] = 'Usuń';
 $wb['reinstall_txt'] = 'Przeinstaluj';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_aps_packages_list.lng b/interface/web/sites/lib/lang/pl_aps_packages_list.lng
index 2e2140d95d7ece96f2f64e9ad76956ad2db81029..684f4d719b1c87c1b30850a4c1a778dc6737654e 100644
--- a/interface/web/sites/lib/lang/pl_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/pl_aps_packages_list.lng
@@ -6,4 +6,3 @@ $wb['category_txt'] = 'Kategoria';
 $wb['status_txt'] = 'Odblokowany';
 $wb['filter_txt'] = 'Szukaj';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng
index a5d3b8b8916faf23679dea430cc7ea821f475472..a097d0813ea3e0ee728bb0722aa5f87e60f6dfb8 100644
--- a/interface/web/sites/lib/lang/pl_cron.lng
+++ b/interface/web/sites/lib/lang/pl_cron.lng
@@ -19,4 +19,3 @@ $wb['run_wday_error_format'] = 'Niepoprawny format dni w tygodniu.';
 $wb['command_error_format'] = 'Niepoprawny format polecenia. W zbiorze url może być tylko adres http/https który ma pozwolenie.';
 $wb['unknown_fieldtype_error'] = 'Został użyty niepoprawny format pola.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_cron_list.lng b/interface/web/sites/lib/lang/pl_cron_list.lng
index 67e2e6fba8eb572d7e7f2168ef58075c4a0bbbd5..467cae6ed13d97b5e23e0b9d9702cb39763a444c 100644
--- a/interface/web/sites/lib/lang/pl_cron_list.lng
+++ b/interface/web/sites/lib/lang/pl_cron_list.lng
@@ -11,4 +11,3 @@ $wb['command_txt'] = 'Komenda';
 $wb['add_new_cron_txt'] = 'Dodaj nowe zadanie Cron';
 $wb['parent_domain_id_txt'] = 'Witryna';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng
index 92af857087792d535565d1736af5b50e3e0c5cab..05bd91bf9de56fd068db962f96e1035d7e603a4f 100644
--- a/interface/web/sites/lib/lang/pl_database.lng
+++ b/interface/web/sites/lib/lang/pl_database.lng
@@ -44,4 +44,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 wyników';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
 $wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_database_admin_list.lng b/interface/web/sites/lib/lang/pl_database_admin_list.lng
index 653657ee100f7ff1922d16236b2dfefcc20ec07d..5785a779fd62ae8bb1ad2f0a2489fc4a3e935bab 100644
--- a/interface/web/sites/lib/lang/pl_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_admin_list.lng
@@ -8,4 +8,3 @@ $wb['database_name_txt'] = 'Nazwa bazy danych';
 $wb['add_new_record_txt'] = 'Dodaj nowÄ… bazÄ™ danych';
 $wb['sys_groupid_txt'] = 'Klient';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_database_list.lng b/interface/web/sites/lib/lang/pl_database_list.lng
index 0b419fef482c82dec60c5cd83aae366b8eee4349..2162a15a21a0b3991abcc991934ed341339aeeeb 100644
--- a/interface/web/sites/lib/lang/pl_database_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_list.lng
@@ -7,4 +7,3 @@ $wb['database_name_txt'] = 'Nazwa bazy danych';
 $wb['add_new_record_txt'] = 'Dodaj nowÄ… bazÄ™ danych';
 $wb['database_user_txt'] = 'Użytkownik bazy danych';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_database_user.lng b/interface/web/sites/lib/lang/pl_database_user.lng
index 5bf00310f6ddb1eed275622890e45a77b8354c2a..66a0718349ba3afad8bc3b50d0da0a5a55318d41 100644
--- a/interface/web/sites/lib/lang/pl_database_user.lng
+++ b/interface/web/sites/lib/lang/pl_database_user.lng
@@ -21,4 +21,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 results';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
 $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_database_user_admin_list.lng b/interface/web/sites/lib/lang/pl_database_user_admin_list.lng
index a44cc7cfa08d5a67c202da8c1750175a7006fdcc..d7f88c4c360e87959fefa5ca1d3678425dbf0ef1 100644
--- a/interface/web/sites/lib/lang/pl_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_user_admin_list.lng
@@ -4,4 +4,3 @@ $wb['database_user_txt'] = 'Database user';
 $wb['add_new_record_txt'] = 'Add new User';
 $wb['sys_groupid_txt'] = 'Client';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_database_user_list.lng b/interface/web/sites/lib/lang/pl_database_user_list.lng
index 522780d246177ba69e1fc5492358ff596d91ef81..8c226496a6a06a6b2c70db300f35aaac7619d223 100644
--- a/interface/web/sites/lib/lang/pl_database_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_user_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Database user';
 $wb['database_user_txt'] = 'Database user';
 $wb['add_new_record_txt'] = 'Add new user';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_ftp_user.lng b/interface/web/sites/lib/lang/pl_ftp_user.lng
index 5a97a4bba8881c656b34934cab79ccd913ce6292..5c914011331555ac6a0c9461920cd3f5ec65d069 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user.lng
@@ -32,4 +32,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
 $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
 $wb['password_match_txt'] = 'Hasła pasują';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_ftp_user_list.lng b/interface/web/sites/lib/lang/pl_ftp_user_list.lng
index 95772093635ad6552bfe7f9f4bd22507fed6e962..fecbba355ad91ada06ff4867b8cdf1e45a5a3875 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Strona www';
 $wb['username_txt'] = 'Nazwa użytkownika';
 $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika FTP';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_shell_user.lng b/interface/web/sites/lib/lang/pl_shell_user.lng
index 2852ccc82303b70bbf16e5cdf11507e28c015d8b..5259aeb2be3cb94bb7192ffb8f86344038c7f636 100644
--- a/interface/web/sites/lib/lang/pl_shell_user.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user.lng
@@ -27,4 +27,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
 $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
 $wb['password_match_txt'] = 'Hasła pasują';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_shell_user_list.lng b/interface/web/sites/lib/lang/pl_shell_user_list.lng
index 0f179803dd74fdf33c6be3ce6d2fe9163dbf6700..10f9e433ac7664b86a99b69f0fed7ac940460162 100644
--- a/interface/web/sites/lib/lang/pl_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Strona';
 $wb['username_txt'] = 'Nazwa użytkownika';
 $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika Shell';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
index f92c3603a2b044d4714b17a61cb5e0c988bc0138..d8e963de81bf47690ffc0488f6766450e8beb668 100644
--- a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
@@ -7,4 +7,3 @@ $wb['hard_txt'] = 'Limit twardy';
 $wb['soft_txt'] = 'Limit miękki';
 $wb['files_txt'] = 'Pojedyncze pliki';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
index 62d88d949e86067729a267f2e11a0590033e0fe4..19cd691bebf7ae8790e13ac6c382abda472de6fb 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
@@ -113,4 +113,3 @@ $wb['proxy_directives_txt'] = 'Dyrektywny Proxy';
 $wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
 $wb['Domain'] = 'Alias domeny';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
index a57741558f34f152919a2ce64fa12250dc7dc7df..5bdd8e8316d266b715c0ee69a42794e07541769f 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
@@ -12,4 +12,3 @@ $wb['no_redirect_txt'] = 'Bez przekierowania';
 $wb['no_flag_txt'] = 'Bez flagi';
 $wb['none_txt'] = 'Brak';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_backup_list.lng b/interface/web/sites/lib/lang/pl_web_backup_list.lng
index e7d9aed9ab3969ac051c9d08c554bb4cbb88e167..401ee655f900bdf2fd983f3c34c84eb32d7f540f 100644
--- a/interface/web/sites/lib/lang/pl_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_backup_list.lng
@@ -13,4 +13,3 @@ $wb['restore_pending_txt'] = 'Trwa już jedno zadanie przywrócenia danych z kop
 $wb['backup_type_mysql'] = 'Baza MySQL';
 $wb['backup_type_web'] = 'Pliki strony';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng
index 5c02a06abb240d15833106cf33e221183032e415..4cac25f0bbf775aae4272ac6947d58f15399fc90 100644
--- a/interface/web/sites/lib/lang/pl_web_domain.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain.lng
@@ -111,5 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apa
 $wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
 $wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
 $wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
index 1aab019c08f820e36fd012116873bc998cf2f5ae..56634eb62354d213842b5cf22ebd83cda1ecdefb 100644
--- a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
@@ -7,4 +7,3 @@ $wb['server_id_txt'] = 'Serwer';
 $wb['domain_txt'] = 'Domena';
 $wb['add_new_record_txt'] = 'Dodaj nowÄ… stronÄ™';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_domain_list.lng b/interface/web/sites/lib/lang/pl_web_domain_list.lng
index 8a74d05dd8c2fae18aaae775056feb2534a2a1ee..62b7455ff349875cffd586aac2a615bfccc288af 100644
--- a/interface/web/sites/lib/lang/pl_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain_list.lng
@@ -6,4 +6,3 @@ $wb['server_id_txt'] = 'Serwer';
 $wb['domain_txt'] = 'Domena';
 $wb['add_new_record_txt'] = 'Dodaj nowÄ… stronÄ™';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_folder.lng b/interface/web/sites/lib/lang/pl_web_folder.lng
index 053a2c012be774f28fd2f4f92215486c330baf54..6eec2fd5f0071b07dcbb2b069e5f2a3862f76978 100644
--- a/interface/web/sites/lib/lang/pl_web_folder.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder.lng
@@ -5,4 +5,3 @@ $wb['path_txt'] = 'Ścieżka';
 $wb['active_txt'] = 'Aktywny';
 $wb['path_error_regex'] = 'Nieprawidłowa ścieżka katalogu.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_folder_list.lng b/interface/web/sites/lib/lang/pl_web_folder_list.lng
index cd167216785913ceaa418f678bb9be4b47128706..87a769008fd76546baefd9bacdc62d7c918448e8 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_list.lng
@@ -5,4 +5,3 @@ $wb['server_id_txt'] = 'Serwer';
 $wb['parent_domain_id_txt'] = 'Witryna';
 $wb['path_txt'] = 'Ścieżka';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_folder_user.lng b/interface/web/sites/lib/lang/pl_web_folder_user.lng
index 48893ba7dfb88b10974d314632ca1795c6bfd166..1975ae581dd3553b5ef2dce0317a4e4328149aaa 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_user.lng
@@ -10,4 +10,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
 $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
 $wb['password_match_txt'] = 'Hasła pasują';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_folder_user_list.lng b/interface/web/sites/lib/lang/pl_web_folder_user_list.lng
index 462d3b9def0388c66b5d111b2e888b63273e3296..81769bd9d0c9dd71b905ac0d1d677c602dff5901 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_user_list.lng
@@ -4,4 +4,3 @@ $wb['active_txt'] = 'Aktywny';
 $wb['web_folder_id_txt'] = 'Katalog';
 $wb['username_txt'] = 'Login';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
index 14319404ae40d70dc77fe09f844e2df43b3ff862..29985f02f04a0cdd549d43c18f15335c3bae7f25 100644
--- a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
@@ -7,4 +7,3 @@ $wb['this_year_txt'] = 'Ten rok';
 $wb['last_year_txt'] = 'Ostatni rok';
 $wb['sum_txt'] = 'Razem';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng
index 4bfc75b5d34098f59eca81491a8df75447b6cc49..def9efb723be33c0c6d98e3f2bd2da5490a094be 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng
@@ -44,4 +44,3 @@ $wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
 $wb['available_proxy_directive_snippets_txt'] = 'Dostępne konfiguracje dodatkowe Proxy';
 $wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
index d20a14cb70c87eee132b70f675dd110ab7f6ae1b..9ccb0a3c770dfe17c6d55f427577e50e87d0b215 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Strona www';
 $wb['domain_txt'] = 'Subdomena';
 $wb['add_new_record_txt'] = 'Dodaj nowÄ… subdomene';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
index fa77cdef54d4f33e313cc1f8041418eda527eb75..8420a9d2b7fb93871968132b431a761fceefc7fd 100644
--- a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
@@ -116,4 +116,3 @@ $wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw ngin
 $wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
 $wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
index 58084a63ffb1b0515b474cf03b77b4f8e0a8be72..1c16bcda288f146167a5a49221951769017f580b 100644
--- a/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
@@ -6,4 +6,3 @@ $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/pl_webdav_user.lng b/interface/web/sites/lib/lang/pl_webdav_user.lng
index 669c1b308821df96238f852a591f537129dd3bf1..8d80f94e4c7604392a82c19d02349ca8b5cd3361 100644
--- a/interface/web/sites/lib/lang/pl_webdav_user.lng
+++ b/interface/web/sites/lib/lang/pl_webdav_user.lng
@@ -19,4 +19,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
 $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
 $wb['password_match_txt'] = 'Hasła pasują do siebie';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pl_webdav_user_list.lng b/interface/web/sites/lib/lang/pl_webdav_user_list.lng
index f679685e8d6b6c477b61a5eb4d26b1c1cb568781..5e7e4b6a58549376ccb6e51c6a07d693af72c92e 100644
--- a/interface/web/sites/lib/lang/pl_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_webdav_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Strona';
 $wb['username_txt'] = 'Nazwa użytkownika';
 $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika Webdav';
 ?>
-
diff --git a/interface/web/sites/lib/lang/pt_web_domain.lng b/interface/web/sites/lib/lang/pt_web_domain.lng
index b060656a1847f90b36f5285ecfc8b0a4341605b7..e3acc8a29a2647c50b596fca658e0e7071667394 100644
--- a/interface/web/sites/lib/lang/pt_web_domain.lng
+++ b/interface/web/sites/lib/lang/pt_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain.lng b/interface/web/sites/lib/lang/ro_web_domain.lng
index 791f67b5772fbe7cd179fa60a4a1e30085963516..d100895fae59136bc975a926d636802086eb1243 100644
--- a/interface/web/sites/lib/lang/ro_web_domain.lng
+++ b/interface/web/sites/lib/lang/ro_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_domain.lng
index be367c0f62ca1d5e19882c5f11608e72da7da4cc..46f377f9421c86fd920fe9aaf96946c588c5bdb8 100644
--- a/interface/web/sites/lib/lang/ru_web_domain.lng
+++ b/interface/web/sites/lib/lang/ru_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng
index 15df4849177dc5bbb82fd93e840f03fb54b1f1ac..a44eee857b1283b0d97a423f7b6e773fefd07e82 100644
--- a/interface/web/sites/lib/lang/se_web_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_web_domain.lng b/interface/web/sites/lib/lang/sk_web_domain.lng
index 6df59378051df7476a6282d11803e12f8d248271..b127ec23b0bbed75842b314b7288fd0a85b26ee5 100644
--- a/interface/web/sites/lib/lang/sk_web_domain.lng
+++ b/interface/web/sites/lib/lang/sk_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 ?>
diff --git a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
index 59a146cbfd045e45581126f417a2a9ca52d178cf..cff29d541a9a25397d54f9ef3d50cf8856997aed 100644
--- a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
@@ -6,5 +6,3 @@ $wb['password_strength_3_txt'] = 'Dobré';
 $wb['password_strength_4_txt'] = 'Silné';
 $wb['password_strength_5_txt'] = 'Velmi silné';
 ?>
-
-
diff --git a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
index 79d031777b2937d362a74944181872ae0945384b..df85c9712415acaa8c7d6fc19ad6700c23420566 100644
--- a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
@@ -6,4 +6,3 @@ $wb['password_strength_3_txt'] = 'Dobre';
 $wb['password_strength_4_txt'] = 'Silne';
 $wb['password_strength_5_txt'] = 'Bardzo mocne';
 ?>
-
diff --git a/interface/web/tools/import_ispconfig.php b/interface/web/tools/import_ispconfig.php
index a06366448c01027a7292aedaeb8a6bf3ff04393f..432bb3191e0411f15111606333dabb424a9b71e1 100644
--- a/interface/web/tools/import_ispconfig.php
+++ b/interface/web/tools/import_ispconfig.php
@@ -149,6 +149,12 @@ function start_domain_import($mail_domain) {
 	if($sys_groupid == 0) $error .= 'Inavlid groupid<br />';
 	if($sys_userid == 0) $error .= 'Inavlid Userid<br />';
 	
+	//* Get the mail server ID
+	$tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE mail_server = 1 LIMIT 0,1");
+	$server_id = intval($tmp['server_id']);
+	unset($tmp);
+	if($server_id == 0) $server_id = 1;
+	
 	//* get the mail domain record
 	$mail_domain_rec = $client->mail_domain_get($remote_session_id, array('domain' => $mail_domain));
 	if(is_array($mail_domain_rec)) {
@@ -160,6 +166,7 @@ function start_domain_import($mail_domain) {
 		//* Change the record owner and remove the index field
 		$mail_domain_rec['sys_userid'] = $sys_userid;
 		$mail_domain_rec['sys_groupid'] = $sys_groupid;
+		$mail_domain_rec['server_id'] = $server_id;
 		unset($mail_domain_rec['domain_id']);
 		
 		//* Insert domain if no error occurred
@@ -181,6 +188,7 @@ function start_domain_import($mail_domain) {
 						//* Prepare record
 						$mail_user['sys_userid'] = $sys_userid;
 						$mail_user['sys_groupid'] = $sys_groupid;
+						$mail_user['server_id'] = $server_id;
 						$remote_mailuser_id = $mail_user['mailuser_id'];
 						unset($mail_user['mailuser_id']);
 						if(!isset($_POST['import_user_filter'])) $mail_user['custom_mailfilter'] = '';
@@ -199,6 +207,7 @@ function start_domain_import($mail_domain) {
 									$mail_user_filter['sys_userid'] = $sys_userid;
 									$mail_user_filter['sys_groupid'] = $sys_groupid;
 									$mail_user_filter['mailuser_id'] = $local_mailuser_id;
+									$mail_user_filter['server_id'] = $server_id;
 									unset($mail_user_filter['filter_id']);
 									
 									//* Insert record in DB
@@ -224,6 +233,7 @@ function start_domain_import($mail_domain) {
 					if($tmp['number'] == 0) {
 						$mail_alias['sys_userid'] = $sys_userid;
 						$mail_alias['sys_groupid'] = $sys_groupid;
+						$mail_alias['server_id'] = $server_id;
 						unset($mail_alias['forwarding_id']);
 						$app->db->datalogInsert('mail_forwarding', $mail_alias, 'forwarding_id');
 						$msg .= "Imported email alias ".$mail_alias['source']."<br />";
@@ -244,6 +254,7 @@ function start_domain_import($mail_domain) {
 					if($tmp['number'] == 0) {
 						$mail_alias['sys_userid'] = $sys_userid;
 						$mail_alias['sys_groupid'] = $sys_groupid;
+						$mail_alias['server_id'] = $server_id;
 						unset($mail_alias['forwarding_id']);
 						$app->db->datalogInsert('mail_forwarding', $mail_alias, 'forwarding_id');
 						$msg .= "Imported email aliasdomain ".$mail_alias['source']."<br />";
@@ -264,6 +275,7 @@ function start_domain_import($mail_domain) {
 					if($tmp['number'] == 0) {
 						$mail_forward['sys_userid'] = $sys_userid;
 						$mail_forward['sys_groupid'] = $sys_groupid;
+						$mail_forward['server_id'] = $server_id;
 						unset($mail_forward['forwarding_id']);
 						$app->db->datalogInsert('mail_forwarding', $mail_forward, 'forwarding_id');
 						$msg .= "Imported email forward ".$mail_forward['source']."<br />";
@@ -284,6 +296,7 @@ function start_domain_import($mail_domain) {
 					if($tmp['number'] == 0) {
 						$mail_spamfilter['sys_userid'] = $sys_userid;
 						$mail_spamfilter['sys_groupid'] = $sys_groupid;
+						$mail_spamfilter['server_id'] = $server_id;
 						unset($mail_spamfilter['id']);
 						$app->db->datalogInsert('spamfilter_users', $mail_spamfilter, 'id');
 						$msg .= "Imported spamfilter user ".$mail_spamfilter['email']."<br />";
diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng
index 480434e148268e5bcf605b420d9c7a6b723296c2..66bcaf49ae1aca04f3c85100ce9bf0a87f1c74c9 100644
--- a/interface/web/tools/lib/lang/cz.lng
+++ b/interface/web/tools/lib/lang/cz.lng
@@ -11,5 +11,3 @@ $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 ba24f58f758665a41192c8c71c441ae2e7dd18a7..8ebf71795c1cdf46acba844e8389337533d3163c 100644
--- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
@@ -21,5 +21,3 @@ $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 b1f32ec119ad1a61026ee170c6fe64b66d1fb793..5ebf1ec341c14fab8c44a4b2313f80041839eb1f 100644
--- a/interface/web/tools/lib/lang/cz_index.lng
+++ b/interface/web/tools/lib/lang/cz_index.lng
@@ -2,5 +2,3 @@
 $wb['page_head_txt'] = 'ISPConfig nástroje';
 $wb['page_desc_txt'] = 'Změna uživatelského nastavení';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_interface.lng b/interface/web/tools/lib/lang/cz_interface.lng
index 1125032b1f966e200731da1c7498eb73438ad439..507b7c3cbeda904058d89d4929dfed78d349fa87 100644
--- a/interface/web/tools/lib/lang/cz_interface.lng
+++ b/interface/web/tools/lib/lang/cz_interface.lng
@@ -5,5 +5,3 @@ $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 3b53ca06a5f53cea35cf89979fbc8b76603a35eb..96d622e28ab2441253a5cc1885ef280fae89cc93 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -11,5 +11,3 @@ $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 53e9bd84426ad5e634df3f6b05c30e89860e9ad0..0f037f1590b07a7fdf6b5dbf3d4f2f951f7045fa 100644
--- a/interface/web/tools/lib/lang/cz_tpl_default.lng
+++ b/interface/web/tools/lib/lang/cz_tpl_default.lng
@@ -5,5 +5,3 @@ $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 7490e52f98945775198015ef5a892f24566c9924..dec46b7a06de801c358648cd73bdb30c8370e482 100644
--- a/interface/web/tools/lib/lang/cz_usersettings.lng
+++ b/interface/web/tools/lib/lang/cz_usersettings.lng
@@ -10,5 +10,3 @@ $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/tools/lib/lang/pl.lng b/interface/web/tools/lib/lang/pl.lng
index a807a75c3d1cff75bddd612c5deeb84e5033eae2..10bf647c0c30272ae1e047b43172a20678d5afb2 100644
--- a/interface/web/tools/lib/lang/pl.lng
+++ b/interface/web/tools/lib/lang/pl.lng
@@ -11,4 +11,3 @@ $wb['ISPConfig 3 mail'] = 'Poczta ISPConfig 3';
 $wb['PDNS Tupa'] = 'PowerDNS Tupa';
 $wb['Interface'] = 'Interfejs';
 ?>
-
diff --git a/interface/web/tools/lib/lang/pl_import_ispconfig.lng b/interface/web/tools/lib/lang/pl_import_ispconfig.lng
index bae9417da15247901cc5d59037b9c8c6eb1c1f61..cba076164a7ca764ee7ba07b07a55876c600ce36 100644
--- a/interface/web/tools/lib/lang/pl_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/pl_import_ispconfig.lng
@@ -21,4 +21,3 @@ $wb['import_forward_txt'] = 'Import przekierowań';
 $wb['import_user_filter_txt'] = 'Import filtrów użytkownika';
 $wb['import_spamfilter_txt'] = 'Import filtrów spamu';
 ?>
-
diff --git a/interface/web/tools/lib/lang/pl_index.lng b/interface/web/tools/lib/lang/pl_index.lng
index 0ff1c84dc4db92d4351279fec4201be88e5a7fe6..d69a272bab8cb94fc15f87b66e2200c2a87ac989 100644
--- a/interface/web/tools/lib/lang/pl_index.lng
+++ b/interface/web/tools/lib/lang/pl_index.lng
@@ -2,4 +2,3 @@
 $wb['page_head_txt'] = 'Narzędzia ISPConfig';
 $wb['page_desc_txt'] = 'Zmiana ustawień użytkownika';
 ?>
-
diff --git a/interface/web/tools/lib/lang/pl_interface.lng b/interface/web/tools/lib/lang/pl_interface.lng
index 7775fe861fc1d98a26bd8319245f8fcc085375bd..0256fab376397535594b29404ab1b4d5cadb7a3e 100644
--- a/interface/web/tools/lib/lang/pl_interface.lng
+++ b/interface/web/tools/lib/lang/pl_interface.lng
@@ -5,4 +5,3 @@ $wb['language_txt'] = 'Język';
 $wb['startmodule_txt'] = 'Moduł startowy';
 $wb['app_theme_txt'] = 'Temat';
 ?>
-
diff --git a/interface/web/tools/lib/lang/pl_resync.lng b/interface/web/tools/lib/lang/pl_resync.lng
index e69bec4e938f7da9c8aa72695e68ed1c0374083e..18b5936ee77515073e42976e6a7b27893a4a473b 100644
--- a/interface/web/tools/lib/lang/pl_resync.lng
+++ b/interface/web/tools/lib/lang/pl_resync.lng
@@ -11,4 +11,3 @@ $wb['resync_dns_txt'] = 'Resynchronizacja rekordów DNS';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Anuluj';
 ?>
-
diff --git a/interface/web/tools/lib/lang/pl_tpl_default.lng b/interface/web/tools/lib/lang/pl_tpl_default.lng
index 84c90f6761066ba51d3700fe3b6f99e5e85379aa..c7cd9c44d2b02e909fa2b3655a3a0cc61cc86db1 100644
--- a/interface/web/tools/lib/lang/pl_tpl_default.lng
+++ b/interface/web/tools/lib/lang/pl_tpl_default.lng
@@ -5,4 +5,3 @@ $wb['no_settings_txt'] = 'Nie ma ustawień dla domyślnego szablonu';
 $wb['btn_start_txt'] = 'Zapisz';
 $wb['btn_cancel_txt'] = 'Wróć';
 ?>
-
diff --git a/interface/web/tools/lib/lang/pl_usersettings.lng b/interface/web/tools/lib/lang/pl_usersettings.lng
index 2dbba9816b7d44d7a8f4ac94f18c63f52f10b3fa..addd42b34e00fa063ab44b4d20c4d85910a19c91 100644
--- a/interface/web/tools/lib/lang/pl_usersettings.lng
+++ b/interface/web/tools/lib/lang/pl_usersettings.lng
@@ -10,4 +10,3 @@ $wb['repeat_password_txt'] = 'Powtórz hasło';
 $wb['password_mismatch_txt'] = 'Hasła się nie zgadzają';
 $wb['password_match_txt'] = 'Hasła się zgadzają';
 ?>
-
diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng
index 21224389a858b483872fa40b83b893650f9ec8be..4167e14a8a150090ecfb1aa6738fb8a6abf17760 100644
--- a/interface/web/vm/lib/lang/cz.lng
+++ b/interface/web/vm/lib/lang/cz.lng
@@ -5,5 +5,3 @@ $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 2930fff65cf4738794991c2b7a8c569b20800826..3e2e3e0b84a82c5520e13f71eba231d40fe25eb1 100644
--- a/interface/web/vm/lib/lang/cz_openvz_action.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_action.lng
@@ -14,5 +14,3 @@ $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 6afda02718ae432985307e38c8bea32b92b4623a..6016681df89f13323f60379acff5e7abd98f4c77 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng
@@ -7,5 +7,3 @@ $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 e392e9c970107b173fa43af39f98af1c40aaab4c..e6a3a68c2c3b9cad34982f035b86d4446ea68439 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
@@ -5,5 +5,3 @@ $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 12f22178d04bb07f612c70557c384fec5af3bfe9..72838a20de8c8ff4944856821cfd1786cde17674 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
@@ -9,5 +9,3 @@ $wb['template_name_error_empty'] = 'Template name is empty.';
 $wb['template_file_error_empty'] = 'Template filename is empty.';
 $wb['Template'] = 'Å ablona';
 ?>
-
-
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 264d944d2cc922805993b0045ac84d02c52815a3..7705a4d18f342e0d87d90f049fae07fc75efc721 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
@@ -6,5 +6,3 @@ $wb['server_id_txt'] = 'Server';
 $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 6f1f394d873b3c1313ac0bc3afb806d2ceab5971..12c80bd6c121d85a5ab5cd906bffe7debd366b87 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template.lng
@@ -91,5 +91,3 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Å ablona';
 $wb['Advanced'] = 'Pokročilý';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_template_list.lng b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
index fc3198560bfe0ed7e1d19afa49d453b4cf50e3ac..89c11ef5d1926da64f4f787a778b7c0f9793149f 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
 $wb['active_txt'] = 'Aktivní';
 $wb['template_name_txt'] = 'Název šablony';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng
index aeed11933e36f638fedef46c6445dd289370cc51..adfa56f0d531654ee4153a93bdd1b9cdd4dcf384 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng
@@ -38,5 +38,3 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Pokročilý';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
index 509764831fa3bb04e6667b314aff26a812b05020..1371c4b70ea40b9670804d290c0b9f96f32cc05c 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
@@ -8,5 +8,3 @@ $wb['hostname_txt'] = 'Hostname';
 $wb['ip_address_txt'] = 'IP address';
 $wb['veid_txt'] = 'VEID';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/pl.lng b/interface/web/vm/lib/lang/pl.lng
index 5c1ab5822999a2616d1b6792b084893848cff580..4167e14a8a150090ecfb1aa6738fb8a6abf17760 100644
--- a/interface/web/vm/lib/lang/pl.lng
+++ b/interface/web/vm/lib/lang/pl.lng
@@ -5,4 +5,3 @@ $wb['VM Templates'] = 'VM Templates';
 $wb['IP addresses'] = 'IP addresses';
 $wb['OpenVZ'] = 'OpenVZ';
 ?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_action.lng b/interface/web/vm/lib/lang/pl_openvz_action.lng
index 71e7263f9d5b28773b7735ae115df12209046d9e..52f73285824f2d6c4107d8c9eec5980a251d505c 100644
--- a/interface/web/vm/lib/lang/pl_openvz_action.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_action.lng
@@ -14,4 +14,3 @@ $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/pl_openvz_ip.lng b/interface/web/vm/lib/lang/pl_openvz_ip.lng
index 67f688576ac762561936a46e18120b84d7033f28..6016681df89f13323f60379acff5e7abd98f4c77 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ip.lng
@@ -7,4 +7,3 @@ $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/pl_openvz_ip_list.lng b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
index 365844325eecd8a27c7369ede26ab68125d7286e..f675aa57c90b098f904b8e9ea793903e2f028c36 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
@@ -5,4 +5,3 @@ $wb['ip_address_txt'] = 'Adresy IP';
 $wb['reserved_txt'] = 'Zarezerwowany';
 $wb['vm_id_txt'] = 'VM';
 ?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng b/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
index bfeb2990887a01281a27b62b467b929f6e3a775d..256750f19a0cf4d459214a327d3f86773f9312d7 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
@@ -9,4 +9,3 @@ $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/pl_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
index df01680e16c89ba24ec3aef446728a2e1a8103a1..6471ec0e277b63b6e110ef8deef7ca35511a2a52 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
@@ -6,4 +6,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['allservers_txt'] = 'Exists on all servers';
 $wb['ostemplate_id_txt'] = 'ID';
 ?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_template.lng b/interface/web/vm/lib/lang/pl_openvz_template.lng
index 0887164d393bf9bfbc9f785e63aa0d3cc5200e66..d285512dcab15fffb604da4ce421f5e5e056d485 100644
--- a/interface/web/vm/lib/lang/pl_openvz_template.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_template.lng
@@ -91,4 +91,3 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 ?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_template_list.lng b/interface/web/vm/lib/lang/pl_openvz_template_list.lng
index 6e4d911c6bbad29d51bd305a60c8b09cec2ca2f5..de4045c36a75506c0452b17c1e9d61080b534ce2 100644
--- a/interface/web/vm/lib/lang/pl_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_template_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
 $wb['active_txt'] = 'Active';
 $wb['template_name_txt'] = 'Template name';
 ?>
-
diff --git a/interface/web/vm/lib/lang/pl_openvz_vm.lng b/interface/web/vm/lib/lang/pl_openvz_vm.lng
index 4698fe681b4101b170b772e6a41517b13b80f587..f2be022dd0ae060ae8688cdcaa356b4200185d7c 100644
--- a/interface/web/vm/lib/lang/pl_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_vm.lng
@@ -38,4 +38,3 @@ $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/pl_openvz_vm_list.lng b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
index a534a65f203afb84fd5882c143d5c336e04c7ba6..2238e2b8f4fa4db72f1b785d6e0849e356922faf 100644
--- a/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
@@ -8,4 +8,3 @@ $wb['hostname_txt'] = 'Hostname';
 $wb['ip_address_txt'] = 'IP address';
 $wb['veid_txt'] = 'VEID';
 ?>
-
diff --git a/server/cron_daily.php b/server/cron_daily.php
index a89468e6560342e1353e3aeaac2dd0e3c1bb35c9..1bcb797ad8b87a49c056c2909f1036f3c42f74fd 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -272,15 +272,24 @@ function setConfigVar( $filename, $varName, $varValue ) {
 }
 
 
-$sql = "SELECT domain_id, domain, document_root, web_folder, type FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'webalizer' AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, document_root, web_folder, type, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'webalizer' AND server_id = ".$conf['server_id'];
 $records = $app->db->queryAllRecords($sql);
 
 foreach($records as $rec) {
 	//$yesterday = date('Ymd',time() - 86400);
 	$yesterday = date('Ymd',strtotime("-1 day", time()));
-	$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
+	
+    $log_folder = 'log';
+    if($rec['type'] == 'vhostsubdomain') {
+        $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($rec['parent_domain_id']));
+        $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']);
+        if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id'];
+        $log_folder .= '/' . $subdomain_host;
+        unset($tmp);
+    }
+    $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log');
 	if(!@is_file($logfile)) {
-		$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
+		$logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log.gz');
 		if(!@is_file($logfile)) {
 			continue;
 		}
@@ -313,7 +322,7 @@ foreach($records as $rec) {
 // Create awstats statistics
 #######################################################################################################
 
-$sql = "SELECT domain_id, domain, document_root, web_folder, type, system_user, system_group FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'awstats' AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, document_root, web_folder, type, system_user, system_group, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'awstats' AND server_id = ".$conf['server_id'];
 $records = $app->db->queryAllRecords($sql);
 
 $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
@@ -321,9 +330,18 @@ $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
 foreach($records as $rec) {
 	//$yesterday = date('Ymd',time() - 86400);
 	$yesterday = date('Ymd',strtotime("-1 day", time()));
-	$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
+	
+    $log_folder = 'log';
+    if($rec['type'] == 'vhostsubdomain') {
+        $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($rec['parent_domain_id']));
+        $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']);
+        if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id'];
+        $log_folder .= '/' . $subdomain_host;
+        unset($tmp);
+    }
+    $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log');
 	if(!@is_file($logfile)) {
-		$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
+		$logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log.gz');
 		if(!@is_file($logfile)) {
 			continue;
 		}
@@ -428,13 +446,23 @@ if(is_dir('/var/log/ispconfig/httpd')) exec('chmod +r /var/log/ispconfig/httpd/*
 // Manage and compress web logfiles and create traffic statistics
 #######################################################################################################
 
-$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, type, document_root, web_folder, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') AND server_id = ".$conf['server_id'];
 $records = $app->db->queryAllRecords($sql);
 foreach($records as $rec) {
 
 	//* create traffic statistics based on yesterdays access log file
 	$yesterday = date('Ymd',time() - 86400);
-	$logfile = $rec['document_root'].'/log/'.$yesterday.'-access.log';
+	
+    $log_folder = 'log';
+    if($rec['type'] == 'vhostsubdomain') {
+        $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($rec['parent_domain_id']));
+        $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']);
+        if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id'];
+        $log_folder .= '/' . $subdomain_host;
+        unset($tmp);
+    }
+    
+    $logfile = $rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log';
 	$total_bytes = 0;
 
 	$handle = @fopen($logfile, "r");
@@ -462,7 +490,7 @@ foreach($records as $rec) {
 	}
 
 	$yesterday2 = date('Ymd',time() - 86400*2);
-	$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday2.'-access.log');
+	$logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday2.'-access.log');
 
 	//* Compress logfile
 	if(@is_file($logfile)) {
@@ -472,7 +500,7 @@ foreach($records as $rec) {
 	}
 
 	// rotate and compress the error.log when it exceeds a size of 10 MB
-	$logfile = escapeshellcmd($rec['document_root'].'/log/error.log');
+	$logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/error.log');
 	if(is_file($logfile) && filesize($logfile) > 10000000) {
 		exec("gzip -c $logfile > $logfile.1.gz");
 		exec("cat /dev/null > $logfile");
@@ -480,7 +508,7 @@ foreach($records as $rec) {
 
 	// delete logfiles after 30 days
 	$month_ago = date('Ymd',time() - 86400 * 30);
-	$logfile = escapeshellcmd($rec['document_root'].'/log/'.$month_ago.'-access.log.gz');
+	$logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$month_ago.'-access.log.gz');
 	if(@is_file($logfile)) {
 		unlink($logfile);
 	}
@@ -488,10 +516,10 @@ foreach($records as $rec) {
 	//* Delete older Log files, in case that we missed them before due to serverdowntimes.
 	$datepart = date('Ym',time() - 86400 * 31 * 2);
 
-	$logfile = escapeshellcmd($rec['document_root']).'/log/'.$datepart.'*-access.log.gz';
+	$logfile = escapeshellcmd($rec['document_root']).'/' . $log_folder . '/'.$datepart.'*-access.log.gz';
 	exec('rm -f '.$logfile);
 
-	$logfile = escapeshellcmd($rec['document_root']).'/log/'.$datepart.'*-access.log';
+	$logfile = escapeshellcmd($rec['document_root']).'/' . $log_folder . '/'.$datepart.'*-access.log';
 	exec('rm -f '.$logfile);
 }
 
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 1de54e29fff8e1938ca62d65a1eadd80ad5a739f..c958e8b86d2f8feca863c69b0d45613a8e9ca556 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -574,6 +574,58 @@ class system{
 	  	}
 	}
 	
+	/**
+	 * Get the group id from an group
+	 *
+	 */
+	function getgid($group){
+		global $app;
+	  	if($this->is_group($group)){
+		    $group_datei = $this->server_conf['group_datei'];
+			$groups = $app->file->no_comments($group_datei);
+			$lines = explode("\n", $groups);
+			if(is_array($lines)){
+		    foreach($lines as $line){
+					if(trim($line) != ""){
+						list($f1, $f2, $f3, $f4) = explode(':', $line);
+						if($f1 == $group) return $f3;
+					}
+				}
+			}
+	  	} else {
+		    return false;
+	  	}
+	}
+	
+	/**
+	* Return info about a group by name
+	*
+	*/
+	function posix_getgrnam($group) {
+		if(!function_exists('posix_getgrnam')){
+			$group_datei = $this->server_conf['group_datei'];
+			$cmd = 'grep -m 1 "^'.$group.':" '.$group_datei;
+			exec($cmd, $output, $return_var);
+			if($return_var != 0 || !$output[0]) return false;
+			list($f1, $f2, $f3, $f4) = explode(':', $output[0]);
+			$f2 = trim($f2);
+			$f3 = trim($f3);
+			$f4 = trim($f4);
+			if($f4 != ''){
+				$members = explode(',', $f4);
+			} else {
+				$members = array();
+			}
+			$group_details = array(	'name' => $group,
+									'passwd' => $f2,
+									'members' => $members,
+									'gid' => $f3);
+			return $group_details;	
+		} else {
+			return posix_getgrnam($group);
+		}
+    }
+	
 	/**
 	 * Get all information from a user
 	 *
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 8df1dcf97ee84177f7c84a550578c9b5b23f7d6c..58e941d6d5ecdd8eba6f37821c1a247b863c326c 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -923,7 +923,7 @@ class apache2_plugin {
 		//* Create custom php.ini
 		if(trim($data['new']['custom_php_ini']) != '') {
 			$has_custom_php_ini = true;
-			if(!is_dir($custom_php_ini_dir)) $app->system->mkdir($custom_php_ini_dir);
+			if(!is_dir($custom_php_ini_dir)) $app->system->mkdirpath($custom_php_ini_dir);
 			$php_ini_content = '';
 			if($data['new']['php'] == 'mod') {
 				$master_php_ini_path = $web_config['php_ini_path_apache'];
diff --git a/server/plugins-available/mailman_plugin.inc.php b/server/plugins-available/mailman_plugin.inc.php
index 7e6eaf258973a1621b64fe2bccdc5bee6ad2bca8..c302806b90ae0db048322e4c19b3871484d1a2bb 100644
--- a/server/plugins-available/mailman_plugin.inc.php
+++ b/server/plugins-available/mailman_plugin.inc.php
@@ -74,7 +74,7 @@ class mailman_plugin {
 		$this->update_config();
 		
 		exec("nohup /usr/lib/mailman/bin/newlist -u ".escapeshellcmd($data["new"]["domain"])." -e ".escapeshellcmd($data["new"]["domain"])." ".escapeshellcmd($data["new"]["listname"])." ".escapeshellcmd($data["new"]["email"])." ".escapeshellcmd($data["new"]["password"])." >/dev/null 2>&1 &");
-		
+		if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');
 		exec('nohup '.$conf['init_scripts'] . '/' . 'mailman reload >/dev/null 2>&1 &');
 		
 		$app->db->query("UPDATE mail_mailinglist SET password = '' WHERE mailinglist_id = ".$app->db->quote($data["new"]['mailinglist_id']));
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 7a1e562ad576a884fdd0d8d385fec47716e0c1b8..2c347f4a2ecd8615ab75425791ed909bbdb83d6a 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -831,7 +831,7 @@ class nginx_plugin {
 		if(!is_dir($web_config['website_basedir'].'/conf')) mkdir($web_config['website_basedir'].'/conf');
 		if(trim($data['new']['custom_php_ini']) != '') {
 			$has_custom_php_ini = true;
-			if(!is_dir($custom_php_ini_dir)) $app->system->mkdir($custom_php_ini_dir);
+			if(!is_dir($custom_php_ini_dir)) $app->system->mkdirpath($custom_php_ini_dir);
 			$php_ini_content = '';
 			if($data['new']['php'] == 'mod') {
 				$master_php_ini_path = $web_config['php_ini_path_apache'];
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index c3133a6fde64d154825f6c00c2012009ca6253a4..2924d49bcb8660edb25bbecffc610e33f0882cc4 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -162,8 +162,8 @@ class shelluser_base_plugin {
 					exec($command);
 					$app->log("Executed command: $command ",LOGLEVEL_DEBUG);
 					*/
-					$groupinfo = posix_getgrnam($data['new']['pgroup']);
-					$app->system->usermod($data['old']['username'],0, $groupinfo[gid], $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']);
+					//$groupinfo = $app->system->posix_getgrnam($data['new']['pgroup']);
+					$app->system->usermod($data['old']['username'],0, $app->system->getgid($data['new']['pgroup']), $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']);
 					$app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
 									
 					// call the ssh-rsa update function