diff --git a/install/apps/bastille-firewall b/install/apps/bastille-firewall
index 86da005ac7375ed58bfb6c08fe6ea5ef624eae2c..d5723dbdbc341a152ea775340becc9e5c51aea3a 100644
--- a/install/apps/bastille-firewall
+++ b/install/apps/bastille-firewall
@@ -58,7 +58,7 @@
 ### END INIT INFO
 
 
-REALSCRIPT=/sbin/bastille-ipchains
+REALSCRIPT=/sbin/bastille-netfilter
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 # exit function to be called in place of regular Bourne exit
@@ -78,13 +78,6 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-if [ -n "$(uname -r | awk -F. ' $1 == 2 && $2 > 2 {print}')" ]; then
-	# We are using Linux 2.3 or newer; use the netfilter script if available
-	if [ -x /sbin/bastille-netfilter ]; then
-		REALSCRIPT=/sbin/bastille-netfilter
-	fi
-fi
-
 if [ ! -x ${REALSCRIPT} ]; then
 	echo "ERROR: \"${REALSCRIPT}\" not available!"
 	clean_exit 1
diff --git a/install/autoupdate.php b/install/autoupdate.php
index a9863cee2dd362528573001d01826616ae9f0d79..ba5b1a1e6393c4de41687f30bc85e2e40b7a50b5 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -144,6 +144,11 @@ if( empty($conf["mysql"]["admin_password"]) ) {
 	die("internal error - MYSQL-Root passord not known");
 }
 
+//** Test mysql root connection
+if(!@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) {
+	die("internal error - MYSQL-Root passord wrong");
+}
+
 /*
  *  Check all tables
 */
@@ -156,7 +161,6 @@ prepareDBDump();
 
 //* initialize the database
 $inst->db = new db();
-$inst->db->dbName = $conf["mysql"]["database"];
 
 /*
  * The next line is a bit tricky!
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 4efb6fc3b12abba34e08d3445c6b46e254d0dc2c..51f2dff824e3cf03cf7d402738cef4802e873acf 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -1029,6 +1029,11 @@ class installer_dist extends installer_base {
 		// Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail
 		replaceLine('/etc/sudoers','Defaults    requiretty','#Defaults    requiretty',0,0);
 		
+		if(is_file($install_dir.'/interface/invoices')) {
+			chmod($install_dir.'/interface/invoices', 0770);
+			chown($install_dir.'/interface/invoices', 'ispconfig');
+			chgrp($install_dir.'/interface/invoices', 'ispconfig');
+		}
 		
 	}
 	
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index ffe5ef2c26a5744c0ed79035838e3bf5d2c3b18a..c5fdad0e770edc18d76352b66e78c25d6b7e3089 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -866,6 +866,12 @@ class installer extends installer_base
 			chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
 		}
 		
+		if(is_file($install_dir.'/interface/invoices')) {
+			chmod($install_dir.'/interface/invoices', 0770);
+			chown($install_dir.'/interface/invoices', 'ispconfig');
+			chgrp($install_dir.'/interface/invoices', 'ispconfig');
+		}
+		
 		// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
 		// and must be fixed as this will allow the apache user to read the ispconfig files.
 		// Later this must run as own apache server or via suexec!
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 22438cc59feede6296477d816c70825dada7bce7..eed222634f8e42bb2be858f76b76ef8d7d420981 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1060,6 +1060,12 @@ class installer_dist extends installer_base {
 			exec('chmod 744 /usr/local/bin/run-getmail.sh');
 		}
 		
+		if(is_file($install_dir.'/interface/invoices')) {
+			chmod($install_dir.'/interface/invoices', 0770);
+			chown($install_dir.'/interface/invoices', 'ispconfig');
+			chgrp($install_dir.'/interface/invoices', 'ispconfig');
+		}
+		
 		
 	}
 	
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 318cda923e0e76500b3e8f11914fbd2eb04ba77c..0d8eb400b24bfbc58e4a87157dcf25b4aa753787 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -582,8 +582,8 @@ function removeLine($filename,$search_pattern,$strict = 0) {
 }
 
 function is_installed($appname) {
-	exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out);
-	if(isset($out[0]) && stristr($out[0],$appname)) {
+	exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out,$returncode);
+	if(isset($out[0]) && stristr($out[0],$appname) && $returncode == 0) {
 		return true;
 	} else {
 		return false;
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index b0cbfd650e4b637333f5e6d1ebcb3b05213f639c..0021057cc55f50c162971e588f0b783b17f528fe 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -514,6 +514,10 @@ class installer_base {
 			copy('tpl/'.$jk_init.'.master', $config_dir.'/'.$jk_init);
 			copy('tpl/'.$jk_chrootsh.'.master', $config_dir.'/'.$jk_chrootsh);
 		}
+		
+		//* help jailkit fo find its ini files
+		if(!is_link('/usr/jk_socketd.ini')) exec('ln -s /etc/jailkit/jk_socketd.ini /usr/jk_socketd.ini');
+		if(!is_link('/usr/jk_init.ini')) exec('ln -s /etc/jailkit/jk_init.ini /usr/jk_init.ini');
 
 	}
 	
@@ -903,7 +907,7 @@ class installer_base {
 		if(is_file($config_dir.'/'.$configfile)) {
 			copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
 		}
-		chmod($config_dir.'/'.$configfile.'~', 0400);
+		if(is_file($config_dir.'/'.$configfile.'~')) chmod($config_dir.'/'.$configfile.'~', 0400);
 		$content = rf('tpl/debian_dovecot-sql.conf.master');
 		$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
 		$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
@@ -1758,6 +1762,12 @@ class installer_base {
 			chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
 			chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
 		}
+		
+		if(is_file($install_dir.'/interface/invoices')) {
+			chmod($install_dir.'/interface/invoices', 0770);
+			chown($install_dir.'/interface/invoices', 'ispconfig');
+			chgrp($install_dir.'/interface/invoices', 'ispconfig');
+		}
 
 		// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
 		// and must be fixed as this will allow the apache user to read the ispconfig files.
@@ -1952,7 +1962,7 @@ class installer_base {
 		wf($install_dir.'/server/lib/mysql_clientdb.conf',$content);
 		chmod($install_dir.'/server/lib/mysql_clientdb.conf', 0600);
 		chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
-		chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
+		chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');		
 
 	}
 
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index d95bbf8043bc63e5993d8b5a0bd3175d1530f2fd..729ee04d89760f946c2b30570145fec3f4f7c6d6 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -113,7 +113,7 @@ function updateDbAndIni() {
 	$ini_array = ini_to_array(stripslashes($tmp['config']));
 	$current_db_version = (isset($tmp['dbversion']))?intval($tmp['dbversion']):0;
 
-	if(count($ini_array) == 0) die('Unable to read server configuration from database.');
+	if(!is_array($ini_array) or count($ini_array) == 0) die('Unable to read server configuration from database.');
 
 	$conf['services']['mail'] = ($tmp['mail_server'] == 1)?true:false;
 	$conf['services']['web'] = ($tmp['web_server'] == 1)?true:false;
@@ -231,7 +231,7 @@ function updateDbAndIni() {
 
 
 	//** Update server ini
-	$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
+	$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
 	$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
 	unset($tmp_server_rec);
 	$tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));
@@ -286,7 +286,7 @@ function updateDbAndIni() {
 	}
 
 	$new_ini = array_to_ini($tpl_ini_array);
-	$sql = "UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id'];
+	$sql = "UPDATE ".$conf["mysql"]["database"].".server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id'];
 	$inst->db->query($sql);
 	unset($old_ini_array);
 	unset($tpl_ini_array);
@@ -294,7 +294,7 @@ function updateDbAndIni() {
 
 
 	//** Update system ini
-	$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1");
+	$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM ".$conf["mysql"]["database"].".sys_ini WHERE sysini_id = 1");
 	$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
 	unset($tmp_server_rec);
 	$tpl_ini_array = ini_to_array(rf('tpl/system.ini.master'));
@@ -309,11 +309,11 @@ function updateDbAndIni() {
 	}
 
 	$new_ini = array_to_ini($tpl_ini_array);
-	$tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM sys_ini WHERE 1');
+	$tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM '.$conf["mysql"]["database"].'.sys_ini WHERE 1');
 	if($tmp['number'] == 0) {
-		$inst->db->query("INSERT INTO sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
+		$inst->db->query("INSERT INTO ".$conf["mysql"]["database"].".sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
 	} else {
-		$inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
+		$inst->db->query("UPDATE ".$conf["mysql"]["database"].".sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
 	}
 	unset($old_ini_array);
 	unset($tpl_ini_array);
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index fd6264855d081c927f2c3c4f35860bef538a50fa..11d1b6c65e19d70f3c70c6f9871b24590953433d 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1919,6 +1919,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.4');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.1');
 
 SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 99d4402c476a4f0a6b92e1f5d156ed82bca5c72c..a6abb12a6ce48c5fb389d69d41cda34171b1301c 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.4');
+define('ISPC_APP_VERSION', '3.0.4.1');
 define('DEVSYSTEM', 0);
 
 
diff --git a/install/tpl/debian6_dovecot-sql.conf.master b/install/tpl/debian6_dovecot-sql.conf.master
index b04abdebced7412a61283799016b044c7fdf349c..380c86b47883dc6eb235e572bc359d744299e792 100644
--- a/install/tpl/debian6_dovecot-sql.conf.master
+++ b/install/tpl/debian6_dovecot-sql.conf.master
@@ -13,20 +13,6 @@ driver = mysql
 connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password}
 default_pass_scheme = CRYPT
 
-password_query = SELECT password FROM mail_user \
-	WHERE login = '%u' AND disable%Ls = 'n'
-
-# Old user query quota part
-#	CONCAT('*:storage=', quota , 'B') AS quota_rule
-# Old user query with email instead of login
-#	WHERE email = '%u' AND disable%Ls = 'n'
-
-user_query = SELECT email as user, \
-	maildir as home, \
-	CONCAT('maildir:', maildir, '/Maildir') as mail, \
-	uid, \
-	gid, \
-	CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, \
-	CONCAT(maildir, '/.sieve') as sieve \
-	FROM mail_user \
-	WHERE email = '%u' AND disable%Ls = 'n'
+password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
+# user_query = SELECT email AS user, maildir AS home, CONCAT('*:storage=', quota , 'B') AS quota_rule FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
diff --git a/install/tpl/debian_dovecot-sql.conf.master b/install/tpl/debian_dovecot-sql.conf.master
index 969a9ed99c234ac2b067d23c3a2f2e1f03f3ef53..8b110e92d0cc74217d6a12ec59679b3170e070bc 100644
--- a/install/tpl/debian_dovecot-sql.conf.master
+++ b/install/tpl/debian_dovecot-sql.conf.master
@@ -122,6 +122,6 @@ default_pass_scheme = CRYPT
 
 password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
 # user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
 
 
diff --git a/install/tpl/fedora_dovecot-sql.conf.master b/install/tpl/fedora_dovecot-sql.conf.master
index 6d7cf62b670a6a0df6a43ee7d1084ac614041ff4..de28a7cf5d4d90056d26419f0e4961414bbd6c3b 100644
--- a/install/tpl/fedora_dovecot-sql.conf.master
+++ b/install/tpl/fedora_dovecot-sql.conf.master
@@ -135,4 +135,4 @@ default_pass_scheme = CRYPT
 
 password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
 # user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
diff --git a/install/tpl/opensuse_dovecot-sql.conf.master b/install/tpl/opensuse_dovecot-sql.conf.master
index 6d7cf62b670a6a0df6a43ee7d1084ac614041ff4..66bcdc87bab70abcf7c248dbad169e7693342fca 100644
--- a/install/tpl/opensuse_dovecot-sql.conf.master
+++ b/install/tpl/opensuse_dovecot-sql.conf.master
@@ -134,5 +134,4 @@ connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_se
 default_pass_scheme = CRYPT
 
 password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-# user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
diff --git a/install/update.php b/install/update.php
index 74764ce4e261e49f34a6059ba1c6d958a72c734f..769cdce59075c321a9506d33475a8c258eab2b2b 100644
--- a/install/update.php
+++ b/install/update.php
@@ -139,11 +139,17 @@ $clientdb_host			= '';
 $clientdb_user			= '';
 $clientdb_password		= '';
 
-//** Ask user for mysql admin_password if empty
-if( empty($conf["mysql"]["admin_password"]) ) {
-
-	$conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
-}
+//** Test mysql root connection
+$finished = false;
+do {
+	if(@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) {
+		$finished = true;
+	} else {
+		swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
+		$conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
+	}
+} while ($finished == false);
+unset($finished);
 
 /*
  *  Prepare the dump of the database 
@@ -152,7 +158,6 @@ prepareDBDump();
 
 //* initialize the database
 $inst->db = new db();
-$inst->db->dbName = $conf["mysql"]["database"];
 
 //* initialize the master DB, if we have a multiserver setup
 if($conf['mysql']['master_slave_setup'] == 'y') {
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index a5843d660329b03fbcd5babfce6dcb8ee5d25e3f..d4b1390c8304181863f5313c18ad4eea73799c88 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -282,7 +282,7 @@ class listform {
     public function decode($record) 
     {
         global $conf, $app;
-        if(is_array($record) && count($record) > 0) {
+        if(is_array($record) && count($record) > 0 && is_array($this->listDef['item'])) {
             foreach($this->listDef['item'] as $field){
                 $key = $field['field'];
 				if(isset($record[$key])) {
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 8d043a430abbcc4083d25c0a21e96e24abd6bab1..33d84aba9a0ef34454ab88a792c764d51fbf5591 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -1372,6 +1372,13 @@ class remoting {
 			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
+		
+		//* Set a few defaults for nginx servers
+		if($params['pm_max_children'] == '') $params['pm_max_children'] = 1;
+		if($params['pm_start_servers'] == '') $params['pm_start_servers'] = 1;
+		if($params['pm_min_spare_servers'] == '') $params['pm_min_spare_servers'] = 1;
+		if($params['pm_max_spare_servers'] == '') $params['pm_max_spare_servers'] = 1;
+		
 		$affected_rows = $this->updateQuery('../sites/form/web_domain.tform.php',$client_id,$primary_id,$params);
 		return $affected_rows;
 	}
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index dca047499fc9141760f34231546472c12efe29d6..add04e6a48b6740e2d81751634d555fe6e89c19c 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -1,70 +1,71 @@
 <?php
-$wb['conf_format_dateshort'] = 'Y-m-d';
-$wb['conf_format_datelong'] = 'l dS Î±Ï€ÏŒ F Y';
-$wb['conf_format_timeshort'] = 'H:i';
-$wb['conf_format_timelong'] = 'H:i:s';
-$wb['conf_format_datetime'] = 'Y-m-d H:i';
-$wb['error_301'] = 'Î‘Ï€Î¿Î³ÏŒÏÎµÏ…ÏƒÎ· Ï‡ÏÎ®ÏƒÎ·Ï‚ Ï„Î¿Ï… Î±ÏÎ¸ÏÏŽÎ¼Î±Ï„Î¿Ï‚ ÏƒÏ„Î¿Î½ Ï„ÏÎÏ‡Ï‰Î½ Ï‡ÏÎ®ÏƒÏ„Î·';
-$wb['error_302'] = 'Î¤Î¿ Î¬ÏÎ¸ÏÏ‰Î¼Î± Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ¿';
-$wb['error_1001'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÎºÎ±Î¹ Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î¬!';
-$wb['error_1002'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÎºÎ±Î¹ Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏƒÏ‰ÏƒÏ„Î¬!';
-$wb['error_1003'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÎµÎ¯Î½Î±Î¹ Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿!';
-$wb['delete_confirmation'] = 'Î•Î¯ÏƒÏ„Îµ ÏƒÎ¯Î³Î¿Ï…ÏÎ¿Î¹ ÏŒÏ„Î¹ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Ï„Î·Î½ ÎµÎ³Î³ÏÎ±Ï†Î®;';
-$wb['error_no_view_permission'] = 'Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Ï„Î± Î±Ï€Î±ÏÎ±Î¯Ï„Î·Ï„Î± Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± Î³Î¹Î± Î½Î± Î´ÎµÎ¯Ï„Îµ Ï„Î·Î½ ÎµÎ³Î³ÏÎ±Ï†Î® Î® Î· ÎµÎ³Î³ÏÎ±Ï†Î® Î´ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹!';
-$wb['error_no_delete_permission'] = 'Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Ï„Î± Î±Ï€Î±ÏÎ±Î¯Ï„Î·Ï„Î± Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± Î³Î¹Î± Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Ï„Î·Î½ ÎµÎ³Î³ÏÎ±Ï†Î® !';
-$wb['page_txt'] = 'Î£ÎµÎ»Î¯Î´Î±';
-$wb['page_of_txt'] = 'Î±Ï€ÏŒ';
-$wb['page_and_txt'] = 'ÎºÎ±Î¹';
-$wb['page_next_txt'] = 'Î•Ï€ÏŒÎ¼ÎµÎ½Î·';
-$wb['page_back_txt'] = 'Î•Ï€Î¹ÏƒÏ„ÏÎ¿Ï†Î®';
-$wb['delete_txt'] = 'Î”Î¹Î±Î³ÏÎ±Ï†Î®';
-$wb['filter_txt'] = 'Î¦Î¯Î»Ï„ÏÎ¿';
-$wb['add_new_record_txt'] = 'ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚';
-$wb['btn_save_txt'] = 'Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·';
-$wb['btn_cancel_txt'] = 'Î•Ï€Î¹ÏƒÏ„ÏÎ¿Ï†Î®';
-$wb['top_menu_system'] = 'Î£ÏÏƒÏ„Î·Î¼Î±';
-$wb['top_menu_client'] = 'Î ÎµÎ»Î¬Ï„Î·Ï‚';
-$wb['top_menu_email'] = 'Email';
-$wb['top_menu_monitor'] = 'Î•Ï€Î¿Ï€Ï„ÎµÎ¯Î±';
-$wb['top_menu_sites'] = 'Sites';
-$wb['top_menu_dns'] = 'DNS';
-$wb['top_menu_tools'] = 'Î•ÏÎ³Î±Î»ÎµÎ¯Î±';
-$wb['top_menu_help'] = 'Î’Î¿Î®Î¸ÎµÎ¹Î±';
-$wb['top_menu_billing'] = 'Î§ÏÎµÏŽÏƒÎµÎ¹Ï‚';
-$wb['top_menu_domain'] = 'Domains';
-$wb['top_menu_dashboard'] = 'Î‘ÏÏ‡Î¹ÎºÎ®';
-$wb['toolsarea_head_txt'] = 'Î•ÏÎ³Î±Î»ÎµÎ¯Î±';
-$wb['latest_news_txt'] = 'Î¤ÎµÎ»ÎµÏ…Ï„Î±Î¯Î± ÎÎÎ±';
-$wb['number_format_decimals'] = '2';
-$wb['number_format_dec_point'] = '.';
-$wb['number_format_thousands_sep'] = '';
-$wb['top_menu_vm'] = 'VServer';
-$wb['datepicker_nextText'] = 'Next';
-$wb['datepicker_prevText'] = 'Prev';
-$wb['daynamesmin_su'] = 'Su';
-$wb['daynamesmin_mo'] = 'Mo';
-$wb['daynamesmin_tu'] = 'Tu';
-$wb['daynamesmin_we'] = 'We';
-$wb['daynamesmin_th'] = 'Th';
-$wb['daynamesmin_fr'] = 'Fr';
-$wb['daynamesmin_sa'] = 'Sa';
-$wb['daynames_sunday'] = 'Sunday';
-$wb['daynames_monday'] = 'Monday';
-$wb['daynames_tuesday'] = 'Tuesday';
-$wb['daynames_wednesday'] = 'Wednesday';
-$wb['daynames_thursday'] = 'Thursday';
-$wb['daynames_friday'] = 'Friday';
-$wb['daynames_saturday'] = 'Saturday';
-$wb['monthnamesshort_jan'] = 'Jan';
-$wb['monthnamesshort_feb'] = 'Feb';
-$wb['monthnamesshort_mar'] = 'Mar';
-$wb['monthnamesshort_apr'] = 'Apr';
-$wb['monthnamesshort_may'] = 'May';
-$wb['monthnamesshort_jun'] = 'Jun';
-$wb['monthnamesshort_jul'] = 'Jul';
-$wb['monthnamesshort_aug'] = 'Aug';
-$wb['monthnamesshort_sep'] = 'Sep';
-$wb['monthnamesshort_oct'] = 'Oct';
-$wb['monthnamesshort_nov'] = 'Nov';
-$wb['monthnamesshort_dec'] = 'Dec';
+$wb['conf_format_dateshort'] = "Y-m-d";
+$wb['conf_format_datelong'] = "l dS Î±Ï€ÏŒ F Y";
+$wb['conf_format_timeshort'] = "H:i";
+$wb['conf_format_timelong'] = "H:i:s";
+$wb['conf_format_datetime'] = "Y-m-d H:i";
+$wb['error_301'] = "Î‘Ï€Î¿Î³ÏŒÏÎµÏ…ÏƒÎ· Ï‡ÏÎ®ÏƒÎ·Ï‚ Ï„Î¿Ï… Î±ÏÎ¸ÏÏŽÎ¼Î±Ï„Î¿Ï‚ ÏƒÏ„Î¿Î½ Ï„ÏÎÏ‡Ï‰Î½ Ï‡ÏÎ®ÏƒÏ„Î·";
+$wb['error_302'] = "Î¤Î¿ Î¬ÏÎ¸ÏÏ‰Î¼Î± Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ¿";
+$wb['error_1001'] = "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÎºÎ±Î¹ Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î¬!";
+$wb['error_1002'] = "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÎºÎ±Î¹ Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏƒÏ‰ÏƒÏ„Î¬!";
+$wb['error_1003'] = "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÎµÎ¯Î½Î±Î¹ Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿!";
+$wb['delete_confirmation'] = "Î•Î¯ÏƒÏ„Îµ ÏƒÎ¯Î³Î¿Ï…ÏÎ¿Î¹ ÏŒÏ„Î¹ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Ï„Î·Î½ ÎµÎ³Î³ÏÎ±Ï†Î®;";
+$wb['error_no_view_permission'] = "Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Ï„Î± Î±Ï€Î±ÏÎ±Î¯Ï„Î·Ï„Î± Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± Î³Î¹Î± Î½Î± Î´ÎµÎ¯Ï„Îµ Ï„Î·Î½ ÎµÎ³Î³ÏÎ±Ï†Î® Î® Î· ÎµÎ³Î³ÏÎ±Ï†Î® Î´ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹!";
+$wb['error_no_delete_permission'] = "Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Ï„Î± Î±Ï€Î±ÏÎ±Î¯Ï„Î·Ï„Î± Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± Î³Î¹Î± Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Ï„Î·Î½ ÎµÎ³Î³ÏÎ±Ï†Î® !";
+$wb['page_txt'] = "Î£ÎµÎ»Î¯Î´Î±";
+$wb['page_of_txt'] = "Î±Ï€ÏŒ";
+$wb['page_and_txt'] = "ÎºÎ±Î¹";
+$wb['page_next_txt'] = "Î•Ï€ÏŒÎ¼ÎµÎ½Î·";
+$wb['page_back_txt'] = "Î•Ï€Î¹ÏƒÏ„ÏÎ¿Ï†Î®";
+$wb['delete_txt'] = "Î”Î¹Î±Î³ÏÎ±Ï†Î®";
+$wb['filter_txt'] = "Î¦Î¯Î»Ï„ÏÎ¿";
+$wb['add_new_record_txt'] = "ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î®";
+$wb['btn_save_txt'] = "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·";
+$wb['btn_cancel_txt'] = "Î•Ï€Î¹ÏƒÏ„ÏÎ¿Ï†Î®";
+$wb['top_menu_system'] = "Î£ÏÏƒÏ„Î·Î¼Î±";
+$wb['top_menu_client'] = "Î ÎµÎ»Î¬Ï„Î·Ï‚";
+$wb['top_menu_email'] = "Email";
+$wb['top_menu_monitor'] = "Î•Ï€Î¿Ï€Ï„ÎµÎ¯Î±";
+$wb['top_menu_sites'] = "Sites";
+$wb['top_menu_dns'] = "DNS";
+$wb['top_menu_tools'] = "Î•ÏÎ³Î±Î»ÎµÎ¯Î±";
+$wb['top_menu_help'] = "Î’Î¿Î®Î¸ÎµÎ¹Î±";
+$wb['top_menu_billing'] = "Î§ÏÎµÏŽÏƒÎµÎ¹Ï‚";
+$wb['top_menu_domain'] = "Domains";
+$wb['top_menu_dashboard'] = "Î‘ÏÏ‡Î¹ÎºÎ®";
+$wb['toolsarea_head_txt'] = "Î•ÏÎ³Î±Î»ÎµÎ¯Î±";
+$wb['latest_news_txt'] = "Î¤ÎµÎ»ÎµÏ…Ï„Î±Î¯Î± ÎÎÎ±";
+$wb['number_format_decimals'] = "2";
+$wb['number_format_dec_point'] = ".";
+$wb['number_format_thousands_sep'] = "";
+$wb['top_menu_vm'] = "VServer";
+$wb['datepicker_nextText'] = "Î•Ï€ÏŒÎ¼.";
+$wb['datepicker_prevText'] = "Î ÏÎ¿Î·Î³.";
+$wb['daynamesmin_su'] = "ÎšÏ…";
+$wb['daynamesmin_mo'] = "Î”Îµ";
+$wb['daynamesmin_tu'] = "Î¤Ï";
+$wb['daynamesmin_we'] = "Î¤Îµ";
+$wb['daynamesmin_th'] = "Î Îµ";
+$wb['daynamesmin_fr'] = "Î Î±";
+$wb['daynamesmin_sa'] = "Î£Î±";
+$wb['daynames_sunday'] = "ÎšÏ…ÏÎ¹Î±ÎºÎ®";
+$wb['daynames_monday'] = "Î”ÎµÏ…Ï„ÎÏÎ±";
+$wb['daynames_tuesday'] = "Î¤ÏÎ¯Ï„Î·";
+$wb['daynames_wednesday'] = "Î¤ÎµÏ„Î¬ÏÏ„Î·";
+$wb['daynames_thursday'] = "Î ÎÎ¼Ï€Ï„Î·";
+$wb['daynames_friday'] = "Î Î±ÏÎ±ÏƒÎºÎµÏ…Î®";
+$wb['daynames_saturday'] = "Î£Î¬Î²Î²Î±Ï„Î¿";
+$wb['monthnamesshort_jan'] = "Î™Î±Î½";
+$wb['monthnamesshort_feb'] = "Î¦ÎµÎ²";
+$wb['monthnamesshort_mar'] = "ÎœÎ±Ï";
+$wb['monthnamesshort_apr'] = "Î‘Ï€Ï";
+$wb['monthnamesshort_may'] = "ÎœÎ±ÏŠ";
+$wb['monthnamesshort_jun'] = "Î™Î¿Ï…Î½";
+$wb['monthnamesshort_jul'] = "Î™Î¿Ï…Î»";
+$wb['monthnamesshort_aug'] = "Î‘Ï…Î³";
+$wb['monthnamesshort_sep'] = "Î£ÎµÏ€";
+$wb['monthnamesshort_oct'] = "ÎŸÎºÏ„";
+$wb['monthnamesshort_nov'] = "ÎÎ¿Îµ";
+$wb['monthnamesshort_dec'] = "Î”ÎµÎº";
 ?>
+
diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng
index a705cb71742b764313e4c6ea8a6c4dbf9fa124b8..732f71645ca344e632517c7d8e4e892242eaa506 100644
--- a/interface/web/admin/lib/lang/el.lng
+++ b/interface/web/admin/lib/lang/el.lng
@@ -30,7 +30,7 @@ $wb['Language Editor'] = 'Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÏ„Î®Ï‚ Î“Î»ÏŽÏƒÏƒÎ±Ï‚';
 $wb['Software'] = 'Î•Ï†Î±ÏÎ¼Î¿Î³ÎÏ‚ & Î ÏÏŒÏƒÎ¸ÎµÏ„Î±';
 $wb['Repositories'] = 'Î‘Ï€Î¿Î¸ÎµÏ„Î®ÏÎ¹Î±';
 $wb['Server Services'] = 'Î¥Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚ Server';
-$wb['Interface Config'] = 'Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚';
+$wb['Interface Config'] = 'Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚';
 $wb['Packages'] = 'Î Î±ÎºÎÏ„Î±';
 $wb['Updates'] = 'Î•Î½Î·Î¼ÎµÏÏŽÏƒÎµÎ¹Ï‚';
 $wb['Merge'] = 'Î£Ï…Î³Ï‡ÏŽÎ½ÎµÏ…ÏƒÎ·';
@@ -38,6 +38,7 @@ $wb['Remote Users'] = 'Î‘Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î¿Î¹ Î§ÏÎ®ÏƒÏ„ÎµÏ‚';
 $wb['Remote Actions'] = 'Î‘Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½ÎµÏ‚ Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚';
 $wb['Do OS-Update'] = 'Î‘Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ· Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¹ÎºÎ¿Ï ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚';
 $wb['Do ISPConfig-Update'] = 'Î‘Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ· ISPConfig';
-$wb['1001'] = 'Username or password is empty.';
-$wb['1002'] = 'Username or password is wrong.';
+$wb['1001'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· Î® Ï„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['1002'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· Î® Ï„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï‚.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_firewall.lng b/interface/web/admin/lib/lang/el_firewall.lng
index ff31bab28b9c2b375a1c242ef1173bc284b92a22..83260ed3aac3ecca0488aed98e3fd5b871c17815 100644
--- a/interface/web/admin/lib/lang/el_firewall.lng
+++ b/interface/web/admin/lib/lang/el_firewall.lng
@@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î¼Î¹Î± ÎµÎ³Î³ÏÎ±Ï†Î® fire
 $wb['tcp_ports_error_regex'] = 'ÎŸÎ¹ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚ Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€Î¿Î½Ï„Î±Î¹ ÏƒÏ„Î¿Î½ Î¿ÏÎ¹ÏƒÎ¼ÏŒ Î¸Ï…ÏÏŽÎ½ tcp. Î•Ï€Î¹Ï„ÏÎÏ€Î¿Î½Ï„Î±Î¹ Î¼ÏŒÎ½Î¿ Î±ÏÎ¹Î¸Î¼Î¿Î¯, : ÎºÎ±Î¹ ,.';
 $wb['udp_ports_error_regex'] = 'ÎŸÎ¹ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚ Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€Î¿Î½Ï„Î±Î¹ ÏƒÏ„Î¿Î½ Î¿ÏÎ¹ÏƒÎ¼ÏŒ Î¸Ï…ÏÏŽÎ½ udp. Î•Ï€Î¹Ï„ÏÎÏ€Î¿Î½Ï„Î±Î¹ Î¼ÏŒÎ½Î¿ Î±ÏÎ¹Î¸Î¼Î¿Î¯, : ÎºÎ±Î¹ ,.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_firewall_list.lng b/interface/web/admin/lib/lang/el_firewall_list.lng
index 0b092e5af160557b31356bedcc3c2735a0285a8e..91cab725f593e33b8054c3bd8c16d0e8329b83b9 100644
--- a/interface/web/admin/lib/lang/el_firewall_list.lng
+++ b/interface/web/admin/lib/lang/el_firewall_list.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Firewall';
-$wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
+$wb['active_txt'] = 'Î•Î½ÎµÏÎ³Î®';
 $wb['server_id_txt'] = 'Server';
 $wb['tcp_port_txt'] = 'Î‘Î½Î¿Î¹Ï‡Ï„ÎÏ‚ Î¸ÏÏÎµÏ‚ TCP';
 $wb['udp_port_txt'] = 'Î‘Î½Î¿Î¹Ï‡Ï„ÎÏ‚ Î¸ÏÏÎµÏ‚ UDP';
 $wb['add_new_record_txt'] = 'ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î® Firewall';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_groups.lng b/interface/web/admin/lib/lang/el_groups.lng
index 68057608f63c7658f958ff4ea6cbbb888dd0cec6..b50df798148ca72621f8c1b428459ac786195748 100644
--- a/interface/web/admin/lib/lang/el_groups.lng
+++ b/interface/web/admin/lib/lang/el_groups.lng
@@ -3,3 +3,4 @@ $wb['description_txt'] = 'Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®';
 $wb['name_txt'] = 'ÎŸÎ¼Î¬Î´Î±';
 $wb['name_err'] = 'Î— Î¿Î¼Î¬Î´Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎÏ‡ÎµÎ¹ Î±Ï€ÏŒ 1 Î¼ÎÏ‡ÏÎ¹ 30 Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_groups_list.lng b/interface/web/admin/lib/lang/el_groups_list.lng
index 977e8032da5b65df8fdbcd5b7d67ba2a7755a988..10ce5ebceb520121e01e47f46b482d3124c7df87 100644
--- a/interface/web/admin/lib/lang/el_groups_list.lng
+++ b/interface/web/admin/lib/lang/el_groups_list.lng
@@ -5,3 +5,4 @@ $wb['name_txt'] = 'ÎŸÎ¼Î¬Î´Î±';
 $wb['add_new_record_txt'] = 'ÎÎÎ± Î¿Î¼Î¬Î´Î±';
 $wb['warning_txt'] = '<b>Î Î¡ÎŸÎ•Î™Î”ÎŸÎ ÎŸÎ™Î—Î£Î—:</b>ÎœÎ·Î½ ÎµÏ€ÎµÎ¾ÎµÏÎ³Î¬Î¶ÎµÏƒÏ„Îµ Î¿Ï€Î¿Î¹Î±Î´Î®Ï€Î¿Ï„Îµ ÏÏÎ¸Î¼Î¹ÏƒÎ· Ï‡ÏÎ®ÏƒÏ„Î· ÎµÎ´ÏŽ. Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÏ„Îµ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î ÎµÎ»Î¬Ï„Î· - ÎºÎ±Î¹ ÎœÎµÏ„Î±Ï€Ï‰Î»Î·Ï„Î® ÏƒÏ„Î¿ Î¬ÏÎ¸ÏÏ‰Î¼Î± Î ÎµÎ»Î¬Ï„Î·Ï‚. Î— ÎµÏ€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± Î¿Î¼Î¬Î´Ï‰Î½ ÎºÎ±Î¹ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ ÎµÎ´ÏŽ, Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€ÏÎ¿ÎºÎ±Î»ÎÏƒÎµÎ¹ Î±Ï€ÏŽÎ»ÎµÎ¹Î± Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½!';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_iptables.lng b/interface/web/admin/lib/lang/el_iptables.lng
index 40760b9498ccdcadaca2bfbdc42748443abb6046..9236d4778c6b2c1c35eb97b433461e4b68adf802 100644
--- a/interface/web/admin/lib/lang/el_iptables.lng
+++ b/interface/web/admin/lib/lang/el_iptables.lng
@@ -1,13 +1,14 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['multiport_txt'] = 'Multi Port';
-$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+$wb['multiport_txt'] = 'Î Î¿Î»Î»Î±Ï€Î»ÎÏ‚ Î˜ÏÏÎµÏ‚';
+$wb['singleport_txt'] = 'ÎœÎ¯Î± Î˜ÏÏÎ±';
+$wb['protocol_txt'] = 'Î ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿';
+$wb['table_txt'] = 'Î Î¯Î½Î±ÎºÎ±Ï‚';
+$wb['target_txt'] = 'Î£Ï„ÏŒÏ‡Î¿Ï‚';
+$wb['state_txt'] = 'ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·';
+$wb['destination_ip_txt'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼Î¿Ï';
+$wb['source_ip_txt'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î‘Ï†ÎµÏ„Î·ÏÎ¯Î±Ï‚';
+$wb['active_txt'] = 'Î•Î½ÎµÏÎ³Î®';
+$wb['iptables_error_unique'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î¼Î¹Î± ÎµÎ³Î³ÏÎ±Ï†Î® Ï„Î¿Ï… firewall Î³Î¹Î± Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ server.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_iptables_list.lng b/interface/web/admin/lib/lang/el_iptables_list.lng
index 15c8baddcb2be5ab4dce61e0d233916f35e436f1..a2da45d8228c5640e6fc641edf6b1d75ed9a12b3 100644
--- a/interface/web/admin/lib/lang/el_iptables_list.lng
+++ b/interface/web/admin/lib/lang/el_iptables_list.lng
@@ -1,15 +1,16 @@
 <?php
 $wb['list_head_txt'] = 'IPTables';
-$wb['add_new_rule_txt'] = 'Add IPTables Rule';
+$wb['add_new_rule_txt'] = 'Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· ÎºÎ±Î½ÏŒÎ½Î± IPTables';
 $wb['server_id_txt'] = 'Server';
-$wb['multiport_txt'] = 'Multi Port';
-$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+$wb['multiport_txt'] = 'Î Î¿Î»Î»Î±Ï€Î»ÎÏ‚ Î˜ÏÏÎµÏ‚';
+$wb['singleport_txt'] = 'ÎœÎ¿Î½Î® Î˜ÏÏÎ±';
+$wb['protocol_txt'] = 'Î ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿';
+$wb['table_txt'] = 'Î Î¯Î½Î±ÎºÎ±Ï‚';
+$wb['target_txt'] = 'Î£Ï„ÏŒÏ‡Î¿Ï‚';
+$wb['state_txt'] = 'ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·';
+$wb['destination_ip_txt'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼Î¿Ï';
+$wb['source_ip_txt'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î•ÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚';
+$wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒÏ‚';
+$wb['iptables_error_unique'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î¼Î¹Î± ÎµÎ³Î³ÏÎ±Ï†Î® firewall Î³Î¹Î± Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ server.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_language_add.lng b/interface/web/admin/lib/lang/el_language_add.lng
index 604f3a7aba386c6d4efdfec24e94d88a4f32fc9a..f783f913c554cd823479120a17a797618ccf33bc 100644
--- a/interface/web/admin/lib/lang/el_language_add.lng
+++ b/interface/web/admin/lib/lang/el_language_add.lng
@@ -6,3 +6,4 @@ $wb['language_new_hint_txt'] = 'ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Î³Î»ÏŽÏƒÏƒÎ±Ï‚ 2 Ï‡Î±ÏÎ±ÎºÏ„Î®Ï
 $wb['btn_save_txt'] = 'ÎÎÎ± Î¿Î¼Î¬Î´Î± Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î³Î»ÏŽÏƒÏƒÎ±Ï‚';
 $wb['btn_cancel_txt'] = 'Î•Ï€Î¹ÏƒÏ„ÏÎ¿Ï†Î®';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_language_complete.lng b/interface/web/admin/lib/lang/el_language_complete.lng
index 629d3b2e5e7939147cd0a10a08f4a39af2c8472c..cf10cabc3e2881a9b5ba141f52bfdc1f6170ce2f 100644
--- a/interface/web/admin/lib/lang/el_language_complete.lng
+++ b/interface/web/admin/lib/lang/el_language_complete.lng
@@ -5,3 +5,4 @@ $wb['language_select_txt'] = 'Î•Ï€Î¹Î»Î¿Î³Î® Î“Î»ÏŽÏƒÏƒÎ±Ï‚';
 $wb['btn_save_txt'] = 'Î£Ï…Î³Ï‡ÏŽÎ½ÎµÏ…ÏƒÎ· Î“Î»ÏŽÏƒÏƒÎ±Ï‚ Ï„ÏŽÏÎ±';
 $wb['btn_cancel_txt'] = 'Î•Ï€Î¹ÏƒÏ„ÏÎ¿Ï†Î®';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_language_edit.lng b/interface/web/admin/lib/lang/el_language_edit.lng
index 5a76f63a0692f47b059375a60b2ef7959f15b743..6faa60e6b7971cfdb09a16319ec0bc4bf54d2e68 100644
--- a/interface/web/admin/lib/lang/el_language_edit.lng
+++ b/interface/web/admin/lib/lang/el_language_edit.lng
@@ -6,3 +6,4 @@ $wb['lang_file_txt'] = 'Î‘ÏÏ‡ÎµÎ¯Î¿ Î³Î»ÏŽÏƒÏƒÎ±Ï‚';
 $wb['btn_save_txt'] = 'Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·';
 $wb['btn_cancel_txt'] = 'Î•Ï€Î¹ÏƒÏ„ÏÎ¿Ï†Î®';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_language_export.lng b/interface/web/admin/lib/lang/el_language_export.lng
index 354b886d42ef92b55698f5a030e197fb354e31fc..4ff092fc17bc3bb07e192f07da9156d8d8755ceb 100644
--- a/interface/web/admin/lib/lang/el_language_export.lng
+++ b/interface/web/admin/lib/lang/el_language_export.lng
@@ -4,3 +4,4 @@ $wb['language_select_txt'] = 'Î•Ï€Î¹Î»Î¿Î³Î® Î“Î»ÏŽÏƒÏƒÎ±Ï‚';
 $wb['btn_save_txt'] = 'Î•Î¾Î±Î³Ï‰Î³Î® Ï„Î·Ï‚ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î·Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î³Î»ÏŽÏƒÏƒÎ±Ï‚';
 $wb['btn_cancel_txt'] = 'Î•Ï€Î¹ÏƒÏ„ÏÎ¿Ï†Î®';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_language_import.lng b/interface/web/admin/lib/lang/el_language_import.lng
index 4bb61c4ef5e5a6cf7e6308c6e01e6c618eac217c..e30eb1ff3c4f2d2ec0198164b71170c752630ad1 100644
--- a/interface/web/admin/lib/lang/el_language_import.lng
+++ b/interface/web/admin/lib/lang/el_language_import.lng
@@ -6,3 +6,4 @@ $wb['language_overwrite_txt'] = 'Î‘Î½Ï„Î¹ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î±ÏÏ‡ÎµÎ¯Î¿Ï…, Î±Î½
 $wb['btn_cancel_txt'] = 'Î•Ï€Î¹ÏƒÏ„ÏÎ¿Ï†Î®';
 $wb['ignore_version_txt'] = 'Î Î±ÏÎ¬Î»ÎµÎ¹ÏˆÎ· ÎµÎ»ÎÎ³Ï‡Î¿Ï… ÎÎºÎ´Î¿ÏƒÎ·Ï‚ ISPConfig';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_language_list.lng b/interface/web/admin/lib/lang/el_language_list.lng
index fa5307319ac0748a8e6d083430ef136bd15fafa7..a9cfee1716e2ad08694fb207adbe7955b7468703 100644
--- a/interface/web/admin/lib/lang/el_language_list.lng
+++ b/interface/web/admin/lib/lang/el_language_list.lng
@@ -5,3 +5,4 @@ $wb['module_txt'] = 'Î†ÏÎ¸ÏÏ‰Î¼Î±';
 $wb['lang_file_txt'] = 'Î‘ÏÏ‡ÎµÎ¯Î¿ Î“Î»ÏŽÏƒÏƒÎ±Ï‚';
 $wb['lang_file_date_txt'] = 'Î¤ÎµÎ»ÎµÏ…Ï„Î±Î¯Î± Ï„ÏÎ¿Ï€Î¿Ï€Î¿Î¯Î·ÏƒÎ·';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_package_install.lng b/interface/web/admin/lib/lang/el_package_install.lng
index 468a82230ae76c67b766634737ebc4209edef423..1c98589076a89f06b51f57e4004ec4012cd06b7f 100644
--- a/interface/web/admin/lib/lang/el_package_install.lng
+++ b/interface/web/admin/lib/lang/el_package_install.lng
@@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î· (Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)';
 $wb['repo_password_txt'] = 'Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ (Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)';
 $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_remote_action.lng b/interface/web/admin/lib/lang/el_remote_action.lng
index 7458f585125903e8fcca1527b2f8f331e932d6b1..59b017c4c9c40045bb5a4aadceae16d592e9167e 100644
--- a/interface/web/admin/lib/lang/el_remote_action.lng
+++ b/interface/web/admin/lib/lang/el_remote_action.lng
@@ -8,3 +8,4 @@ $wb['do_ispcupdate_desc'] = 'Î‘Ï…Ï„Î® Î· ÎµÎ½ÎÏÎ³ÎµÎ¹Î± ÎºÎ¬Î½ÎµÎ¹ Î±Î½Î±Î²Î¬
 $wb['action_scheduled'] = 'Î— ÎµÎ½ÎÏÎ³ÎµÎ¹Î± Ï€ÏÎ¿Î³ÏÎ±Î¼Î¼Î±Ï„Î¯ÏƒÏ„Î·ÎºÎµ Î³Î¹Î± ÎµÎºÏ„ÎÎ»ÎµÏƒÎ·';
 $wb['select_all_server'] = 'Î£Îµ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ servers';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_remote_user.lng b/interface/web/admin/lib/lang/el_remote_user.lng
index 232d2ce869676564f6a48dd03caa8ac83592689d..4033a34250141d64ad6c76a0b81fb4d3aad768ee 100644
--- a/interface/web/admin/lib/lang/el_remote_user.lng
+++ b/interface/web/admin/lib/lang/el_remote_user.lng
@@ -39,5 +39,6 @@ $wb['DNS ptr functions'] = 'Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ ptr Ï„Î¿Ï… DNS';
 $wb['DNS rp functions'] = 'Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ rp Ï„Î¿Ï… DNS';
 $wb['DNS srv functions'] = 'Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ srv Ï„Î¿Ï… DNS';
 $wb['DNS txt functions'] = 'Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ txt Ï„Î¿Ï… DNS';
-$wb['Mail mailing list functions'] = 'Mail mailinglist functions';
+$wb['Mail mailing list functions'] = 'Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚ Mail mailinglist';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_remote_user_list.lng b/interface/web/admin/lib/lang/el_remote_user_list.lng
index 95522db7d50c71171a0571004fa9d9200e55e719..93fc165afb082748401236a464204a70679cdf34 100644
--- a/interface/web/admin/lib/lang/el_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/el_remote_user_list.lng
@@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'ÎÎÎ¿Ï‚ Î§ÏÎ®ÏƒÏ„Î·Ï‚';
 $wb['parent_remote_userid_txt'] = 'ID';
 $wb['username_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î·';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_server.lng b/interface/web/admin/lib/lang/el_server.lng
index 637ee62bd9707ed5518fd32cb105638005720672..2f961c64c96ebc0d3f26759f70de161823ecf0a2 100644
--- a/interface/web/admin/lib/lang/el_server.lng
+++ b/interface/web/admin/lib/lang/el_server.lng
@@ -13,3 +13,4 @@ $wb['- None -'] = '- ÎšÎ±Î½ÎµÎ½ÏŒÏ‚ -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 8a9096c32a0b87f5ae0eabc9cf8c233b012a72b8..1f2a86e893aee227cb24df38b9aa42ae8118a59a 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -5,7 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
 $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
 $wb['website_path_txt'] = 'Î”Î¹Î±Î´ÏÎ¿Î¼Î® Website';
 $wb['website_symlinks_txt'] = 'Website symlinks';
-$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_symlinks_rel_txt'] = 'Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± ÏƒÏ‡ÎµÏ„Î¹ÎºÏŽÎ½ symlinks';
 $wb['website_basedir_txt'] = 'Î’Î±ÏƒÎ¹ÎºÏŒÏ‚ Ï†Î¬ÎºÎµÎ»Î¿Ï‚ Website';
 $wb['vhost_conf_dir_txt'] = 'Î¦Î¬ÎºÎµÎ»Î¿Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Vhost';
 $wb['vhost_conf_enabled_dir_txt'] = 'Î¦Î¬ÎºÎµÎ»Î¿Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ (ÎµÎ½ÎµÏÎ³ÏŽÎ½) Vhost';
@@ -75,26 +75,26 @@ $wb['named_conf_local_path_txt'] = 'Î”Î¹Î±Î´ÏÎ¿Î¼Î® Ï„Î¿Ï… named.conf.local Ï„
 $wb['php_ini_path_cgi_txt'] = 'Î”Î¹Î±Î´ÏÎ¿Î¼Î® Ï„Î¿Ï… php.ini Î³Î¹Î± CGI';
 $wb['php_ini_path_apache_txt'] = 'Î”Î¹Î±Î´ÏÎ¿Î¼Î® Ï„Î¿Ï… php.ini Î³Î¹Î± Apache';
 $wb['check_apache_config_txt'] = 'ÎˆÎ»ÎµÎ³Ï‡Î¿Ï‚ Ï„Ï‰Î½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Ï„Î¿Ï… apache Î® ÎµÏ€Î±Î½Î½ÎµÎºÎ¯Î½Î·ÏƒÎ·';
-$wb['CA_path_txt'] = 'CA Path';
-$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['CA_path_txt'] = 'Î”Î¹Î±Î´ÏÎ¿Î¼Î® CA';
+$wb['CA_pass_txt'] = 'Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ® Ï†ÏÎ¬ÏƒÎ· CA';
 $wb['ufw_enable_txt'] = 'Enable';
-$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
-$wb['ufw_ipv6_txt'] = 'Enable IPv6';
-$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
-$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
-$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
-$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
-$wb['ufw_log_level_txt'] = 'Log Level';
-$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['ufw_manage_builtins_txt'] = 'Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· ÎµÎ½ÏƒÏ‰Î¼Î±Ï„Ï‰Î¼ÎÎ½Ï‰Î½ ÎºÎ±Î½ÏŒÎ½Ï‰Î½';
+$wb['ufw_ipv6_txt'] = 'Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î· Î Î¿Î»Î¹Ï„Î¹ÎºÎ® Î•Î¹ÏƒÏŒÎ´Î¿Ï…';
+$wb['ufw_default_output_policy_txt'] = 'Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î· Î Î¿Î»Î¹Ï„Î¹ÎºÎ® Î•Î¾ÏŒÎ´Î¿Ï…';
+$wb['ufw_default_forward_policy_txt'] = 'Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î· Î Î¿Î»Î¹Ï„Î¹ÎºÎ® Î ÏÎ¿ÏŽÎ¸Î·ÏƒÎ·Ï‚';
+$wb['ufw_default_application_policy_txt'] = 'Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î· Î Î¿Î»Î¹Ï„Î¹ÎºÎ® Î•Ï†Î±ÏÎ¼Î¿Î³ÏŽÎ½';
+$wb['ufw_log_level_txt'] = 'Î•Ï€Î¯Ï€ÎµÎ´Î¿ ÎšÎ±Ï„Î±Î³ÏÎ±Ï†Î®Ï‚';
+$wb['network_config_warning_txt'] = 'Î— ÎµÏ€Î¹Î»Î¿Î³Î® Î³Î¹Î± Ï„Î·Î½ Ï€Î±ÏÎ±Î¼ÎµÏ„ÏÎ¿Ï€Î¿Î¯Î·ÏƒÎ· Ï„Î¿Ï… Î´Î¹ÎºÏ„ÏÎ¿Ï… ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î· Î¼ÏŒÎ½Î¿ Î³Î¹Î± Debian ÎºÎ±Î¹ Ubuntu Servers. ÎœÎ·Î½ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î® Î±Î½ Î· (Î´Î¹ÎµÏ€Î±Ï†Î®) ÎºÎ¬ÏÏ„Î± Î´Î¹ÎºÏ„ÏÎ¿Ï… Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î· eth0.';
 $wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
 $wb['backup_dir_ftpread_txt'] = 'Backup dir. readable for website FTP users.';
-$wb['server_type_txt'] = 'Server Type';
+$wb['server_type_txt'] = 'Î¤ÏÏ€Î¿Ï‚ Server';
 $wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
 $wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
-$wb['nginx_user_txt'] = 'Nginx user';
-$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_user_txt'] = 'Î§ÏÎ®ÏƒÏ„Î·Ï‚ Nginx';
+$wb['nginx_group_txt'] = 'ÎŸÎ¼Î¬Î´Î± Nginx';
 $wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
-$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['backup_dir_error_empty'] = 'ÎŸ Ï†Î¬ÎºÎµÎ»Î¿Ï‚ Backup ÎµÎ¯Î½Î±Î¹ Î¬Î´ÎµÎ¹Î¿Ï‚.';
 $wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
 $wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
 $wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
@@ -150,3 +150,4 @@ $wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down my
 $wb['enable_sni_txt'] = 'Enable SNI';
 $wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_server_config_list.lng b/interface/web/admin/lib/lang/el_server_config_list.lng
index 038e329761bfdd238bb6541c3ec1dcd92030b2f8..e75bda0114a5aad8fcc9af94ddf810bceb1494a4 100644
--- a/interface/web/admin/lib/lang/el_server_config_list.lng
+++ b/interface/web/admin/lib/lang/el_server_config_list.lng
@@ -2,3 +2,4 @@
 $wb['list_head_txt'] = 'Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Server';
 $wb['server_name_txt'] = 'Server';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_server_ip.lng b/interface/web/admin/lib/lang/el_server_ip.lng
index 1a677861b6ebc9317f34fd0791314285e0a01861..00185a1f137586c03ffd5902cf74f405cd74d845 100644
--- a/interface/web/admin/lib/lang/el_server_ip.lng
+++ b/interface/web/admin/lib/lang/el_server_ip.lng
@@ -9,3 +9,4 @@ $wb['ip_type_txt'] = 'Type';
 $wb['virtualhost_port_txt'] = 'HTTP Ports';
 $wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_server_ip_list.lng b/interface/web/admin/lib/lang/el_server_ip_list.lng
index 9d24f06dfe51f61a2f8de253e72ef20e5034af91..f19dc824b42e7304c7e11fb1c2101a2d8a6d729e 100644
--- a/interface/web/admin/lib/lang/el_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/el_server_ip_list.lng
@@ -3,8 +3,9 @@ $wb['list_head_txt'] = 'Î”Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ IP';
 $wb['server_id_txt'] = 'Server';
 $wb['ip_address_txt'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP';
 $wb['add_new_record_txt'] = 'ÎÎÎ± Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP';
-$wb['client_id_txt'] = 'Client';
+$wb['client_id_txt'] = 'Î ÎµÎ»Î¬Ï„Î·Ï‚';
 $wb['virtualhost_txt'] = 'HTTP Vhost';
-$wb['virtualhost_port_txt'] = 'HTTP Ports';
-$wb['ip_type_txt'] = 'Type';
+$wb['virtualhost_port_txt'] = 'Î˜ÏÏÎµÏ‚ HTTP';
+$wb['ip_type_txt'] = 'Î¤ÏÏ€Î¿Ï‚';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_server_list.lng b/interface/web/admin/lib/lang/el_server_list.lng
index fa6c78eff5162e1991a645ad755dd4129577080e..2f7b5695f77a0551997d4324fd6defa6329fc94c 100644
--- a/interface/web/admin/lib/lang/el_server_list.lng
+++ b/interface/web/admin/lib/lang/el_server_list.lng
@@ -1,13 +1,14 @@
 <?php
 $wb['list_head_txt'] = 'Server';
-$wb['server_name_txt'] = 'Name';
+$wb['server_name_txt'] = 'ÎŒÎ½Î¿Î¼Î±';
 $wb['mail_server_txt'] = 'Mail';
 $wb['web_server_txt'] = 'Web';
 $wb['dns_server_txt'] = 'DNS';
-$wb['file_server_txt'] = 'File';
+$wb['file_server_txt'] = 'Î‘ÏÏ‡ÎµÎ¯Î¿';
 $wb['db_server_txt'] = 'DB';
 $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿Ï‚ Server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_software_package_install.lng b/interface/web/admin/lib/lang/el_software_package_install.lng
index 5e3d0fd4022ce48fac39c9379b5de0774c46510b..5e1f63023f1b7fc20a16c8a3f8b107d2901422f8 100644
--- a/interface/web/admin/lib/lang/el_software_package_install.lng
+++ b/interface/web/admin/lib/lang/el_software_package_install.lng
@@ -4,3 +4,4 @@ $wb['install_key_txt'] = 'Î•Î¹ÏƒÎ±Î³Ï‰Î³Î® ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±Ïƒ
 $wb['btn_save_txt'] = 'Î•ÎºÎºÎ¯Î½Î·ÏƒÎ· ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚';
 $wb['btn_cancel_txt'] = 'Î‘ÎºÏÏÏ‰ÏƒÎ·';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_software_package_list.lng b/interface/web/admin/lib/lang/el_software_package_list.lng
index 463c4619654088909d8243753b179daf7fdcab66..f3e22fbf180dc71340f50a95b236d8ec29441259 100644
--- a/interface/web/admin/lib/lang/el_software_package_list.lng
+++ b/interface/web/admin/lib/lang/el_software_package_list.lng
@@ -6,5 +6,6 @@ $wb['package_description_txt'] = 'Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®';
 $wb['action_txt'] = 'Î•Î½ÎÏÎ³ÎµÎ¹Î±';
 $wb['toolsarea_head_txt'] = 'Î Î±ÎºÎÏ„Î±';
 $wb['repoupdate_txt'] = 'Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ· Î»Î¯ÏƒÏ„Î±Ï‚ Ï€Î±ÎºÎºÎÏ„Ï‰Î½';
-$wb['package_id_txt'] = 'local App-ID';
+$wb['package_id_txt'] = 'Ï„Î¿Ï€Î¹ÎºÏŒ App-ID';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_software_repo.lng b/interface/web/admin/lib/lang/el_software_repo.lng
index 5b1e2228edb0f53c8b6b86d7be3f7b0bfc808469..d52666decdf601f4ae868edcb5c411eefe4f987b 100644
--- a/interface/web/admin/lib/lang/el_software_repo.lng
+++ b/interface/web/admin/lib/lang/el_software_repo.lng
@@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Î§ÏÎ®ÏƒÏ„Î·Ï‚ (Î ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)';
 $wb['repo_password_txt'] = 'Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ (Î ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)';
 $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_software_repo_list.lng b/interface/web/admin/lib/lang/el_software_repo_list.lng
index deb896a719c990ba6df4b00d5114b8dc1ac62f43..cb3f2c45d7561bc17fdf3fcd5e416f139e7a79bc 100644
--- a/interface/web/admin/lib/lang/el_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/el_software_repo_list.lng
@@ -4,3 +4,4 @@ $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 $wb['repo_name_txt'] = 'Î‘Ï€Î¿Î¸ÎµÏ„Î®ÏÎ¹Î¿';
 $wb['repo_url_txt'] = 'URL';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_software_update_list.lng b/interface/web/admin/lib/lang/el_software_update_list.lng
index 7bdc66102ce81b5766f2a5fc0584f7eaf1c3e05e..50a4b47e13e19ed116c651f6a0b48645ed9553e8 100644
--- a/interface/web/admin/lib/lang/el_software_update_list.lng
+++ b/interface/web/admin/lib/lang/el_software_update_list.lng
@@ -6,3 +6,4 @@ $wb['update_title_txt'] = 'Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ·';
 $wb['version_txt'] = 'ÎˆÎºÎ´Î¿ÏƒÎ·';
 $wb['action_txt'] = 'Î•Î½ÎÏÎ³ÎµÎ¹Î±';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index 0f929c42eb9d10d5e0ba5acdd77a8e39a1ece747..6c5b8b53a43a8739e909e90edc3df471d605e28e 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -24,7 +24,8 @@ $wb['webftp_url_txt'] = 'URL Ï„Î¿Ï… WebFTP';
 $wb['enable_custom_login_txt'] = 'Allow custom login name';
 $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
 $wb['mailmailinglist_url_txt'] = 'Mailing list URL';
-$wb['admin_mail_txt'] = 'Administrators e-mail';
+$wb['admin_mail_txt'] = 'e-mail Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„ÏŽÎ½';
 $wb['monitor_key_txt'] = 'Monitor keyword';
 $wb['admin_name_txt'] = 'Administrators name';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index db913587c2e8c0598a282ee66c1a3d9e25589356..eacd3853fc1b12edc6bcdbd7621a9633a0d75e78 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -7,7 +7,7 @@ $wb['passwort_txt'] = 'Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ';
 $wb['password_strength_txt'] = 'Î”ÏÎ½Î±Î¼Î· Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï';
 $wb['modules_txt'] = 'Î†ÏÎ¸ÏÏ‰Î¼Î±';
 $wb['startmodule_txt'] = 'Î†ÏÎ¸ÏÏ‰Î¼Î± Î•ÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚';
-$wb['app_theme_txt'] = 'Design';
+$wb['app_theme_txt'] = 'Î˜ÎµÎ¼Î±Ï„Î¹ÎºÎ® Î Î±ÏÎ±Î»Î»Î±Î³Î®';
 $wb['typ_txt'] = 'Î¤ÏÏ€Î¿Ï‚';
 $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒÏ‚';
 $wb['language_txt'] = 'Î“Î»ÏŽÏƒÏƒÎ±';
@@ -26,3 +26,4 @@ $wb['groups_txt'] = 'ÎŸÎ¼Î¬Î´ÎµÏ‚';
 $wb['default_group_txt'] = 'Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î· ÎŸÎ¼Î¬Î´Î±';
 $wb['startmodule_err'] = 'Î¤Î¿ Î¬ÏÎ¸ÏÏ‰Î¼Î± ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚ Î´ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ ÏƒÏ„Î± Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î± Î±ÏÎ¸ÏÏŽÎ¼Î±Ï„Î±.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/el_users_list.lng b/interface/web/admin/lib/lang/el_users_list.lng
index eee43054fe3fa96829c8a54bfe67e15912235732..69b640db76c11ca98c08f63aeb3dc3459af6a936 100644
--- a/interface/web/admin/lib/lang/el_users_list.lng
+++ b/interface/web/admin/lib/lang/el_users_list.lng
@@ -7,3 +7,4 @@ $wb['ort_txt'] = 'Ï€ÏŒÎ»Î·';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿Ï‚ Î§ÏÎ®ÏƒÏ„Î·Ï‚';
 $wb['warning_txt'] = '<b>Î Î¡ÎŸÎ•Î™Î”ÎŸÎ ÎŸÎ™Î—Î£Î—:</b>ÎœÎ·Î½ ÎµÏ€ÎµÎ¾ÎµÏÎ³Î¬Î¶ÎµÏƒÏ„Îµ ÎºÎ±Î¼Î¯Î± ÏÏÎ¸Î¼Î¹ÏƒÎ· Ï‡ÏÎ®ÏƒÏ„Î· ÎµÎ´ÏŽ. Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÏ„Îµ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î ÎµÎ»Î¬Ï„Î· - ÎºÎ±Î¹ ÎœÎµÏ„Î±Ï€Ï‰Î»Î·Ï„Î® ÏƒÏ„Î¿ Î¬ÏÎ¸ÏÏ‰Î¼Î± Î ÎµÎ»Î¬Ï„Î·Ï‚. Î— ÎµÏ€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± Î¿Î¼Î¬Î´Ï‰Î½ ÎºÎ±Î¹ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ ÎµÎ´ÏŽ, Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€ÏÎ¿ÎºÎ±Î»ÎÏƒÎµÎ¹ Î±Ï€ÏŽÎ»ÎµÎ¹Î± Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½!';
 ?>
+
diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng
index ee89b2e30bfbe3112661319bfdce8fbb0cbbd034..e2bb0ab1f3b230fec81bd228afe1e4049393a4b8 100644
--- a/interface/web/client/lib/lang/el.lng
+++ b/interface/web/client/lib/lang/el.lng
@@ -11,3 +11,4 @@ $wb['Edit Reseller'] = 'Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± ÎœÎµÏ„Î±Ï€Ï‰Î»Î·Ï„Î®';
 $wb['Resellers'] = 'ÎœÎµÏ„Î±Ï€Ï‰Î»Î·Ï„ÎÏ‚';
 $wb['error_has_clients'] = 'ÎŸ ÎœÎµÏ„Î±Ï€Ï‰Î»Î·Ï„Î®Ï‚ ÎÏ‡ÎµÎ¹ Ï€ÎµÎ»Î¬Ï„ÎµÏ‚. Î”Î¹Î±Î³ÏÎ¬ÏˆÏ„Îµ Ï€ÏÏŽÏ„Î± Ï„Î¿Ï…Ï‚ Ï€ÎµÎ»Î¬Ï„ÎµÏ‚.';
 ?>
+
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index a79478d7f1f58956866738c5713a500e454c99ee..44e2bf1f90c7fc5b1180e14a48bbe5cf5679a8b2 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -98,10 +98,11 @@ $wb['limit_trafficquota_error_notint'] = 'Î¤Î¿ ÎŒÏÎ¹Î¿ ÎºÎ¯Î½Î·ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿
 $wb['customer_no_txt'] = 'ÎšÏ‰Î´. Î ÎµÎ»Î¬Ï„Î·';
 $wb['vat_id_txt'] = 'Î‘.Î¦.Îœ';
 $wb['required_fields_txt'] = '* Î¥Ï€Î¿Ï‡ÏÎµÏ‰Ï„Î¹ÎºÎ¬ Î ÎµÎ´Î¯Î±';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
+$wb['limit_mailmailinglist_txt'] = 'ÎœÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ mailing lists';
+$wb['limit_mailmailinglist_error_notint'] = 'Î¤Î¿ Ï€Î»Î®Î¸Î¿Ï‚ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ Ï„Î·Ï‚ mailing list Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
+$wb['company_id_txt'] = 'ID Î•Ï„Î±Î¹ÏÎ¯Î±Ï‚/Î•Ï€Î¹Ï‡ÎµÎ¯ÏÎ·ÏƒÎ·Ï‚';
+$wb['limit_openvz_vm_txt'] = 'ÎœÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÏŽÎ½ servers';
+$wb['limit_openvz_vm_template_id_txt'] = 'Î•Î¾Î±Î½Î±Î³ÎºÎ±ÏƒÎ¼ÏŒÏ‚ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï… ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï server';
+$wb['limit_openvz_vm_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÏŽÎ½ server Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 ?>
+
diff --git a/interface/web/client/lib/lang/el_client_del.lng b/interface/web/client/lib/lang/el_client_del.lng
index ef21bfe2189e6a366e6d3e06be6daf0d7e791fe1..7bd428457aff31f08e410bc429a954e95e158847 100644
--- a/interface/web/client/lib/lang/el_client_del.lng
+++ b/interface/web/client/lib/lang/el_client_del.lng
@@ -4,3 +4,4 @@ $wb['delete_explanation'] = 'Î— ÎµÎ½ÎÏÎ³ÎµÎ¹Î± Î¸Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÎ¹ Ï„Î¹Ï‚
 $wb['btn_save_txt'] = 'Î”Î¹Î±Î³ÏÎ±Ï†Î® Ï€ÎµÎ»Î¬Ï„Î·';
 $wb['btn_cancel_txt'] = 'Î‘ÎºÏÏÏ‰ÏƒÎ· Ï‡Ï‰ÏÎ¯Ï‚ Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï€ÎµÎ»Î¬Ï„Î·';
 ?>
+
diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng
index b3a282d2d2c6bd2ccd12d6049f3a69d1a0978aba..c2e6044635d677f104fd1e1723357f0d36a422fc 100644
--- a/interface/web/client/lib/lang/el_client_template.lng
+++ b/interface/web/client/lib/lang/el_client_template.lng
@@ -60,13 +60,14 @@ $wb['limit_web_quota_txt'] = 'ÎŒÏÎ¹Î¿ Web';
 $wb['limit_traffic_quota_txt'] = 'ÎŒÏÎ¹Î¿ ÎšÎ¯Î½Î·ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½';
 $wb['limit_trafficquota_error_notint'] = 'Î¤Î¿ ÎŒÏÎ¹Î¿ ÎšÎ¯Î½Î·ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 $wb['template_del_aborted_txt'] = 'Î— Î´Î¹Î±Î³ÏÎ±Ï†Î® Î±ÎºÏ…ÏÏŽÎ¸Î·ÎºÎµ. Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¿Ï…Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Î½ ÎÎ½Î±Ï‚ Ï€ÎµÎ»Î¬Ï„Î·Ï‚ Ï€Î¿Ï… ÎÏ‡ÎµÎ¹ Ï„Î¿ Ï€ÏÏŒÏ„Ï…Ï€Î¿ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿.';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
-$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
-$wb['web_php_options_txt'] = 'PHP Options';
-$wb['template_type_txt'] = 'Template type';
-$wb['template_name_txt'] = 'Template name';
+$wb['limit_mailmailinglist_txt'] = 'ÎœÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ mailing lists';
+$wb['limit_mailmailinglist_error_notint'] = 'Î¤Î¿ Ï€Î»Î®Î¸Î¿Ï‚ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ Ï„Î·Ï‚ mailing list Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
+$wb['limit_openvz_vm_txt'] = 'ÎœÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÏŽÎ½ servers';
+$wb['limit_openvz_vm_template_id_txt'] = 'Î•Î¾Î±Î½Î±Î³ÎºÎ±ÏƒÎ¼ÏŒÏ‚ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï… ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï server';
+$wb['limit_openvz_vm_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÏŽÎ½ server Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
+$wb['ssh_chroot_txt'] = 'Î•Ï€Î¹Î»Î¿Î³ÎÏ‚ SSH-Chroot';
+$wb['web_php_options_txt'] = 'Î•Ï€Î¹Î»Î¿Î³ÎÏ‚ PHP';
+$wb['template_type_txt'] = 'Î¤ÏÏ€Î¿Ï‚ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï…';
+$wb['template_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï…';
 ?>
+
diff --git a/interface/web/client/lib/lang/el_client_template_list.lng b/interface/web/client/lib/lang/el_client_template_list.lng
index 1ce866d23cc534bae1b03e30b5f4b984645b27e8..30e6969e3dae983e01069f7d648781d256a129c6 100644
--- a/interface/web/client/lib/lang/el_client_template_list.lng
+++ b/interface/web/client/lib/lang/el_client_template_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Î ÏÏŒÏ„Ï…Ï€Î± Î ÎµÎ»Î¬Ï„Î·';
 $wb['template_type_txt'] = 'Î¤ÏÏ€Î¿Ï‚';
 $wb['template_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î ÏÎ¿Ï„ÏÏ€Î¿Ï…';
 ?>
+
diff --git a/interface/web/client/lib/lang/el_clients_list.lng b/interface/web/client/lib/lang/el_clients_list.lng
index 5b80e283da5b0ff56e195385e1d3785c9bc687b3..dd652bfd6adaada80ec005e790f1e9a2a798023d 100644
--- a/interface/web/client/lib/lang/el_clients_list.lng
+++ b/interface/web/client/lib/lang/el_clients_list.lng
@@ -8,3 +8,4 @@ $wb['country_txt'] = 'Î§ÏŽÏÎ±';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿Ï‚ Î ÎµÎ»Î¬Ï„Î·Ï‚';
 $wb['username_txt'] = 'Username';
 ?>
+
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 9a4751afcc938c2717ad91ce530bb5c6c971b688..f3e2dffd9747d75529a5d55c3e1313c2f0eab465 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -96,12 +96,13 @@ $wb['limit_trafficquota_error_notint'] = 'Î¤Î¿ ÎŒÏÎ¹Î¿ Ï„Î±Ï‡ÏÏ„Î·Ï„Î±Ï‚ Ï€Ï
 $wb['customer_no_txt'] = 'Î‘/Î‘ Î ÎµÎ»Î¬Ï„Î·';
 $wb['vat_id_txt'] = 'Î‘.Î¦.Îœ.';
 $wb['required_fields_txt'] = '* Î¥Ï€Î¿Ï‡ÏÎµÏ‰Ï„Î¹ÎºÎ¬ Î ÎµÎ´Î¯Î±';
-$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
-$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
+$wb['limit_webdav_user_txt'] = 'ÎœÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ Webdav';
+$wb['limit_webdav_user_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ webdav user Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
+$wb['limit_mailmailinglist_txt'] = 'ÎœÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ mailing lists';
+$wb['limit_mailaliasdomain_txt'] = 'ÎœÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ ÏˆÎµÏ…Î´Î¿Î½ÏÎ¼Ï‰Î½ domain';
+$wb['limit_mailmailinglist_error_notint'] = 'Î¤Î¿ Ï€Î»Î®Î¸Î¿Ï‚ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ Ï„Î·Ï‚ mailing list Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
+$wb['limit_openvz_vm_txt'] = 'ÎœÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÏŽÎ½ servers';
+$wb['limit_openvz_vm_template_id_txt'] = 'Î•Î¾Î±Î½Î±Î³ÎºÎ±ÏƒÎ¼ÏŒÏ‚ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï… ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï server';
+$wb['limit_openvz_vm_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÏŽÎ½ server Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 ?>
+
diff --git a/interface/web/client/lib/lang/el_resellers_list.lng b/interface/web/client/lib/lang/el_resellers_list.lng
index 78f7c23892ea4ac67b382e99e86c84666422b371..53eecc98dc6df6620d90c453362f77b0635fed0e 100644
--- a/interface/web/client/lib/lang/el_resellers_list.lng
+++ b/interface/web/client/lib/lang/el_resellers_list.lng
@@ -7,3 +7,4 @@ $wb['city_txt'] = 'Î ÏŒÎ»Î·';
 $wb['country_txt'] = 'Î§ÏŽÏÎ±';
 $wb['add_new_record_txt'] = 'ÎÎµÏŒÏ‚ ÎœÎµÏ„Î±Ï€Ï‰Î»Î·Ï„Î®Ï‚';
 ?>
+
diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php
index e1828aa4a5aadb94dd10b10700e283aa966033fb..88d459f33c35d8efe1d809c0f9626bdf083a9de6 100644
--- a/interface/web/dashboard/dashboard.php
+++ b/interface/web/dashboard/dashboard.php
@@ -98,16 +98,16 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') {
 	$v2 = $_SESSION['s']['new_ispconfig_version'];
 	$this_version = explode(".",$v1);
 	$this_fullversion = (($this_version[0] < 10) ? '0'.$this_version[0] : $this_version[0]) .
-			    (($this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) .
-			    (($this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) .
-			    (($this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : $this_version[3]);
+			    ((isset($this_version[1]) && $this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) .
+			    ((isset($this_version[2]) && $this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) .
+			    ((isset($this_version[3]) && $this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : $this_version[3]);
 
 
 	$new_version = explode(".",$v2);
 	$new_fullversion =  (($new_version[0] < 10) ? '0'.$new_version[0] : $new_version[0]) .
-			    (($new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) .
-			    (($new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) .
-			    (($new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : $new_version[3]);
+			    ((isset($new_version[1]) && $new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) .
+			    ((isset($new_version[2]) && $new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) .
+			    ((isset($new_version[3]) && $new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : $new_version[3]);
 	if($new_fullversion > $this_fullversion) {
 		$info[] = array('info_msg' => 'There is a new Version of ISPConfig 3 available!<br>' . 
 			'This Version: ' . $v1 . '<br>' . 
diff --git a/interface/web/dashboard/lib/lang/el.lng b/interface/web/dashboard/lib/lang/el.lng
index 144becd21ca4f1fe9c92819c7f0d9bf7f5281908..39bf4b868dc65dac73283fb51acded95d9f91c7f 100644
--- a/interface/web/dashboard/lib/lang/el.lng
+++ b/interface/web/dashboard/lib/lang/el.lng
@@ -2,3 +2,4 @@
 $wb['welcome_user_txt'] = 'ÎšÎ±Î»Ï‰ÏƒÎ®ÏÎ¸Î±Ï„Îµ %s';
 $wb['available_modules_txt'] = 'Î”Î¹Î±Î¸ÎÏƒÎ¹Î¼Î± Î±ÏÎ¸ÏÏŽÎ¼Î±Ï„Î±';
 ?>
+
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
index 13940bd52fbf116253d3c8058138775437aadb87..351e98231a3b7469ca5cb295f49af40f1edef1ca 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
@@ -28,3 +28,4 @@ $wb['limit_client_txt'] = 'Î Î»Î®Î¸Î¿Ï‚ Î ÎµÎ»Î±Ï„ÏŽÎ½';
 $wb['limit_database_txt'] = 'Î Î»Î®Î¸Î¿Ï‚ Databases';
 $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists';
 ?>
+
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
index 95f750a58fd78fe65f3cb18413e9ea8f6b8973ba..17d42ed2efc58d998138281e2b6205731444a341 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Î”Î¹Î±Î¸ÎÏƒÎ¹Î¼Î± Î±ÏÎ¸ÏÏŽÎ¼Î±Ï„Î±';
 ?>
+
diff --git a/interface/web/designer/lib/lang/el.lng b/interface/web/designer/lib/lang/el.lng
index acb6c3546c6150b4edbafb782d3ed85c499210b5..29f4a51efebb370aeb04c5144a604ca2c04e02be 100644
--- a/interface/web/designer/lib/lang/el.lng
+++ b/interface/web/designer/lib/lang/el.lng
@@ -1,2 +1,3 @@
 <?php
 ?>
+
diff --git a/interface/web/designer/lib/lang/el_form_edit.lng b/interface/web/designer/lib/lang/el_form_edit.lng
index 04ebc02db35408c553afe5003b5b6b5c25e7d218..1e653873f2be5bb76c22423031e38f9d2eb74cd4 100644
--- a/interface/web/designer/lib/lang/el_form_edit.lng
+++ b/interface/web/designer/lib/lang/el_form_edit.lng
@@ -22,3 +22,4 @@ $wb['auth_preset_perm_user_txt'] = 'Perm. User';
 $wb['auth_preset_perm_group_txt'] = 'Perm. Group';
 $wb['auth_preset_perm_other_txt'] = 'Perm. Other';
 ?>
+
diff --git a/interface/web/designer/lib/lang/el_form_list.lng b/interface/web/designer/lib/lang/el_form_list.lng
index 4cf043aefac43e747760697157fd5cbbc7635c3e..f428b6935c92c42a3f9326fcf850f6be3e9260ec 100644
--- a/interface/web/designer/lib/lang/el_form_list.lng
+++ b/interface/web/designer/lib/lang/el_form_list.lng
@@ -5,3 +5,4 @@ $wb['module_txt'] = 'Î†ÏÎ¸ÏÏ‰Î¼Î±';
 $wb['title_txt'] = 'Î¤Î¯Ï„Î»Î¿Ï‚';
 $wb['description_txt'] = 'Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®';
 ?>
+
diff --git a/interface/web/designer/lib/lang/el_form_show.lng b/interface/web/designer/lib/lang/el_form_show.lng
index cf51060a2cc6df48a6dfe47f1e2f94d3282fec26..1cedf2676408c22422a1714cd0d186e5770fd754 100644
--- a/interface/web/designer/lib/lang/el_form_show.lng
+++ b/interface/web/designer/lib/lang/el_form_show.lng
@@ -16,3 +16,4 @@ $wb['module_del_txt'] = 'Î”Î¹Î±Î³ÏÎ±Ï†Î® Î±ÏÎ¸ÏÏŽÎ¼Î±Ï„Î¿Ï‚ ÎºÎ±Î¹ ÏŒÎ»Ï‰Î½ 
 $wb['menu_del_txt'] = 'Î”Î¹Î±Î³ÏÎ±Ï†Î® Î¼ÎµÎ½Î¿Ï ÎºÎ±Î¹ ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Ï‰Î½;';
 $wb['item_del_txt'] = 'Î”Î¹Î±Î³ÏÎ±Ï†Î® Ï„Î¿Ï… ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î¿Ï… Î¼ÎµÎ½Î¿Ï';
 ?>
+
diff --git a/interface/web/designer/lib/lang/el_module_edit.lng b/interface/web/designer/lib/lang/el_module_edit.lng
index 733e2aec885094e59625e36452c6d856b6a91df1..a253cbc0bea1cd2bcff142d7549299b906511740 100644
--- a/interface/web/designer/lib/lang/el_module_edit.lng
+++ b/interface/web/designer/lib/lang/el_module_edit.lng
@@ -10,3 +10,4 @@ $wb['cancel_txt'] = 'Î‘ÎºÏÏÏ‰ÏƒÎ·';
 $wb['header_txt'] = 'Î™Î´Î¹ÏŒÏ„Î·Ï„ÎµÏ‚ Î±ÏÎ¸ÏÏŽÎ¼Î±Ï„Î¿Ï‚';
 $wb['description_txt'] = '<b>Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®</b> <br><br> <b>ÎŒÎ½Î¿Î¼Î± Î±ÏÎ¸ÏÏŽÎ¼Î±Ï„Î¿Ï‚:</b> ÎŒÎ½Î¿Î¼Î± Ï„Î¿Ï… Ï†Î±ÎºÎÎ»Î¿Ï… Ï„Î¿Ï… Î±ÏÎ¸ÏÏŽÎ¼Î±Ï„Î¿Ï‚. Î•Ï€Î¹Ï„ÏÎÏ€Î¿Î½Ï„Î±Î¹ Î¼ÏŒÎ½Î¿ Î±ÏÎ¹Î¸Î¼Î¿Î¯, Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚ ÎºÎ±Î¹ Î· ÎºÎ¬Ï„Ï‰ Ï€Î±ÏÎ»Î±.<br> <b>Î¤Î¯Ï„Î»Î¿Ï‚ Î‘ÏÎ¸ÏŽÎ¼Î±Ï„Î¿Ï‚:</b> Î˜Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„ÎµÎ¯ ÏƒÏ„Î¿ Î²Î±ÏƒÎ¹ÎºÏŒ Î¼ÎµÎ½Î¿Ï (ÎµÏ€Î¬Î½Ï‰).<br> <b>Î‘ÏÏ‡ÎµÎ¯Î¿ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï…:</b> Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï… Ï„Î¿Ï… Î±ÏÎ¸ÏÏŽÎ¼Î±Ï„Î¿Ï‚. Î ÏÎ¿Ï‚ Ï„Î¿ Ï€Î±ÏÏŽÎ½ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î±: module.tpl.htm ÎºÎ±Î¹ module_tree.tpl.htm. Î¤Î¿ Ï€ÏÎ¿ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿ ÎµÎ¯Î½Î±Î¹ Ï„Î¿ module.tpl.htm.<br> <b>NaviFrame:</b> Î‘Î½ Ï„Î¿ module_tree.tpl.htm ÎµÏ€Î¹Î»ÎÏ‡Î¸Î·ÎºÎµ ÏŽÎ± Î±ÏÏ‡ÎµÎ¯Î¿ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï…, ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ ÎµÎ´ÏŽ Ï„Î·Î½ Î´Î¹Î±Î´ÏÎ¿Î¼Î® Î³Î¹Î± Ï„Î¿ script Ï€Î¿Ï… Î±Ï†Î¿ÏÎ¬ Ï„Î¿ Î±ÏÎ¹ÏƒÏ„ÎµÏÏŒ frame.<br> <b>Î ÏÎ¿ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î· Î£ÎµÎ»Î¯Î´Î±:</b> Î‘Ï…Ï„Î® ÏƒÎµÎ»Î¯Î´Î± Î¸Î± ÎµÎ¼Ï†Î±Î½Î¯Î¶ÎµÏ„Î±Î¹ ÏŒÏ„Î±Î½ Î±Î½Î¿Î¯Î¾ÎµÎ¹ Ï„Î¿ Î¬ÏÎ¸ÏÏ‰Î¼Î±.<br> <b>Î Î»Î¬Ï„Î¿Ï‚ ÎšÎ±ÏÏ„ÎÎ»Î±Ï‚:</b>Î¤Î¿ Ï€Î»Î¬Ï„Î¿Ï‚ Ï„Î·Ï‚ ÎºÎ±ÏÏ„ÎÎ»Î±Ï‚ ÏƒÏ„Î¿ Î²Î±ÏƒÎ¹ÎºÏŒ Î¼ÎµÎ½Î¿Ï. Î¤Î¿ Ï€ÎµÎ´Î¯Î¿ ÎµÎ¯Î½Î±Î¹ Î¬Î´ÎµÎ¹Î¿ ÎµÎ¾ Î¿ÏÎ¹ÏƒÎ¼Î¿Ï. ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Î±Ï€ÏŒÎ»Ï…Ï„ÎµÏ‚ Ï„Î¹Î¼ÎÏ‚ ÏƒÎµ pixel (Ï€.Ï‡. 20) Î® ÏƒÏ‡ÎµÏ„Î¹ÎºÎÏ‚ (Ï€.Ï‡. 20%).<br> <b>Î’Î¿Î®Î¸ÎµÎ¹Î±:</b> ÎŒÎ»ÎµÏ‚ Î¿Î¹ Î´Î¹Î±Î´ÏÎ¿Î¼ÎÏ‚ ÎµÎ¯Î½Î±Î¹ ÏƒÏ‡ÎµÏ„Î¹ÎºÎÏ‚ Ï‰Ï‚ Ï€ÏÎ¿Ï‚ Ï„Î¿Î½ Ï†Î¬ÎºÎµÎ»Î¿ ';
 ?>
+
diff --git a/interface/web/designer/lib/lang/el_module_list.lng b/interface/web/designer/lib/lang/el_module_list.lng
index 1edbed0f794c26b0f01e82136de1dffa05f8688b..c5c484d16ef76d690f50143250a63b4209934c7f 100644
--- a/interface/web/designer/lib/lang/el_module_list.lng
+++ b/interface/web/designer/lib/lang/el_module_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Backend Î†ÏÎ¸ÏÏ‰Î¼Î±';
 $wb['module_txt'] = 'Î†ÏÎ¸ÏÏ‰Î¼Î±';
 $wb['title_txt'] = 'Î¤Î¯Ï„Î»Î¿Ï‚';
 ?>
+
diff --git a/interface/web/designer/lib/lang/el_module_nav_edit.lng b/interface/web/designer/lib/lang/el_module_nav_edit.lng
index 02104add2bd81e9022735f4e1204e0d415f34fc8..b41f138a239a626a5396ca9120bd15317c0556c5 100644
--- a/interface/web/designer/lib/lang/el_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/el_module_nav_edit.lng
@@ -4,3 +4,4 @@ $wb['header_txt'] = 'Î™Î´Î¹ÏŒÏ„Î·Ï„ÎµÏ‚ Navi';
 $wb['save_txt'] = 'Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·';
 $wb['cancel_txt'] = 'Î†ÎºÏ…ÏÎ¿';
 ?>
+
diff --git a/interface/web/designer/lib/lang/el_module_nav_item_edit.lng b/interface/web/designer/lib/lang/el_module_nav_item_edit.lng
index 82a9ecff512a355bd75566693cdd7f355e7c489b..af3c434ace5834e5c8744b50d4f94e8c76eaf0ca 100644
--- a/interface/web/designer/lib/lang/el_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/el_module_nav_item_edit.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['title_txt'] = 'Î¤Î¯Ï„Î»Î¿Ï‚';
-$wb['target_txt'] = 'Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚';
+$wb['target_txt'] = 'Î£Ï„ÏŒÏ‡Î¿Ï‚';
 $wb['link_txt'] = 'Î£ÏÎ½Î´ÎµÏƒÎ¼Î¿Ï‚';
 $wb['header_txt'] = 'Î™Î´Î¹ÏŒÏ„Î·Ï„ÎµÏ‚ Navi';
 $wb['save_txt'] = 'Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·';
 $wb['cancel_txt'] = 'Î‘ÎºÏÏÏ‰ÏƒÎ·';
 ?>
+
diff --git a/interface/web/designer/lib/lang/el_module_show.lng b/interface/web/designer/lib/lang/el_module_show.lng
index 12895ccc69232b0c4679841018dca983fdb7f7bf..be99c925bb101eece4d6ba78aa72ffa15f603297 100644
--- a/interface/web/designer/lib/lang/el_module_show.lng
+++ b/interface/web/designer/lib/lang/el_module_show.lng
@@ -14,3 +14,4 @@ $wb['module_del_txt'] = 'Î˜ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Ï„Î¿ Î¬ÏÎ¸Ï‰Î¼
 $wb['menu_del_txt'] = 'Î˜ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Ï„Î¿ Î¼ÎµÎ½Î¿Ï ÎºÎ±Î¹ ÏŒÎ»Î± Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï„Î¿Ï…;';
 $wb['item_del_txt'] = 'Î˜ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Ï„Î¿ ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î¿;';
 ?>
+
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index 8ad3275599582fcb00b1ea4223f9bf8f1029e955..3aaaf3f872e2ae4160da524142e05d1050ce19c6 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -256,6 +256,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
 						$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
 						$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
 						break;
+					case 'txt':
+						$dns_rr[$r]['aux'] = 0;
+						$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+						if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+						if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+						break;
 					default:
 						$dns_rr[$r]['aux'] = 0;
 						$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
@@ -274,6 +280,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
 							$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
 							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
 							break;
+						case 'txt':
+							$dns_rr[$r]['aux'] = 0;
+							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+							if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+							if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+							break;
 						default:
 							$dns_rr[$r]['aux'] = 0;
 							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
@@ -292,6 +304,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
 							$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
 							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
 							break;
+						case 'txt':
+							$dns_rr[$r]['aux'] = 0;
+							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+							if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+							if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+							break;
 						default:
 							$dns_rr[$r]['aux'] = 0;
 							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
@@ -310,6 +328,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
 							$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
 							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
 							break;
+						case 'txt':
+							$dns_rr[$r]['aux'] = 0;
+							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+							if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+							if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+							break;
 						default:
 							$dns_rr[$r]['aux'] = 0;
 							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
@@ -330,6 +354,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
 							$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
 							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
 							break;
+						case 'txt':
+							$dns_rr[$r]['aux'] = 0;
+							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+							if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+							if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+							break;
 						default:
 							$dns_rr[$r]['aux'] = 0;
 							$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
diff --git a/interface/web/dns/lib/lang/el.lng b/interface/web/dns/lib/lang/el.lng
index 071cac2950ccf990e50a93f43a4c408e45068e14..45144226e1141273391e5d94b0ca7325b93cf16c 100644
--- a/interface/web/dns/lib/lang/el.lng
+++ b/interface/web/dns/lib/lang/el.lng
@@ -17,7 +17,8 @@ $wb['DNS TXT'] = 'DNS TXT';
 $wb['DNS Wizard'] = 'ÎŸÎ´Î·Î³ÏŒÏ‚ DNS';
 $wb['Add DNS Zone'] = 'ÎÎÎ± Î¶ÏŽÎ½Î· DNS';
 $wb['Templates'] = 'Î ÏÏŒÏ„Ï…Ï€Î±';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['zone_file_successfully_imported_txt'] = 'Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Î¶ÏŽÎ½Î·Ï‚ ÎµÎ¹ÏƒÎ®Ï‡Î¸Î·ÎºÎµ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚!';
+$wb['error_no_valid_zone_file_txt'] = 'Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Î¶ÏŽÎ½Î·Ï‚ Ï†Î±Î¯Î½ÎµÏ„Î±Î¹ Î½Î± Î¼Î·Î½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ¿!';
+$wb['zonefile_to_import_txt'] = 'Î‘ÏÏ‡ÎµÎ¯Î¿ Î–ÏŽÎ½Î·Ï‚';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_a.lng b/interface/web/dns/lib/lang/el_dns_a.lng
index 4f20e9e682f18dda9ba9d2652ab82bf4a2182f3b..7772b5ff09a44696784b4c0646464f9dd9d3fe20 100644
--- a/interface/web/dns/lib/lang/el_dns_a.lng
+++ b/interface/web/dns/lib/lang/el_dns_a.lng
@@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®';
 $wb['data_error_regex'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP Î¼Îµ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·';
 $wb['data_error_duplicate'] = 'Î”Î¹Ï€Î»Î® ÎµÎ³Î³ÏÎ±Ï†Î® A-Record Î® CNAME-Record';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_a_list.lng b/interface/web/dns/lib/lang/el_dns_a_list.lng
index 30b3143b94c729538ff1718573786541dac944e5..05ed36039eeaadd47786d10cd7e85deeb552b76c 100644
--- a/interface/web/dns/lib/lang/el_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_a_list.lng
@@ -12,3 +12,4 @@ $wb['page_txt'] = 'Î£ÎµÎ»Î¯Î´Î±';
 $wb['page_of_txt'] = 'Î±Ï€ÏŒ';
 $wb['delete_confirmation'] = 'Î˜ÎÎ»ÎµÏ„Îµ Î¿Ï€Ï‰ÏƒÎ´Î®Ï€Î¿Ï„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÎ³Î³ÏÎ±Ï†Î®;';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_aaaa.lng b/interface/web/dns/lib/lang/el_dns_aaaa.lng
index 77728e3c3b6b3b33874c66bf0e63ab91275beb48..76a46877c45f1597e6ad2e1c3bdfb9c47c925c54 100644
--- a/interface/web/dns/lib/lang/el_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/el_dns_aaaa.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Î¤Î¿ hostname Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏ‰ÏƒÏ„Î® Î¼Î¿ÏÏ†Î¿Ï€
 $wb['data_error_empty'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP ÎºÎµÎ½Î®';
 $wb['data_error_regex'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP Î¼Îµ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_alias.lng b/interface/web/dns/lib/lang/el_dns_alias.lng
index 9d29354028ec96338b55119c2dff6e0eeb132ff1..46bcfe2842850dbcbdfc0f01feee302ee76ba85c 100644
--- a/interface/web/dns/lib/lang/el_dns_alias.lng
+++ b/interface/web/dns/lib/lang/el_dns_alias.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Î¤Î¿ hostname ÎÏ‡ÎµÎ¹ Î»Î¬Î¸Î¿Ï‚ Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·
 $wb['data_error_empty'] = 'Î¤Î¿ hostname Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯';
 $wb['data_error_regex'] = 'Î¤Î¿ hostname Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ ÎÏ‡ÎµÎ¹ Î»Î¬Î¸Î¿Ï‚ Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_cname.lng b/interface/web/dns/lib/lang/el_dns_cname.lng
index cc10beb118907244dfdacea94b1e1296b2e12a50..4a8cc63ab7d5cad5caf2e71ff5af493342122318 100644
--- a/interface/web/dns/lib/lang/el_dns_cname.lng
+++ b/interface/web/dns/lib/lang/el_dns_cname.lng
@@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Î¤Î¿ hostname Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿
 $wb['data_error_regex'] = 'Hostname Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î¼Îµ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·';
 $wb['data_error_duplicate'] = 'Î”Î¹Ï€Î»Î¿ÎµÎ³Î³ÏÎ±Ï†Î® A-Record Î® CNAME-Record';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_hinfo.lng b/interface/web/dns/lib/lang/el_dns_hinfo.lng
index 457213e60fd13ef83ac8a352384ecf3734b1a429..8c869537a1a2bd31e74a78e92b0465940011a874 100644
--- a/interface/web/dns/lib/lang/el_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/el_dns_hinfo.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Î¤Î¿ hostname Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏ‰ÏƒÏ„Î® Î¼Î¿ÏÏ†Î¿Ï€
 $wb['data_error_empty'] = 'ÎŸÎ¹ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Ï„Î¿Ï… Host ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÎÏ‚';
 $wb['data_error_regex'] = 'ÎŸÎ¹ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Host ÎÏ‡Î¿Ï…Î½ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng
index 890cfc921fc37e2d977412b087449d107a6415a7..85718b7caef938a5548e6939d6b160ca70283b09 100644
--- a/interface/web/dns/lib/lang/el_dns_mx.lng
+++ b/interface/web/dns/lib/lang/el_dns_mx.lng
@@ -14,3 +14,4 @@ $wb['name_error_regex'] = 'Î¤Î¿ hostname Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏ‰ÏƒÏ„Î® Î¼Î¿ÏÏ†Î¿Ï€
 $wb['data_error_empty'] = 'Î¤Î¿ hostname Mailserver Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯';
 $wb['data_error_regex'] = 'Mailserver hostname Î¼Îµ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_ns.lng b/interface/web/dns/lib/lang/el_dns_ns.lng
index 02e157265efbbbaa3fc27b55425f08b2572bea4e..06ad7cf870bde40198272eb923d457732919c3f8 100644
--- a/interface/web/dns/lib/lang/el_dns_ns.lng
+++ b/interface/web/dns/lib/lang/el_dns_ns.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Î— Î¶ÏŽÎ½Î· Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏ‰ÏƒÏ„Î® Î¼Î¿ÏÏ†Î¿Ï€Î¿
 $wb['data_error_empty'] = 'ÎŸ Nameserver Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯';
 $wb['data_error_regex'] = 'Î— Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï„Î¿Ï… Nameserver Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏƒÏ‰ÏƒÏ„Î®';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_ptr.lng b/interface/web/dns/lib/lang/el_dns_ptr.lng
index bcd431ecd18e56769f6233e6979094c2778d33e3..ceb8b138934e9c6d8fd7b9b3b2108a6146efbd01 100644
--- a/interface/web/dns/lib/lang/el_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/el_dns_ptr.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏ‰ÏƒÏ„Î® Î¼Î¿ÏÏ†Î¿
 $wb['data_error_empty'] = 'Î¤Î¿ ÎšÎ±Î½Î¿Î½Î¹ÎºÎ¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿ hostname Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯';
 $wb['data_error_regex'] = 'ÎšÎ±Î½Î¿Î½Î¹ÎºÎ¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿ hostname Î¼Îµ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_rp.lng b/interface/web/dns/lib/lang/el_dns_rp.lng
index 83fd36d02f74891ff752153fb603e4f56d4feacd..b63597c8593f484355fab7a56488c6af5ed4e16b 100644
--- a/interface/web/dns/lib/lang/el_dns_rp.lng
+++ b/interface/web/dns/lib/lang/el_dns_rp.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Î¤Î¿ hostname Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏ‰ÏƒÏ„Î® Î¼Î¿ÏÏ†Î¿Ï€
 $wb['data_error_empty'] = 'Î¤Î¿ Ï€ÏÏŒÏƒÏ‰Ï€Î¿ ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î¯Î±Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.';
 $wb['data_error_regex'] = 'Î— Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï„Î¿Ï… Ï…Ï€ÎµÏÎ¸Ï…Î½Î¿Ï… Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ·';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_slave.lng b/interface/web/dns/lib/lang/el_dns_slave.lng
index 4693628452bbc82014f703b5bbb1f5ec292a5c5d..ae3f5d004cee043c9c3f6eb3521aee18de39fc62 100644
--- a/interface/web/dns/lib/lang/el_dns_slave.lng
+++ b/interface/web/dns/lib/lang/el_dns_slave.lng
@@ -11,6 +11,7 @@ $wb['origin_error_empty'] = 'Î— Î¶ÏŽÎ½Î· ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®.';
 $wb['origin_error_unique'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î¼Î¹Î± ÎµÎ³Î³ÏÎ±Ï†Î® Î³Î¹Î± Î±Ï…Ï„Î® Ï„Î·Î½ Î¶ÏŽÎ½Î·.';
 $wb['origin_error_regex'] = 'Î— Î¶ÏŽÎ½Î· Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·.';
 $wb['ns_error_regex'] = 'ÎŸ NS Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·.';
-$wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['eg_domain_tld'] = 'Ï€.Ï‡. domain.tld.';
+$wb['ipv4_form_txt'] = 'Î¼Î¿ÏÏ†Î® IPv4 - Ï€.Ï‡. 1.2.3.4';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_slave_list.lng b/interface/web/dns/lib/lang/el_dns_slave_list.lng
index a20a32859a970fed3f4f661f883d25c446966cf3..aa50cae6f156f9346d5d169aa95f01973625f116 100644
--- a/interface/web/dns/lib/lang/el_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_slave_list.lng
@@ -5,5 +5,6 @@ $wb['server_id_txt'] = 'Server';
 $wb['origin_txt'] = 'Î–ÏŽÎ½Î·';
 $wb['ns_txt'] = 'NS';
 $wb['add_new_record_txt'] = 'ÎÎÎ± Î”ÎµÏ…Ï„ÎµÏÎµÏÎ¿Ï…ÏƒÎ± Î¶ÏŽÎ½Î· DNS';
-$wb['eg_domain_tld'] = 'e.g. domain.tld.';
+$wb['eg_domain_tld'] = 'Ï€.Ï‡. domain.tld.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng
index c4dd31138d5a4f45f6ba59b7276abfd33555a1cc..a05a49e2cc83299e68473922393e8ee1326f751d 100644
--- a/interface/web/dns/lib/lang/el_dns_soa.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa.lng
@@ -21,11 +21,12 @@ $wb['origin_error_regex'] = 'Î— Î¶ÏŽÎ½Î· Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿
 $wb['ns_error_regex'] = 'NS Î¼Îµ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·.';
 $wb['mbox_error_empty'] = 'Î¤Î¿ Email Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.';
 $wb['mbox_error_regex'] = 'Email Î¼Îµ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·.';
-$wb['also_notify_txt'] = 'Also Notify';
-$wb['also_notify_error_regex'] = 'Please use an IP address.';
-$wb['update_acl_txt'] = 'Update ACL';
-$wb['seconds_txt'] = 'Seconds';
-$wb['eg_domain_tld'] = 'e.g. domain.tld';
-$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
-$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['also_notify_txt'] = 'Î•Î¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÏ€Î¯ÏƒÎ·Ï‚ ÏƒÎµ';
+$wb['also_notify_error_regex'] = 'Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ÏƒÏ„Îµ Î¼Î¹Î± Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP.';
+$wb['update_acl_txt'] = 'Î‘Î½Î±Î½ÎÏ‰ÏƒÎ· ACL';
+$wb['seconds_txt'] = 'Î”ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î±';
+$wb['eg_domain_tld'] = 'Ï€.Ï‡. domain.tld';
+$wb['eg_ns1_domain_tld'] = 'Ï€.Ï‡. ns1.domain.tld';
+$wb['eg_webmaster_domain_tld'] = 'Ï€.Ï‡. webmaster@domain.tld';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_soa_list.lng b/interface/web/dns/lib/lang/el_dns_soa_list.lng
index 99c1d73d9a0e72f563131b99904141b5a8a34e00..17446da45993a9847fa87cfd69398591f10aeb21 100644
--- a/interface/web/dns/lib/lang/el_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa_list.lng
@@ -8,3 +8,4 @@ $wb['mbox_txt'] = 'Email';
 $wb['add_new_record_wizard_txt'] = 'ÎÎÎ± Î¶ÏŽÎ½Î· DNS Î¼Îµ ÎŸÎ´Î·Î³ÏŒ';
 $wb['add_new_record_txt'] = 'ÎÎÎ± Î¶ÏŽÎ½Î· DNS (Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î±)';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_srv.lng b/interface/web/dns/lib/lang/el_dns_srv.lng
index 01901ce6a3caa3e3c0afe9782bef38256f8f2706..1dc24f902e80f160cfe0c00bb7546758b8a92aa8 100644
--- a/interface/web/dns/lib/lang/el_dns_srv.lng
+++ b/interface/web/dns/lib/lang/el_dns_srv.lng
@@ -15,3 +15,4 @@ $wb['data_error_empty'] = 'Î— ÎµÎ³Î³ÏÎ±Ï†Î® Server ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®';
 $wb['data_error_regex'] = 'Î•Î³Î³ÏÎ±Ï†Î®  Server Î¼Îµ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·';
 $wb['srv_error_regex'] = 'Î•Î³Î³ÏÎ±Ï†Î®  Server Î¼Îµ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·. Î— ÎµÎ³Î³ÏÎ±Ï†Î® Server Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ 3 Î»ÎÎ¾ÎµÎ¹Ï‚ Ï‡Ï‰ÏÎ¹ÏƒÎ¼ÎÎ½ÎµÏ‚ Î¼Îµ ÎºÎµÎ½Î¬.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_template.lng b/interface/web/dns/lib/lang/el_dns_template.lng
index 20e9bf81bcea73806408854cfdf5b1ab1d948bab..2ba9b4dab71a137c3851b812106571a730fc88df 100644
--- a/interface/web/dns/lib/lang/el_dns_template.lng
+++ b/interface/web/dns/lib/lang/el_dns_template.lng
@@ -4,3 +4,4 @@ $wb['fields_txt'] = 'Î ÎµÎ´Î¯Î±';
 $wb['template_txt'] = 'Î ÏÏŒÏ„Ï…Ï€Î¿';
 $wb['visible_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_template_list.lng b/interface/web/dns/lib/lang/el_dns_template_list.lng
index ff676a1c1a3c3a2ed9f90cec138696b0c901174f..64da2e810aad4a152824b2e5a2730a329118b155 100644
--- a/interface/web/dns/lib/lang/el_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_template_list.lng
@@ -4,3 +4,4 @@ $wb['visible_txt'] = 'ÎŸÏÎ±Ï„ÏŒÏ‚';
 $wb['name_txt'] = 'ÎŒÎ½Î¿Î¼Î±';
 $wb['add_new_record_txt'] = 'ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î®';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_txt.lng b/interface/web/dns/lib/lang/el_dns_txt.lng
index 62c2dc8beb6a808f17bf33ec5e095e23fbda6910..c98ceca5d7f2aa5a0f3413a12b0490c7a029ef65 100644
--- a/interface/web/dns/lib/lang/el_dns_txt.lng
+++ b/interface/web/dns/lib/lang/el_dns_txt.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Î¤Î¿ hostname Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏ‰ÏƒÏ„Î® Î¼Î¿ÏÏ†Î¿Ï€
 $wb['data_error_empty'] = 'Î¤Î¿ ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯';
 $wb['data_error_regex'] = 'ÎšÎµÎ¯Î¼ÎµÎ½Î¿ Î¼Îµ Î¼Î· ÎÎ³ÎºÏ…ÏÎ· Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ·';
 ?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng
index 6275c56192e0cb9a3fab02c2450981f5a005d72f..6ed6d91a3854dfe67efa84f6cf733b8ac432ee3f 100644
--- a/interface/web/dns/lib/lang/el_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/el_dns_wizard.lng
@@ -27,3 +27,4 @@ $wb['error_ns1_regex'] = 'ÎŸ NS1 Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î¼Î· ÎµÏ€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½Î¿
 $wb['error_ns2_regex'] = 'ÎŸ NS2 Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î¼Î· ÎµÏ€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½Î¿Ï…Ï‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚';
 $wb['error_email_regex'] = 'Î¤Î¿ Email Î´ÎµÎ½ Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î¼Î¹Î± ÎÎ³ÎºÏ…ÏÎ· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·.';
 ?>
+
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index 5d563310baa4e77659dec0dc67d3453118e316a3..b353094dea3fb78e657dbfab23ad66a76dcbd5e0 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -11,7 +11,7 @@
     <fieldset class="inlineLabels"><legend>DNS Zone</legend>
       <div class="ctrlHolder">
       	<label for="template_id">{tmpl_var name='template_id_txt'}</label>
-        <select name="template_id" id="template_id" class="selectInput">
+        <select name="template_id" id="template_id" class="selectInput" onChange="submitForm('pageForm','dns/dns_wizard.php')">
 					{tmpl_var name='template_id_option'}
 				</select>
       </div>
diff --git a/interface/web/domain/lib/lang/el.lng b/interface/web/domain/lib/lang/el.lng
index c1f1284fb53f309d279e9103597833908456afcd..aab3355e122b039dda1961ccd5c9ab0f0c6b6af2 100644
--- a/interface/web/domain/lib/lang/el.lng
+++ b/interface/web/domain/lib/lang/el.lng
@@ -7,3 +7,4 @@ $wb['error_domain_in webuse'] = 'Î‘Ï…Ï„ÏŒ Ï„Î¿ domain Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± 
 $wb['error_client_can_not_add_domain'] = 'Î”ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Ï€ÏÎ¿ÏƒÎ¸ÎÏƒÎµÏ„Îµ Î½ÎÎ¿ domain';
 $wb['error_client_group_id_empty'] = 'Î ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÏ€Î¹Î»ÎÎ¾ÎµÏ„Îµ Ï€ÎµÎ»Î¬Ï„Î·<br>';
 ?>
+
diff --git a/interface/web/domain/lib/lang/el_domain.lng b/interface/web/domain/lib/lang/el_domain.lng
index 696d10da42b75b164259a43d2cedbfc0df32f90c..79bf5a86d4e0ac05d3f3546e6c60754aa93cc355 100644
--- a/interface/web/domain/lib/lang/el_domain.lng
+++ b/interface/web/domain/lib/lang/el_domain.lng
@@ -4,3 +4,4 @@ $wb['domain_error_unique'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± domain Ï…Ï€Î¬ÏÏ‡ÎµÎ¹';
 $wb['domain_error_regex'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± domain Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹';
 $wb['Domain'] = 'Domain';
 ?>
+
diff --git a/interface/web/domain/lib/lang/el_domain_list.lng b/interface/web/domain/lib/lang/el_domain_list.lng
index 943003863dc5371af4104d8c2c1be6cd443ae1dd..7d3a53bdd24bfaf13dd29ea6e62c2cc3dc4c17cd 100644
--- a/interface/web/domain/lib/lang/el_domain_list.lng
+++ b/interface/web/domain/lib/lang/el_domain_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Domains';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿ Domain';
 $wb['domain_txt'] = 'Domain';
 ?>
+
diff --git a/interface/web/help/lib/lang/ar_help_faq_list.lng b/interface/web/help/lib/lang/ar_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/ar_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/bg_help_faq_list.lng b/interface/web/help/lib/lang/bg_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/bg_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/br_help_faq_list.lng b/interface/web/help/lib/lang/br_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/br_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/cz_help_faq_list.lng b/interface/web/help/lib/lang/cz_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/cz_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/de_help_faq_list.lng b/interface/web/help/lib/lang/de_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/de_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/el.lng b/interface/web/help/lib/lang/el.lng
index 2a379411e3e71afa2984d145279c771f469c51f7..1a690af19cd77d2ab92567f37f2b7a717d477525 100644
--- a/interface/web/help/lib/lang/el.lng
+++ b/interface/web/help/lib/lang/el.lng
@@ -6,9 +6,10 @@ $wb['View messages'] = 'Î ÏÎ¿Î²Î¿Î»Î® Î¼Î·Î½Ï…Î¼Î¬Ï„Ï‰Î½';
 $wb['Support'] = 'Î¥Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î·';
 $wb['About ISPConfig'] = 'Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î³Î¹Î± Ï„Î¿ ISPConfig';
 $wb['Version'] = 'ÎˆÎºÎ´Î¿ÏƒÎ·';
-$wb['Frequently Asked Questions'] = 'Frequently Asked Questions';
-$wb['FAQ Sections'] = 'FAQ Sections';
-$wb['Manage Sections'] = 'Manage Sections';
-$wb['Add a Question & Answer Pair'] = 'Add a Question & Answer Pair';
-$wb['Manage Questions'] = 'Manage Questions';
+$wb['Frequently Asked Questions'] = 'Î£Ï…Ï‡Î½ÎÏ‚ Î•ÏÏ‰Ï„Î®ÏƒÎµÎ¹Ï‚';
+$wb['FAQ Sections'] = 'Î•Î½ÏŒÏ„Î·Ï„ÎµÏ‚ Î•ÏÏ‰Ï„Î®ÏƒÎµÏ‰Î½';
+$wb['Manage Sections'] = 'Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î•Î½Î¿Ï„Î®Ï„Ï‰Î½';
+$wb['Add a Question & Answer Pair'] = 'Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î¶ÎµÏÎ³Î¿Ï…Ï‚ Î•ÏÏŽÏ„Î·ÏƒÎ·Ï‚ - Î‘Ï€Î¬Î½Ï„Î·ÏƒÎ·Ï‚';
+$wb['Manage Questions'] = 'Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î•ÏÏ‰Ï„Î®ÏƒÎµÏ‰Î½';
 ?>
+
diff --git a/interface/web/help/lib/lang/el_faq_form.lng b/interface/web/help/lib/lang/el_faq_form.lng
index dfc4e8799c6caad6695051279a5ccb89da1def15..9f84708f27b2aa768d1f8b05c9724f7e603fbb41 100644
--- a/interface/web/help/lib/lang/el_faq_form.lng
+++ b/interface/web/help/lib/lang/el_faq_form.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['faq_faq_txt'] = 'Frequently Asked Questions';
-$wb['faq_question_txt'] = 'Question';
-$wb['faq_answer_txt'] = 'Answer';
-$wb['faq_section_txt'] = 'Section';
+$wb['faq_faq_txt'] = "Î£Ï…Ï‡Î½ÎÏ‚ Î•ÏÏ‰Ï„Î®ÏƒÎµÎ¹Ï‚";
+$wb['faq_question_txt'] = "Î•ÏÏŽÏ„Î·ÏƒÎ·";
+$wb['faq_answer_txt'] = "Î‘Ï€Î¬Î½Ï„Î·ÏƒÎ·";
+$wb['faq_section_txt'] = "Î•Î½ÏŒÏ„Î·Ï„Î±";
 ?>
+
diff --git a/interface/web/help/lib/lang/el_faq_manage_questions_list.lng b/interface/web/help/lib/lang/el_faq_manage_questions_list.lng
index 54e727dead6f311b05869cdd330774215005bcbe..a05a0a82435589e7e9d57f86d77430dfb5429d57 100644
--- a/interface/web/help/lib/lang/el_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/el_faq_manage_questions_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['faq_question_txt'] = 'Question';
-$wb['faq_section_name_txt'] = 'Section';
-$wb['faq_delete_txt'] = 'Delete';
-$wb['faq_edit_txt'] = 'Edit';
-$wb['faq_sections_txt'] = 'Section';
-$wb['faq_faq_questions_txt'] = 'Frequently Asked Questions';
-$wb['faq_new_question_txt'] = 'Add a new question & answer pair';
+$wb['faq_question_txt'] = 'Î•ÏÏŽÏ„Î·ÏƒÎ·';
+$wb['faq_section_name_txt'] = 'Î•Î½ÏŒÏ„Î·Ï„Î±';
+$wb['faq_delete_txt'] = 'Î”Î¹Î±Î³ÏÎ±Ï†Î®';
+$wb['faq_edit_txt'] = 'Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î±';
+$wb['faq_sections_txt'] = 'Î•Î½ÏŒÏ„Î·Ï„Î±';
+$wb['faq_faq_questions_txt'] = 'Î£Ï…Ï‡Î½ÎÏ‚ Î•ÏÏ‰Ï„Î®ÏƒÎµÎ¹Ï‚';
+$wb['faq_new_question_txt'] = 'Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î¶ÎµÏÎ³Î¿Ï…Ï‚ Î•ÏÏŽÏ„Î·ÏƒÎ·Ï‚ - Î‘Ï€Î¬Î½Ï„Î·ÏƒÎ·Ï‚';
 ?>
+
diff --git a/interface/web/help/lib/lang/el_faq_sections_form.lng b/interface/web/help/lib/lang/el_faq_sections_form.lng
index dab0863b812ae5dac8b7ba14c718632b6e14b241..e8fdc0a2cbbd9589c0048cf90d317a8226cc543a 100644
--- a/interface/web/help/lib/lang/el_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/el_faq_sections_form.lng
@@ -1,3 +1,4 @@
 <?php
-$wb['faq_section_name_txt'] = 'Section Name';
+$wb['faq_section_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î•Î½ÏŒÏ„Î·Ï„Î±Ï‚';
 ?>
+
diff --git a/interface/web/help/lib/lang/el_help_faq_list.lng b/interface/web/help/lib/lang/el_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/el_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/el_help_faq_sections_list.lng b/interface/web/help/lib/lang/el_help_faq_sections_list.lng
index cb6ce84c05a3f1715a53f395e6e922e00257f20e..08116299151dbf323291a2be9df34142ad0b2c85 100644
--- a/interface/web/help/lib/lang/el_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/el_help_faq_sections_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['faq_section_name_txt'] = 'Section Name';
-$wb['faq_delete_txt'] = 'Delete';
-$wb['faq_edit_txt'] = 'Edit';
-$wb['faq_sections_txt'] = 'Sections';
-$wb['faq_faq_sections_txt'] = 'FAQ Sections';
-$wb['faq_new_section_txt'] = 'Add a new section';
+$wb['faq_section_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î•Î½ÏŒÏ„Î·Ï„Î±Ï‚';
+$wb['faq_delete_txt'] = 'Î”Î¹Î±Î³ÏÎ±Ï†Î®';
+$wb['faq_edit_txt'] = 'Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î±';
+$wb['faq_sections_txt'] = 'Î•Î½ÏŒÏ„Î·Ï„ÎµÏ‚';
+$wb['faq_faq_sections_txt'] = 'Î•Î½ÏŒÏ„Î·Ï„ÎµÏ‚ Î•ÏÏ‰Ï„Î®ÏƒÎµÏ‰Î½';
+$wb['faq_new_section_txt'] = 'Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î•Î½ÏŒÏ„Î·Ï„Î±Ï‚';
 ?>
+
diff --git a/interface/web/help/lib/lang/el_support_message.lng b/interface/web/help/lib/lang/el_support_message.lng
index 7ac0adfdf2979047c75821c168f0d32059428b8d..1613a71e579efccd7419ba423bfefc346e5abff4 100644
--- a/interface/web/help/lib/lang/el_support_message.lng
+++ b/interface/web/help/lib/lang/el_support_message.lng
@@ -4,5 +4,6 @@ $wb['sender_id_txt'] = 'ID Î‘Ï€Î¿ÏƒÏ„Î¿Î»ÎÎ±';
 $wb['subject_txt'] = 'Î˜ÎÎ¼Î±';
 $wb['message_txt'] = 'ÎœÎ®Î½Ï…Î¼Î±';
 $wb['tstamp_txt'] = 'Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î±/ÎÏÎ±';
-$wb['reply_txt'] = 'Reply';
+$wb['reply_txt'] = 'Î‘Ï€Î¬Î½Ï„Î·ÏƒÎ·';
 ?>
+
diff --git a/interface/web/help/lib/lang/el_support_message_list.lng b/interface/web/help/lib/lang/el_support_message_list.lng
index e8b2cf33818eabc2c20b2e8b84b3b89d8de7a313..97381d836d5fef1fae335a1730d2ce33c7a7b08b 100644
--- a/interface/web/help/lib/lang/el_support_message_list.lng
+++ b/interface/web/help/lib/lang/el_support_message_list.lng
@@ -4,3 +4,4 @@ $wb['sender_id_txt'] = 'Î‘Ï€Î¿ÏƒÏ„Î¿Î»ÎÎ±Ï‚';
 $wb['subject_txt'] = 'Î˜ÎÎ¼Î±';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿ Î¼Î®Î½Ï…Î¼Î± Ï…Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î·Ï‚';
 ?>
+
diff --git a/interface/web/help/lib/lang/en_help_faq_list.lng b/interface/web/help/lib/lang/en_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/en_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/es_help_faq_list.lng b/interface/web/help/lib/lang/es_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/es_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/fi_help_faq_list.lng b/interface/web/help/lib/lang/fi_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/fi_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/fr_help_faq_list.lng b/interface/web/help/lib/lang/fr_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/fr_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/hr_help_faq_list.lng b/interface/web/help/lib/lang/hr_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/hr_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/hu_help_faq_list.lng b/interface/web/help/lib/lang/hu_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/hu_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/id_help_faq_list.lng b/interface/web/help/lib/lang/id_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/id_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/it_help_faq_list.lng b/interface/web/help/lib/lang/it_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/it_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/ja_help_faq_list.lng b/interface/web/help/lib/lang/ja_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/ja_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/nl_help_faq_list.lng b/interface/web/help/lib/lang/nl_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/nl_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/pl_help_faq_list.lng b/interface/web/help/lib/lang/pl_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/pl_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/pt_help_faq_list.lng b/interface/web/help/lib/lang/pt_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/pt_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/ro_help_faq_list.lng b/interface/web/help/lib/lang/ro_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/ro_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/ru_help_faq_list.lng b/interface/web/help/lib/lang/ru_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/ru_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/se_help_faq_list.lng b/interface/web/help/lib/lang/se_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/se_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/sk_help_faq_list.lng b/interface/web/help/lib/lang/sk_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/sk_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/tr_help_faq_list.lng b/interface/web/help/lib/lang/tr_help_faq_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b6c7b460b9ecab5767e64a0b73350772e5a7027b
--- /dev/null
+++ b/interface/web/help/lib/lang/tr_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm
index cba74d2ae58adcfe882bcd885e1e33448de8635d..2451c9f41711227c359abc9ec97c5202b0934e22 100644
--- a/interface/web/help/templates/help_faq_list.htm
+++ b/interface/web/help/templates/help_faq_list.htm
@@ -11,7 +11,7 @@ href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpses
 >
 <span>Delete</span></a>
 	</div>
-<a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">Edit</a>
+<a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="edit_txt"}</a>
 	<br/>
 	<br/>
 	<br/>
diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng
index e9056a43eaabc15c78ad8eb54c54dfb68bef7fca..849537b27dcf9586e395b9c81b21be0eb13b7dcb 100644
--- a/interface/web/login/lib/lang/el.lng
+++ b/interface/web/login/lib/lang/el.lng
@@ -15,3 +15,4 @@ $wb['username_txt'] = 'ÎŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·';
 $wb['password_txt'] = 'Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ';
 $wb['login_button_txt'] = 'Î•Î¯ÏƒÎ¿Î´Î¿Ï‚';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el.lng b/interface/web/mail/lib/lang/el.lng
index d3d25ffad3be23851fc34e33ee88177043c67132..5180b8d9ef8051c4b655dd534092d44e8b75f33c 100644
--- a/interface/web/mail/lib/lang/el.lng
+++ b/interface/web/mail/lib/lang/el.lng
@@ -45,3 +45,4 @@ $wb['Global Filters'] = 'ÎšÎ±Î¸Î¿Î»Î¹ÎºÎ¬ Î¦Î¯Î»Ï„ÏÎ±';
 $wb['Domain Alias'] = 'Î¨ÎµÏ…Î´ÏŽÎ½Ï…Î¼Î¿ Domain';
 $wb['Relay Recipients'] = 'Î Î±ÏÎ±Î»Î®Ï€Ï„ÎµÏ‚ Relay';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_alias.lng b/interface/web/mail/lib/lang/el_mail_alias.lng
index 767b35a859124294ecad0f070aa09b5f2a54c663..8b8a3ae3f471a40e340aab8a1c7a511ea19fa092 100644
--- a/interface/web/mail/lib/lang/el_mail_alias.lng
+++ b/interface/web/mail/lib/lang/el_mail_alias.lng
@@ -10,3 +10,4 @@ $wb['limit_mailalias_txt'] = 'ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®
 $wb['duplicate_mailbox_txt'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î¼Î¹Î± Î¸Ï…ÏÎ¯Î´Î± Î¼Îµ Î±Ï…Ï„Î® Ï„Î· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email';
 $wb['domain_txt'] = 'Domain';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_alias_list.lng b/interface/web/mail/lib/lang/el_mail_alias_list.lng
index f6dc4576b80b15dc79e136ccf18e0bc6b9fc4b7a..b3e1f7ef4cf958f091531b36faf93b4c36b4e955 100644
--- a/interface/web/mail/lib/lang/el_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_alias_list.lng
@@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿ Î¨ÎµÏ…Î´ÏŽÎ½Ï…Î¼Î¿ Email';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_aliasdomain.lng b/interface/web/mail/lib/lang/el_mail_aliasdomain.lng
index d4a165815039ad2fabcf5fd676ce4525abe99de9..52f26a057d05f71cbbb3fdf50511a1dab43716db 100644
--- a/interface/web/mail/lib/lang/el_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/el_mail_aliasdomain.lng
@@ -4,8 +4,9 @@ $wb['destination_txt'] = 'Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚';
 $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 $wb['no_domain_perm'] = 'Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ domain.';
 $wb['limit_mailaliasdomain_txt'] = 'Î¤Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ ÏˆÎµÏ…Î´Ï‰Î½ÏÎ¼Ï‰Î½ email domains Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚, ÎÏ‡ÎµÎ¹ ÎµÎ¾Î±Î½Ï„Î»Î·Î¸ÎµÎ¯';
-$wb['source_destination_identical_txt'] = 'Î¤Î± Domain Î Î·Î³Î® ÎºÎ±Î¹ Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ ÎµÎ¯Î½Î±Î¹ Î¯Î´Î¹Î±';
+$wb['source_destination_identical_txt'] = 'Î¤Î± Domain Î•ÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚ ÎºÎ±Î¹ Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼Î¿Ï ÎµÎ¯Î½Î±Î¹ Î¯Î´Î¹Î±';
 $wb['source_error_empty'] = 'Î¤Î¿ Domain Î Î·Î³Î® Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯';
 $wb['source_error_unique'] = 'Î¤Î¿ Domain Î Î·Î³Î® Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î¼Î¿Î½Î±Î´Î¹ÎºÏŒ';
-$wb['source_error_regex'] = 'ÎœÎ® ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Î³Î¹Î± Ï„Î¿ Domain Î Î·Î³Î®';
+$wb['source_error_regex'] = 'ÎœÎ® ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Î³Î¹Î± Ï„Î¿ Domain Î•ÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng
index fa50e87bb4c0002c927d89ac3db1b4c989993dd1..dbbe3006082066dd230fa8f513aee380dc6f53eb 100644
--- a/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng
@@ -5,3 +5,4 @@ $wb['source_txt'] = 'Î Î·Î³Î®';
 $wb['destination_txt'] = 'Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿ ÏˆÎµÏ…Î´Ï‰Î½ÏÎ¼Î¿ Domain';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_blacklist.lng b/interface/web/mail/lib/lang/el_mail_blacklist.lng
index 479a3deb0168c44221f7a64a8872e44a780a9659..75485e4f1c57db3835e82e72dc0cc630139c9ae6 100644
--- a/interface/web/mail/lib/lang/el_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/el_mail_blacklist.lng
@@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®.';
 $wb['type_txt'] = 'Î¤ÏÏ€Î¿Ï‚';
 $wb['limit_mailfilter_txt'] = 'ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Ï†Î¯Î»Ï„ÏÏ‰Î½ email Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_blacklist_list.lng b/interface/web/mail/lib/lang/el_mail_blacklist_list.lng
index a2f23fd0554bcdf2fe09d46eee986a38f9c317da..3f3a4d288355335914fb1e69ebdc7242bb71c5d0 100644
--- a/interface/web/mail/lib/lang/el_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_blacklist_list.lng
@@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Î Î±ÏÎ±Î»Î®Ï€Ï„Î·Ï‚';
 $wb['add_new_record_txt'] = 'ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î® Blacklist';
 $wb['access_txt'] = 'Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_content_filter.lng b/interface/web/mail/lib/lang/el_mail_content_filter.lng
index 46c6d80072f58bc060d73d4d042877414d2e5087..c974878b08fb2772f07ccaba7afb4e1cf106cb92 100644
--- a/interface/web/mail/lib/lang/el_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/el_mail_content_filter.lng
@@ -7,3 +7,4 @@ $wb['action_txt'] = 'Î•Î½ÎÏÎ³ÎµÎ¹Î±';
 $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 $wb['pattern_error_empty'] = 'Î¤Î¿ Î¼Î¿Ï„Î¯Î²Î¿ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_content_filter_list.lng b/interface/web/mail/lib/lang/el_mail_content_filter_list.lng
index 2103b5cd12a836fb0cde2f15d8f81acd593b206c..200058fcf4b14a863b66e11018413a727f7af45a 100644
--- a/interface/web/mail/lib/lang/el_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_content_filter_list.lng
@@ -6,3 +6,4 @@ $wb['pattern_txt'] = 'ÎœÎ¿Ï„Î¯Î²Î¿';
 $wb['action_txt'] = 'Î•Î½ÎÏÎ³ÎµÎ¹Î±';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿ Ï†Î¯Î»Ï„ÏÎ¿ Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï…';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng
index 7e825ad4ba3737b00facd211a195901521b92236..9c29f475515b688a95fa1529ed5f9a47931a6389 100644
--- a/interface/web/mail/lib/lang/el_mail_domain.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain.lng
@@ -11,3 +11,4 @@ $wb['limit_maildomain_txt'] = 'ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- Î±Î½ÎµÎ½ÎµÏÎ³ÏŒ -';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng
index b3be224d56fee48d4d37abfef87da62d9b2c914a..4a1a84ed8d1805796a92c4bade35f97b48380ab5 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng
@@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'ÎÎÎ¿ Domain';
 $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 $wb['sys_groupid_txt'] = 'Î ÎµÎ»Î¬Ï„Î·Ï‚';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
index 2465af0d3861b32a6ca2fbfa711575642fe79f6c..fdf5e408259ef6aaf0208694d90339dd736ce21d 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
@@ -7,3 +7,4 @@ $wb['no_domain_perm'] = 'Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± Î³Î¹Î± Î±Ï…Ï„ÏŒ
 $wb['domain_error_regex'] = 'ÎœÎ· ÎÎ³ÎºÏÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± domain Î® Ï„Î¿ ÏŒÎ½Î¿Î¼Î± Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î¼Î· ÎµÏ€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½Î¿Ï…Ï‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚';
 $wb['limit_mailcatchall_txt'] = 'Î¤Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ email catchall Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚, ÎÏ‡ÎµÎ¹ ÎµÎ¾Î±Î½Ï„Î»Î·Î¸ÎµÎ¯.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng
index e21ecb7f7fef5474ee110a4217ed4e62b069b361..55d0e08bdc98f67cc9b0130d120bab493bdcaf0d 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng
@@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿ Catchall';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_domain_list.lng b/interface/web/mail/lib/lang/el_mail_domain_list.lng
index 89fb44aa210b98ff15f1b8a25ff35b2c8e12ba2b..393171c43a87322e15ebfeac3413e6e15b17feaf 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_list.lng
@@ -5,3 +5,4 @@ $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿ Domain';
 $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_forward.lng b/interface/web/mail/lib/lang/el_mail_forward.lng
index d9066d275e4915107a00e6c614cd891f2bcc81d8..02450709657477f417be85f6710456134d1ec42f 100644
--- a/interface/web/mail/lib/lang/el_mail_forward.lng
+++ b/interface/web/mail/lib/lang/el_mail_forward.lng
@@ -6,3 +6,4 @@ $wb['limit_mailforward_txt'] = 'Î¤Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ email fo
 $wb['duplicate_mailbox_txt'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î¼Î¹Î± Î¸Ï…ÏÎ¯Î´Î± Î¼Îµ Î±Ï…Ï„Î® Ï„Î· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email';
 $wb['domain_txt'] = 'Domain';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_forward_list.lng b/interface/web/mail/lib/lang/el_mail_forward_list.lng
index 623c4f266ad2880944b8f17cc39134250ecc0c79..11e5650dc975f024160bb422948b17b7623d861d 100644
--- a/interface/web/mail/lib/lang/el_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_forward_list.lng
@@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'ÎÎÎ± Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎ· Email';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_get.lng b/interface/web/mail/lib/lang/el_mail_get.lng
index 66d2cb3dce7e24d1b735a8609c499a1c3aaa5912..4cba32614df8b8b3b43beb3b042a3af933afc334 100644
--- a/interface/web/mail/lib/lang/el_mail_get.lng
+++ b/interface/web/mail/lib/lang/el_mail_get.lng
@@ -13,5 +13,6 @@ $wb['source_username_error_isempty'] = 'Î¤Î¿ ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î· Î´ÎµÎ½ ÎÏ‡
 $wb['source_password_error_isempty'] = 'Î¤Î¿ Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.';
 $wb['destination_error_isemail'] = 'Î”ÎµÎ½ ÎµÏ€Î¹Î»ÎÏ‡Î¸Î·ÎºÎµ Ï€ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚.';
 $wb['source_server_error_regex'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï… Pop3/Imap Server Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ¿.';
-$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['source_read_all_txt'] = 'Î‘Î½Î¬ÎºÏ„Î·ÏƒÎ· ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ emails (ÏƒÏ…Î¼Ï€ÎµÏ. Î±Î½Î±Î³Î½Ï‰ÏƒÎ¼ÎÎ½Ï‰Î½ mails)';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_get_list.lng b/interface/web/mail/lib/lang/el_mail_get_list.lng
index 0490889745a64fdea05d69346457a63c678a0938..658e6b27e18dab13d6efc96aeda84df57ca93167 100644
--- a/interface/web/mail/lib/lang/el_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_get_list.lng
@@ -7,3 +7,4 @@ $wb['source_username_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î·';
 $wb['destination_txt'] = 'Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿Ï‚ Î›Î¿Î³Î±ÏÎ¹ÏƒÎ¼ÏŒÏ‚';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist.lng b/interface/web/mail/lib/lang/el_mail_mailinglist.lng
index d9c3059f1e8dd4fc7b3ec01ea11c996d883e679c..485d7a1b76afc78d56d8f17f751777b00998c340 100644
--- a/interface/web/mail/lib/lang/el_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/el_mail_mailinglist.lng
@@ -1,15 +1,16 @@
 <?php
-$wb['limit_mailmailinglist_txt'] = 'Limit reached';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['listname_error_empty'] = 'Listname is empty.';
-$wb['domain_error_regex'] = 'Invalid domain name.';
-$wb['email_in_use_txt'] = 'Email is in use';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['listname_txt'] = 'Listname';
-$wb['client_txt'] = 'Client';
-$wb['email_txt'] = 'Email';
-$wb['password_txt'] = 'Password';
+$wb['limit_mailmailinglist_txt'] = "Î¤Î¿ ÏŒÏÎ¹Î¿ Î¾ÎµÏ€ÎµÏÎ¬ÏƒÏ„Î·ÎºÎµ.";
+$wb['domain_error_empty'] = "Î¤Î¿ Domain ÎµÎ¯Î½Î±Î¹ Î¬Î´ÎµÎ¹Î¿.";
+$wb['listname_error_empty'] = "Î— Î»Î¯ÏƒÏ„Î± ÎµÎ¯Î½Î±Î¹ Î¬Î´ÎµÎ¹Î±.";
+$wb['domain_error_regex'] = "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± domain Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ¿/";
+$wb['email_in_use_txt'] = "Î¤Î¿ email Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î®Î´Î·.";
+$wb['no_domain_perm'] = "Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ domain.";
+$wb['password_strength_txt'] = "Î”ÏÎ½Î±Î¼Î· ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï";
+$wb['server_id_txt'] = "Server";
+$wb['domain_txt'] = "Domain";
+$wb['listname_txt'] = "ÎŒÎ½Î¿Î¼Î± Î»Î¯ÏƒÏ„Î±Ï‚";
+$wb['client_txt'] = "Î ÎµÎ»Î¬Ï„Î·Ï‚";
+$wb['email_txt'] = "Email";
+$wb['password_txt'] = "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ";
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng
index dac225ad99abb180eaa61fb503b5ca89634f2640..4701821caf310bfd859af979ae7896a8b720e86e 100644
--- a/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['list_head_txt'] = 'Mailing List';
 $wb['domain_txt'] = 'Domain';
-$wb['listname_txt'] = 'Listname';
+$wb['listname_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î›Î¯ÏƒÏ„Î±Ï‚';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_relay_recipient.lng b/interface/web/mail/lib/lang/el_mail_relay_recipient.lng
index 8a643627f52f52bc4e901354d8be61dfcc40b06c..769e306613b8c557c2fffcb32e67e10408d8e335 100644
--- a/interface/web/mail/lib/lang/el_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/el_mail_relay_recipient.lng
@@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®';
 $wb['type_txt'] = 'Î¤ÏÏ€Î¿Ï‚';
 $wb['limit_mailfilter_txt'] = 'Î¤Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Ï†Î¯Î»Ï„ÏÏ‰Î½ email Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚, ÎµÎ¾Î±Î½Ï„Î»Î®Î¸Î·ÎºÎµ.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng
index 80298c1e6719143814c088b6109d030cd5531316..1028112c96ea5811a3acf58c1e2306c78f60970b 100644
--- a/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng
@@ -7,3 +7,4 @@ $wb['recipient_txt'] = 'Î Î±ÏÎ±Î»Î®Ï€Ï„Î·Ï‚';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿Ï‚ Ï€Î±ÏÎ±Î»Î®Ï€Ï„Î·Ï‚ relay';
 $wb['access_txt'] = 'Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter.lng b/interface/web/mail/lib/lang/el_mail_spamfilter.lng
index 48c4eaa4cdf3c060c9bea1bcf795e73fe55ba737..b6cd7197aeb1437c68a8fa9d1410c6868973311c 100644
--- a/interface/web/mail/lib/lang/el_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/el_mail_spamfilter.lng
@@ -15,3 +15,4 @@ $wb['email_error_unique'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î¼Î¹Î± ÎµÎ³Î³ÏÎ±Ï†Î® Ï†Î¯Î»
 $wb['spam_redirect_maildir_purge_txt'] = 'Î•ÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· Ï†Î±ÎºÎÎ»Î¿Ï… mail Î¼ÎµÏ„Î¬';
 $wb['days_txt'] = 'Î—Î¼ÎÏÎµÏ‚.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng
index 9468e4e9d4418d5bfac699b340c969998b21641f..4b2f141cc509d86ef2b8e853fb8b8c479635a8ee 100644
--- a/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng
@@ -6,3 +6,4 @@ $wb['server_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Server';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î® Ï†Î¯Î»Ï„ÏÎ¿Ï… Spam';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_transport.lng b/interface/web/mail/lib/lang/el_mail_transport.lng
index ab097e31d4ee188cf454049d98d8b1eeb0540a50..34c779dbff4e54655177167821c77a79a3f4d2e3 100644
--- a/interface/web/mail/lib/lang/el_mail_transport.lng
+++ b/interface/web/mail/lib/lang/el_mail_transport.lng
@@ -8,3 +8,4 @@ $wb['sort_order_txt'] = 'Î¤Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ· ÎºÎ±Ï„Î¬';
 $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 $wb['limit_mailrouting_txt'] = 'Î¤Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î®ÏƒÎµÏ‰Î½ email Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚, ÎµÎ¾Î±Î½Ï„Î»Î®Î¸Î·ÎºÎµ.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_transport_list.lng b/interface/web/mail/lib/lang/el_mail_transport_list.lng
index 249eee9e5cd1f6c6f99ce6be10dcfd599cc62396..72ae994eac3be0de938de580e4e18e928d06a1e5 100644
--- a/interface/web/mail/lib/lang/el_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_transport_list.lng
@@ -7,3 +7,4 @@ $wb['transport_txt'] = 'ÎœÎµÏ„Î±Ï†Î¿ÏÎ¬';
 $wb['sort_order_txt'] = 'Î¤Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ· ÎºÎ±Ï„Î¬';
 $wb['add_new_record_txt'] = 'ÎÎÎ± Î¼ÎµÏ„Î±Ï†Î¿ÏÎ¬';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng
index a2ea16026bd3d947db142bb571bb5cadcb420f6c..dd2e6847c79265d3ef2ab048c041ec37103ad1d2 100644
--- a/interface/web/mail/lib/lang/el_mail_user.lng
+++ b/interface/web/mail/lib/lang/el_mail_user.lng
@@ -1,44 +1,45 @@
 <?php
-$wb['custom_mailfilter_txt'] = 'Î ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿ Ï†Î¯Î»Ï„ÏÎ¿';
-$wb['email_txt'] = 'Email';
-$wb['cryptpwd_txt'] = 'Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ';
-$wb['password_strength_txt'] = 'Î”ÏÎ½Î±Î¼Î· Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï';
-$wb['active_txt'] = 'Active';
-$wb['email_error_isemail'] = 'Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Email Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ·.';
-$wb['email_error_unique'] = 'Î”Î¹Ï€Î»Î® Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Email.';
-$wb['autoresponder_text_txt'] = 'ÎšÎµÎ¯Î¼ÎµÎ½Î¿';
-$wb['autoresponder_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
-$wb['autoresponder_start_date_txt'] = 'ÎˆÎ½Î±ÏÎ¾Î·';
-$wb['autoresponder_start_date_isfuture'] = 'Î— Î·Î¼ÎµÏ. ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÎ¯Î½Î±Î¹ ÏƒÏ„Î¿ Ï€Î±ÏÎµÎ»Î¸ÏŒÎ½.';
-$wb['autoresponder_end_date_txt'] = 'Î›Î®Î¾Î·';
-$wb['autoresponder_end_date_isgreater'] = 'Î— Î·Î¼ÎµÏ. Ï„ÎÎ»Î¿Ï…Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î´Ï‰Î¸ÎµÎ¯ ÎºÎ±Î¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î¼ÎµÏ„Î±Î³ÎµÎ½ÎÏƒÏ„ÎµÏÎ· Ï„Î·Ï‚ Î·Î¼ÎµÏ. ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['error_no_pwd'] = 'Î¤Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.';
-$wb['quota_error_isint'] = 'Î¤Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ Ï„Î·Ï‚ Î¸Ï…ÏÎ¯Î´Î±Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
-$wb['quota_txt'] = 'ÎŒÏÎ¹Î¿ Ï‡ÏŽÏÎ¿Ï…';
-$wb['server_id_txt'] = 'Aerver_id';
-$wb['password_txt'] = 'Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ';
-$wb['maildir_txt'] = 'Maildir';
-$wb['postfix_txt'] = 'Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î›Î®ÏˆÎ·Ï‚';
-$wb['access_txt'] = 'Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚';
-$wb['policy_txt'] = 'Spamfilter';
-$wb['no_policy'] = '- Î±Î½ÎµÎ½ÎµÏÎ³Î® -';
-$wb['limit_mailbox_txt'] = 'ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Î¸Ï…ÏÎ¯Î´Ï‰Î½ Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚.';
-$wb['limit_mailquota_txt'] = 'ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ ÏƒÏ„Î¿ Î¼ÎÎ³ÎµÏƒÏ„Î¿ Ï‡ÏŽÏÎ¿ Ï„Î·Ï‚ Î¸Ï…ÏÎ¯Î´Î± ÏƒÎ±Ï‚.ÎŸ Î¼ÎÎ³Î¹ÏƒÏ„Î¿Ï‚ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ Ï‡ÏŽÏÎ¿Ï‚ ÏƒÎµ MB ÎµÎ¯Î½Î±Î¹';
-$wb['disableimap_txt'] = 'Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· IMAP';
-$wb['disablepop3_txt'] = 'Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· POP3';
-$wb['duplicate_alias_or_forward_txt'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· ÎÎ½Î± ÏˆÎµÏ…Î´Ï‰Î½ÏÎ¼Î¿ Î® Î¼Î¯Î± Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎ· Î¼Îµ Î±Ï…Ï„Î® Ï„Î· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email.';
-$wb['quota_error_value'] = 'ÎœÎ· ÎÎ³ÎºÏ…ÏÎ· Ï„Î¹Î¼Î® Î¿ÏÎ¯Î¿Ï… Ï‡ÏŽÏÎ¿Ï…. Î•Ï€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½ÎµÏ‚ Ï„Î¹Î¼ÎÏ‚ ÎµÎ¯Î½Î±Î¹: 0 Î³Î¹Î± Î±Ï€ÎµÏÎ¹ÏŒÏÎ¹ÏƒÏ„Î¿ Î® Î±ÏÎ¹Î¸Î¼Î¿Î¯ > 1';
-$wb['move_junk_txt'] = 'ÎœÎµÏ„Î±ÎºÎ¯Î½Î·ÏƒÎ· Ï„Ï‰Î½ Spam Emails ÏƒÏ„Î¿ Ï†Î¬ÎºÎµÎ»Î¿ Junk';
-$wb['name_txt'] = 'Î ÏÎ±Î³Î¼Î±Ï„Î¹ÎºÏŒ ÎŒÎ½Î¿Î¼Î±';
-$wb['name_optional_txt'] = '(Î ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)';
-$wb['autoresponder_active'] = 'Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î·Ï‚ Î±Ï€Î¬Î½Ï„Î·ÏƒÎ·Ï‚';
-$wb['cc_txt'] = 'Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î® Î±Î½Ï„Î¹Î³ÏÎ¬Ï†Î¿Ï… ÏƒÎµ ';
-$wb['cc_error_isemail'] = 'Î¤Î¿ ';
-$wb['domain_txt'] = 'Domain';
-$wb['now_txt'] = 'Now';
-$wb['login_error_unique'] = 'Login is already taken.';
-$wb['login_error_regex'] = 'Valid characters are A-Z, a-z, 0-9, ., _ and -.';
-$wb['login_txt'] = 'Login (optional)';
-$wb['error_login_email_txt'] = 'This login is not allowed. Please enter a different login or use the mail address as login.';
+$wb['custom_mailfilter_txt'] = "Î ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿ Ï†Î¯Î»Ï„ÏÎ¿";
+$wb['email_txt'] = "Email";
+$wb['cryptpwd_txt'] = "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ";
+$wb['password_strength_txt'] = "Î”ÏÎ½Î±Î¼Î· Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï";
+$wb['active_txt'] = "Î•Î½ÎµÏÎ³ÏŒ";
+$wb['email_error_isemail'] = "Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Email Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ·.";
+$wb['email_error_unique'] = "Î”Î¹Ï€Î»Î® Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Email.";
+$wb['autoresponder_text_txt'] = "ÎšÎµÎ¯Î¼ÎµÎ½Î¿";
+$wb['autoresponder_txt'] = "Î•Î½ÎµÏÎ³ÏŒ";
+$wb['autoresponder_start_date_txt'] = "ÎˆÎ½Î±ÏÎ¾Î·";
+$wb['autoresponder_start_date_isfuture'] = "Î— Î·Î¼ÎµÏ. ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÎ¯Î½Î±Î¹ ÏƒÏ„Î¿ Ï€Î±ÏÎµÎ»Î¸ÏŒÎ½.";
+$wb['autoresponder_end_date_txt'] = "Î›Î®Î¾Î·";
+$wb['autoresponder_end_date_isgreater'] = "Î— Î·Î¼ÎµÏ. Ï„ÎÎ»Î¿Ï…Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î´Ï‰Î¸ÎµÎ¯ ÎºÎ±Î¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î¼ÎµÏ„Î±Î³ÎµÎ½ÎÏƒÏ„ÎµÏÎ· Ï„Î·Ï‚ Î·Î¼ÎµÏ. ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚";
+$wb['no_domain_perm'] = "Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ domain.";
+$wb['error_no_pwd'] = "Î¤Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.";
+$wb['quota_error_isint'] = "Î¤Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ Ï„Î·Ï‚ Î¸Ï…ÏÎ¯Î´Î±Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.";
+$wb['quota_txt'] = "ÎŒÏÎ¹Î¿ Ï‡ÏŽÏÎ¿Ï…";
+$wb['server_id_txt'] = "Aerver_id";
+$wb['password_txt'] = "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ";
+$wb['maildir_txt'] = "Maildir";
+$wb['postfix_txt'] = "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î›Î®ÏˆÎ·Ï‚";
+$wb['access_txt'] = "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚";
+$wb['policy_txt'] = "Î¦Î¯Î»Ï„ÏÎ¿ Spam";
+$wb['no_policy'] = "- Î±Î½ÎµÎ½ÎµÏÎ³Î® -";
+$wb['limit_mailbox_txt'] = "ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Î¸Ï…ÏÎ¯Î´Ï‰Î½ Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚.";
+$wb['limit_mailquota_txt'] = "ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ ÏƒÏ„Î¿ Î¼ÎÎ³ÎµÏƒÏ„Î¿ Ï‡ÏŽÏÎ¿ Ï„Î·Ï‚ Î¸Ï…ÏÎ¯Î´Î± ÏƒÎ±Ï‚.ÎŸ Î¼ÎÎ³Î¹ÏƒÏ„Î¿Ï‚ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ Ï‡ÏŽÏÎ¿Ï‚ ÏƒÎµ MB ÎµÎ¯Î½Î±Î¹";
+$wb['disableimap_txt'] = "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· IMAP";
+$wb['disablepop3_txt'] = "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· POP3";
+$wb['duplicate_alias_or_forward_txt'] = "Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· ÎÎ½Î± ÏˆÎµÏ…Î´Ï‰Î½ÏÎ¼Î¿ Î® Î¼Î¯Î± Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎ· Î¼Îµ Î±Ï…Ï„Î® Ï„Î· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email.";
+$wb['quota_error_value'] = "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ· Ï„Î¹Î¼Î® Î¿ÏÎ¯Î¿Ï… Ï‡ÏŽÏÎ¿Ï…. Î•Ï€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½ÎµÏ‚ Ï„Î¹Î¼ÎÏ‚ ÎµÎ¯Î½Î±Î¹: 0 Î³Î¹Î± Î±Ï€ÎµÏÎ¹ÏŒÏÎ¹ÏƒÏ„Î¿ Î® Î±ÏÎ¹Î¸Î¼Î¿Î¯ > 1";
+$wb['move_junk_txt'] = "ÎœÎµÏ„Î±ÎºÎ¯Î½Î·ÏƒÎ· Ï„Ï‰Î½ Spam Emails ÏƒÏ„Î¿ Ï†Î¬ÎºÎµÎ»Î¿ Junk";
+$wb['name_txt'] = "Î ÏÎ±Î³Î¼Î±Ï„Î¹ÎºÏŒ ÎŒÎ½Î¿Î¼Î±";
+$wb['name_optional_txt'] = "(Î ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)";
+$wb['autoresponder_active'] = "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î·Ï‚ Î±Ï€Î¬Î½Ï„Î·ÏƒÎ·Ï‚";
+$wb['cc_txt'] = "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î® Î±Î½Ï„Î¹Î³ÏÎ¬Ï†Î¿Ï… ÏƒÎµ ";
+$wb['cc_error_isemail'] = "Î ÏÎ¿Ï‚";
+$wb['domain_txt'] = "Domain";
+$wb['now_txt'] = "Î¤ÏŽÏÎ±";
+$wb['login_error_unique'] = "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î®Î´Î·";
+$wb['login_error_regex'] = "ÎˆÎ³Î³Ï…ÏÎ¿Î¹ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚ ÎµÎ¯Î½Î±Î¹ Î¿Î¹ A-Z, a-z, 0-9, ., _ ÎºÎ±Î¹ -.";
+$wb['login_txt'] = "Login (Ï€ÏÎ¿Î±Î¹Ï„ÎµÏÎ¹ÎºÎ¬)";
+$wb['error_login_email_txt'] = "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹. Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Î±Î¹ ÎÎ½Î± Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÏŒ ÏŒÎ½Î¿Î¼Î± Î® Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ÏƒÏ„Îµ Ï„Î·Î½ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· e-mail.";
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_user_filter.lng b/interface/web/mail/lib/lang/el_mail_user_filter.lng
index cee6a05823db53c2f35d6ab3a749bafdbcdd73e6..39ad5eae03ba3d4bd43e4147c6889297fe8c8969 100644
--- a/interface/web/mail/lib/lang/el_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_filter.lng
@@ -8,13 +8,14 @@ $wb['searchterm_is_empty'] = 'ÎŸ ÏŒÏÎ¿Ï‚ Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ 
 $wb['source_txt'] = 'Î Î·Î³Î®';
 $wb['target_error_regex'] = 'ÎŸ Ï€ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î¼ÏŒÎ½Î¿ Î±Ï…Ï„Î¿ÏÏ‚ Ï„Î¿Ï…Ï‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚: a-z, 0-9, -, ., _, ÎºÎ±Î¹ {ÎºÎµÎ½ÏŒ}';
 $wb['limit_mailfilter_txt'] = 'ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Ï†Î¯Î»Ï„ÏÏ‰Î½ mail.';
-$wb['subject_txt'] = 'Subject';
-$wb['from_txt'] = 'From';
-$wb['to_txt'] = 'To';
-$wb['contains_txt'] = 'Contains';
-$wb['is_txt'] = 'Is';
-$wb['begins_with_txt'] = 'Begins with';
-$wb['ends_with_txt'] = 'Ends with';
-$wb['move_to_txt'] = 'Move to';
-$wb['delete_txt'] = 'Delete';
+$wb['subject_txt'] = 'Î˜ÎÎ¼Î±';
+$wb['from_txt'] = 'Î‘Ï€ÏŒ';
+$wb['to_txt'] = 'Î ÏÎ¿Ï‚';
+$wb['contains_txt'] = 'Î ÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹';
+$wb['is_txt'] = 'ÎµÎ¯Î½Î±Î¹';
+$wb['begins_with_txt'] = 'ÎžÎµÎºÎ¹Î½Î¬ Î¼Îµ';
+$wb['ends_with_txt'] = 'Î¤ÎµÎ»ÎµÎ¹ÏŽÎ½ÎµÎ¹ ÏƒÎµ';
+$wb['move_to_txt'] = 'ÎœÎµÏ„Î±ÎºÎ¯Î½Î·ÏƒÎ· ÏƒÎµ';
+$wb['delete_txt'] = 'Î”Î¹Î±Î³ÏÎ±Ï†Î®';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_user_filter_list.lng b/interface/web/mail/lib/lang/el_mail_user_filter_list.lng
index 63efeb4fbf679c26fb62b4ac8dd49950c9b94a96..9f2aa4000b02e23c650bf223db30a43b03ca958d 100644
--- a/interface/web/mail/lib/lang/el_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_filter_list.lng
@@ -5,3 +5,4 @@ $wb['page_txt'] = 'Î£ÎµÎ»Î¯Î´Î±';
 $wb['page_of_txt'] = 'Î±Ï€ÏŒ';
 $wb['delete_confirmation'] = 'Î˜ÎÎ»ÎµÏ„Îµ Î¿Ï€Ï‰ÏƒÎ´Î®Ï€Î¿Ï„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Ï„Î¿ Ï†Î¯Î»Ï„ÏÎ¿ mail;';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_user_list.lng b/interface/web/mail/lib/lang/el_mail_user_list.lng
index 7e3f57bb72ba25148d7f3734d25c18b18a78f890..aa82d04b22e76a9b1c385d5286338c1681dd7478 100644
--- a/interface/web/mail/lib/lang/el_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_list.lng
@@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'ÎÎÎ± Î˜Ï…ÏÎ¯Î´Î±';
 $wb['name_txt'] = 'Î ÏÎ±Î³Î¼Î±Ï„Î¹ÎºÏŒ ÎŒÎ½Î¿Î¼Î±';
 $wb['login_txt'] = 'Login';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_user_stats_list.lng b/interface/web/mail/lib/lang/el_mail_user_stats_list.lng
index 5cfd25e483a04de5a7ef1c464f8066aa37c3b67b..e51cbd3ce82c607fa9cdc9ce59ac32a110d118bf 100644
--- a/interface/web/mail/lib/lang/el_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_stats_list.lng
@@ -6,3 +6,4 @@ $wb['last_month_txt'] = 'Î¤Î¿Î½ Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Î¼Î®Î½Î±';
 $wb['this_year_txt'] = 'Î‘Ï…Ï„ÏŒ Ï„Î¿ Ï‡ÏÏŒÎ½Î¿';
 $wb['last_year_txt'] = 'Î¤Î¿Î½ Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Ï‡ÏÏŒÎ½Î¿';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_whitelist.lng b/interface/web/mail/lib/lang/el_mail_whitelist.lng
index 6c477f60c2b4f0bd2b0bed463245abb0b4c6336b..80f7c8ff26f2903b79213e5d701ee60cdbc05c7d 100644
--- a/interface/web/mail/lib/lang/el_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/el_mail_whitelist.lng
@@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®';
 $wb['type_txt'] = 'Î¤ÏÏ€Î¿Ï‚';
 $wb['limit_mailfilter_txt'] = 'ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Ï†Î¯Î»Ï„ÏÏ‰Î½ email Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_mail_whitelist_list.lng b/interface/web/mail/lib/lang/el_mail_whitelist_list.lng
index 5fe38d9790df0ae45f4fc7dd6493004e9df7b941..f744f35151b36e4a706000a3fdbc01a090523d0a 100644
--- a/interface/web/mail/lib/lang/el_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_whitelist_list.lng
@@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Î Î±ÏÎ±Î»Î®Ï€Ï„Î·Ï‚';
 $wb['add_new_record_txt'] = 'ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î® ÏƒÏ„Î·Î½ Î»Î¯ÏƒÏ„Î± Ï„Ï‰Î½ ÎµÏ€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½Ï‰Î½ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÏ‰Î½';
 $wb['access_txt'] = 'Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng
index 2bf1e289a2b5350e03aaf48b58f1f1d7cc951279..a2377487ececc91e45719a336f9e212e1319049a 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng
@@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Î ÏÎ¿Ï„ÎµÏÎ±Î¹ÏŒÏ„Î·Ï„Î±';
 $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 $wb['limit_spamfilter_wblist_txt'] = 'Î¤Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Whitelist Î® Blacklist ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚, ÎÏ‡ÎµÎ¹ ÎµÎ¾Î±Î½Ï„Î»Î·Î¸ÎµÎ¯.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng
index c470871671d66ebfcaa78a683516f0b678614e88..169c21a529c783255c624f38ca7e54005d09369b 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng
@@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Î˜Ï…ÏÎ¯Î´Î± Î§ÏÎ®ÏƒÏ„Î·';
 $wb['email_txt'] = 'Blacklisted Email';
 $wb['add_new_record_txt'] = 'ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î® Blacklist';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_spamfilter_config.lng b/interface/web/mail/lib/lang/el_spamfilter_config.lng
index aa8b52e54d2100a9c7260a83b7381b5d73a3f781..4654dd2dd2b3eb982a6ab81f79eb77773676b234 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_config.lng
@@ -6,15 +6,16 @@ $wb['gateway_txt'] = 'Gateway';
 $wb['hostname_txt'] = 'Hostname';
 $wb['nameservers_txt'] = 'Nameservers';
 $wb['module_txt'] = 'Î†ÏÎ¸ÏÏ‰Î¼Î± Server';
-$wb['maildir_path_txt'] = 'Maildir Path';
-$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['maildir_path_txt'] = 'Î”Î¹Î±Î´ÏÎ¿Î¼Î® Maildir';
+$wb['homedir_path_txt'] = 'Î”Î¹Î±Î´ÏÎ¿Î¼Î® Homedir';
 $wb['mailuser_uid_txt'] = 'Mailuser UID';
 $wb['mailuser_gid_txt'] = 'Mailuser GID';
-$wb['mailuser_name_txt'] = 'Mailuser Name';
-$wb['mailuser_group_txt'] = 'Mailuser Group';
+$wb['mailuser_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Mailuser';
+$wb['mailuser_group_txt'] = 'ÎŸÎ¼Î¬Î´Î± Mailuser';
 $wb['relayhost_txt'] = 'Relayhost';
-$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_user_txt'] = 'Î§ÏÎ®ÏƒÏ„Î·Ï‚ Relayhost';
 $wb['relayhost_password_txt'] = 'Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Relayhost';
 $wb['mailbox_size_limit_txt'] = 'ÎŒÏÎ¹Î¿ Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ Î¸Ï…ÏÎ¯Î´Î±Ï‚';
 $wb['message_size_limit_txt'] = 'ÎŒÏÎ¹Î¿ Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ Î¼Î·Î½ÏÎ¼Î±Ï„Î¿Ï‚';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_spamfilter_config_list.lng b/interface/web/mail/lib/lang/el_spamfilter_config_list.lng
index 94cd6d815c41b8b891872e322b26a12c404ea8f2..84bd401c823d82aba35a2e3d7ecb2e4cd2649acd 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_config_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Server';
 $wb['server_name_txt'] = 'Server';
 $wb['server_id_txt'] = 'server_id';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_spamfilter_policy.lng b/interface/web/mail/lib/lang/el_spamfilter_policy.lng
index 4ab7291697d37d7932f3a1ce950b641116258d46..f928816d312df5a28013fea1d33de3693bd992a3 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_policy.lng
@@ -36,3 +36,4 @@ $wb['spam_admin_txt'] = 'SPAM admin';
 $wb['message_size_limit_txt'] = 'ÎŒÏÎ¹Î¿ Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ Î¼Î·Î½ÏÎ¼Î±Ï„Î¿Ï‚';
 $wb['banned_rulenames_txt'] = 'Banned rulenames';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng
index 3d10f4dcabc74ab23bf66ec9df182c8ba30e49cc..4b894093c0c9af3482c556367c8952f4397f59d7 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng
@@ -7,3 +7,4 @@ $wb['banned_files_lover_txt'] = 'Î‘Ï€Î¿Î´Î¿Ï‡Î® Î¼Ï€Î»Î¿ÎºÎ±ÏÎ¹ÏƒÎ¼ÎÎ½Ï‰Î½ Î±
 $wb['bad_header_lover_txt'] = 'Î‘Ï€Î¿Î´Î¿Ï‡Î® ÎºÎ±ÎºÏŽÎ½ ÎºÎµÏ†Î±Î»Î¯Î´Ï‰Î½';
 $wb['add_new_record_txt'] = 'ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î® Î Î¿Î»Î¹Ï„Î¹ÎºÎ®Ï‚';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_spamfilter_users.lng b/interface/web/mail/lib/lang/el_spamfilter_users.lng
index 39a927363aa58bf42509e78b14d9b96de6d6fbf9..e5b6d042813cf3769c14f46b3ecbfb3dec6ab6c9 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_users.lng
@@ -6,3 +6,4 @@ $wb['email_txt'] = 'Email (ÎœÎ¿Ï„Î¯Î²Î¿)';
 $wb['fullname_txt'] = 'ÎŒÎ½Î¿Î¼Î±';
 $wb['local_txt'] = 'Î¤Î¿Ï€Î¹ÎºÏŒÏ‚';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_spamfilter_users_list.lng b/interface/web/mail/lib/lang/el_spamfilter_users_list.lng
index a18e6ce424cc753f619d652288a202bf6e075f52..1176465b3959eb99ba771b7d0ef2f5e6ce33b6df 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_users_list.lng
@@ -8,3 +8,4 @@ $wb['fullname_txt'] = 'ÎŒÎ½Î¿Î¼Î±';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Spamfilter';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng
index 1ee4470e96614fc455f425de2154b06b1a29e516..acbe6cca416e230838d78a3c311f9d3bf3a31834 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng
@@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Î ÏÎ¿Ï„ÎµÏÎ±Î¹ÏŒÏ„Î·Ï„Î±';
 $wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
 $wb['limit_spamfilter_wblist_txt'] = 'Î¤Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ White Î· Blacklist ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ ÎÏ‡ÎµÎ¹ ÎµÎ¾Î±Î½Ï„Î»Î·Î¸ÎµÎ¯.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng
index 24febf7b7a9804938f0785fac239083622843aba..811ebea0c386ca59675b4ac1492288c6199bc7e1 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng
@@ -7,3 +7,4 @@ $wb['rid_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î·';
 $wb['email_txt'] = 'Whitelisted Email';
 $wb['add_new_record_txt'] = 'ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î® Whitelist';
 ?>
+
diff --git a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng
index 95fff21abadaa6c3f3637837d2d7053deee945a6..dde63a052ee9a1015dc73a31686551e8e4f494d1 100755
--- a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng
@@ -5,3 +5,4 @@ $wb['name_txt'] = 'Name';
 $wb['email_txt'] = 'Email Address';
 $wb['used_txt'] = 'Used space';
 ?>
+
diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng
index e7e20e63dc9091d120d63c668af8cf96a305095c..829a661d484e7d835d70d0571f8816893b738008 100644
--- a/interface/web/monitor/lib/lang/el.lng
+++ b/interface/web/monitor/lib/lang/el.lng
@@ -142,8 +142,9 @@ $wb['monitor_title_fail2ban_txt'] = 'Î‘ÏÏ‡ÎµÎ¯Î¿ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†Î®Ï‚ Fail2Ban'
 $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter';
 $wb['monitor_updates_nosupport_txt'] = 'Î‘Ï…Ï„Î® Î· ÎµÏ€Î¿Ï€Ï„ÎµÎ¯Î± Î´ÎµÎ½ Ï…Ï€Î¿ÏƒÏ„Î·ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î³Î¹Î± Ï„Î· Î´Î¹Î±Î½Î¿Î¼Î® ÏƒÎ±Ï‚ ';
 $wb['monitor_beancounter_nosupport_txt'] = 'Î‘Ï…Ï„ÏŒÏ‚ Î¿ server Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ½Î±Ï‚ OpenVz VE ÎºÎ±Î¹ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î³Î¹Î± Ï„Î¿Î½ beancounter';
-$wb['monitor_title_iptables_txt'] = 'IPTables Rules';
-$wb['Show fail2ban-Log'] = 'Show fail2ban-Log';
-$wb['Show IPTables'] = 'Show IPTables';
+$wb['monitor_title_iptables_txt'] = 'ÎšÎ±Î½ÏŒÎ½ÎµÏ‚ IPTables';
+$wb['Show fail2ban-Log'] = 'Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· fail2ban-Log';
+$wb['Show IPTables'] = 'Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· IPTables';
 $wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter';
 ?>
+
diff --git a/interface/web/monitor/lib/lang/el_syslog_list.lng b/interface/web/monitor/lib/lang/el_syslog_list.lng
index c2db4823dd51ad0bc68d1aaf1ce9dfa90fe0dade..8789a4336c6e81b816de0ce4f9a64ed77261894a 100644
--- a/interface/web/monitor/lib/lang/el_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/el_syslog_list.lng
@@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['loglevel_txt'] = 'Î•Ï€Î¯Ï€ÎµÎ´Î¿ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†Î®Ï‚';
 $wb['message_txt'] = 'ÎœÎ®Î½Ï…Î¼Î±';
 ?>
+
diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php
index 20f0b05e8e8745a96add068a436d1448603e5a8c..88fa3c9d4ae23585c58c6a718c9fd70163f45153 100644
--- a/interface/web/monitor/show_sys_state.php
+++ b/interface/web/monitor/show_sys_state.php
@@ -196,7 +196,7 @@ function _getServerState($serverId, $serverName) {
 	$ispcData = null;
 	foreach($records as $record) {
 		/* get the state from the db-data */
-		_processDbState($record['type'], $serverId, $serverState, $messages);
+		_processDbState($record['type'], $serverId, &$serverState, &$messages);
 		/* if we have the os-info, get it */
 		if ($record['type'] == 'os_info') {
 			$osData = unserialize($record['data']);
diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm
index 122d8e34f5e88092ed106460c69080109bb39114..904361cb1f410d0bc831c0da72fab229edc35f1d 100644
--- a/interface/web/monitor/templates/show_sys_state.htm
+++ b/interface/web/monitor/templates/show_sys_state.htm
@@ -1,25 +1,25 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_sys_state">
-
-  <div class="pnl_toolsarea">
-    <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
-      <div class="buttons">
-	      <div class="ctrlHolder">
-	      	<label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
-	        <select name="refreshinterval" id="refreshinterval" class="selectInput" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
-						{tmpl_var name='refresh'}
-					</select>
-	      </div>
-      </div>
-    </fieldset>
-  </div>
-  
-  <div class="pnl_formarea">
-    <fieldset><legend></legend>
-      <div class="stateview"><tmpl_var name="state_data"></div>
-    </fieldset>
-  </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_sys_state">
+
+  <div class="pnl_toolsarea">
+    <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
+      <div class="buttons">
+	      <div class="ctrlHolder">
+	      	<label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
+	        <select name="refreshinterval" id="refreshinterval" class="selectInput withicons" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
+						{tmpl_var name='refresh'}
+					</select>
+	      </div>
+      </div>
+    </fieldset>
+  </div>
+  
+  <div class="pnl_formarea">
+    <fieldset><legend></legend>
+      <div class="stateview"><tmpl_var name="state_data"></div>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/monitor/tools.inc.php b/interface/web/monitor/tools.inc.php
index 46ccaada4d450169df7eaf5d41843bd3d29788f9..60d006ad8b7d70ff7b7ca06c6afa47920d0da483 100644
--- a/interface/web/monitor/tools.inc.php
+++ b/interface/web/monitor/tools.inc.php
@@ -314,7 +314,7 @@ function showSystemUpdate() {
 		}
 		else {
 			$data = unserialize($record['data']);
-			$html .= nl2br($data['output']);
+			$html .= nl2br(html_entity_decode($data['output']));
 		}
 		$html .= '</div></div>';
 	} else {
diff --git a/interface/web/sites/form/web_folder_user.tform.php b/interface/web/sites/form/web_folder_user.tform.php
index de22b3d4616648823bdfbf9771be78b7268e3d95..6f94c6267534055d820e49ff7310987461de052c 100644
--- a/interface/web/sites/form/web_folder_user.tform.php
+++ b/interface/web/sites/form/web_folder_user.tform.php
@@ -50,6 +50,8 @@ $form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update,
 $form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
 $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
 
+$auth_sql = $app->tform->getAuthSQL('r', 'web_domain');
+
 $form["tabs"]['user'] = array (
 	'title' 	=> "Folder",
 	'width' 	=> 100,
@@ -74,7 +76,7 @@ $form["tabs"]['user'] = array (
 			'formtype'	=> 'SELECT',
 			'default'	=> '',
 			'datasource'	=> array ( 	'type'	=> 'SQL',
-										'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND {AUTHSQL} ORDER BY web_domain.domain",
+										'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND ".$auth_sql." ORDER BY web_domain.domain",
 										'keyfield'=> 'web_folder_id',
 										'valuefield'=> 'name'
 									 ),
diff --git a/interface/web/sites/lib/lang/el.lng b/interface/web/sites/lib/lang/el.lng
index d66ee86ee820e77ce5435546bfb595a4294ec276..da8b1a53cfe190e4a26919f283c45378b73c9fec 100644
--- a/interface/web/sites/lib/lang/el.lng
+++ b/interface/web/sites/lib/lang/el.lng
@@ -21,5 +21,6 @@ $wb['Cron'] = 'Cron';
 $wb['Cron Jobs'] = 'Î•ÏÎ³Î±ÏƒÎ¯ÎµÏ‚ Cron';
 $wb['Statistics'] = 'Î£Ï„Î±Ï„Î¹ÏƒÏ„Î¹ÎºÎ¬';
 $wb['Web traffic'] = 'ÎšÎ¯Î½Î·ÏƒÎ· Web';
-$wb['Website quota (Harddisk)'] = 'Website quota (Harddisk)';
+$wb['Website quota (Harddisk)'] = 'ÎŒÏÎ¹Î¿ Î´Î¯ÏƒÎºÎ¿Ï… Website (Harddisk)';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_cron.lng b/interface/web/sites/lib/lang/el_cron.lng
index 3e8f7eb70470764bf21fa8eefc74a8d1cd944310..dbc8eccf6cf2d7aa42e23fdc11c41516cb9bd99c 100644
--- a/interface/web/sites/lib/lang/el_cron.lng
+++ b/interface/web/sites/lib/lang/el_cron.lng
@@ -19,3 +19,4 @@ $wb['run_wday_error_format'] = 'Î— Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î³Î¹Î± Ï„Î¹Ï‚ Î·Î¼ÎÏ
 $wb['command_error_format'] = 'Î— Î¼Î¿ÏÏ†Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î³Î¹Î± Ï„Î·Î½ ÎµÎ½Ï„Î¿Î»Î® Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ·. Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÏƒÎ·Î¼ÎµÎ¹ÏŽÏƒÏ„Îµ ÏŒÏ„Î¹ ÏƒÏ„Î·Î½ Ï€ÎµÏÎ¯Ï€Ï„Ï‰ÏƒÎ· Ï„Î¿Ï… url Î¼ÏŒÎ½Î¿ Ï„Î± http/https ÎµÏ€Î¹Ï„ÏÎÏ€Î¿Î½Ï„Î±Î¹.';
 $wb['unknown_fieldtype_error'] = 'Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ Î¬Î³Î½Ï‰ÏƒÏ„ÏŒÏ‚ Ï„ÏÏ€Î¿Ï‚ Ï€ÎµÎ´Î¯Î¿Ï….';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_cron_list.lng b/interface/web/sites/lib/lang/el_cron_list.lng
index a43b9daa9ec929ea75ea5f19c516b1613b0eed81..b629b8900cf8acd0dd40bcefdd8374030e26ec91 100644
--- a/interface/web/sites/lib/lang/el_cron_list.lng
+++ b/interface/web/sites/lib/lang/el_cron_list.lng
@@ -11,3 +11,4 @@ $wb['command_txt'] = 'Î•Î½Ï„Î¿Î»Î®';
 $wb['add_new_cron_txt'] = 'ÎÎÎ± ÎµÏÎ³Î±ÏƒÎ¯Î± Cron';
 $wb['parent_domain_id_txt'] = 'Website';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng
index 39f6fa0b6d925adb1d82f4b80704e050b1047e6b..78190bd631be4fd7bf524e67c38eadbb22a78e15 100644
--- a/interface/web/sites/lib/lang/el_database.lng
+++ b/interface/web/sites/lib/lang/el_database.lng
@@ -16,10 +16,11 @@ $wb['database_name_error_unique'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î¼Î¯Î± Î²Î¬ÏƒÎ· Î´Îµ
 $wb['database_name_error_regex'] = 'ÎœÎ® ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½. Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î·Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î±Ï…Ï„Î¿ÏÏ‚ Ï„Î¿Ï…Ï‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚: a-z, A-Z, 0-9 ÎºÎ±Î¹ Ï„Î·Î½ ÎºÎ¬Ï„Ï‰ Ï€Î±ÏÎ»Î±. ÎœÎÎ³ÎµÎ¸Î¿Ï‚: 2 - 64 Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚.';
 $wb['database_user_error_empty'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î·Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.';
 $wb['database_user_error_unique'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· ÎÎ½Î±Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Î¼Îµ Î±Ï…Ï„ÏŒ Ï„Î¿ ÏŒÎ½Î¿Î¼Î± ÏƒÏ„Î¿Î½ server. Î“Î¹Î± Î½Î± Ï†Ï„Î¹Î¬Î¾ÎµÏ„Îµ ÎÎ½Î± Î¼Î¿Î½Î±Î´Î¹ÎºÏŒ ÏŒÎ½Î¿Î¼Î±, Ï€.Ï‡. Î²Î¬Î»Ï„Îµ Î¼Ï€ÏÎ¿ÏƒÏ„Î¬ Î±Ï€ÏŒ Ï„Î¿ ÏŒÎ½Î¿Î¼Î±, Ï„Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï… domain.';
-$wb['database_user_error_regex'] = 'ÎœÎ® ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·. Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î±Ï…Ï„Î¿ÏÏ‚ Ï„Î¿Ï…Ï‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚: a-z, A-Z, 0-9 ÎºÎ±Î¹ Ï„Î·Î½ ÎºÎ¬Ï„Ï‰ Ï€Î±ÏÎ»Î±. ÎœÎÎ³ÎµÎ¸Î¿Ï‚: 2 - 64 Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚.';
+$wb['database_user_error_regex'] = 'ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·. Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î±Ï…Ï„Î¿ÏÏ‚ Ï„Î¿Ï…Ï‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚: a-z, A-Z, 0-9 ÎºÎ±Î¹ Ï„Î·Î½ ÎºÎ¬Ï„Ï‰ Ï€Î±ÏÎ»Î±. ÎœÎÎ³ÎµÎ¸Î¿Ï‚: 2 - 64 Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚.';
 $wb['limit_database_txt'] = 'ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Î²Î¬ÏƒÎµÏ‰Î½ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½.';
 $wb['database_name_change_txt'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î·Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î±Î»Î»Î±Ï‡Î¸ÎµÎ¯';
 $wb['database_charset_change_txt'] = 'Î— ÎºÏ‰Î´Î¹ÎºÎ¿Ï€Î¿Î¯Î·ÏƒÎ· Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÏ‰Î½ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹';
 $wb['database_name_error_len'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î·Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½  - {db} - ÎµÎ¯Î½Î±Î¹ Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿. Î¤Î¿ ÏƒÏ…Î½Î¿Î»Î¹ÎºÏŒ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î¾ÎµÏ€ÎµÏÎ½Î¬ Ï„Î¿Ï…Ï‚ 64 Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚.';
 $wb['database_user_error_len'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· Ï„Î·Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ - {user}- ÎµÎ¯Î½Î±Î¹ Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿. Î¤Î¿ ÏƒÏ…Î½Î¿Î»Î¹ÎºÏŒ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î¾ÎµÏ€ÎµÏÎ½Î¬ Ï„Î¿Ï…Ï‚ 16 Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_database_admin_list.lng b/interface/web/sites/lib/lang/el_database_admin_list.lng
index f414200740402f5abcc2ce656b9a43b7f1d8f4e6..404162248126c1cae85fea921ba83003aca53d3a 100644
--- a/interface/web/sites/lib/lang/el_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/el_database_admin_list.lng
@@ -8,3 +8,4 @@ $wb['database_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î²Î¬ÏƒÎ·Ï‚';
 $wb['add_new_record_txt'] = 'ÎÎÎ± Î²Î¬ÏƒÎ· Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½';
 $wb['sys_groupid_txt'] = 'Î ÎµÎ»Î¬Ï„Î·Ï‚';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_database_list.lng b/interface/web/sites/lib/lang/el_database_list.lng
index ce54134293db4e1cf538abc80d85d7ff56b48417..20f1320cb82d672616c4159814c3f4382097f0a4 100644
--- a/interface/web/sites/lib/lang/el_database_list.lng
+++ b/interface/web/sites/lib/lang/el_database_list.lng
@@ -7,3 +7,4 @@ $wb['database_user_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î· Î’Î¬ÏƒÎ·Ï‚ Î”ÎµÎ´Î¿Î¼ÎÎ½Ï‰
 $wb['database_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î’Î¬ÏƒÎ·Ï‚ Î”ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½';
 $wb['add_new_record_txt'] = 'ÎÎÎ± Î’Î¬ÏƒÎ·Ï‚ Î”ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_ftp_user.lng b/interface/web/sites/lib/lang/el_ftp_user.lng
index a5bca9dd78059f2d6dfa598a054c0564d7e080c7..863d8227936a16a3731601e5c9eb7886dbd93f27 100644
--- a/interface/web/sites/lib/lang/el_ftp_user.lng
+++ b/interface/web/sites/lib/lang/el_ftp_user.lng
@@ -24,5 +24,6 @@ $wb['uid_error_empty'] = 'Î¤Î¿ GID Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.';
 $wb['directory_error_empty'] = 'ÎŸ Î¦Î¬ÎºÎµÎ»Î¿Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.';
 $wb['directory_error_notinweb'] = 'ÎŸ Ï†Î¬ÎºÎµÎ»Î¿Ï‚ Î´ÎµÎ½ Î²ÏÎ¯ÏƒÎºÎµÏ„Î±Î¹ Î¼ÎÏƒÎ± ÏƒÏ„Î¿Î½ ÏÎ¹Î¶Î¹ÎºÏŒ Ï†Î¬ÎºÎµÎ»Î¿ web.';
 $wb['parent_domain_id_error_empty'] = 'Î”ÎµÎ½ ÎµÏ€Î¹Î»ÎÏ‡Î¸Î·ÎºÎµ website.';
-$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['quota_size_error_regex'] = 'ÎŒÏÎ¹Î¿: ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ -1 Î³Î¹Î± Î±Ï€ÎµÏÎ¹ÏŒÏÎ¹ÏƒÏ„Î± Î® ÎÎ½Î±Î½ Î±ÏÎ¹Î¸Î¼ÏŒ > 0';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_ftp_user_list.lng b/interface/web/sites/lib/lang/el_ftp_user_list.lng
index 96c98d3dd509d68f49b1e601c6f2419d55f5cadf..66db7de7e1f46c4a7698b9f54a0f2609aa9631fe 100644
--- a/interface/web/sites/lib/lang/el_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/el_ftp_user_list.lng
@@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Website';
 $wb['username_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î·';
 $wb['add_new_record_txt'] = 'ÎÎµÏŒÏ‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ FTP';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_shell_user.lng b/interface/web/sites/lib/lang/el_shell_user.lng
index 8b126393f5acaa8d81d35cf5e55e3f02c59864f5..ab7e321c0339b35bdf1d1a0d591890134a287950 100644
--- a/interface/web/sites/lib/lang/el_shell_user.lng
+++ b/interface/web/sites/lib/lang/el_shell_user.lng
@@ -19,5 +19,6 @@ $wb['uid_error_empty'] = 'Î¤Î¿ GID Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯';
 $wb['directory_error_empty'] = 'ÎŸ Ï†Î¬ÎºÎµÎ»Î¿Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯';
 $wb['limit_shell_user_txt'] = 'Î¦Ï„Î¬ÏƒÎ±Ï„Îµ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½ Shell';
 $wb['parent_domain_id_error_empty'] = 'Î”ÎµÎ½ ÎµÏ€Î¹Î»ÎÏ‡Î¸Î·ÎºÎµ website';
-$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['ssh_rsa_txt'] = 'Î”Î·Î¼ÏŒÏƒÎ¹Î¿ ÎšÎ»ÎµÎ¹Î´Î¯ SSH-RSA (Î³Î¹Î± key-based logins)';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_shell_user_list.lng b/interface/web/sites/lib/lang/el_shell_user_list.lng
index 5468905bbf0d02448aa40d1bb529eb753ad6e4f6..71db7154262d03fd78c85feec71dcbf46678e399 100644
--- a/interface/web/sites/lib/lang/el_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/el_shell_user_list.lng
@@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Site';
 $wb['username_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î·';
 $wb['add_new_record_txt'] = 'ÎÎµÏŒÏ‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Shell';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng
index d93169cce770f3ee91e938016ab201ee734c2539..1e1072bdce90e77e7803d1081c0ff7d0ac7992ba 100644
--- a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng
@@ -6,3 +6,4 @@ $wb['used_txt'] = 'Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î¿ÏÎ¼ÎµÎ½Î¿Ï‚ Ï‡ÏŽÏÎ¿Ï‚';
 $wb['hard_txt'] = 'Î‘Ï€ÏŒÎ»Ï…Ï„Î¿ ÏŒÏÎ¹Î¿';
 $wb['soft_txt'] = 'Î”Î¹Î±Î»Î±ÎºÏ„Î¹ÎºÏŒ ÏŒÏÎ¹Î¿';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
index b12aba2a5643b146ff93201cb511a417e4ea0e24..6ad7f1af51e495a2005040bf3d69bdc3589672b5 100644
--- a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
@@ -12,3 +12,4 @@ $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng
index c085c9288465fa8378e9dc073dc373e6865fc93d..240ed48d9dfd423b0108417999dfa70776c2334d 100644
--- a/interface/web/sites/lib/lang/el_web_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_domain.lng
@@ -65,16 +65,16 @@ $wb['ruby_txt'] = 'Ruby';
 $wb['stats_user_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î· Î£Ï„Î±Ï„Î¹ÏƒÏ„Î¹ÎºÏŽÎ½ Web';
 $wb['stats_type_txt'] = 'Î ÏÏŒÎ³ÏÎ±Î¼Î¼Î± Î£Ï„Î±Ï„Î¹ÏƒÏ„Î¹ÎºÏŽÎ½ Web';
 $wb['custom_php_ini_txt'] = 'Î ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½ÎµÏ‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ php.ini';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['none_txt'] = 'ÎšÎ±Î½Î¬Î½Î±';
+$wb['disabled_txt'] = 'Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€.';
+$wb['no_redirect_txt'] = 'Î§Ï‰ÏÎ¯Ï‚ Î‘Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ·';
+$wb['no_flag_txt'] = 'Î§Ï‰ÏÎ¯Ï‚ Î£Î·Î¼Î±Î¯Î±';
+$wb['save_certificate_txt'] = 'Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï';
+$wb['create_certificate_txt'] = 'Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï';
+$wb['delete_certificate_txt'] = 'Î”Î¹Î±Î³ÏÎ±Ï†Î® Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï';
+$wb['ipv6_address_txt'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IPv6';
+$wb['nginx_directives_txt'] = 'ÎÏ„Î¹ÏÎµÎºÏ„Î¯Î²ÎµÏ‚ nginx';
+$wb['seo_redirect_txt'] = 'Î‘Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ· SEO';
 $wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
 $wb['www_to_non_www_txt'] = 'www -&gt; non-www';
 $wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
@@ -90,3 +90,4 @@ $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positi
 $wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
 $wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_domain_admin_list.lng b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng
index 9b2091447e394c692a60b57f899b9723fc0dbf72..155393393b69ff7f766743e63e6a2593b69fc2f6 100644
--- a/interface/web/sites/lib/lang/el_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng
@@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿ website';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_domain_list.lng b/interface/web/sites/lib/lang/el_web_domain_list.lng
index c3f42a94a5e33c0aef6809d9e4bfc1372b72b1da..a35fad5e7f477c53c2e467d2d8408f5402f7b299 100644
--- a/interface/web/sites/lib/lang/el_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_domain_list.lng
@@ -6,3 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿ website';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_folder.lng b/interface/web/sites/lib/lang/el_web_folder.lng
index 93cd40a0810dff54001024d81787bc91c1139a55..410cd3f0d69ee3ed086a30c5b1e9c0006f63f9e8 100644
--- a/interface/web/sites/lib/lang/el_web_folder.lng
+++ b/interface/web/sites/lib/lang/el_web_folder.lng
@@ -1,7 +1,8 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
-$wb['path_txt'] = 'Path';
-$wb['active_txt'] = 'Active';
-$wb['path_error_regex'] = 'Invalid folder path.';
+$wb['path_txt'] = 'Î”Î¹Î±Î´ÏÎ¿Î¼Î®';
+$wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
+$wb['path_error_regex'] = 'ÎœÎ· ÎÎ³ÎºÏ…ÏÎ· Î´Î¹Î±Î´ÏÎ¿Î¼Î® Ï†Î±ÎºÎÎ»Î¿Ï….';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_folder_list.lng b/interface/web/sites/lib/lang/el_web_folder_list.lng
index 76d97029ba3acd24e5345c8041c9498b6bf51e3c..761a6c1b4aa69e5595aba58d2122f3520386531a 100644
--- a/interface/web/sites/lib/lang/el_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/el_web_folder_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Folder';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Î¦Î¬ÎºÎµÎ»Î¿Ï‚';
+$wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒÏ‚';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
-$wb['path_txt'] = 'Path';
+$wb['path_txt'] = 'Î”Î¹Î±Î´ÏÎ¿Î¼Î®';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_folder_user.lng b/interface/web/sites/lib/lang/el_web_folder_user.lng
index f877df2092809ce4d16790620f018ad661bdfe22..c10412c2f58e6f49e81061134b4756b7e038a056 100644
--- a/interface/web/sites/lib/lang/el_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/el_web_folder_user.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['web_folder_id_txt'] = 'Folder';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['active_txt'] = 'Active';
-$wb['folder_error_empty'] = 'No web folder selecetd.';
+$wb['web_folder_id_txt'] = "Î¦Î¬ÎºÎµÎ»Î¿Ï‚";
+$wb['username_txt'] = "ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î·";
+$wb['password_txt'] = "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ";
+$wb['active_txt'] = "Î•Î½ÎµÏÎ³ÏŒÏ‚";
+$wb['folder_error_empty'] = "Î”ÎµÎ½ ÎµÏ€Î¹Î»ÎÏ‡Î¸Î·ÎºÎµ Ï†Î¬ÎºÎµÎ»Î¿Ï‚ web.";
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_folder_user_list.lng b/interface/web/sites/lib/lang/el_web_folder_user_list.lng
index 9a7286a95c6a1228d7424d9da7320f4e798384a7..4f6ec2080e44449bd76f392be7b1f246112c00e6 100644
--- a/interface/web/sites/lib/lang/el_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/el_web_folder_user_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Folder User';
-$wb['active_txt'] = 'Active';
-$wb['web_folder_id_txt'] = 'Folder';
-$wb['username_txt'] = 'Username';
+$wb['list_head_txt'] = 'Î§ÏÎ®ÏƒÏ„Î·Ï‚ Î¦Î±ÎºÎÎ»Î¿Ï…';
+$wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒÏ‚';
+$wb['web_folder_id_txt'] = 'Î¦Î¬ÎºÎµÎ»Î¿Ï‚';
+$wb['username_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î·';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
index 0e8c50aaee33d3cc610871b8333ee0cdb7318ca9..b7e9d5962c845a27262772624d4c6a704c864d15 100644
--- a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
@@ -6,3 +6,4 @@ $wb['last_month_txt'] = 'Î¤Î¿ Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Î¼Î®Î½Î±';
 $wb['this_year_txt'] = 'Î‘Ï…Ï„ÏŒ Ï„Î¿ Ï‡ÏÏŒÎ½Î¿';
 $wb['last_year_txt'] = 'Î¤Î¿Î½ Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Ï‡ÏÏŒÎ½Î¿';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng
index 93dd79178bcae525eb26b9fdac5ab62abb3a84f6..0b0167fbd47614ba313a87549a5854a5ecc23daf 100644
--- a/interface/web/sites/lib/lang/el_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_subdomain.lng
@@ -37,6 +37,7 @@ $wb['domain_error_unique'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· ÎÎ½Î± website Î® sub / alia
 $wb['domain_error_regex'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï… Domain Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ¿.';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Î— Î´Î¹Î±Î´ÏÎ¿Î¼Î® Î±Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ·Ï‚ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ·. ÎˆÎ³ÎºÏ…ÏÎµÏ‚ Î´Î¹Î±Î´ÏÎ¿Î¼ÎÏ‚ ÎµÎ¯Î½Î±Î¹ Î³Î¹Î± Ï€Î±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î± Î¿Î¹: /test/ Î® http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
+$wb['no_redirect_txt'] = 'Î§Ï‰ÏÎ¯Ï‚ Î‘Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ·';
+$wb['no_flag_txt'] = 'Î§Ï‰ÏÎ¯Ï‚ Î£Î·Î¼Î±Î¯Î±';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_web_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_subdomain_list.lng
index a4426cf3ce987eb5246773639412216a13782c87..b24ae4dafb139adff280bf7f21f87fc0729ccbd9 100644
--- a/interface/web/sites/lib/lang/el_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_subdomain_list.lng
@@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Subdomain';
 $wb['add_new_record_txt'] = 'ÎÎÎ¿ subdomain';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_webdav_user.lng b/interface/web/sites/lib/lang/el_webdav_user.lng
index 423bad52199d3ccbf28f436841ff07a60ffd1ae7..dd052b031f9f62c52c85d5b298a40036991cccd6 100644
--- a/interface/web/sites/lib/lang/el_webdav_user.lng
+++ b/interface/web/sites/lib/lang/el_webdav_user.lng
@@ -13,3 +13,4 @@ $wb['username_error_regex'] = 'Î¤Î¿ ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î· Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î¼
 $wb['directory_error_empty'] = 'ÎŸ Ï†Î¬ÎºÎµÎ»Î¿Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.';
 $wb['parent_domain_id_error_empty'] = 'Î”ÎµÎ½ ÎµÏ€Î¹Î»ÎÏ‡Î¸Î·ÎºÎµ website.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/el_webdav_user_list.lng b/interface/web/sites/lib/lang/el_webdav_user_list.lng
index bf19b31bf2694fba7df67fe0dae725e646a97bc8..56501275280cba8affc2088b24541a2afa895af8 100644
--- a/interface/web/sites/lib/lang/el_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/el_webdav_user_list.lng
@@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Website';
 $wb['username_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î§ÏÎ®ÏƒÏ„Î·';
 $wb['add_new_record_txt'] = 'ÎÎµÏŒÏ‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Webdav';
 ?>
+
diff --git a/interface/web/sites/list/web_folder_user.list.php b/interface/web/sites/list/web_folder_user.list.php
index 2ee44810519ced12bff92d7fff943be41b576124..5b8324ace92049792a2b1b6e7495238249b48feb 100644
--- a/interface/web/sites/list/web_folder_user.list.php
+++ b/interface/web/sites/list/web_folder_user.list.php
@@ -42,6 +42,8 @@ $liste["paging_tpl"]		= "templates/paging.tpl.htm";
 // Enable auth
 $liste["auth"]				= "yes";
 
+$auth_sql = $app->tform->getAuthSQL('r', 'web_domain');
+
 
 /*****************************************************
 * Suchfelder
@@ -65,7 +67,7 @@ $liste["item"][] = array(	'field'		=> "web_folder_id",
 							'prefix'	=> "",
 							'suffix'	=> "",
 							'datasource'	=> array ( 	'type'	=> 'SQL',
-										'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND {AUTHSQL} ORDER BY web_domain.domain",
+										'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND ".$auth_sql." ORDER BY web_domain.domain",
 										'keyfield'=> 'web_folder_id',
 										'valuefield'=> 'name'
 									 ),
diff --git a/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng
index 3e62f1d33cc2cb99abeabdb4ddc6eda5716f04c2..036a6afc188b774be6476562e038f360fe810f4e 100644
--- a/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng
@@ -6,3 +6,4 @@ $wb['password_strength_3_txt'] = 'ÎšÎ±Î»ÏŒ';
 $wb['password_strength_4_txt'] = 'Î”Ï…Î½Î±Ï„ÏŒ';
 $wb['password_strength_5_txt'] = 'Î Î¿Î»Ï Î´Ï…Î½Î±Ï„ÏŒ';
 ?>
+
diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default/css/screen/content_ispc.css
index faeb4ab2bb8873aea1be658c6c895bf1fa7640d1..2a1a64dc4ea344af7cc9fc8bb24e4d5d252ff3b0 100644
--- a/interface/web/themes/default/css/screen/content_ispc.css
+++ b/interface/web/themes/default/css/screen/content_ispc.css
@@ -261,6 +261,7 @@
 	.dashboard-modules.help { background-image: url('../../icons/x32/help.png') !important; }
 	.dashboard-modules.domain { background-image: url('../../icons/x32/domain.png') !important; }
 	.dashboard-modules.sites { background-image: url('../../icons/x32/sites.png') !important; }
+	.dashboard-modules.billing { background-image: url('../../icons/x32/calculator.png') !important; }
 	
 	.panel_dashboard h2 {
 		font-size:20px;
diff --git a/interface/web/tools/lib/lang/el.lng b/interface/web/tools/lib/lang/el.lng
index 32bcea3c263968488dc94d922dba6c408865204e..29fea410d34d89b282500f67468e37585f5d427a 100644
--- a/interface/web/tools/lib/lang/el.lng
+++ b/interface/web/tools/lib/lang/el.lng
@@ -3,5 +3,6 @@ $wb['User Settings'] = 'Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î§ÏÎ®ÏƒÏ„Î·';
 $wb['Settings'] = 'Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚';
 $wb['ISPConfig Tools'] = 'Î•ÏÎ³Î±Î»ÎµÎ¯Î± ISPConfig';
 $wb['Password and Language'] = 'Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÎºÎ±Î¹ Î“Î»ÏŽÏƒÏƒÎ±';
-$wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.';
+$wb['ispconfig_tools_note'] = 'Î¤Î¿ Î¬ÏÎ¸ÏÏ‰Î¼Î± ÏƒÎ±Ï‚ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Î½Î± Î±Î»Î»Î¬Î¾ÎµÏ„Îµ Ï„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÎºÎ±Î¹ Ï„Î·Î½ Î³Î»ÏŽÏƒÏƒÎ± ÎºÎ±Î¹ Î½Î± Î¾ÎµÎºÎ¹Î½Î®ÏƒÎµÏ„Îµ ÎÎ½Î±Î½ ÎµÏ€Î±Î½Î±ÏƒÏ…Î³Ï‡ÏÎ¿Î½Î¹ÏƒÎ¼ÏŒ Ï„Ï‰Î½ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ DNS.';
 ?>
+
diff --git a/interface/web/tools/lib/lang/el_usersettings.lng b/interface/web/tools/lib/lang/el_usersettings.lng
index ce9c955114b3c1050e821780cb15e5462dc57fe6..103489c3e95c12a60868c5d502094f61be955fb3 100644
--- a/interface/web/tools/lib/lang/el_usersettings.lng
+++ b/interface/web/tools/lib/lang/el_usersettings.lng
@@ -6,3 +6,4 @@ $wb['password_mismatch'] = 'Î¤Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÏƒÏ„Î¿ Î´ÎµÏÏ„ÎµÏÎ¿ Ï€
 $wb['Form to edit the user password and language.'] = 'Î¦ÏŒÏÎ¼Î± ÎµÏ€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ÎºÎ±Î¹ Î³Î»ÏŽÏƒÏƒÎ±Ï‚';
 $wb['Settings'] = 'Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚';
 ?>
+
diff --git a/interface/web/vm/lib/lang/el.lng b/interface/web/vm/lib/lang/el.lng
index 4167e14a8a150090ecfb1aa6738fb8a6abf17760..1a846817667958eeaeb029be1c5b18c4e79b040b 100644
--- a/interface/web/vm/lib/lang/el.lng
+++ b/interface/web/vm/lib/lang/el.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['Virtual Servers'] = 'Virtual Servers';
+$wb['Virtual Servers'] = 'Î•Î¹ÎºÎ¿Î½Î¹ÎºÎ¿Î¯ Servers';
 $wb['OS Templates'] = 'OS Templates';
 $wb['VM Templates'] = 'VM Templates';
-$wb['IP addresses'] = 'IP addresses';
+$wb['IP addresses'] = 'Î”Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ IP';
 $wb['OpenVZ'] = 'OpenVZ';
 ?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_action.lng b/interface/web/vm/lib/lang/el_openvz_action.lng
index 52f73285824f2d6c4107d8c9eec5980a251d505c..96a7352423d90bed017bb09eccb9e00952ec5b31 100644
--- a/interface/web/vm/lib/lang/el_openvz_action.lng
+++ b/interface/web/vm/lib/lang/el_openvz_action.lng
@@ -1,16 +1,17 @@
 <?php
 $wb['head_txt'] = 'Virtual server actions for VM:';
-$wb['start_txt'] = 'Start virtual server';
-$wb['stop_txt'] = 'Stop virtual server';
-$wb['restart_txt'] = 'Restart virtual server';
-$wb['ostemplate_txt'] = 'Create OSTemplate';
-$wb['ostemplate_desc_txt'] = '(example: debian-6.0-i386-custom)';
-$wb['btn_save_txt'] = 'Execute selected action';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['start_exec_txt'] = 'Start command has been sent to the VM host server. It may take a minute until the VM is started.';
-$wb['stop_exec_txt'] = 'Stop command has been sent to the VM host server. It may take a minute until the VM is stopped.';
-$wb['restart_exec_txt'] = 'Restart command has been sent to the VM host server. It may take a minute until the VM is restarted.';
-$wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characters.';
-$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.';
+$wb['start_txt'] = 'Î•ÎºÎºÎ¯Î½Î·ÏƒÎ· ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï server';
+$wb['stop_txt'] = 'Î¤ÎµÏÎ¼Î±Ï„Î¹ÏƒÎ¼ÏŒÏ‚ ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï server';
+$wb['restart_txt'] = 'Î•Ï€Î±Î½Î½ÎµÎºÎ¯Î½Î·ÏƒÎ· ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï server';
+$wb['ostemplate_txt'] = 'Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± OSTemplate';
+$wb['ostemplate_desc_txt'] = '(Ï€Î±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î±: debian-6.0-i386-custom)';
+$wb['btn_save_txt'] = 'Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î·Ï‚ ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚';
+$wb['btn_cancel_txt'] = 'Î†ÎºÏ…ÏÎ¿';
+$wb['start_exec_txt'] = 'Î— ÎµÎ½Ï„Î¿Î»Î® ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚ ÎµÏƒÏ„Î¬Î»ÎµÎ¹ ÏƒÏ„Î¿Î½ VM host server. ÎœÏ€Î¿ÏÎµÎ¯ Î½Î± Î´Î¹Î±ÏÎºÎÏƒÎµÎ¹ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ¿ Î±Ï€ÏŒ ÎÎ½Î± Î»ÎµÏ€Ï„ÏŒ Î· ÎµÎºÎºÎ¯Î½Î·ÏƒÎ· Ï„Î¿Ï… VM.';
+$wb['stop_exec_txt'] = 'Î— ÎµÎ½Ï„Î¿Î»Î® Ï„ÎµÏÎ¼Î±Ï„Î¹ÏƒÎ¼Î¿Ï ÎµÏƒÏ„Î¬Î»ÎµÎ¹ ÏƒÏ„Î¿Î½ VM host server. ÎœÏ€Î¿ÏÎµÎ¯ Î½Î± Î´Î¹Î±ÏÎºÎÏƒÎµÎ¹ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ¿ Î±Ï€ÏŒ ÎÎ½Î± Î»ÎµÏ€Ï„ÏŒ Î¿ Ï„ÎµÏÎ¼Î±Ï„Î¹ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Ï… VM.';
+$wb['restart_exec_txt'] = 'Î— ÎµÎ½Ï„Î¿Î»Î® ÎµÏ€Î±Î½ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚ ÎµÏƒÏ„Î¬Î»ÎµÎ¹ ÏƒÏ„Î¿Î½ VM host server. ÎœÏ€Î¿ÏÎµÎ¯ Î½Î± Î´Î¹Î±ÏÎºÎÏƒÎµÎ¹ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ¿ Î±Ï€ÏŒ ÎÎ½Î± Î»ÎµÏ€Ï„ÏŒ Î· ÎµÏ€Î±Î½ÎµÎºÎºÎ¯Î½Î·ÏƒÎ· Ï„Î¿Ï… VM.';
+$wb['ostemplate_name_error'] = 'Î¤Î¿ OSTemplate Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î¼Î· ÎµÏ€Î¹Ï„ÏÎµÏ€Ï„Î¿ÏÏ‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚.';
+$wb['ostemplate_name_unique_error'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· ÎÎ½Î± OSTemplate Î¼Îµ Î±Ï…Ï„ÏŒ Ï„Î¿ ÏŒÎ½Î¿Î¼Î±.';
+$wb['ostemplate_exec_txt'] = 'Î— ÎµÎ½Ï„Î¿Î»Î® Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±Ï‚ Ï„Î¿Ï… OSTemplate ÎµÏƒÏ„Î¬Î»ÎµÎ¹ ÏƒÏ„Î¿Î½ server. ÎœÏ€Î¿ÏÎµÎ¯ Î½Î± Î´Î¹Î±ÏÎºÎÏƒÎµÎ¹ Î±ÏÎºÎµÏ„Î¬ Î»ÎµÏ€Ï„Î¬ Î· Ï€Î»Î®ÏÎ·Ï‚ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Ï„Î¿Ï… OSTemplate.';
 ?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_ip.lng b/interface/web/vm/lib/lang/el_openvz_ip.lng
index 6016681df89f13323f60379acff5e7abd98f4c77..a0252fc95beb3ca34cf3221a532148b36d99af58 100644
--- a/interface/web/vm/lib/lang/el_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ip.lng
@@ -1,9 +1,10 @@
 <?php
 $wb['server_id_txt'] = 'Hostserver';
-$wb['ip_address_txt'] = 'IP address';
-$wb['vm_id_txt'] = 'Virtual server';
+$wb['ip_address_txt'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP';
+$wb['vm_id_txt'] = 'Î•Î¹ÎºÎ¿Î½Î¹ÎºÏŒÏ‚ server';
 $wb['reserved_txt'] = 'Reserved';
-$wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
-$wb['ip_error_unique'] = 'This IP address does already exist.';
-$wb['IP address'] = 'IP address';
+$wb['ip_error_wrong'] = 'Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÏƒÏ…Î¼Ï€Î»Î·ÏÏŽÏƒÏ„Îµ Î¼Î¹Î± ÎÎ³ÎºÏ…ÏÎ· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IPv4.';
+$wb['ip_error_unique'] = 'Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î·.';
+$wb['IP address'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP';
 ?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_ip_list.lng b/interface/web/vm/lib/lang/el_openvz_ip_list.lng
index c5f06013b9812e10272e3f42bf8a4aea7f408962..388df199791694db8af280f95685b869e208c6ed 100644
--- a/interface/web/vm/lib/lang/el_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ip_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'OpenVZ IP addresses';
+$wb['list_head_txt'] = 'Î”Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ IP OpenVZ';
 $wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP address';
+$wb['ip_address_txt'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP';
 $wb['reserved_txt'] = 'Reserved';
 ?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_ostemplate.lng b/interface/web/vm/lib/lang/el_openvz_ostemplate.lng
index 256750f19a0cf4d459214a327d3f86773f9312d7..802ed82748f8be0fbaf973fab63e0f7b2205226e 100644
--- a/interface/web/vm/lib/lang/el_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ostemplate.lng
@@ -1,11 +1,12 @@
 <?php
-$wb['template_name_txt'] = 'Template name';
-$wb['template_file_txt'] = 'Template filename';
+$wb['template_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Ï€ÏÎ¿Ï„ÏÏ€Ï…';
+$wb['template_file_txt'] = 'Î‘ÏÏ‡ÎµÎ¯Î¿ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï…';
 $wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
-$wb['active_txt'] = 'Active';
-$wb['description_txt'] = 'Description';
-$wb['template_name_error_empty'] = 'Template name is empty.';
-$wb['template_file_error_empty'] = 'Template filename is empty.';
-$wb['Template'] = 'Template';
+$wb['allservers_txt'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ ÏƒÎµ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ servers';
+$wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
+$wb['description_txt'] = 'Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®';
+$wb['template_name_error_empty'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï… Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï… ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['template_file_error_empty'] = 'Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Ï„Î¿Ï… Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï… Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯.';
+$wb['Template'] = 'Î ÏÏŒÏ„Ï…Ï€Î¿';
 ?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng
index 6471ec0e277b63b6e110ef8deef7ca35511a2a52..a950faad128d4c0948231ec8f8f9f7706bab1113 100644
--- a/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'OpenVZ OSTemplate';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
+$wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
+$wb['template_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï…';
 $wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
+$wb['allservers_txt'] = 'Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ ÏƒÎµ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ servers';
 $wb['ostemplate_id_txt'] = 'ID';
 ?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_template.lng b/interface/web/vm/lib/lang/el_openvz_template.lng
index d285512dcab15fffb604da4ce421f5e5e056d485..023aa0713ad3249228e1d5590b851b6699191d99 100644
--- a/interface/web/vm/lib/lang/el_openvz_template.lng
+++ b/interface/web/vm/lib/lang/el_openvz_template.lng
@@ -29,13 +29,13 @@ $wb['template_name_txt'] = 'Template name';
 $wb['diskspace_txt'] = 'Diskspace';
 $wb['ram_txt'] = 'RAM (guaranteed)';
 $wb['ram_burst_txt'] = 'RAM (burst)';
-$wb['cpu_units_txt'] = 'CPU units';
-$wb['cpu_num_txt'] = 'CPU cores';
-$wb['cpu_limit_txt'] = 'CPU limit %';
-$wb['io_priority_txt'] = 'I/O priority';
+$wb['cpu_units_txt'] = 'ÎœÎ¿Î½Î¬Î´ÎµÏ‚ CPU';
+$wb['cpu_num_txt'] = 'Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ CPU';
+$wb['cpu_limit_txt'] = 'ÎŒÏÎ¹Î¿ CPU %';
+$wb['io_priority_txt'] = 'Î ÏÎ¿Ï„ÎµÏÎ±Î¹ÏŒÏ„Î·Ï„Î± Î•/Î•';
 $wb['active_txt'] = 'Active';
-$wb['description_txt'] = 'Description';
-$wb['numproc_desc_txt'] = 'Number of processes and threads.';
+$wb['description_txt'] = 'Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®';
+$wb['numproc_desc_txt'] = 'Î Î»Î®Î¸Î¿Ï‚ Î´Î¹ÎµÏÎ³Î±ÏƒÎ¹ÏŽÎ½ ÎºÎ±Î¹ Î½Î·Î¼Î¬Ï„Ï‰Î½.';
 $wb['numtcpsock_desc_txt'] = 'Number of TCP sockets.';
 $wb['numothersock_desc_txt'] = 'Number of sockets other than TCP.';
 $wb['vmguarpages_desc_txt'] = 'Memory allocation guarantee, in pages.';
@@ -49,15 +49,15 @@ $wb['privvmpages_desc_txt'] = 'Memory allocation limit, in pages.';
 $wb['lockedpages_desc_txt'] = 'Process pages not allowed to be swapped out (pages locked by mlock(2)).';
 $wb['shmpages_desc_txt'] = 'Total size of shared memory (IPC, shared anonymous mappings and tmpfs objects), in pages.';
 $wb['physpages_desc_txt'] = 'Total number of RAM pages used by processes.';
-$wb['numfile_desc_txt'] = 'Number of open files.';
-$wb['numflock_desc_txt'] = 'Number of file locks.';
-$wb['numpty_desc_txt'] = 'Number of pseudo-terminals.';
+$wb['numfile_desc_txt'] = 'Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ Î±Î½Î¿Î¹Ï‡Ï„ÏŽÎ½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½.';
+$wb['numflock_desc_txt'] = 'Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ ÎºÎ»ÎµÎ¹Î´Ï‰Î¼Î¬Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½.';
+$wb['numpty_desc_txt'] = 'Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ ÏˆÎµÏ…Î´Î¿-Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÏŽÎ½';
 $wb['numsiginfo_desc_txt'] = 'Number of siginfo structures.';
 $wb['dcachesize_desc_txt'] = 'Total size of dentry and inode structures locked in memory.';
 $wb['numiptent_desc_txt'] = 'Number of NETFILTER (IP packet filtering) entries.';
 $wb['swappages_desc_txt'] = 'Amount of swap space to show in container.';
-$wb['create_dns_txt'] = 'Create DNS for hostname';
-$wb['template_name_error_empty'] = 'Template name is empty.';
+$wb['create_dns_txt'] = 'Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± DNS Î³Î¹Î± Ï„Î¿ hostname';
+$wb['template_name_error_empty'] = 'Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï… Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï… ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
 $wb['diskspace_error_empty'] = 'Diskspace is empty.';
 $wb['ram_error_empty'] = 'RAM (guaranteed) is empty.';
 $wb['ram_burst_error_empty'] = 'RAM (burst) is empty.';
@@ -91,3 +91,4 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 ?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_template_list.lng b/interface/web/vm/lib/lang/el_openvz_template_list.lng
index de4045c36a75506c0452b17c1e9d61080b534ce2..781ef0af53b576346cfdeaed36f1efa6bbbcdb08 100644
--- a/interface/web/vm/lib/lang/el_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/el_openvz_template_list.lng
@@ -1,5 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
+$wb['list_head_txt'] = 'Î ÏÏŒÏ„Ï…Ï€Î¿ Î•Î¹ÎºÎ¿Î½Î¹ÎºÎ®Ï‚ ÎœÎ·Ï‡Î±Î½Î®Ï‚ OpenVZ';
+$wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒ';
+$wb['template_name_txt'] = 'ÎŒÎ½Î¿Î¼Î± Î ÏÎ¿Ï„ÏÏ€Î¿Ï…';
 ?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_vm.lng b/interface/web/vm/lib/lang/el_openvz_vm.lng
index f2be022dd0ae060ae8688cdcaa356b4200185d7c..a4f6a2ebf71b07a83529459e6c196fe468217db2 100644
--- a/interface/web/vm/lib/lang/el_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/el_openvz_vm.lng
@@ -1,40 +1,41 @@
 <?php
-$wb['diskspace_txt'] = 'Diskspace';
-$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['diskspace_txt'] = 'Î§ÏŽÏÎ¿Ï‚ Î”Î¯ÏƒÎºÎ¿Ï…';
+$wb['ram_txt'] = 'RAM (ÎµÎ³Î³Ï…Î·Î¼ÎÎ½Î·)';
 $wb['ram_burst_txt'] = 'RAM (burst)';
-$wb['cpu_units_txt'] = 'CPU units';
-$wb['cpu_num_txt'] = 'CPU number';
-$wb['cpu_limit_txt'] = 'CPU limit';
-$wb['io_priority_txt'] = 'I/O priority';
+$wb['cpu_units_txt'] = 'ÎœÎ¿Î½Î¬Î´ÎµÏ‚ CPU';
+$wb['cpu_num_txt'] = 'Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ CPU';
+$wb['cpu_limit_txt'] = 'ÎŒÏÎ¹Î¿ CPU';
+$wb['io_priority_txt'] = 'Î ÏÎ¿Ï„ÎµÏÎ±Î¹ÏŒÏ„Î·Ï„Î± Î•/Î•';
 $wb['nameserver_txt'] = 'Nameserver(s)';
-$wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Capability';
+$wb['nameserver_desc_txt'] = '(Î´Î¹Î±Ï‡Ï‰ÏÎ¹ÏƒÏ„Î¹ÎºÏŒÏ‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎ±Ï‚ Ï„Î¿ ÎºÎµÎ½ÏŒ)';
+$wb['capability_txt'] = 'Î”Ï…Î½Î±Ï„ÏŒÏ„Î·Ï„Î±';
 $wb['server_id_txt'] = 'Hostserver';
 $wb['ostemplate_id_txt'] = 'OSTemplate';
-$wb['template_id_txt'] = 'Template';
-$wb['ip_address_txt'] = 'IP address';
+$wb['template_id_txt'] = 'Î ÏÏŒÏ„Ï…Ï€Î¿';
+$wb['ip_address_txt'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP';
 $wb['hostname_txt'] = 'Hostname';
-$wb['vm_password_txt'] = 'VM Password';
-$wb['start_boot_txt'] = 'Start at boot';
-$wb['active_txt'] = 'Active';
-$wb['description_txt'] = 'Description';
-$wb['client_group_id_txt'] = 'Client';
+$wb['vm_password_txt'] = 'Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ VM';
+$wb['start_boot_txt'] = 'Î•ÎºÎºÎ¯Î½Î·ÏƒÎ· ÏƒÏ„Î¿ boot';
+$wb['active_txt'] = 'EÎ•Î½ÎµÏÎ³ÏŒÏ‚';
+$wb['description_txt'] = 'Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®';
+$wb['client_group_id_txt'] = 'Î ÎµÎ»Î¬Ï„Î·Ï‚';
 $wb['veid_txt'] = 'VEID';
-$wb['create_dns_txt'] = 'Create DNS for hostname';
-$wb['active_until_date_txt'] = 'Active until date';
-$wb['ip_address_error_empty'] = 'IP address is empty.';
-$wb['hostname_error_empty'] = 'Hostname is empty.';
-$wb['vm_password_error_empty'] = 'VM Password is empty.';
-$wb['veid_error_empty'] = 'VEID is empty.';
-$wb['veid_error_unique'] = 'VEID does already exist.';
-$wb['diskspace_error_empty'] = 'Diskspace is empty.';
-$wb['ram_error_empty'] = 'RAM (guaranteed) is empty.';
-$wb['ram_burst_error_empty'] = 'RAM (burst) is empty.';
-$wb['cpu_units_error_empty'] = 'CPU units is empty.';
-$wb['cpu_num_error_empty'] = 'CPU number is empty.';
-$wb['cpu_limit_error_empty'] = 'CPU limit is empty.';
-$wb['io_priority_error_empty'] = 'I/O priority is empty.';
-$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
-$wb['Virtual server'] = 'Virtual server';
-$wb['Advanced'] = 'Advanced';
+$wb['create_dns_txt'] = 'Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± DNS Î³Î¹Î± Ï„Î¿ hostname';
+$wb['active_until_date_txt'] = 'Î•Î½ ÎµÎ½ÎµÏÎ³ÎµÎ¯Î± Î¼ÎÏ‡ÏÎ·Ï„ Ï„Î·Î½ Î·Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î±';
+$wb['ip_address_error_empty'] = 'Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®.';
+$wb['hostname_error_empty'] = 'Î¤Î¿ Hostname ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['vm_password_error_empty'] = 'Î¤Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ VM ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['veid_error_empty'] = 'Î¤Î¿ VEID ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['veid_error_unique'] = 'Î¤Î¿ VEID Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î·.';
+$wb['diskspace_error_empty'] = 'Î¤Î¿ Diskspace ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['ram_error_empty'] = 'Î¤Î¿ RAM (ÎµÎ³Î³Ï…Î·Î¼ÎÎ½Î·) ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['ram_burst_error_empty'] = 'Î¤Î¿ RAM (burst) ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['cpu_units_error_empty'] = 'Î¤Î¿ Î¼Î¿Î½Î¬Î´ÎµÏ‚ CPU ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['cpu_num_error_empty'] = 'Î¤Î¿ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚ CPU ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['cpu_limit_error_empty'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ CPU ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['io_priority_error_empty'] = 'Î¤Î¿ Î ÏÎ¿Ï„ÎµÏÎ±Î¹ÏŒÏ„Î·Ï„Î± Î•/Î• ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['template_nameserver_error_empty'] = 'Î¤Î¿ Nameserver(s) ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.';
+$wb['Virtual server'] = 'Î•Î¹ÎºÎ¿Î½Î¹ÎºÏŒÏ‚ server';
+$wb['Advanced'] = 'Î“Î¹Î± Ï€ÏÎ¿Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î¿Ï…Ï‚';
 ?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_vm_list.lng b/interface/web/vm/lib/lang/el_openvz_vm_list.lng
index 2238e2b8f4fa4db72f1b785d6e0849e356922faf..dee8b9d22295265c7294f58113277e9f4afa3732 100644
--- a/interface/web/vm/lib/lang/el_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/el_openvz_vm_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Virtual server';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Î•Î¹ÎºÎ¿Î½Î¹ÎºÏŒÏ‚ server';
+$wb['active_txt'] = 'Î•Î½ÎµÏÎ³ÏŒÏ‚';
 $wb['server_id_txt'] = 'Hostserver';
 $wb['ostemplate_id_txt'] = 'OSTemplate';
-$wb['template_id_txt'] = 'Template';
+$wb['template_id_txt'] = 'Î ÏÏŒÏ„Ï…Ï€Î¿';
 $wb['hostname_txt'] = 'Hostname';
-$wb['ip_address_txt'] = 'IP address';
+$wb['ip_address_txt'] = 'Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP';
 $wb['veid_txt'] = 'VEID';
 ?>
+
diff --git a/remoting_client/API-docs/main.html b/remoting_client/API-docs/index.html
similarity index 100%
rename from remoting_client/API-docs/main.html
rename to remoting_client/API-docs/index.html
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index e680462762467229eb936135d0207eb7122dacd3..acc62e5f7907b52234dd20b2f983d4beb4320a41 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -1,4 +1,4 @@
-require ["fileinto", "regex", "date", "relational", "vacation"];
+require ["fileinto", "regex", "vacation"];
 
 <tmpl_if name="cc">
 # Send a copy of email to
@@ -28,11 +28,8 @@ if header :contains "X-Spam-Flag" "YES" {
   # Stop here so that we do not reply on spams
   stop;
 }
-
-if allof(currentdate :value "ge" "iso8601" "<tmpl_var name='start_date'>", currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>") {
 vacation  :days 1
-  :subject "<tmpl_var name='autoresponder_subject'>"
-  <tmpl_var name='addresses'>
+  :subject "Out of office reply"
+  # :addresses ["test@test.int", "till@test.int"]
   "<tmpl_var name='autoresponder_text'>";
-}
-</tmpl_if>
+</tmpl_if>
\ No newline at end of file
diff --git a/server/conf/sieve_filter_1.2.master b/server/conf/sieve_filter_1.2.master
new file mode 100644
index 0000000000000000000000000000000000000000..78a9355166195e3fe8f06d3133d880e71a8ff284
--- /dev/null
+++ b/server/conf/sieve_filter_1.2.master
@@ -0,0 +1,39 @@
+require ["fileinto", "regex", "date", "relational", "vacation"];
+
+<tmpl_if name="cc">
+# Send a copy of email to
+redirect "<tmpl_var name='cc'>";
+keep;
+</tmpl_if>
+
+<tmpl_if name="move_junk" op="==" value="y">
+# Move spam to spam folder
+if header :contains "X-Spam-Flag" "YES" {
+  fileinto "Junk";
+  # Stop here so that we do not reply on spams
+  stop;
+}
+</tmpl_if>
+
+<tmpl_var name='custom_mailfilter'>
+
+<tmpl_if name="autoresponder" op="==" value="y">
+#################################################################
+# Autoreply
+#################################################################
+
+# Move spam to spam folder
+if header :contains "X-Spam-Flag" "YES" {
+  fileinto "Junk";
+  # Stop here so that we do not reply on spams
+  stop;
+}
+
+if allof(currentdate :value "ge" "iso8601" "<tmpl_var name='start_date'>", currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>") {
+vacation  :days 1
+  :subject "<tmpl_var name='autoresponder_subject'>"
+  <tmpl_var name='addresses'>
+  "<tmpl_var name='autoresponder_text'>";
+}
+</tmpl_if>
+
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index ae1287dc17f5c228afef6eaf3e493763fa0f4ab3..3345e0b383fbbf6bd31a873b4e2b92714031901f 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -176,7 +176,7 @@
 <tmpl_if name='fastcgi_config_syntax' op='==' value='2'>
         FcgidIdleTimeout 300
         FcgidProcessLifeTime 3600
-        FcgidMaxProcesses 1000
+        # FcgidMaxProcesses 1000
         FcgidMinProcessesPerClass 0
         FcgidMaxProcessesPerClass 100
         FcgidConnectTimeout 3
@@ -215,7 +215,7 @@
     RewriteEngine on
 <tmpl_if name='seo_redirect_enabled'>
     RewriteCond %{HTTP_HOST} ^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
-    RewriteRule ^(.*)$ http://<tmpl_var name='seo_redirect_target_domain'>/$1 [R=301,L]
+    RewriteRule ^(.*)$ http://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
 </tmpl_if>
 <tmpl_loop name="redirects">
     RewriteCond %{HTTP_HOST}   <tmpl_var name='rewrite_domain'>$ [NC]
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 26768c3e9a67e7f412e465f0a6123b5c21fc3642..f120bcb3a7a883151c9bccb69ec8443634108ff8 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -175,7 +175,13 @@ class monitor_tools {
 					$quotafile = file($filename);
 					$data[$email]['used'] = trim($quotafile['1']);
 					unset($quotafile);
-				}   
+				} else {
+					exec('du -s '.escapeshellcmd('/var/vmail/'.$email_parts[1].'/'.$email_parts[0]),$out);
+					$parts = explode(' ',$out[0]);
+					$data[$email]['used'] = intval($parts[0])*1024;
+					unset($out);
+					unset($parts);
+				}
 			}
 		}
 		
@@ -887,9 +893,6 @@ class monitor_tools {
 			$state = 'no_state';
 			$data['output'] = '';
 		}
-		
-		//* Encode data
-		$data['output'] = htmlentities($data['output']);
 
 		/*
 		 * Return the Result
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index ec85bed32ae283302e21fa888cf95c0e17d11bf3..bfb03be975dbd5c390a709104902dd0b0de4d002 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -120,6 +120,13 @@ class monitor_core_module {
         global $app;
 
         /*
+		 *  This monitoring is expensive, so do it only every 15 minutes
+		 */
+		$min = @date('i');
+		if ($min % 15 != 0) return;
+		
+		
+		/*
          * First we get the Monitoring-data from the tools
          */
         $res = $this->_tools->monitorEmailQuota();
@@ -406,6 +413,9 @@ class monitor_core_module {
 		 * First we get the Monitoring-data from the tools
 		 */
 		$res = $this->_tools->monitorSystemUpdate();
+		
+		//* Ensure that output is encoded so that it does not break the serialize
+		$res['data']['output'] = htmlentities($res['data']['output']);
 
 		/*
 		 * Insert the data into the database
@@ -692,6 +702,9 @@ class monitor_core_module {
 		 * First we get the Monitoring-data from the tools
 		 */
 		$res = $this->_tools->monitorISPCCronLog();
+		
+		//* Ensure that output is encoded so that it does not break the serialize
+		$res['data']['output'] = htmlentities($res['data']['output']);
 
 		/*
 		 * Insert the data into the database
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index fbf91b9e00d2f1d19bee26110c51e65467ace0cb..7dc07fe748c96869aafa622b14089a561d498ee5 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -190,7 +190,7 @@ class apache2_plugin {
 		//* Save a SSL certificate to disk
 		if($data["new"]["ssl_action"] == 'save') {
 			$ssl_dir = $data["new"]["document_root"]."/ssl";
-			$domain = $data["new"]["ssl_domain"];
+			$domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"];
 			$csr_file = $ssl_dir.'/'.$domain.".csr";
 			$crt_file = $ssl_dir.'/'.$domain.".crt";
 			$bundle_file = $ssl_dir.'/'.$domain.".bundle";
@@ -207,7 +207,7 @@ class apache2_plugin {
 		//* Delete a SSL certificate
 		if($data['new']['ssl_action'] == 'del') {
 			$ssl_dir = $data['new']['document_root'].'/ssl';
-			$domain = $data['new']['ssl_domain'];
+			$domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"];
 			$csr_file = $ssl_dir.'/'.$domain.'.csr';
 			$crt_file = $ssl_dir.'/'.$domain.'.crt';
 			$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
@@ -228,7 +228,6 @@ class apache2_plugin {
 			$app->log('Deleting SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
 		}
 
-
 	}
 
 
@@ -542,74 +541,76 @@ class apache2_plugin {
 
 		if($this->action == 'insert' || $data["new"]["system_user"] != $data["old"]["system_user"]) {
 			// Chown and chmod the directories below the document root
-			$this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
+			$this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']).'/web');
 			// The document root itself has to be owned by root in normal level and by the web owner in security level 20
 			if($web_config['security_level'] == 20) {
-				$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
+				$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']).'/web');
 			} else {
-				$this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
+				$this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']).'/web');
 			}
 		}
 
 
 
 		//* If the security level is set to high
-		if($web_config['security_level'] == 20) {
+		if($this->action == 'insert' && $data['new']['type'] == 'vhost') {
+			if($web_config['security_level'] == 20) {
 
-			$this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']));
-			$this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']).'/*');
-			$this->_exec('chmod 710 '.escapeshellcmd($data['new']['document_root'].'/web'));
+				$this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']));
+				$this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']).'/*');
+				$this->_exec('chmod 710 '.escapeshellcmd($data['new']['document_root'].'/web'));
 
-			// make tmp directory writable for Apache and the website users
-			$this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+				// make tmp directory writable for Apache and the website users
+				$this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
 			
-			// Set Log symlink to 755 to make the logs accessible by the FTP user
-			$this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"])."/log");
-
-			$command = 'usermod';
-			$command .= ' --groups sshusers';
-			$command .= ' '.escapeshellcmd($data['new']['system_user']);
-			$this->_exec($command);
-
-			//* if we have a chrooted Apache environment
-			if($apache_chrooted) {
-				$this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
+				// Set Log symlink to 755 to make the logs accessible by the FTP user
+				$this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"])."/log");
+
+				$command = 'usermod';
+				$command .= ' --groups sshusers';
+				$command .= ' '.escapeshellcmd($data['new']['system_user']);
+				$this->_exec($command);
+
+				//* if we have a chrooted Apache environment
+				if($apache_chrooted) {
+					$this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
+
+					//* add the apache user to the client group in the chroot environment
+					$tmp_groupfile = $app->system->server_conf['group_datei'];
+					$app->system->server_conf['group_datei'] = $web_config['website_basedir'].'/etc/group';
+					$app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
+					$app->system->server_conf['group_datei'] = $tmp_groupfile;
+					unset($tmp_groupfile);
+				}
 
-				//* add the apache user to the client group in the chroot environment
-				$tmp_groupfile = $app->system->server_conf['group_datei'];
-				$app->system->server_conf['group_datei'] = $web_config['website_basedir'].'/etc/group';
+				//* add the Apache user to the client group
 				$app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
-				$app->system->server_conf['group_datei'] = $tmp_groupfile;
-				unset($tmp_groupfile);
-			}
 
-			//* add the Apache user to the client group
-			$app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
+				$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
 
-			$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
+				/*
+				* Workaround for jailkit: If jailkit is enabled for the site, the 
+				* website root has to be owned by the root user and we have to chmod it to 755 then
+				*/
 
-			/*
-			* Workaround for jailkit: If jailkit is enabled for the site, the 
-			* website root has to be owned by the root user and we have to chmod it to 755 then
-			*/
+				//* Check if there is a jailkit user for this site
+				$tmp = $app->db->queryOneRecord('SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = '.$data['new']['domain_id']." AND chroot = 'jailkit'");
+				if($tmp['number'] > 0) {
+					$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
+					$this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
+				}
+				unset($tmp);
+
+				// If the security Level is set to medium
+			} else {
 
-			//* Check if there is a jailkit user for this site
-			$tmp = $app->db->queryOneRecord('SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = '.$data['new']['domain_id']." AND chroot = 'jailkit'");
-			if($tmp['number'] > 0) {
 				$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
+				$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/*'));
 				$this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
-			}
-			unset($tmp);
-
-			// If the security Level is set to medium
-		} else {
-
-			$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
-			$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/*'));
-			$this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
 
-			// make temp directory writable for Apache and the website users
-			$this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+				// make temp directory writable for Apache and the website users
+				$this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+			}
 		}
 
 		// Change the ownership of the error log to the owner of the website
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 5701799d4a312fae90db6f2513098c1f116d19d5..25e4cf2c8f3817f39e1da8d1b54fafd24f96a2e6 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -101,9 +101,23 @@ class maildeliver_plugin {
 			if(is_file($sieve_file)) unlink($sieve_file)  or $app->log("Unable to delete file: $sieve_file",LOGLEVEL_WARN);
 				
 			$app->load('tpl');
-		
+			
+			//* Select sieve filter file for dovecot version
+			exec('dovecot --version',$tmp);
+			if(substr($tmp[0],0,3) == '1.0') {
+				$filter_file_template = "sieve_filter.master";
+			} elseif(substr($tmp[0],0,3) == '1.2') {
+				$filter_file_template = "sieve_filter_1.2.master";
+			} elseif(substr($tmp[0],0,1) == '2') {
+				$filter_file_template = "sieve_filter_1.2.master";
+			} else {
+				$filter_file_template = "sieve_filter.master";
+			}
+			unset($tmp);
+			
+			//* Create new filter file based on template
 			$tpl = new tpl();
-			$tpl->newTemplate("sieve_filter.master");
+			$tpl->newTemplate($filter_file_template);
 			
 			// cc Field
 			$tpl->setVar('cc',$data["new"]["cc"]);
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 946aaaa4c61e5f24d62c4ca0610918f92a8ba683..7677778eae97d6beb531b88aa817822ca92c98be 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -235,7 +235,7 @@ class shelluser_base_plugin {
 		if (!file_exists($sshkeys)){
 			// add root's key
 			$app->file->mkdirs($sshdir, '0755');
-			file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys'));
+			if(is_file('/root/.ssh/authorized_keys')) file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys'));
 		
 			// Remove duplicate keys
 			$existing_keys = file($sshkeys);
@@ -273,7 +273,7 @@ class shelluser_base_plugin {
 			$this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
 		}
 		// set proper file permissions
-		exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
+		// exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
 		exec("chmod 600 '$sshkeys'");
 		
 	}
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index c1e2b2cd3f0a965e8d24776da490764895dfcd1b..50d2b24b54cc08e85682674252bc81f9f1cf668b 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -266,14 +266,14 @@ class shelluser_jailkit_plugin {
 			exec($command);
 				
 			$this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG);
-				
-			mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), 0755, true);
+						
+			if(!is_dir($this->data['new']['dir'].$jailkit_chroot_userhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), 0755, true);
 			chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['username']);
 			chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['pgroup']);
 				
 			$this->app->log("Added created jailkit user home in : ".$this->data['new']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
 			
-			mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), 0755, true);
+			if(!is_dir($this->data['new']['dir'].$jailkit_chroot_puserhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), 0755, true);
 			chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['puser']);
 			chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['pgroup']);
 				
@@ -404,7 +404,7 @@ class shelluser_jailkit_plugin {
 		if (!file_exists($sshkeys)){
 			// add root's key
 			$app->file->mkdirs($sshdir, '0755');
-			file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys'));
+			if(is_file('/root/.ssh/authorized_keys')) file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys'));
 		
 			// Remove duplicate keys
 			$existing_keys = file($sshkeys);
@@ -442,7 +442,7 @@ class shelluser_jailkit_plugin {
 			$this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
 		}
 		// set proper file permissions
-		exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
+		// exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
 		exec("chmod 600 '$sshkeys'");
 		
 	}
diff --git a/server/scripts/create_jailkit_chroot.sh b/server/scripts/create_jailkit_chroot.sh
index 312148db5291196f457d23826d7ff81793e2582d..6ffa889cdb1083226124d739607337a210242dc1 100755
--- a/server/scripts/create_jailkit_chroot.sh
+++ b/server/scripts/create_jailkit_chroot.sh
@@ -21,7 +21,7 @@ CHROOT_APP_SECTIONS=$2
 chown root:root $CHROOT_HOMEDIR
 
 ## Initialize the chroot into the specified directory with the specified applications
-jk_init -f -k -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS
+jk_init -f -k -c /etc/jailkit/jk_init.ini -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS
 
 ## Create the temp directory
 if [ ! -d "$CHROOT_HOMEDIR/tmp" ]
diff --git a/server/server.php b/server/server.php
index c5ff5ac2f3f823a3cafaac1699c4258b0b3a9e09..5e27cb52595b929fca87bf9fdd51498d2664aa79 100644
--- a/server/server.php
+++ b/server/server.php
@@ -37,19 +37,6 @@ ini_set('error_reporting', E_ALL & ~E_NOTICE);
 // make sure server_id is always an int
 $conf['server_id'] = intval($conf['server_id']);
 
-/*
-  // Get server record, if updates where available for this server
-  $server_db_record = $app->db->queryOneRecord("SELECT * FROM server WHERE update = 1 AND server_id = ".$conf['server_id']);
-  if($server_db_record == false) {
-  $app->log('Nothing to update for server_id '.$conf['server_id']);
-  die();
-  } else {
-  // Set update status to 0, so we dont start the update process twice
-  $app->db->query("UPDATE server SET update = 0 WHERE server_id = ".$conf['server_id']);
-  $app->log('Begin update.');
-  }
- */
-
 /*
  * Try to Load the server configuration from the master-db
  */