diff --git a/TODO.txt b/TODO.txt
index 9902ef333253e69205872e2e43233eedfd37305e..6dcae104a29e055a6febd2ce4b761d7070052ef3 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -22,10 +22,6 @@ Uninstaller
 Server
 --------------------------------------
 
-- Add a backend plugin to configure network card settings. The IP address
-  settings are stored in the server_ip table.
--- This works now on Debian and Ubuntu Linux.
-
 
 Mail module
 --------------------------------------
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index 61c3073417ea765a69a0e0952d8ac4c9be765943..1ddb6029fe9ba3b69f27ea29b4d6efd07efb7e72 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -118,7 +118,7 @@ class installer extends installer_base {
 		chgrp($config_dir.'/'.$configfile, 'root');
 		
 		// Dovecot shall ignore mounts in website directory
-		exec("doveadm mount add '/var/www/*' ignore");
+		if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
 
 	}
 
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 8f074f3b96640e4b6ef2d6c6615690e6cb969c67..7669572875743911dcd4517f7ad7be5a262dee67 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -633,6 +633,7 @@ class installer_base {
 
 		//* Create aliasaes
 		exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
+		if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');
 
 	}
 
@@ -1007,7 +1008,7 @@ class installer_base {
 		chgrp($config_dir.'/'.$configfile, 'root');
 		
 		// Dovecot shall ignore mounts in website directory
-		exec("doveadm mount add '/var/www/*' ignore");
+		if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
 
 	}
 
diff --git a/install/tpl/fedora_dovecot2.conf.master b/install/tpl/fedora_dovecot2.conf.master
index 0d91006dda7fcc79e1c23beeb0e77b14581a5b6a..b0d365eb8c481f4c312462ec66137b030ffb99aa 100644
--- a/install/tpl/fedora_dovecot2.conf.master
+++ b/install/tpl/fedora_dovecot2.conf.master
@@ -51,6 +51,7 @@ protocol pop3 {
 }
 protocol lda {
   mail_plugins = sieve quota
+  postmaster_address = root@localhost
 }
 protocol lmtp {
   postmaster_address = webmaster@localhost
diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php
index 308d9dfd2d552e8244caee6731e959976612a3ad..930aabbca94591bbeb7214f0b9a0bbf095d030ec 100644
--- a/interface/lib/classes/ispcmail.inc.php
+++ b/interface/lib/classes/ispcmail.inc.php
@@ -593,6 +593,11 @@ class ispcmail {
 		$response = fgets($this->_smtp_conn, 515);
 		if(empty($this->_smtp_conn)) return false;
 
+		//Say Hello to SMTP
+		if($this->smtp_helo == '') $this->detectHelo();
+		fputs($this->_smtp_conn, 'HELO ' . $this->smtp_helo . $this->_crlf);
+		$response = fgets($this->_smtp_conn, 515);
+
 		// ENCRYPTED?
 		if($this->smtp_crypt == 'tls') {
 			fputs($this->_smtp_conn, 'STARTTLS' . $this->_crlf);
@@ -600,11 +605,6 @@ class ispcmail {
 			stream_socket_enable_crypto($this->_smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
 		}
 
-		//Say Hello to SMTP
-		if($this->smtp_helo == '') $this->detectHelo();
-		fputs($this->_smtp_conn, 'HELO ' . $this->smtp_helo . $this->_crlf);
-		$response = fgets($this->_smtp_conn, 515);
-
 		//AUTH LOGIN
 		fputs($this->_smtp_conn, 'AUTH LOGIN' . $this->_crlf);
 		$response = fgets($this->_smtp_conn, 515);
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index ea62001b24d58e98d9d4f94cfaa456135c21b438..5f7cb709e93e1631f4f9e55f582a5fd6c1822009 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -69,70 +69,70 @@ $wb['monthnamesshort_oct'] = 'Οκτ';
 $wb['monthnamesshort_nov'] = 'Νοε';
 $wb['monthnamesshort_dec'] = 'Δεκ';
 $wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
-$wb['logout_txt'] = 'Αποσύνδεση';
-$wb['submit_confirmation'] = 'Είστε σίγουροι ότι θέλετε να κάνετε αυτή την ενέργεια?';
+$wb['logout_txt'] = 'Logout';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
 $wb['top_menu_mailuser'] = 'Mailuser';
-$wb['globalsearch_resultslimit_of_txt'] = 'από';
-$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα';
-$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.';
-$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση';
-$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις';
-$wb['global_tabchange_warning_txt'] = 'Τα τροποποιημένα δεδομένα σε αυτή την καρτέλα θα αλλάξουν οριστικά αν πατήσετε ΟΚ. Πατήσετε Άκυρο για να μην συμβεί αυτό..';
-$wb['global_tabchange_discard_txt'] = 'Έχετε μη αποθηκευμένες αλλαγές σε αυτή την καρτέλα. Οι αλλαγές θα χαθούν αν συνεχίσετε.';
-$wb['datalog_changes_txt'] = 'Οι επόμενες αλλαγές δεν έχουν προωθηθεί στους servers:';
-$wb['datalog_changes_end_txt'] = 'Η αποθήκευση των ενημερώσεων μπορεί να διαρκέσει μεχρι και ένα λεπτό. Παρακαλούμε να είστε υπομονετικοί.';
-$wb['datalog_status_i_web_database'] = 'Δημιουργία νέας Βάσης Δεδομένων (ΒΔ)';
-$wb['datalog_status_u_web_database'] = 'Ενημέρωση Βάσης Δεδομένων';
-$wb['datalog_status_d_web_database'] = 'Διαγραφή Βάσης Δεδομένων';
-$wb['datalog_status_i_web_database_user'] = 'Δημιουργία χρήστη για την Βάση Δεδομένων';
-$wb['datalog_status_u_web_database_user'] = 'Ενημέρωση χρήστη Βάσης Δεδομένων';
-$wb['datalog_status_d_web_database_user'] = 'Διαγραφή χρήστη Βάσης Δεδομένων';
-$wb['datalog_status_i_web_domain'] = 'Δημιουργία νέου website';
-$wb['datalog_status_u_web_domain'] = 'Ενημέρωση ρυθμίσεων website';
-$wb['datalog_status_d_web_domain'] = 'Διαγραφή website';
-$wb['datalog_status_i_ftp_user'] = 'Δημιουργία χρήστη FTP';
-$wb['datalog_status_u_ftp_user'] = 'Ενημέρωση FTP user';
-$wb['datalog_status_d_ftp_user'] = 'Διαγραφή FTP user';
-$wb['datalog_status_i_mail_domain'] = 'Δημιουργία email domain';
-$wb['datalog_status_u_mail_domain'] = 'Ενημέρωση email domain';
-$wb['datalog_status_d_mail_domain'] = 'Διαγραφή email domain';
-$wb['datalog_status_i_mail_user'] = 'Δημιουργία χρήστη email';
-$wb['datalog_status_u_mail_user'] = 'Ενημέρωση χρήστη email';
-$wb['datalog_status_d_mail_user'] = 'Διαγραφή χρήστη email';
-$wb['datalog_status_i_mail_forwarding'] = 'Δημιουργία διεύθυνσης email';
-$wb['datalog_status_u_mail_forwarding'] = 'Ενημέρωση διεύθυνσης email';
-$wb['datalog_status_d_mail_forwarding'] = 'Διαγραφή διεύθυνσης email';
-$wb['datalog_status_i_dns_rr'] = 'Δημιουργία εγγραφής DNS';
-$wb['datalog_status_u_dns_rr'] = 'Ενημέρωση εγγραφής DNS';
-$wb['datalog_status_d_dns_rr'] = 'Διαγραφή εγγραφής DNS';
-$wb['datalog_status_i_dns_soa'] = 'Δημιουργία ζώνης DNS';
-$wb['datalog_status_u_dns_soa'] = 'Ενημέρωση ζώνης DNS';
-$wb['datalog_status_d_dns_soa'] = 'Διαγραφή ζώνης DNS';
-$wb['datalog_status_i_cron'] = 'Δημιουργία εργασίας cron';
-$wb['datalog_status_u_cron'] = 'Ενημέρωση εργασίας cron';
-$wb['datalog_status_d_cron'] = 'Διαγραφή εργασίας cron';
-$wb['datalog_status_i_mail_get'] = 'Δημιουργία δημιουργία λογαριασμού mail fetcher';
-$wb['datalog_status_u_mail_get'] = 'Ενημέρωση δημιουργία λογαριασμού mail fetcher';
-$wb['datalog_status_d_mail_get'] = 'Διαγραφή δημιουργία λογαριασμού mail fetcher';
-$wb['datalog_status_i_mail_mailinglist'] = 'Δημιουργία λίστας mail';
-$wb['datalog_status_u_mail_mailinglist'] = 'Ενημέρωση λίστας mail';
-$wb['datalog_status_d_mail_mailinglist'] = 'Διαγραφή λίστας mail';
-$wb['datalog_status_i_shell_user'] = 'Δημιουργία χρήστη shell';
-$wb['datalog_status_u_shell_user'] = 'Ενημέρωση χρήστη shell';
-$wb['datalog_status_d_shell_user'] = 'Διαγραφή χρήστη shell';
-$wb['datalog_status_i_web_folder'] = 'Δημιουργία προστασίας φακέλου';
-$wb['datalog_status_u_web_folder'] = 'Ενημέρωση προστασίας φακέλου';
-$wb['datalog_status_d_web_folder'] = 'Διαγραφή προστασίας φακέλου';
-$wb['datalog_status_i_web_folder_user'] = 'Δημιουργία χρήστη προστασίας φακέλου';
-$wb['datalog_status_u_web_folder_user'] = 'Ενημέρωση χρήστη προστασίας φακέλου';
-$wb['datalog_status_d_web_folder_user'] = 'Διαγραφή χρήστη προστασίας φακέλου';
-$wb['datalog_status_i_spamfilter_users'] = 'Δημιουργία ρυθμίσεων φίλτρου spam';
-$wb['datalog_status_u_spamfilter_users'] = 'Ενημέρωση ρυθμίσεων φίλτρου spam';
-$wb['datalog_status_d_spamfilter_users'] = 'Διαγραφή ρυθμίσεων φίλτρου spam';
-$wb['login_as_txt'] = 'Είσοδος ως';
-$wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα για αυτό το domain.';
-$wb['no_destination_perm'] = 'Δεν έχετε δικαιώματα για αυτόν τον προορισμό.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$wb['globalsearch_noresults_limit_txt'] = '0 results';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
+$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
+$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
+$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
+$wb['login_as_txt'] = 'Log in as';
+$wb['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['no_destination_perm'] = 'You have no permission for this destination.';
 $wb['client_you_are_locked'] = 'You have no permission to change any settings.';
 $wb['gender_m_txt'] = 'Mr.';
 $wb['gender_f_txt'] = 'Ms.';
@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
 $wb['strength_3'] = 'Good';
 $wb['strength_4'] = 'Strong';
 $wb['strength_5'] = 'Very Strong';
-$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
+$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".';
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 ?>
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
index 4ee0d6b9d461784ed4c07021b4f1e80ee938a901..f344dc3a437be9149fd6665c0c7a3339bfa94e36 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -68,71 +68,71 @@ $wb['monthnamesshort_nov'] = 'Nov';
 $wb['monthnamesshort_dec'] = 'Dec';
 $wb['datepicker_nextText'] = 'Suivant';
 $wb['datepicker_prevText'] = 'Précédent';
-$wb['logout_txt'] = 'Logout';
-$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
-$wb['submit_confirmation'] = 'Do you really want to perform this action?';
+$wb['logout_txt'] = 'Se déconnecter';
+$wb['conf_format_dateshort_human_readable'] = 'dd-mm-yyyy';
+$wb['submit_confirmation'] = 'Voulez-vous vraiment effectuer cette action ?';
 $wb['top_menu_mailuser'] = 'Mailuser';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
+$wb['globalsearch_resultslimit_of_txt'] = 'de';
+$wb['globalsearch_resultslimit_results_txt'] = 'resultats';
+$wb['globalsearch_noresults_text_txt'] = 'Aucun resultat.';
+$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Rechercher';
 $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
-$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
-$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
-$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
-$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
-$wb['datalog_status_i_web_database'] = 'Create new database';
-$wb['datalog_status_u_web_database'] = 'Update database';
-$wb['datalog_status_d_web_database'] = 'Delete database';
-$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
-$wb['datalog_status_u_web_database_user'] = 'Update database user';
-$wb['datalog_status_d_web_database_user'] = 'Delete database user';
-$wb['datalog_status_i_web_domain'] = 'Create new website';
-$wb['datalog_status_u_web_domain'] = 'Update website settings';
-$wb['datalog_status_d_web_domain'] = 'Delete website';
-$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
-$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
-$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
-$wb['datalog_status_i_mail_domain'] = 'Create email domain';
-$wb['datalog_status_u_mail_domain'] = 'Update email domain';
-$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
-$wb['datalog_status_i_mail_user'] = 'Create email user';
-$wb['datalog_status_u_mail_user'] = 'Update email user';
-$wb['datalog_status_d_mail_user'] = 'Delete email user';
-$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
-$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
-$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
-$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
-$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
-$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
-$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
-$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
-$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
-$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
-$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
-$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
-$wb['datalog_status_i_cron'] = 'Create cron job';
-$wb['datalog_status_u_cron'] = 'Update cron job';
-$wb['datalog_status_d_cron'] = 'Delete cron job';
-$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
-$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
-$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
-$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
-$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
-$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
-$wb['datalog_status_i_shell_user'] = 'Create shell user';
-$wb['datalog_status_u_shell_user'] = 'Update shell user';
-$wb['datalog_status_d_shell_user'] = 'Delete shell user';
-$wb['datalog_status_i_web_folder'] = 'Create folder protection';
-$wb['datalog_status_u_web_folder'] = 'Update folder protection';
-$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
-$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
-$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
-$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
-$wb['login_as_txt'] = 'Log in as';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['no_destination_perm'] = 'You have no permission for this destination.';
+$wb['global_tabchange_warning_txt'] = 'Les données seront modifiées si vous cliquez sur OK. Cliquez sur annuler pour ne rien modifier.';
+$wb['global_tabchange_discard_txt'] = 'Vous avez des données modifiées non enregistrées dans cet onglet. Les modifications seront perdues si vous continuez.';
+$wb['datalog_changes_txt'] = 'Les modifications n\'ont pas encore été appliquées à tous les serveurs:';
+$wb['datalog_changes_end_txt'] = 'Les mises à jour peuvent prendre jusqu\'à 1 minute. Merci de patienter.';
+$wb['datalog_status_i_web_database'] = 'Créer une nouvelle base de données';
+$wb['datalog_status_u_web_database'] = 'Modifier une base de données';
+$wb['datalog_status_d_web_database'] = 'Supprimer une base de données';
+$wb['datalog_status_i_web_database_user'] = 'Créer un utilisateur de base de données';
+$wb['datalog_status_u_web_database_user'] = 'Modifier un utilisateur de base de données';
+$wb['datalog_status_d_web_database_user'] = 'Supprimer un utilisateur de base de données';
+$wb['datalog_status_i_web_domain'] = 'Créer un nouveau site';
+$wb['datalog_status_u_web_domain'] = 'Mettre à jour la configuration du site';
+$wb['datalog_status_d_web_domain'] = 'Supprimer le site';
+$wb['datalog_status_i_ftp_user'] = 'Créer un utilisateur FTP';
+$wb['datalog_status_u_ftp_user'] = 'Modifier un utilisateur FTP';
+$wb['datalog_status_d_ftp_user'] = 'Supprimer un utilisateur FTP';
+$wb['datalog_status_i_mail_domain'] = 'Créer un domaine email';
+$wb['datalog_status_u_mail_domain'] = 'Modifier un domaine email';
+$wb['datalog_status_d_mail_domain'] = 'Supprimer un domaine email';
+$wb['datalog_status_i_mail_user'] = 'Créer un utilisateur email';
+$wb['datalog_status_u_mail_user'] = 'Modifier un utilisateur email';
+$wb['datalog_status_d_mail_user'] = 'Supprimer un utilisateur email';
+$wb['datalog_status_i_spamfilter_users'] = 'Créer un filtre anti-spam';
+$wb['datalog_status_u_spamfilter_users'] = 'Modifier un filtre anti-spam';
+$wb['datalog_status_d_spamfilter_users'] = 'Supprimer un filtre anti-spam';
+$wb['datalog_status_i_mail_forwarding'] = 'Créer une adresse email';
+$wb['datalog_status_u_mail_forwarding'] = 'Modifier une adresse email';
+$wb['datalog_status_d_mail_forwarding'] = 'Supprimer une adresse email';
+$wb['datalog_status_i_dns_rr'] = 'Créer un enregistrement DNS';
+$wb['datalog_status_u_dns_rr'] = 'Modifier un enregistrement DNS';
+$wb['datalog_status_d_dns_rr'] = 'Supprimer un enregistrement DNS';
+$wb['datalog_status_i_dns_soa'] = 'Créer une zone DNS';
+$wb['datalog_status_u_dns_soa'] = 'Modifier une zone DNS';
+$wb['datalog_status_d_dns_soa'] = 'Supprimer une zone DNS';
+$wb['datalog_status_i_cron'] = 'Créer une tâche cron';
+$wb['datalog_status_u_cron'] = 'Modifier une tâche cron';
+$wb['datalog_status_d_cron'] = 'Supprimer une tâche cron';
+$wb['datalog_status_i_mail_get'] = 'Créer un compte mail récupérateur';
+$wb['datalog_status_u_mail_get'] = 'Modifier un compte mail récupérateur';
+$wb['datalog_status_d_mail_get'] = 'Supprimer un compte mail récupérateur';
+$wb['datalog_status_i_mail_mailinglist'] = 'Créer une liste d\'envoi';
+$wb['datalog_status_u_mail_mailinglist'] = 'Modifier une liste d\'envoi';
+$wb['datalog_status_d_mail_mailinglist'] = 'Supprimer une liste d\'envoi';
+$wb['datalog_status_i_shell_user'] = 'Créer un utilisateur Shell';
+$wb['datalog_status_u_shell_user'] = 'Modifier un utilisateur Shell';
+$wb['datalog_status_d_shell_user'] = 'Supprimer un utilisateur Shell';
+$wb['datalog_status_i_web_folder'] = 'Créer un dossier protégé';
+$wb['datalog_status_u_web_folder'] = 'Modifier un dossier protégé';
+$wb['datalog_status_d_web_folder'] = 'Supprimer un dossier protégé';
+$wb['datalog_status_i_web_folder_user'] = 'Créer un utilisateur de dossier protégé';
+$wb['datalog_status_u_web_folder_user'] = 'Modifier un utilisateur de dossier protégé';
+$wb['datalog_status_d_web_folder_user'] = 'Supprimer un utilisateur de dossier protégé';
+$wb['login_as_txt'] = 'Connexion en tant que';
+$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
+$wb['no_destination_perm'] = 'Vous n\'avez pas de permission pour cette destination.';
 $wb['client_you_are_locked'] = 'You have no permission to change any settings.';
 $wb['gender_m_txt'] = 'Mr.';
 $wb['gender_f_txt'] = 'Ms.';
@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
 $wb['strength_3'] = 'Good';
 $wb['strength_4'] = 'Strong';
 $wb['strength_5'] = 'Very Strong';
-$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
+$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".';
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 ?>
diff --git a/interface/web/admin/form/firewall.tform.php b/interface/web/admin/form/firewall.tform.php
index 0bef6ebcc0b16066dff4ad061087e8972f62a21a..ce7d2dbd09f1c891a78a17471e18b27f9fc906e2 100644
--- a/interface/web/admin/form/firewall.tform.php
+++ b/interface/web/admin/form/firewall.tform.php
@@ -79,7 +79,7 @@ $form["tabs"]['firewall'] = array (
 					'regex' => '/^[\s0-9\,\:]{0,255}$/',
 					'errmsg'=> 'tcp_ports_error_regex'),
 			),
-			'default' => '20,21,22,25,53,80,110,143,443,993,995,3306,8080,8081,10000',
+			'default' => '20,21,22,25,53,80,110,143,443,587,993,995,3306,8080,8081,10000',
 			'value'  => '',
 			'width'  => '30',
 			'maxlength' => '255'
diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng
index 4926ef2ad0894463e85e13f39a9029b7e6a7ea4f..010a5506df6d3ab750ad751a7365b97c1e2693a0 100644
--- a/interface/web/admin/lib/lang/el.lng
+++ b/interface/web/admin/lib/lang/el.lng
@@ -26,14 +26,13 @@ $wb['Web'] = 'Web';
 $wb['FastCGI'] = 'FastCGI';
 $wb['Jailkit'] = 'Jailkit';
 $wb['Rescue'] = 'Rescue';
-$wb['Server IP addresses'] = 'Διευθύνσεις IP Server';
-$wb['Additional PHP Versions'] = 'Πρόσθετες εκδόσεις PHP';
-$wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Server IP addresses'] = 'Server IP addresses';
+$wb['Additional PHP Versions'] = 'Additional PHP Versions';
 $wb['Firewall'] = 'Firewall';
-$wb['Interface'] = 'Διεπαφή';
-$wb['Interface Config'] = 'Βασική Διαμόρφωση';
+$wb['Interface'] = 'Interface';
+$wb['Interface Config'] = 'Main Config';
 $wb['Domains'] = 'Domains';
-$wb['Misc'] = 'Διάφορα';
+$wb['Misc'] = 'Misc';
 $wb['Software'] = 'Εφαρμογές & Πρόσθετα';
 $wb['Repositories'] = 'Αποθετήρια';
 $wb['Packages'] = 'Πακέτα';
@@ -47,4 +46,5 @@ $wb['Import'] = 'Εισαγωγή';
 $wb['Remote Actions'] = 'Απομακρυσμένες Ενέργειες';
 $wb['Do OS-Update'] = 'Αναβάθμιση λειτουργικού συστήματος';
 $wb['Do ISPConfig-Update'] = 'Αναβάθμιση ISPConfig';
+$wb['Directive Snippets'] = 'Directive Snippets';
 ?>
diff --git a/interface/web/admin/lib/lang/el_directive_snippets.lng b/interface/web/admin/lib/lang/el_directive_snippets.lng
index 684640f26b69e446eaa6c114c5fff7d635d5e865..0f09c12ee0abd6491457243d488bbb7ad10b7e10 100644
--- a/interface/web/admin/lib/lang/el_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/el_directive_snippets.lng
@@ -1,10 +1,10 @@
 <?php
 $wb['Directive Snippets'] = 'Directive Snippets';
-$wb['name_txt'] = 'Όνομα Snippet';
-$wb['type_txt'] = 'Τύπος';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
 $wb['snippet_txt'] = 'Snippet';
-$wb['active_txt'] = 'Ενεργό';
-$wb['directive_snippets_name_empty'] = 'Παρακαλούμε ορίστε όνομα snippet.';
-$wb['directive_snippets_name_error_unique'] = 'Υπάρχει ήδη ένα directive snippet με αυτό το όνομα.';
+$wb['active_txt'] = 'Active';
+$wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
+$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
 ?>
diff --git a/interface/web/admin/lib/lang/el_directive_snippets_list.lng b/interface/web/admin/lib/lang/el_directive_snippets_list.lng
index 1461c4e4bad90c4844bced29d27518900e6b2279..4124ea34641c48c25db6319110a5f119264242e6 100644
--- a/interface/web/admin/lib/lang/el_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/el_directive_snippets_list.lng
@@ -1,7 +1,7 @@
 <?php
 $wb['list_head_txt'] = 'Directive Snippets';
-$wb['active_txt'] = 'Ενεργό';
-$wb['name_txt'] = 'Όνομα Snippet';
-$wb['type_txt'] = 'Τύπος';
-$wb['add_new_record_txt'] = 'Προσθήκη Directive Snippet';
+$wb['active_txt'] = 'Active';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['add_new_record_txt'] = 'Add Directive Snippet';
 ?>
diff --git a/interface/web/admin/lib/lang/el_firewall.lng b/interface/web/admin/lib/lang/el_firewall.lng
index a0003f4fa63135103db2fe4487365fb0b423b205..ff31bab28b9c2b375a1c242ef1173bc284b92a22 100644
--- a/interface/web/admin/lib/lang/el_firewall.lng
+++ b/interface/web/admin/lib/lang/el_firewall.lng
@@ -5,7 +5,7 @@ $wb['udp_port_txt'] = 'Ανοιχτές θύρες UDP';
 $wb['tcp_port_help_txt'] = 'Χωρισμένες με κόμα';
 $wb['udp_port_help_txt'] = 'Χωρισμένες με κόμα';
 $wb['active_txt'] = 'Ενεργό';
-$wb['firewall_error_unique'] = 'Υπάρχει ήδη μια εγγραφή firewall για αυτό τον server.';
+$wb['firewall_error_unique'] = 'Υπάρχει ήδη μια εγγραφή firewall για αυτό τον σερωερ server.';
 $wb['tcp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών tcp. Επιτρέπονται μόνο αριθμοί, : και ,.';
 $wb['udp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών udp. Επιτρέπονται μόνο αριθμοί, : και ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/el_remote_action.lng b/interface/web/admin/lib/lang/el_remote_action.lng
index 4d9487844626c01a9cd1c53671bc99c500f035a5..e4f97cb228c1702267b178ff7f3f3b763f133d37 100644
--- a/interface/web/admin/lib/lang/el_remote_action.lng
+++ b/interface/web/admin/lib/lang/el_remote_action.lng
@@ -7,6 +7,6 @@ $wb['do_ispcupdate_caption'] = 'Εκκίνηση αναβάθμισης ISPConfi
 $wb['do_ispcupdate_desc'] = 'Αυτή η ενέργεια κάνει αναβάθμιση στο ISPConfig3 στον επιλεγμένο σας server.<br><br><strong>ΧΡΗΣΙΜΟΠΟΙΗΣΤΕ ΤΟ ΜΕ ΔΙΚΗ ΣΑΣ ΕΥΘΥΝΗ!</strong>';
 $wb['action_scheduled'] = 'Η ενέργεια προγραμματίστηκε για εκτέλεση';
 $wb['select_all_server'] = 'Σε όλους τους servers';
-$wb['ispconfig_update_title'] = 'Οδηγίες ενημέρωσης ISPConfig';
-$wb['ispconfig_update_text'] = 'Εισέλθετε ως χρήστης root σε κάποιο κέλυφος στον server σας και εκτελέστε την εντολή<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />για να εκκινήστε την ενημέρωση του ISPConfig.<br /><br /><a href=\'http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/\' target=\'_blank\'>Πατήστε εδώ για λεπτομερείς οδηγίες</a>';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=\'http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/\' target=\'_blank\'>Click here for detailed update instructins</a>';
 ?>
diff --git a/interface/web/admin/lib/lang/el_remote_user.lng b/interface/web/admin/lib/lang/el_remote_user.lng
index 8b79d6178640503451d54c58edde50ca586f37b7..ddffd7072da6b080d51310e9f64bc86f48d74ea5 100644
--- a/interface/web/admin/lib/lang/el_remote_user.lng
+++ b/interface/web/admin/lib/lang/el_remote_user.lng
@@ -5,7 +5,7 @@ $wb['function_txt'] = 'Ενέργειες:';
 $wb['username_error_unique'] = 'Το όνομα χρήστη πρέπει να είναι μοναδικό';
 $wb['username_error_empty'] = 'Το όνομα χρήστη δεν μπορεί να είναι κενό';
 $wb['password_error_empty'] = 'Το συνθηματικό δεν μπορεί να είναι κενό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
 $wb['Mail domain functions'] = 'Ενέργειες Mail domain';
 $wb['Mail user functions'] = 'Ενέργειες Χρήστη Mail';
 $wb['Mail alias functions'] = 'Ενέργειες Ψευδωνύμου Mail';
@@ -40,8 +40,8 @@ $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';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 7ec8787ab99bccb50e13d98bf043120a5c04bd0a..da3f99c5dbbaffe76a88d604a7bfc73d89c10f60 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -149,45 +149,45 @@ $wb['do_not_try_rescue_mail_txt'] = 'Απενεργοποίηση εποπτεί
 $wb['rescue_description_txt'] = '<b>Πληροφορία:</b> Αν θέλετε να τερματίσετε την MySQL πρέπει να επιλέξετε την επιλογή Απενεργοποίηση εποπτείας MySQL και μετά να περιμένετε 2-3 λεπτά.<br>Αν δεν περιμένετε 2-3 λεπτά, η εποπτεία και αποκατάσταση θα προσπαθήσει να επανεκκινήσει την MySQL!';
 $wb['enable_sni_txt'] = 'Ενεργοποίηση SNI';
 $wb['do_not_try_rescue_httpd_txt'] = 'Απενεργοποίηση εποπτείας HTTPD';
-$wb['set_folder_permissions_on_update_txt'] = 'Ορισμός δικαιωμάτων φακέλων κατά την ενημέρωση';
-$wb['add_web_users_to_sshusers_group_txt'] = 'Προσθήκη των χρηστών web στην ομάδα -sshusers-';
-$wb['connect_userid_to_webid_txt'] = 'Σύνδεση Linux userid στο webid';
-$wb['connect_userid_to_webid_start_txt'] = 'ID εκκίνησης για την σύνδεση userid/webid';
-$wb['website_autoalias_txt'] = 'Αυτόματο ψευδώνυμο Website';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
 $wb['website_autoalias_note_txt'] = 'Placeholders:';
-$wb['backup_mode_txt'] = 'Κατάσταση Backup';
-$wb['backup_mode_userzip'] = 'Να γίνει αντίγραφο ασφαλείας των αρχείων web που ανήκουν στον χρήστη web με τον μορφότυπο zip';
-$wb['backup_mode_rootgz'] = 'Να γίνει αντίγραφο ασφαλείας όλων των αρχείων στον φάκελο web ως χρήστης root';
-$wb['realtime_blackhole_list_txt'] = 'Λίστα Blackhole παρόχων πραγματικού χρόνου (RBL)';
-$wb['realtime_blackhole_list_note_txt'] = '(Διαχωρισμός RBL\'s με κόμματα)';
-$wb['ssl_settings_txt'] = 'Ρυθμίσεις SSL';
-$wb['permissions_txt'] = 'Δικαιώματα';
-$wb['php_settings_txt'] = 'Ρυθμίσεις PHP';
-$wb['apps_vhost_settings_txt'] = 'Ρυθμίσεις Apps Vhost';
-$wb['awstats_settings_txt'] = 'Ρυθμίσεις AWStats';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
 $wb['firewall_txt'] = 'Firewall';
-$wb['mailbox_quota_stats_txt'] = 'Στατιστικά χρήσης χώρου θυρίδας Mail';
-$wb['enable_ip_wildcard_txt'] = 'Ενεργοποίηση IP wildcard (*)';
-$wb['web_folder_protection_txt'] = 'Να γίνουν οι φάκελοι web αμετάβλητοι (εκτεταμένες ιδιότητες)';
-$wb['overtraffic_notify_admin_txt'] = 'Αποστολή ειδοποιήσεων υπέρβασης ορίου μεταφοράς δεδομένων στον διαχειριστή';
-$wb['overtraffic_notify_client_txt'] = 'Αποστολή ειδοποιήσεων υπέρβασης ορίου μεταφοράς δεδομένων στον πελάτη';
-$wb['rbl_error_regex'] = 'Παρακαλούμε ορίστε έγκυρα RBL hostnames.';
-$wb['overquota_notify_admin_txt'] = 'Αποστολή προειδοποιήσεων ορίων στον διαχειριστή';
-$wb['overquota_notify_client_txt'] = 'Αποστολή προειδοποιήσεων ορίων στον πελάτη';
-$wb['overquota_notify_onok_txt'] = 'Αποστολή ΟΚ μηνυμάτων ορίων στον πελάτη';
-$wb['overquota_notify_freq_txt'] = 'Αποστολή προειδοποιήσεων κάθε Χ ημέρες';
-$wb['overquota_notify_freq_note_txt'] = '0 = αποστολή μηνύματος μόνο μία φορά, (οχι επαναληπτικά μηνύματα)';
-$wb['admin_notify_events_txt'] = 'Αποστολή email στον διαχειριστή, ξεκινώντας από το ακόλουθο επίπεδο';
-$wb['no_notifications_txt'] = 'Χωρίς Ειδοποιήσεις';
-$wb['monit_url_txt'] = 'URL Monit';
-$wb['monit_user_txt'] = 'Χρήστης Monit';
-$wb['monit_password_txt'] = 'Συνθηματικό Monit';
-$wb['monit_url_error_regex'] = 'Μη έγκυρο URL Monit';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
+$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
+$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
+$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
+$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
+$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';
+$wb['overquota_notify_onok_txt'] = 'Send quota ok message to client';
+$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days';
+$wb['overquota_notify_freq_note_txt'] = '0 = send message just once, no repeated messages';
+$wb['admin_notify_events_txt'] = 'Send email to admin starting with the following level';
+$wb['no_notifications_txt'] = 'No Notifications';
+$wb['monit_url_txt'] = 'Monit URL';
+$wb['monit_user_txt'] = 'Monit User';
+$wb['monit_password_txt'] = 'Monit Password';
+$wb['monit_url_error_regex'] = 'Invalid Monit URL';
 $wb['monit_url_note_txt'] = 'Placeholder:';
-$wb['munin_url_txt'] = 'URL Munin';
-$wb['munin_user_txt'] = 'Χρήστης Munin';
-$wb['munin_password_txt'] = 'Συνθηματικό Munin';
-$wb['munin_url_error_regex'] = 'Μη έγκυρο URL Munin';
+$wb['munin_url_txt'] = 'Munin URL';
+$wb['munin_user_txt'] = 'Munin User';
+$wb['munin_password_txt'] = 'Munin Password';
+$wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
diff --git a/interface/web/admin/lib/lang/el_server_ip.lng b/interface/web/admin/lib/lang/el_server_ip.lng
index c858124141d9f94161a0e5db7a41e71dbead382f..212f432793c0ef23131d64fa34939bb3dd6e7681 100644
--- a/interface/web/admin/lib/lang/el_server_ip.lng
+++ b/interface/web/admin/lib/lang/el_server_ip.lng
@@ -7,5 +7,5 @@ $wb['ip_error_unique'] = 'Η Διεύθυνση IP πρέπει να είναι
 $wb['client_id_txt'] = 'Πελάτης';
 $wb['ip_type_txt'] = 'Τύπος';
 $wb['virtualhost_port_txt'] = 'Θύρες HTTP';
-$wb['error_port_syntax'] = 'Μη έγκυροι χαρακτήρες στο πεδίο θύρας, παρακαλούμε εισάγετε μόνο αριθμούς χωρισμένους με κόμματα. Παράδειγμα: 80,443';
+$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_php.lng b/interface/web/admin/lib/lang/el_server_php.lng
index be99452b22b21b546db66aa622292755baceb785..addbfa49357aa4e45f3c0ef1700065df9cf541f7 100644
--- a/interface/web/admin/lib/lang/el_server_php.lng
+++ b/interface/web/admin/lib/lang/el_server_php.lng
@@ -1,16 +1,16 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['client_id_txt'] = 'Πελάτης';
-$wb['name_txt'] = 'Όνομα PHP';
-$wb['Name'] = 'Όνομα';
+$wb['client_id_txt'] = 'Client';
+$wb['name_txt'] = 'PHP Name';
+$wb['Name'] = 'Name';
 $wb['FastCGI Settings'] = 'FastCGI Settings';
 $wb['PHP-FPM Settings'] = 'PHP-FPM Settings';
-$wb['Additional PHP Versions'] = 'Πρόσθετες εκδόσεις PHP';
-$wb['Form to edit additional PHP versions'] = 'Φόρμα για την επεξεργασία επιπλέον εκδόσεων PHP';
-$wb['server_php_name_error_empty'] = 'Πρέπει να ορίσετε το πειο Όνομα.';
-$wb['php_fastcgi_binary_txt'] = 'Διαδρομή για το εκτελέσιμο PHP FastCGI';
-$wb['php_fastcgi_ini_dir_txt'] = 'Διαδρομή για τον φάκελο php.ini';
-$wb['php_fpm_init_script_txt'] = 'Διαδρομή για το init script PHP-FPM';
-$wb['php_fpm_ini_dir_txt'] = 'Διαδρομή για τον φάκελο php.ini';
-$wb['php_fpm_pool_dir_txt'] = 'Διαδρομή για τον φάκελο PHP-FPM';
+$wb['Additional PHP Versions'] = 'Additional PHP Versions';
+$wb['Form to edit additional PHP versions'] = 'Form to edit additional PHP versions';
+$wb['server_php_name_error_empty'] = 'The Name field must not be empty.';
+$wb['php_fastcgi_binary_txt'] = 'Path to the PHP FastCGI binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory';
+$wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
+$wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
+$wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_php_list.lng b/interface/web/admin/lib/lang/el_server_php_list.lng
index 06c17a30047cf67e6a9202afcbdfcdb1014788bc..b402fd1ed19978b32027a9ed16e7b44f241db93e 100644
--- a/interface/web/admin/lib/lang/el_server_php_list.lng
+++ b/interface/web/admin/lib/lang/el_server_php_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Πρόσθετες εκδόσεις PHP';
+$wb['list_head_txt'] = 'Additional PHP Versions';
 $wb['server_id_txt'] = 'Server';
-$wb['add_new_record_txt'] = 'Προσθήκη νέας έκδοσης PHP';
-$wb['client_id_txt'] = 'Πελάτης';
-$wb['name_txt'] = 'Όνομα PHP';
+$wb['add_new_record_txt'] = 'Add new PHP version';
+$wb['client_id_txt'] = 'Client';
+$wb['name_txt'] = 'PHP Name';
 ?>
diff --git a/interface/web/admin/lib/lang/el_software_package.lng b/interface/web/admin/lib/lang/el_software_package.lng
index 16be47e587eebca01fee74e3b81053fb18a36b74..faffe38217fb9cac04020e73e473c6c46e3caaa1 100644
--- a/interface/web/admin/lib/lang/el_software_package.lng
+++ b/interface/web/admin/lib/lang/el_software_package.lng
@@ -1,6 +1,6 @@
 <?php
-$wb['package_title_txt'] = 'Τίτλος Πακέτου';
-$wb['package_key_txt'] = 'Κλειδί Πακέτου';
-$wb['Software Package'] = 'Πακέτο Λογισμικού';
-$wb['Modify software package details'] = 'Επεξεργασία λεπτομερειών Πακέτου';
+$wb['package_title_txt'] = 'Package Title';
+$wb['package_key_txt'] = 'Package Key';
+$wb['Software Package'] = 'Software Package';
+$wb['Modify software package details'] = 'Modify software package details';
 ?>
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 515dbb792b86aaf6a412d0aa3dde37b1dda03607..1553ea1ceafeca4b43be5bd163c9b3fc47ae9864 100644
--- a/interface/web/admin/lib/lang/el_software_package_list.lng
+++ b/interface/web/admin/lib/lang/el_software_package_list.lng
@@ -5,9 +5,9 @@ $wb['package_title_txt'] = 'Πακέτο';
 $wb['package_description_txt'] = 'Περιγραφή';
 $wb['action_txt'] = 'Ενέργεια';
 $wb['toolsarea_head_txt'] = 'Πακέτα';
-$wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακέτων';
+$wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακκέτων';
 $wb['package_id_txt'] = 'τοπικό App-ID';
-$wb['no_packages_txt'] = 'Δεν υπάρχουν διαθέσιμα πακέτα';
+$wb['no_packages_txt'] = 'No packages available';
 $wb['edit_txt'] = 'Edit';
 $wb['delete_txt'] = 'Delete';
 ?>
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 69c7026ab83fcacc3f4f75cda316d21e8178dac3..42100d0c8903ad84f65f8f5137feee995b83d3d5 100644
--- a/interface/web/admin/lib/lang/el_software_update_list.lng
+++ b/interface/web/admin/lib/lang/el_software_update_list.lng
@@ -5,5 +5,5 @@ $wb['installed_txt'] = 'Ενέργεια';
 $wb['update_title_txt'] = 'Ενημέρωση';
 $wb['version_txt'] = 'Έκδοση';
 $wb['action_txt'] = 'Ενέργεια';
-$wb['no_updates_txt'] = 'Δεν υπάρχουν διαθέσιμες ενημερώσεις';
+$wb['no_updates_txt'] = 'No updates available';
 ?>
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index f754137ddf3af3a6412b9e2fb0e8864831228311..8cb675c80c0d68d699ff5f5ebf9b7f3fb703b0c9 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -1,8 +1,8 @@
 <?php
 $wb['system_config_desc_txt'] = '';
-$wb['dashboard_atom_url_admin_txt'] = 'URL ροής atom του Dashboard (διαχειριστής)';
-$wb['dashboard_atom_url_reseller_txt'] = 'URL ροής atom του Dashboard (μεταπωλητής)';
-$wb['dashboard_atom_url_client_txt'] = 'URL ροής atom του Dashboard (πελάτης)';
+$wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)';
+$wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)';
+$wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)';
 $wb['warning'] = 'Επεξεργαστείτε τις τιμές με προσοχή! ΜΗΝ αφαιρείτε τα προθέματα σε συστήματα με περισσότερους από έναν πελάτες.';
 $wb['dbname_prefix_txt'] = 'Πρόθεμα Ονόματος Βάσης Δεδομένων';
 $wb['dbuser_prefix_txt'] = 'Πρόθεμα Χρήστη Βάσης Δεδομένων';
@@ -14,22 +14,22 @@ $wb['dbuser_prefix_error_regex'] = 'Δεν επιτρέπονται χαρακτ
 $wb['ftpuser_prefix_error_regex'] = 'Δεν επιτρέπονται χαρακτήρες στο πρόθεμα του Χρήστη ftp.';
 $wb['shelluser_prefix_error_regex'] = 'Δεν επιτρέπονται χαρακτήρες στο πρόθεμα του Χρήστη Shell.';
 $wb['webdavuser_prefix_error_regex'] = 'Δεν επιτρέπονται χαρακτήρες στο πρόθεμα του Χρήστη Webdav.';
-$wb['dblist_phpmyadmin_link_txt'] = 'Σύνδεσμος για το phpmyadmin στη λίστα των βάσεων δεδομένων';
-$wb['mailboxlist_webmail_link_txt'] = 'Σύνδεσμος για το webmail στην λίστα των θυρίδων mail';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link για το phpmyadmin στη λίστα των βάσεων δεδομένων';
+$wb['mailboxlist_webmail_link_txt'] = 'Link για το webmail στην λίστα των θυρίδων mail';
 $wb['webmail_url_txt'] = 'URL του Webmail';
 $wb['phpmyadmin_url_txt'] = 'URL του PHPMyAdmin';
 $wb['use_domain_module_txt'] = 'Χρήση του αρθρώματος-domain για την προσθήκη νέων domains';
 $wb['use_domain_module_hint'] = 'Αν χρησιμοποιήσετε αυτό το άρθρωμα, οι πελάτες σας μπορούν μόνο να διαλέξουν ένα από τα domains που δημιούργησε για αυτούς ο διαχειριστής. Δεν μπορούν να επεξεργαστούν ελεύθερα τα πεδία του domain.Πρέπει να επανασυνδεθείτε αν αλλάξετε αυτή την τιμή, για να γίνουν οι αλλαγές σας, ορατές.';
 $wb['new_domain_txt'] = 'HTML για την δημιουργία domain';
 $wb['webftp_url_txt'] = 'URL του WebFTP';
-$wb['enable_custom_login_txt'] = 'Αποδοχή  προσαρμοσμένου ονόματος εισόδου';
-$wb['mailmailinglist_link_txt'] = 'Σύνδεσμος της λίστας mail στις λίστες mail';
+$wb['enable_custom_login_txt'] = 'Αποδοχή  προσαρμοσμένου ονόματος login';
+$wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
 $wb['mailmailinglist_url_txt'] = 'URL της Mailing list ';
 $wb['admin_mail_txt'] = 'e-mail Διαχειριστών';
-$wb['monitor_key_txt'] = 'keyword εποπτείας';
+$wb['monitor_key_txt'] = 'Monitor keyword';
 $wb['admin_name_txt'] = 'Όνομα Administrator';
-$wb['maintenance_mode_txt'] = 'Κατάσταση συντήρησης';
-$wb['smtp_enabled_txt'] = 'Χρήση SMTP για την αποστολή mail συστήματος';
+$wb['maintenance_mode_txt'] = 'Maintenance Mode';
+$wb['smtp_enabled_txt'] = 'Use SMTP to send system mails';
 $wb['smtp_host_txt'] = 'SMTP host';
 $wb['smtp_port_txt'] = 'SMTP θύρα';
 $wb['smtp_user_txt'] = 'SMTP χρήστης';
@@ -66,7 +66,7 @@ $wb['customer_no_template_error_regex_txt'] = 'The customer No. template contain
 $wb['customer_no_start_txt'] = 'Customer No. start value';
 $wb['customer_no_counter_txt'] = 'Customer No. counter';
 $wb['session_timeout_txt'] = 'Session timeout (minutes)';
-$wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
+$wb['session_allow_endless_txt'] = 'Enable \"stay logged in\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
diff --git a/interface/web/admin/lib/lang/el_tpl_default_admin.lng b/interface/web/admin/lib/lang/el_tpl_default_admin.lng
index 88053dbca5065c2d255f137dae104161a06fd075..eee3af5fe4e30c2f22bfa5742d902ce678cfa830 100644
--- a/interface/web/admin/lib/lang/el_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/el_tpl_default_admin.lng
@@ -2,17 +2,17 @@
 $wb['tpl_default_admin_head_txt'] = 'Global Default-Theme Settings';
 $wb['tpl_default_admin_desc_txt'] = '';
 $wb['server_id_txt'] = 'Server';
-$wb['client_id_txt'] = 'Πελάτης';
-$wb['name_txt'] = 'Όνομα PHP';
-$wb['Name'] = 'Όνομα';
-$wb['FastCGI Settings'] = 'Ρυθμίσεις FastCGI';
-$wb['PHP-FPM Settings'] = 'Ρυθμίσεις PHP-FPM';
-$wb['Additional PHP Versions'] = 'Πρόσθετες εκδόσεις PHP';
-$wb['Form to edit additional PHP versions'] = 'Φόρμα για την επεξεργασία επιπλέον εκδόσεων PHP';
-$wb['server_php_name_error_empty'] = 'Πρέπει να ορίσετε το πειο Όνομα.';
-$wb['php_fastcgi_binary_txt'] = 'Διαδρομή για το εκτελέσιμο PHP FastCGI';
-$wb['php_fastcgi_ini_dir_txt'] = 'Διαδρομή για τον φάκελο php.ini';
-$wb['php_fpm_init_script_txt'] = 'Διαδρομή για το init script PHP-FPM';
-$wb['php_fpm_ini_dir_txt'] = 'Διαδρομή για τον φάκελο του php.ini';
-$wb['php_fpm_pool_dir_txt'] = 'Διαδρομή για τον φάκελο PHP-FPM';
+$wb['client_id_txt'] = 'Client';
+$wb['name_txt'] = 'PHP Name';
+$wb['Name'] = 'Name';
+$wb['FastCGI Settings'] = 'FastCGI Settings';
+$wb['PHP-FPM Settings'] = 'PHP-FPM Settings';
+$wb['Additional PHP Versions'] = 'Additional PHP Versions';
+$wb['Form to edit additional PHP versions'] = 'Form to edit additional PHP versions';
+$wb['server_php_name_error_empty'] = 'The Name field must not be empty.';
+$wb['php_fastcgi_binary_txt'] = 'Path to the PHP FastCGI binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory';
+$wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
+$wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
+$wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
 ?>
diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index 6b73a157b7ff1e1b6271ae074799c1cb70040e88..34859812228351d3128b7e5de5d43c2d6d5d0fb3 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -4,7 +4,7 @@ $wb['username_err'] = 'Το όνομα χρήστη είναι πολύ μεγά
 $wb['username_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί.';
 $wb['username_unique'] = 'Υπάρχει ήδη ένας χρήστης με αυτό το όνομα χρήστη.';
 $wb['passwort_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
 $wb['modules_txt'] = 'Άρθρωμα';
 $wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης';
 $wb['app_theme_txt'] = 'Θεματική Παραλλαγή';
@@ -25,10 +25,10 @@ $wb['fax_txt'] = 'Fax';
 $wb['groups_txt'] = 'Ομάδες';
 $wb['default_group_txt'] = 'Προκαθορισμένη Ομάδα';
 $wb['startmodule_err'] = 'Το άρθρωμα εκκίνησης δεν υπάρχει στα διαθέσιμα αρθρώματα.';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
-$wb['username_error_collision'] = 'Το όνομα χρήστη δεν μπορεί να αρχίζει από την λέξη -web- ή την λέξη -web- ακολουθούμενη από αριθμό.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
 $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
 ?>
diff --git a/interface/web/admin/lib/lang/el_users_list.lng b/interface/web/admin/lib/lang/el_users_list.lng
index a1b33ca0ef159fa34b1128f77e28353621591084..b61af2591929957c5f745fb3c555482291195af1 100644
--- a/interface/web/admin/lib/lang/el_users_list.lng
+++ b/interface/web/admin/lib/lang/el_users_list.lng
@@ -5,5 +5,5 @@ $wb['client_id_txt'] = 'Client ID';
 $wb['active_txt'] = 'Active';
 $wb['add_new_record_txt'] = 'Νέος Χρήστης';
 $wb['warning_txt'] = '<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b>Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
-$wb['groups_txt'] = 'Ομάδες';
+$wb['groups_txt'] = 'Groups';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng
index b6db6d72ffcf4f8ed054b32431da96ac1068d408..778068d657080df4f135ed35f5dc1f2483d30689 100644
--- a/interface/web/admin/lib/lang/fr_system_config.lng
+++ b/interface/web/admin/lib/lang/fr_system_config.lng
@@ -66,7 +66,7 @@ $wb['customer_no_template_error_regex_txt'] = 'The customer No. template contain
 $wb['customer_no_start_txt'] = 'Customer No. start value';
 $wb['customer_no_counter_txt'] = 'Customer No. counter';
 $wb['session_timeout_txt'] = 'Session timeout (minutes)';
-$wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
+$wb['session_allow_endless_txt'] = 'Enable \"stay logged in\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng
index fe70d3fde9487ae02da885d6fbba03d121336c4f..ee9e3541973bdd935e260d81edd181bb028bfbfe 100644
--- a/interface/web/client/lib/lang/el.lng
+++ b/interface/web/client/lib/lang/el.lng
@@ -5,22 +5,22 @@ $wb['Limits'] = 'Όρια';
 $wb['Add Client'] = 'Νέος Πελάτης';
 $wb['Edit Client'] = 'Επεξεργασία Πελάτη';
 $wb['Clients'] = 'Πελάτες';
-$wb['Templates'] = 'Templates';
-$wb['Limit-Templates'] = 'Limit-Templates';
 $wb['Add Reseller'] = 'Νέος Μεταπωλητής';
 $wb['Edit Reseller'] = 'Επεξεργασία Μεταπωλητή';
 $wb['Resellers'] = 'Μεταπωλητές';
 $wb['error_has_clients'] = 'Ο Μεταπωλητής έχει πελάτες. Διαγράψτε πρώτα τους πελάτες.';
-$wb['add_additional_template_txt'] = 'Προσθήκη πρόσθετου προτύπου';
-$wb['delete_additional_template_txt'] = 'Διαγραφή πρόσθετου προτύπου';
-$wb['Messaging'] = 'Μηνύματα';
-$wb['Send email'] = 'Αποστολή Email';
-$wb['Edit Client Circle'] = 'Επεξεργασία Κύκλου Πελάτη';
+$wb['add_additional_template_txt'] = 'Add additional template';
+$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send email'] = 'Send Email';
+$wb['Edit Client Circle'] = 'Edit Client Circle';
 $wb['Domains'] = 'Domains';
 $wb['domain_txt'] = 'Domain';
-$wb['client_txt'] = 'Πελάτης';
-$wb['error_domain_in mailuse'] = 'Το domain δεν μπορεί να διαγραφεί γιατί χρησιμοποιείται ως mail-domain';
-$wb['error_domain_in webuse'] = 'Το domain δεν μπορεί να διαγραφεί γιατί χρησιμοποιείται ως web-domain';
-$wb['error_client_can_not_add_domain'] = 'Δεν μπορείτε να προσθέσετε νέο domain';
-$wb['error_client_group_id_empty'] = 'Πρέπει να επιλέξετε έναν πελάτη<br>';
+$wb['client_txt'] = 'Client';
+$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';
+$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain';
+$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain';
+$wb['error_client_group_id_empty'] = 'You have to select a customer<br>';
+$wb['Templates'] = 'Templates';
+$wb['Limit-Templates'] = 'Limit-Templates';
 ?>
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 034af05038c75d6cfc63a5ce6fc3b84eb09342b5..e68db3172f479da0dd6353ce8caef6419893f7c0 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -17,7 +17,7 @@ $wb['company_name_txt'] = 'Όνομα εταιρίας';
 $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας';
 $wb['username_txt'] = 'Όνομα Χρήστη';
 $wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
 $wb['language_txt'] = 'Γλώσσα';
 $wb['usertheme_txt'] = 'Θεματική Παραλλαγή';
 $wb['street_txt'] = 'Οδός';
@@ -94,8 +94,8 @@ $wb['ssh_chroot_txt'] = 'Ρυθμίσεις  SSH-Chroot';
 $wb['web_php_options_txt'] = 'Ρυθμίσεις PHP';
 $wb['limit_client_error'] = 'Το μέγιστο πλήθος πελατών εξαντλήθηκε.';
 $wb['limit_web_quota_txt'] = 'Όριο χώρου Web';
-$wb['limit_traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων';
-$wb['limit_trafficquota_error_notint'] = 'Το Όριο μεταφοράς δεδομένων πρέπει να είναι αριθμός.';
+$wb['limit_traffic_quota_txt'] = 'Όριο κίνησης δεδομένων';
+$wb['limit_trafficquota_error_notint'] = 'Το Όριο κίνησης δεδομένων πρέπει να είναι αριθμός.';
 $wb['customer_no_txt'] = 'Κωδ. Πελάτη';
 $wb['vat_id_txt'] = 'Α.Φ.Μ';
 $wb['required_fields_txt'] = '* Υποχρεωτικά Πεδία';
@@ -105,45 +105,45 @@ $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 πρέπει να είναι αριθμός.';
-$wb['web_php_options_notempty'] = 'Δεν επιλέχθηκαν επιλογές PHP. Επιλέξτε τουλάχιστον μία επιλογή PHP.';
-$wb['ssh_chroot_notempty'] = 'Δεν επιλέχθηκαν επιλογές SSH chroot. Επιλέξτε τουλάχιστον μία επιλογή SSH.';
-$wb['username_error_collision'] = 'Το όνομα χρήστη δεν μπορεί να αρχίζει από την λέξη -web- ή την λέξη -web- ακολουθούμενη από αριθμό.';
-$wb['add_additional_template_txt'] = 'Προσθήκη πρόσθετου προτύπου';
-$wb['delete_additional_template_txt'] = 'Διαγραφή  πρόσθετου προτύπου';
-$wb['limit_cgi_txt'] = 'Διαθέσιμο CGI';
-$wb['limit_ssi_txt'] = 'Διαθέσιμο SSI';
-$wb['limit_perl_txt'] = 'Διαθέσιμη Perl';
+$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
+$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
+$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
+$wb['add_additional_template_txt'] = 'Add additional template';
+$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['limit_cgi_txt'] = 'CGI available';
+$wb['limit_ssi_txt'] = 'SSI available';
+$wb['limit_perl_txt'] = 'Perl available';
 $wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Διαθέσιμη Python';
-$wb['force_suexec_txt'] = 'Εξαναγκασμός SuEXEC';
-$wb['limit_hterror_txt'] = 'Διαθέσιμα έγγραφα προσαρμοσμένων μηνυμάτων σφάλματος';
+$wb['limit_python_txt'] = 'Python available';
+$wb['force_suexec_txt'] = 'SuEXEC forced';
+$wb['limit_hterror_txt'] = 'Custom error docs available';
 $wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'Διαθέσιμο SSL';
-$wb['bank_account_number_txt'] = 'Αρ. Λογαριασμού Τράπεζας.';
-$wb['bank_code_txt'] = 'Κωδικός Τράπεζας';
-$wb['bank_name_txt'] = 'Όνομα Τράπεζας';
+$wb['limit_ssl_txt'] = 'SSL available';
+$wb['bank_account_number_txt'] = 'Bank account no.';
+$wb['bank_code_txt'] = 'Bank code';
+$wb['bank_name_txt'] = 'Bank name';
 $wb['bank_account_iban_txt'] = 'IBAN';
-$wb['bank_account_swift_txt'] = 'BIC/Swift';
-$wb['web_limits_txt'] = 'Όρια Web';
-$wb['email_limits_txt'] = 'Όρια Email';
-$wb['database_limits_txt'] = 'Όρια Βάσεων Δεδομένων';
-$wb['cron_job_limits_txt'] = 'Όρια Εργασιών Cron';
-$wb['dns_limits_txt'] = 'Όρια DNS';
-$wb['virtualization_limits_txt'] = 'Όρια Virtualization';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.';
-$wb['active_template_additional_txt'] = 'Ενεργά Πρόσθετα';
-$wb['bank_account_owner_txt'] = 'Ιδιοκτήτης Λογαριασμού Τράπεζας';
-$wb['email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email.';
-$wb['customer_no_error_unique'] = 'Ο κωδικός πελάτη πρέπει να είναι μοναδικός (ή άδειος).';
-$wb['paypal_email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email PayPal.';
+$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'Email Limits';
+$wb['database_limits_txt'] = 'Database Limits';
+$wb['cron_job_limits_txt'] = 'Cron Job Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
+$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
 $wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'Όλες οι ρυθμίσεις προσαρμοσμένων ορίων θα αγνοηθούν αν κάποιο βασικό πρότυπο, εκτός του \\"Custom\\", είναι επιλεγμένο.';
-$wb['aps_limits_txt'] = 'Όρια APS Installer';
-$wb['limit_aps_txt'] = 'Μέγιστο πλήθος ενεργών APS';
-$wb['limit_aps_error_notint'] = 'Το μέγιστο πλήθος ενεργών APS πρέπει να είναι αριθμός.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['locked_txt'] = 'Locked (disables all webs etc.)';
 $wb['canceled_txt'] = 'Canceled (disables client login)';
diff --git a/interface/web/client/lib/lang/el_client_circle.lng b/interface/web/client/lib/lang/el_client_circle.lng
index 54aa0bc6e8a040d44fb1e98957a1f1d03c2fb66a..f98a1447fc75bfe3b4968c02c51b20266d826505 100644
--- a/interface/web/client/lib/lang/el_client_circle.lng
+++ b/interface/web/client/lib/lang/el_client_circle.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['Client Circle'] = 'Κύκλος Πελάτη';
-$wb['Circle'] = 'Κύκλος';
-$wb['circle_txt'] = 'Κύκλος';
-$wb['circle_name_txt'] = 'Όνομα Κύκλου';
-$wb['client_ids_txt'] = 'Πελάτες/Μεταπωλητές';
-$wb['description_txt'] = 'Περιγραφή';
-$wb['active_txt'] = 'Ενεργός';
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/client/lib/lang/el_client_circle_list.lng b/interface/web/client/lib/lang/el_client_circle_list.lng
index cb7ef18a6426709edec5f9e5fd38cfb5a99db276..00fd0b3998912555116db17c2963578096503f45 100644
--- a/interface/web/client/lib/lang/el_client_circle_list.lng
+++ b/interface/web/client/lib/lang/el_client_circle_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Κύκλοι πελατών';
-$wb['circle_id_txt'] = 'ID Κύκλου';
-$wb['circle_name_txt'] = 'Όνομα Κύκλου';
-$wb['description_txt'] = 'Περιγραφή';
-$wb['add_new_record_txt'] = 'Προσθήκη νέου Κύκλου';
-$wb['filter_txt'] = 'Φίλτρο';
-$wb['delete_txt'] = 'Διαγραφή';
-$wb['active_txt'] = 'Ενεργός';
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/client/lib/lang/el_client_message.lng b/interface/web/client/lib/lang/el_client_message.lng
index 844f05481f79738069a283622ef75cd83f8b54b4..6b2a872f10af4cb357413ee297331408c740a6c2 100644
--- a/interface/web/client/lib/lang/el_client_message.lng
+++ b/interface/web/client/lib/lang/el_client_message.lng
@@ -1,20 +1,20 @@
 <?php
-$wb['btn_send_txt'] = 'Αποστολή email';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['sender_txt'] = 'Διεύθυνση email αποστολέα';
-$wb['subject_txt'] = 'Θέμα';
-$wb['message_txt'] = 'Μήνυμα';
-$wb['form_legend_client_txt'] = 'Αποστολή μηνύματος email σε όλους τους πελάτες.';
-$wb['form_legend_admin_txt'] = 'Αποστολή μηνύματος email σε όλους τους πελάτες και τους μεταπωλητές.';
-$wb['sender_invalid_error'] = 'Η Διεύθυνση email αποστολέα δεν είναι έγκυρη.';
-$wb['subject_invalid_error'] = 'Το θέμα είναι άδειο.';
-$wb['message_invalid_error'] = 'Το μήνυμα είναι άδειο.';
-$wb['email_sent_to_txt'] = 'Το Email εστάλει σε:';
-$wb['page_head_txt'] = 'Αποστολή πληροφοριών πελάτη';
-$wb['recipient_txt'] = 'Παραλήπτης';
-$wb['all_clients_resellers_txt'] = 'Όλοι οι πελάτες και οι μεταπωλητές';
-$wb['all_clients_txt'] = 'Όλοι οι πελάτες';
-$wb['variables_txt'] = 'Μεταβλητές:';
+$wb['btn_send_txt'] = 'Send email';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['sender_txt'] = 'Sender email address';
+$wb['subject_txt'] = 'Subject';
+$wb['message_txt'] = 'Message';
+$wb['form_legend_client_txt'] = 'Send email message to all clients.';
+$wb['form_legend_admin_txt'] = 'Send email message to all clients and resellers.';
+$wb['sender_invalid_error'] = 'Sender email invalid.';
+$wb['subject_invalid_error'] = 'Subject is empty.';
+$wb['message_invalid_error'] = 'Message is empty.';
+$wb['email_sent_to_txt'] = 'Email sent to:';
+$wb['page_head_txt'] = 'Send customer information';
+$wb['recipient_txt'] = 'Recipient';
+$wb['all_clients_resellers_txt'] = 'All clients and resellers';
+$wb['all_clients_txt'] = 'All clients';
+$wb['variables_txt'] = 'Variables:';
 $wb['gender_m_txt'] = 'Mr.';
 $wb['gender_f_txt'] = 'Ms.';
 ?>
diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng
index 090c2fbb284606c1c9e8910421649d672493fbfe..5c9917c2456701c0f2d4544c008c32aa122553e5 100644
--- a/interface/web/client/lib/lang/el_client_template.lng
+++ b/interface/web/client/lib/lang/el_client_template.lng
@@ -58,8 +58,8 @@ $wb['limit_cron_error_notint'] = 'Το όριο εργασιών cron πρέπε
 $wb['limit_cron_error_frequency'] = 'Το όριο συχνότητας των εργασιών cron πρέπει να είναι αριθμός.';
 $wb['error_template_name_empty'] = 'Παρακαλούμε εισάγετε ένα όνομα Προτύπου';
 $wb['limit_web_quota_txt'] = 'Όριο Web';
-$wb['limit_traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων';
-$wb['limit_trafficquota_error_notint'] = 'Το Όριο μεταφοράς δεδομένων πρέπει να είναι αριθμός.';
+$wb['limit_traffic_quota_txt'] = 'Όριο Κίνησης δεδομένων';
+$wb['limit_trafficquota_error_notint'] = 'Το Όριο Κίνησης δεδομένων πρέπει να είναι αριθμός.';
 $wb['template_del_aborted_txt'] = 'Η διαγραφή ακυρώθηκε. Υπάρχει τουλάχιστον ένας πελάτης που έχει το πρότυπο ενεργοποιημένο.';
 $wb['limit_mailmailinglist_txt'] = 'Μέγιστο πλήθος mailing lists';
 $wb['limit_mailmailinglist_error_notint'] = 'Το πλήθος εγγραφών της mailing list πρέπει να είναι αριθμός.';
@@ -70,24 +70,24 @@ $wb['ssh_chroot_txt'] = 'Επιλογές SSH-Chroot';
 $wb['web_php_options_txt'] = 'Επιλογές PHP';
 $wb['template_type_txt'] = 'Τύπος προτύπου';
 $wb['template_name_txt'] = 'Όνομα προτύπου';
-$wb['limit_cgi_txt'] = 'Διάθεση CGI';
-$wb['limit_ssi_txt'] = 'Διάθεση SSI';
-$wb['limit_perl_txt'] = 'Διάθεση Perl';
-$wb['limit_ruby_txt'] = 'Διάθεση Ruby';
-$wb['limit_python_txt'] = 'Διάθεση Python';
-$wb['force_suexec_txt'] = 'Εξαναγκασμός SuEXEC';
-$wb['limit_hterror_txt'] = 'Διάθεση προσαρμοσμένων αρχείων σφάλματος';
+$wb['limit_cgi_txt'] = 'CGI available';
+$wb['limit_ssi_txt'] = 'SSI available';
+$wb['limit_perl_txt'] = 'Perl available';
+$wb['limit_ruby_txt'] = 'Ruby available';
+$wb['limit_python_txt'] = 'Python available';
+$wb['force_suexec_txt'] = 'SuEXEC forced';
+$wb['limit_hterror_txt'] = 'Custom error docs available';
 $wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'Διαθέσιμο SSL';
-$wb['web_limits_txt'] = 'Όρια Web';
-$wb['email_limits_txt'] = 'Όρια Email';
-$wb['database_limits_txt'] = 'Όρια Βάσεων Δεδομένων';
-$wb['cron_job_limits_txt'] = 'Όρια εργασιών Cron';
-$wb['dns_limits_txt'] = 'Όρια DNS';
-$wb['virtualization_limits_txt'] = 'Όρια Virtualization';
-$wb['aps_limits_txt'] = 'Όρια APS Installer';
-$wb['limit_aps_txt'] = 'Μέγιστο πλήθος ενεργών APS';
-$wb['limit_aps_error_notint'] = 'Το μέγιστο πλήθος ενεργών APS πρέπει να είναι αριθμός.';
+$wb['limit_ssl_txt'] = 'SSL available';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'Email Limits';
+$wb['database_limits_txt'] = 'Database Limits';
+$wb['cron_job_limits_txt'] = 'Cron Job Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 ?>
diff --git a/interface/web/client/lib/lang/el_clients_list.lng b/interface/web/client/lib/lang/el_clients_list.lng
index bda08707febd1ac90071ac81bd5602bdab1512e4..56abc6218b0c0f6934fc706e854f4f848e36d4ee 100644
--- a/interface/web/client/lib/lang/el_clients_list.lng
+++ b/interface/web/client/lib/lang/el_clients_list.lng
@@ -6,6 +6,6 @@ $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας';
 $wb['city_txt'] = 'Πόλη';
 $wb['country_txt'] = 'Χώρα';
 $wb['add_new_record_txt'] = 'Νέος Πελάτης';
-$wb['username_txt'] = 'Όνομα Χρήστη';
-$wb['customer_no_txt'] = 'Αρ. Πελάτη';
+$wb['username_txt'] = 'Username';
+$wb['customer_no_txt'] = 'Customer No.';
 ?>
diff --git a/interface/web/client/lib/lang/el_domain_list.lng b/interface/web/client/lib/lang/el_domain_list.lng
index b152f9313edf69e766f2ccc1622e6f9e3f165717..507f895e3ba75f22d90266cda3ae643c188d2ae7 100644
--- a/interface/web/client/lib/lang/el_domain_list.lng
+++ b/interface/web/client/lib/lang/el_domain_list.lng
@@ -2,5 +2,5 @@
 $wb['list_head_txt'] = 'Domains';
 $wb['add_new_record_txt'] = 'Νέο Domain';
 $wb['domain_txt'] = 'Domain';
-$wb['user_txt'] = 'Πελάτης';
+$wb['user_txt'] = 'Client';
 ?>
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 2791f32e0c2f992e225013cca4d0adcb63b293f8..eec08b79e63b675db476dd1078f63e821dbd3bb8 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -16,7 +16,7 @@ $wb['company_name_txt'] = 'Όνομα Εταιρίας';
 $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας';
 $wb['username_txt'] = 'Όνομα Χρήστη';
 $wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
 $wb['language_txt'] = 'Γλώσσα';
 $wb['usertheme_txt'] = 'Θεματική Παραλλαγή';
 $wb['street_txt'] = 'Οδός';
@@ -91,7 +91,7 @@ $wb['web_php_options_txt'] = 'Επιλογές PHP';
 $wb['limit_client_error'] = 'Έχετε φτάσει το μέγιστο πλήθος πελατών.';
 $wb['limit_client_error_positive'] = 'Το πλήθος πελατών πρέπει να είναι > 0';
 $wb['limit_web_quota_txt'] = 'Όριο χώρου Web';
-$wb['limit_traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων';
+$wb['limit_traffic_quota_txt'] = 'Όριο ταχύτητας';
 $wb['limit_trafficquota_error_notint'] = 'Το Όριο ταχύτητας πρέπει να είναι αριθμός.';
 $wb['customer_no_txt'] = 'Α/Α Πελάτη';
 $wb['vat_id_txt'] = 'Α.Φ.Μ.';
@@ -110,39 +110,39 @@ $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one
 $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
 $wb['add_additional_template_txt'] = 'Add additional template';
 $wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['limit_cgi_txt'] = 'Διαθέσιμο CGI';
-$wb['limit_ssi_txt'] = 'Διαθέσιμο SSI';
-$wb['limit_perl_txt'] = 'Διαθέσιμη Perl';
-$wb['limit_ruby_txt'] = 'Διαθέσιμη Ruby';
-$wb['limit_python_txt'] = 'Διαθέσιμη Python';
-$wb['force_suexec_txt'] = 'Εξαναγκασμός SuEXEC';
-$wb['limit_hterror_txt'] = 'Διαθέσιμα έγγραφα προσαρμοσμένων μηνυμάτων σφάλματος';
+$wb['limit_cgi_txt'] = 'CGI available';
+$wb['limit_ssi_txt'] = 'SSI available';
+$wb['limit_perl_txt'] = 'Perl available';
+$wb['limit_ruby_txt'] = 'Ruby available';
+$wb['limit_python_txt'] = 'Python available';
+$wb['force_suexec_txt'] = 'SuEXEC forced';
+$wb['limit_hterror_txt'] = 'Custom error docs available';
 $wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
 $wb['limit_ssl_txt'] = 'SSL available';
-$wb['web_limits_txt'] = 'Όρια Web';
-$wb['email_limits_txt'] = 'Όρια Email';
-$wb['database_limits_txt'] = 'Όρια Βάσεων Δεδομένων';
-$wb['cron_job_limits_txt'] = 'Όρια Εργασιών Cron';
-$wb['dns_limits_txt'] = 'Όρια DNS';
-$wb['virtualization_limits_txt'] = 'Όρια Virtualization';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.';
-$wb['email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email.';
-$wb['customer_no_error_unique'] = 'Ο κωδικός πελάτη πρέπει να είναι μοναδικός (ή άδειος).';
-$wb['paypal_email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email PayPal.';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'Email Limits';
+$wb['database_limits_txt'] = 'Database Limits';
+$wb['cron_job_limits_txt'] = 'Cron Job Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
+$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
 $wb['paypal_email_txt'] = 'PayPal Email';
 $wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['bank_account_number_txt'] = 'Αριθμός Τραπεζικού Λογαριασμού.';
-$wb['bank_account_owner_txt'] = 'Ιδιοκτήτης Λογαριασμού Τράπεζας';
-$wb['bank_code_txt'] = 'Κωδικός Τράπεζας';
-$wb['bank_name_txt'] = 'Όνομα Τράπεζας';
+$wb['bank_account_number_txt'] = 'Bank account no.';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['bank_code_txt'] = 'Bank code';
+$wb['bank_name_txt'] = 'Bank name';
 $wb['bank_account_iban_txt'] = 'IBAN';
-$wb['bank_account_swift_txt'] = 'BIC/Swift';
-$wb['aps_limits_txt'] = 'Όρια Εγκαταστάτη APS';
-$wb['limit_aps_txt'] = 'Μέγιστο πλήθος ενεργών APS';
-$wb['limit_aps_error_notint'] = 'Το μέγιστο πλήθος ενεργών APS πρέπει να είναι αριθμός.';
+$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['locked_txt'] = 'Locked';
 $wb['canceled_txt'] = 'Canceled';
@@ -158,5 +158,5 @@ $wb['added_date_txt'] = 'Added date';
 $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
 ?>
diff --git a/interface/web/client/lib/lang/el_resellers_list.lng b/interface/web/client/lib/lang/el_resellers_list.lng
index 73e35274a5322f242e3fe222b2025c31f3fb0cb9..74edc051a667ae1bbf3ec07a886290fe3a5ae47a 100644
--- a/interface/web/client/lib/lang/el_resellers_list.lng
+++ b/interface/web/client/lib/lang/el_resellers_list.lng
@@ -6,6 +6,6 @@ $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας';
 $wb['city_txt'] = 'Πόλη';
 $wb['country_txt'] = 'Χώρα';
 $wb['add_new_record_txt'] = 'Νεός Μεταπωλητής';
-$wb['customer_no_txt'] = 'Αρ. Πελάτη';
-$wb['username_txt'] = 'Όνομα χρήστη';
+$wb['customer_no_txt'] = 'Customer No.';
+$wb['username_txt'] = 'Username';
 ?>
diff --git a/interface/web/client/lib/lang/fr.lng b/interface/web/client/lib/lang/fr.lng
index 02d06dfd2e1e64db1ac6d00864b34350f80b83a5..dba251c4efe990bbc470bce219ca95981f81ed6b 100644
--- a/interface/web/client/lib/lang/fr.lng
+++ b/interface/web/client/lib/lang/fr.lng
@@ -5,22 +5,22 @@ $wb['Limits'] = 'Limites';
 $wb['Add Client'] = 'Ajouter un Client';
 $wb['Edit Client'] = 'Editer un Client';
 $wb['Clients'] = 'Clients';
-$wb['Templates'] = 'Templates';
-$wb['Limit-Templates'] = 'Limit-Templates';
 $wb['Add Reseller'] = 'Ajouter un Revendeur';
 $wb['Edit Reseller'] = 'Editer un Revendeur';
 $wb['Resellers'] = 'Revendeurs';
 $wb['error_has_clients'] = 'Ce revendeur a des clients. Effacez dabord les clients de ce revendeur.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['Messaging'] = 'Messaging';
-$wb['Send email'] = 'Send Email';
-$wb['Edit Client Circle'] = 'Edit Client Circle';
-$wb['Domains'] = 'Domains';
-$wb['domain_txt'] = 'Domain';
+$wb['add_additional_template_txt'] = 'Ajouter un modèle';
+$wb['delete_additional_template_txt'] = 'Supprimer un modèle';
+$wb['Messaging'] = 'Messagerie';
+$wb['Send email'] = 'Envoyer un email';
+$wb['Edit Client Circle'] = 'Editer les groupes clients';
+$wb['Domains'] = 'Domaines';
+$wb['domain_txt'] = 'Domaine';
 $wb['client_txt'] = 'Client';
-$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';
-$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain';
-$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain';
-$wb['error_client_group_id_empty'] = 'You have to select a customer<br>';
+$wb['error_domain_in mailuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un compte email';
+$wb['error_domain_in webuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un site Web';
+$wb['error_client_can_not_add_domain'] = 'Vous ne pouvez pas ajouter de nouveau domaine';
+$wb['error_client_group_id_empty'] = 'Vous devez sélectionner un client<br>';
+$wb['Templates'] = 'Templates';
+$wb['Limit-Templates'] = 'Limit-Templates';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index daf8504c0dabfb1f571423edfeccb557a02b2a76..ffb062d751354e95b4c1addc424a8bd3aa1f601a 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -99,52 +99,52 @@ $wb['limit_trafficquota_error_notint'] = 'Le Quota de trafic doit être un nombr
 $wb['customer_no_txt'] = 'No. Client';
 $wb['vat_id_txt'] = 'Numéro de TVA';
 $wb['required_fields_txt'] = '* Champs requis';
-$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['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
-$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
-$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['limit_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
-$wb['limit_hterror_txt'] = 'Custom error docs available';
-$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
-$wb['bank_account_number_txt'] = 'Bank account no.';
-$wb['bank_code_txt'] = 'Bank code';
-$wb['bank_name_txt'] = 'Bank name';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'email.';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite de listes d\'email doit être un nombre';
+$wb['company_id_txt'] = 'ID Entreprise/Dirigeant';
+$wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels.';
+$wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel.';
+$wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
+$wb['web_php_options_notempty'] = 'Aucune option PHP choisie. Sélectonnez au moins une option PHP.';
+$wb['ssh_chroot_notempty'] = 'Aucune option SSH chroot choisie. Sélectionnez au moins une option SSH.';
+$wb['username_error_collision'] = 'Le nom d\'utilisateur ne peut pas commencer par -web- ou -web- followed suivi d\'un nombre.';
+$wb['add_additional_template_txt'] = 'Ajouter un modèle';
+$wb['delete_additional_template_txt'] = 'Supprimer un modèle';
+$wb['limit_cgi_txt'] = 'CGI autorisé';
+$wb['limit_ssi_txt'] = 'SSI autorisé';
+$wb['limit_perl_txt'] = 'Perl autorisé';
+$wb['limit_ruby_txt'] = 'Ruby autorisé';
+$wb['limit_python_txt'] = 'Python autorisé';
+$wb['force_suexec_txt'] = 'Forcer le SuEXEC';
+$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['limit_wildcard_txt'] = 'Sous-domaine joker autorisé';
+$wb['limit_ssl_txt'] = 'SSL autorisé';
+$wb['bank_account_number_txt'] = 'Numéro de compte bancaire';
+$wb['bank_code_txt'] = 'Code banque';
+$wb['bank_name_txt'] = 'Nom de la banque';
 $wb['bank_account_iban_txt'] = 'IBAN';
 $wb['bank_account_swift_txt'] = 'BIC / Swift';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
-$wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['active_template_additional_txt'] = 'Active Addons';
-$wb['bank_account_owner_txt'] = 'Bank account owner';
-$wb['email_error_isemail'] = 'Please enter a valid email address.';
-$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
-$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
-$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
-$wb['aps_limits_txt'] = 'APS Installer Limits';
-$wb['limit_aps_txt'] = 'Max. number of APS instances';
-$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
-$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['web_limits_txt'] = 'Limites Web';
+$wb['email_limits_txt'] = 'Limites d\'emails';
+$wb['database_limits_txt'] = 'Limite de bases de données';
+$wb['cron_job_limits_txt'] = 'Limites de tâches CRON';
+$wb['dns_limits_txt'] = 'Limites DNS';
+$wb['virtualization_limits_txt'] = 'Limites de virtualisation';
+$wb['generate_password_txt'] = 'Genérer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['active_template_additional_txt'] = 'Addons actifs';
+$wb['bank_account_owner_txt'] = 'Titulaire du compte bancaire';
+$wb['email_error_isemail'] = 'Saisissez une adresse email valide.';
+$wb['customer_no_error_unique'] = 'Le numéro client doit être unique (ou vide).';
+$wb['paypal_email_error_isemail'] = 'Saisissez un compte Paypal valide.';
+$wb['paypal_email_txt'] = 'Compte Paypal';
+$wb['err_msg_master_tpl_set'] = 'Les paramètres de limites personnalisés seront ignorés si un modèle maître autre que \"custom\" est sélectionné.';
+$wb['aps_limits_txt'] = 'Nombre max d\'Installeur APS';
+$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre';
+$wb['default_slave_dnsserver_txt'] = 'Serveur DNS secondaire par défaut';
 $wb['locked_txt'] = 'Locked (disables all webs etc.)';
 $wb['canceled_txt'] = 'Canceled (disables client login)';
 $wb['gender_txt'] = 'Title';
diff --git a/interface/web/client/lib/lang/fr_client_circle.lng b/interface/web/client/lib/lang/fr_client_circle.lng
index f98a1447fc75bfe3b4968c02c51b20266d826505..75288e6bdca36ffcdaf6f060c33eb15ad5894442 100644
--- a/interface/web/client/lib/lang/fr_client_circle.lng
+++ b/interface/web/client/lib/lang/fr_client_circle.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['Client Circle'] = 'Client Circle';
-$wb['Circle'] = 'Circle';
-$wb['circle_txt'] = 'Circle';
-$wb['circle_name_txt'] = 'Circle Name';
-$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['Client Circle'] = 'Groupe client';
+$wb['Circle'] = 'Groupe';
+$wb['circle_txt'] = 'Groupe';
+$wb['circle_name_txt'] = 'Nom du groupe';
+$wb['client_ids_txt'] = 'Clients/Revendeurs';
 $wb['description_txt'] = 'Description';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Actif';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client_circle_list.lng b/interface/web/client/lib/lang/fr_client_circle_list.lng
index 00fd0b3998912555116db17c2963578096503f45..0db291a1923b4eb267c5a5e4589a6ca0393dd683 100644
--- a/interface/web/client/lib/lang/fr_client_circle_list.lng
+++ b/interface/web/client/lib/lang/fr_client_circle_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Client Circles';
-$wb['circle_id_txt'] = 'Circle ID';
-$wb['circle_name_txt'] = 'Circle Name';
+$wb['list_head_txt'] = 'Groupes clients';
+$wb['circle_id_txt'] = 'ID du groupe';
+$wb['circle_name_txt'] = 'Nom du groupe';
 $wb['description_txt'] = 'Description';
-$wb['add_new_record_txt'] = 'Add new circle';
-$wb['filter_txt'] = 'Filter';
-$wb['delete_txt'] = 'Delete';
-$wb['active_txt'] = 'Active';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau groupe';
+$wb['filter_txt'] = 'Filtrer';
+$wb['delete_txt'] = 'Supprimer';
+$wb['active_txt'] = 'Actif';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client_del.lng b/interface/web/client/lib/lang/fr_client_del.lng
index de7757aceb488fbf70a693eddf37fa0ce93bd192..2ec2d877bf8a49d7760ebb9b638834042e200341 100644
--- a/interface/web/client/lib/lang/fr_client_del.lng
+++ b/interface/web/client/lib/lang/fr_client_del.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['confirm_action_txt'] = 'Confirmer laction';
+$wb['confirm_action_txt'] = 'Confirmer l\'action';
 $wb['delete_explanation'] = 'Cette action va supprimer le nombre d\'enregistrements suivants associés avec le client';
 $wb['btn_save_txt'] = 'Effacer le client';
 $wb['btn_cancel_txt'] = 'Annuler sans effacer le client';
-$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['confirm_client_delete_txt'] = 'Confirmez-vous la suppression de ce client ?';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client_message.lng b/interface/web/client/lib/lang/fr_client_message.lng
index 6b2a872f10af4cb357413ee297331408c740a6c2..7ba9a66c92e0d56b3fc17cbbf4d6474820ad145e 100644
--- a/interface/web/client/lib/lang/fr_client_message.lng
+++ b/interface/web/client/lib/lang/fr_client_message.lng
@@ -1,20 +1,20 @@
 <?php
-$wb['btn_send_txt'] = 'Send email';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['sender_txt'] = 'Sender email address';
-$wb['subject_txt'] = 'Subject';
+$wb['btn_send_txt'] = 'Envoyer';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['sender_txt'] = 'Adresse email de l\'expéditeur';
+$wb['subject_txt'] = 'Objet';
 $wb['message_txt'] = 'Message';
-$wb['form_legend_client_txt'] = 'Send email message to all clients.';
-$wb['form_legend_admin_txt'] = 'Send email message to all clients and resellers.';
-$wb['sender_invalid_error'] = 'Sender email invalid.';
-$wb['subject_invalid_error'] = 'Subject is empty.';
-$wb['message_invalid_error'] = 'Message is empty.';
-$wb['email_sent_to_txt'] = 'Email sent to:';
-$wb['page_head_txt'] = 'Send customer information';
-$wb['recipient_txt'] = 'Recipient';
-$wb['all_clients_resellers_txt'] = 'All clients and resellers';
-$wb['all_clients_txt'] = 'All clients';
-$wb['variables_txt'] = 'Variables:';
+$wb['form_legend_client_txt'] = 'Envoyer l\'email à tous les clients';
+$wb['form_legend_admin_txt'] = 'Envoyer l\'email à tous les clients et revendeurs';
+$wb['sender_invalid_error'] = 'Adresse d\'expédition invalide.';
+$wb['subject_invalid_error'] = 'L\'objet est vide.';
+$wb['message_invalid_error'] = 'Le message est vide.';
+$wb['email_sent_to_txt'] = 'Email envoyé à :';
+$wb['page_head_txt'] = 'Envoyer les informations client';
+$wb['recipient_txt'] = 'Destinataire';
+$wb['all_clients_resellers_txt'] = 'Tous les clients et revendeurs';
+$wb['all_clients_txt'] = 'Tous les clients';
+$wb['variables_txt'] = 'Variables :';
 $wb['gender_m_txt'] = 'Mr.';
 $wb['gender_f_txt'] = 'Ms.';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng
index 89ac13d4e38851eb9bad6768a238ce49ec8f1f1e..429941c8a69faef1e0c3e4c05994e5368f59ed71 100644
--- a/interface/web/client/lib/lang/fr_client_template.lng
+++ b/interface/web/client/lib/lang/fr_client_template.lng
@@ -61,33 +61,33 @@ $wb['limit_web_quota_txt'] = 'Quota web';
 $wb['limit_traffic_quota_txt'] = 'Quota de trafic';
 $wb['limit_trafficquota_error_notint'] = 'le quota de trafic doit être un nombre.';
 $wb['template_del_aborted_txt'] = 'Supression annulée. Il y a toujours un client qui a ce gabarit sélectionné.';
-$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_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
-$wb['limit_hterror_txt'] = 'Custom error docs available';
-$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
-$wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$wb['aps_limits_txt'] = 'APS Installer Limits';
-$wb['limit_aps_txt'] = 'Max. number of APS instances';
-$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'emails';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite de listes d\'emails doit être un nombre.';
+$wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels';
+$wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel';
+$wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
+$wb['ssh_chroot_txt'] = 'Options SSH-Chroot';
+$wb['web_php_options_txt'] = 'Options PHP';
+$wb['template_type_txt'] = 'Modèle type';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['limit_cgi_txt'] = 'CGI autorisé';
+$wb['limit_ssi_txt'] = 'SSI autorisé';
+$wb['limit_perl_txt'] = 'Perl autorisé';
+$wb['limit_ruby_txt'] = 'Ruby autorisé';
+$wb['limit_python_txt'] = 'Python autorisé';
+$wb['force_suexec_txt'] = 'Forcer le SuEXEC';
+$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['limit_wildcard_txt'] = 'Sous-domaine joker autorisé';
+$wb['limit_ssl_txt'] = 'SSL autorisé';
+$wb['web_limits_txt'] = 'Limite Web';
+$wb['email_limits_txt'] = 'Limite d\'emails';
+$wb['database_limits_txt'] = 'Limite de bases de données';
+$wb['cron_job_limits_txt'] = 'Limite de tâches CRON';
+$wb['dns_limits_txt'] = 'Limite DNS';
+$wb['virtualization_limits_txt'] = 'Limite de virtualisations';
+$wb['aps_limits_txt'] = 'Limite d\'installeurs APS';
+$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client_template_list.lng b/interface/web/client/lib/lang/fr_client_template_list.lng
index 571b8705b59a7277cff0f7d772dbf13420af3c17..b5315018d2eaf163d9020fd2ac4c33ce311f3e09 100644
--- a/interface/web/client/lib/lang/fr_client_template_list.lng
+++ b/interface/web/client/lib/lang/fr_client_template_list.lng
@@ -2,5 +2,5 @@
 $wb['list_head_txt'] = 'Modèles de clients';
 $wb['template_type_txt'] = 'Type';
 $wb['template_name_txt'] = 'Nom du modèle';
-$wb['template_id_txt'] = 'Template ID';
+$wb['template_id_txt'] = 'ID du modèle';
 ?>
diff --git a/interface/web/client/lib/lang/fr_clients_list.lng b/interface/web/client/lib/lang/fr_clients_list.lng
index 5252bc55ee03616ac4024a7a6150233a39284f9e..e3503f39c55687a841efbbceb9a589a2c950af63 100644
--- a/interface/web/client/lib/lang/fr_clients_list.lng
+++ b/interface/web/client/lib/lang/fr_clients_list.lng
@@ -6,6 +6,6 @@ $wb['contact_name_txt'] = 'Nom du contact';
 $wb['city_txt'] = 'Ville';
 $wb['country_txt'] = 'Pays';
 $wb['add_new_record_txt'] = 'Ajouter un nouveau client';
-$wb['username_txt'] = 'Username';
-$wb['customer_no_txt'] = 'Customer No.';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['customer_no_txt'] = 'Numéro client';
 ?>
diff --git a/interface/web/client/lib/lang/fr_domain.lng b/interface/web/client/lib/lang/fr_domain.lng
index 4465c83e82db16a8ae93830d8cc6efacb7d32682..f94d21bbe558503f263788386fdfda37aeea4fbf 100644
--- a/interface/web/client/lib/lang/fr_domain.lng
+++ b/interface/web/client/lib/lang/fr_domain.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['domain_error_empty'] = 'Le nom de domaine est vide';
 $wb['domain_error_unique'] = 'Ce nom de domaine existe déjà';
-$wb['domain_error_regex'] = 'Ce nom de domaine nest pas autorisé';
+$wb['domain_error_regex'] = 'Ce nom de domaine n\'est pas autorisé';
 $wb['Domain'] = 'Domaine';
 ?>
diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng
index 18f5ee3d4ed0a4c45331b65360d7fa2a7095a99d..ac42cb81bf4a5552841ac6180ee1f699795d59b6 100644
--- a/interface/web/client/lib/lang/fr_reseller.lng
+++ b/interface/web/client/lib/lang/fr_reseller.lng
@@ -17,7 +17,7 @@ $wb['contact_name_txt'] = 'Nom de contact';
 $wb['username_txt'] = 'Nom d\'utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
-$wb['language_txt'] = 'Langage';
+$wb['language_txt'] = 'Langue';
 $wb['usertheme_txt'] = 'Thème';
 $wb['street_txt'] = 'Rue';
 $wb['zip_txt'] = 'Code Postal';
@@ -99,51 +99,50 @@ $wb['required_fields_txt'] = '* Champs requis';
 $wb['limit_mailaliasdomain_txt'] = 'Nombre max d\'alias de domaine';
 $wb['limit_webdav_user_txt'] = 'Nombre max d\'utilisateurs Webdav';
 $wb['limit_webdav_user_error_notint'] = 'La limite d\'utilisateurs Webdav doit être un nombre.';
-$wb['limit_backup_txt'] = 'Backupfunction available';
-$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['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
-$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
-$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['limit_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
-$wb['limit_hterror_txt'] = 'Custom error docs available';
-$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
-$wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['email_error_isemail'] = 'Please enter a valid email address.';
-$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
-$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
-$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['bank_account_number_txt'] = 'Bank account no.';
-$wb['bank_account_owner_txt'] = 'Bank account owner';
-$wb['bank_code_txt'] = 'Bank code';
-$wb['bank_name_txt'] = 'Bank name';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'emails';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite d\'enregistrement de liste d\'emails doit être un nombre.';
+$wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels.';
+$wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel.';
+$wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
+$wb['web_php_options_notempty'] = 'Aucune option PHP choisie. Selectionnez au moins une option PHP.';
+$wb['ssh_chroot_notempty'] = 'Aucune option SSH chroot choisie. Selectionnez au moins une option SSH.';
+$wb['username_error_collision'] = 'Le nom d\'utilisateur ne devrait pas commencer par le mot -web- ou -web- suivi d\'un nombre.';
+$wb['add_additional_template_txt'] = 'Ajouter un modèle';
+$wb['delete_additional_template_txt'] = 'Supprimer un modèle';
+$wb['limit_cgi_txt'] = 'CGI autorisé';
+$wb['limit_ssi_txt'] = 'SSI autorisé';
+$wb['limit_perl_txt'] = 'Perl autorisé';
+$wb['limit_ruby_txt'] = 'Ruby autorisé';
+$wb['limit_python_txt'] = 'Python autorisé';
+$wb['force_suexec_txt'] = 'SuEXEC forcé';
+$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['limit_wildcard_txt'] = 'Sous-domaine Joker autorisé';
+$wb['limit_ssl_txt'] = 'SSL autorisé';
+$wb['web_limits_txt'] = 'Limites Web';
+$wb['email_limits_txt'] = 'Limites emails';
+$wb['database_limits_txt'] = 'Limites de bases de données';
+$wb['cron_job_limits_txt'] = 'Limites de tâches CRON';
+$wb['dns_limits_txt'] = 'Limites DNS';
+$wb['virtualization_limits_txt'] = 'Limites de virtualisation';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Répétez le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['email_error_isemail'] = 'Saisissez une adresse email valide.';
+$wb['customer_no_error_unique'] = 'Le numéro de client doit être unique (ou vide).';
+$wb['paypal_email_error_isemail'] = 'Saisissez un compte Paypal valide.';
+$wb['paypal_email_txt'] = 'Compte Paypal';
+$wb['company_id_txt'] = 'ID entreprise/dirigeant';
+$wb['bank_account_number_txt'] = 'Numéro de compte bancaire';
+$wb['bank_account_owner_txt'] = 'Titulaire du compte bancaire';
+$wb['bank_code_txt'] = 'Code banque';
+$wb['bank_name_txt'] = 'Nom de la banque';
 $wb['bank_account_iban_txt'] = 'IBAN';
 $wb['bank_account_swift_txt'] = 'BIC / Swift';
-$wb['aps_limits_txt'] = 'APS Installer Limits';
-$wb['limit_aps_txt'] = 'Max. number of APS instances';
-$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
-$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['aps_limits_txt'] = 'Limites d\'installeur APS';
+$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre.';
+$wb['default_slave_dnsserver_txt'] = 'Serveur DNS secondaire par défaut';
 $wb['locked_txt'] = 'Locked';
 $wb['canceled_txt'] = 'Canceled';
 $wb['gender_m_txt'] = 'Mr.';
@@ -174,5 +173,5 @@ $wb['added_date_txt'] = 'Added date';
 $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
 ?>
diff --git a/interface/web/client/lib/lang/fr_resellers_list.lng b/interface/web/client/lib/lang/fr_resellers_list.lng
index 537600aa13d00053781ecda91516317578cb3405..b477e473148f45a0584474aada250bcc8e543f14 100644
--- a/interface/web/client/lib/lang/fr_resellers_list.lng
+++ b/interface/web/client/lib/lang/fr_resellers_list.lng
@@ -1,11 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Clients';
+$wb['list_head_txt'] = 'Revendeurs';
 $wb['client_id_txt'] = 'ID';
 $wb['company_name_txt'] = 'Nom de l\'entreprise';
 $wb['contact_name_txt'] = 'Nom du contact';
 $wb['city_txt'] = 'Ville';
 $wb['country_txt'] = 'Pays';
-$wb['add_new_record_txt'] = 'Ajouter un nouveau client';
-$wb['customer_no_txt'] = 'Customer No.';
-$wb['username_txt'] = 'Username';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau revendeur';
+$wb['customer_no_txt'] = 'Revendeur No.';
+$wb['username_txt'] = 'Nom d\'utilisateur';
 ?>
diff --git a/interface/web/dashboard/lib/lang/el.lng b/interface/web/dashboard/lib/lang/el.lng
index 144becd21ca4f1fe9c92819c7f0d9bf7f5281908..134b9b52c58866912344df2b52fa32a3e99962b2 100644
--- a/interface/web/dashboard/lib/lang/el.lng
+++ b/interface/web/dashboard/lib/lang/el.lng
@@ -1,4 +1,4 @@
 <?php
 $wb['welcome_user_txt'] = 'Καλωσήρθατε %s';
-$wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα';
+$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 4fcf6cf150e26047e2961c5d4043790e1eb792c8..fc373ea3e45a88a3d00df81697a3fe6e5644915d 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
@@ -2,29 +2,29 @@
 $wb['limits_txt'] = 'Όρια Λογαριασμών';
 $wb['of_txt'] = 'από';
 $wb['unlimited_txt'] = 'Απεριόριστα';
-$wb['limit_maildomain_txt'] = 'Πλήθος email domains';
-$wb['limit_mailbox_txt'] = 'Πλήθος θυρίδων';
-$wb['limit_mailalias_txt'] = 'Πλήθος ψευδωνύμων email';
-$wb['limit_mailaliasdomain_txt'] = 'Πλήθος ψευδωνύμων domain';
-$wb['limit_mailforward_txt'] = 'Πλήθος email forwarders';
-$wb['limit_mailcatchall_txt'] = 'Πλήθος λογαριασμών email catchall';
-$wb['limit_mailrouting_txt'] = 'Πλήθος δρομολογήσεων email';
-$wb['limit_mailfilter_txt'] = 'Πλήθος φίλτρων email';
-$wb['limit_fetchmail_txt'] = 'Πλήθος λογαριασμών fetchmail';
-$wb['limit_spamfilter_wblist_txt'] = 'Πλήθος φίλτρων spamfilter white / blacklist';
-$wb['limit_spamfilter_user_txt'] = 'Πλήθος χρηστών spamfilter';
-$wb['limit_spamfilter_policy_txt'] = 'Πλήθος πολιτικών spamfilter';
-$wb['limit_cron_txt'] = 'Πλήθος εργασιών cron';
-$wb['limit_web_domain_txt'] = 'Πλήθος web domains';
-$wb['limit_web_aliasdomain_txt'] = 'Πλήθος ψευδωνύμων web domain';
-$wb['limit_web_subdomain_txt'] = 'Πλήθος web subdomains';
-$wb['limit_ftp_user_txt'] = 'Πλήθος χρηστών FTP';
-$wb['limit_dns_zone_txt'] = 'Πλήθος ζωνών DNS';
-$wb['limit_dns_slave_zone_txt'] = 'Πλήθος δευτερεύουσων ζωνών DNS';
-$wb['limit_dns_record_txt'] = 'Πλήθος εγγραφών DNS';
-$wb['limit_shell_user_txt'] = 'Πλήθος χρηστών Κελύφους';
-$wb['limit_webdav_user_txt'] = 'Πλήθος χρηστών Webdav';
-$wb['limit_client_txt'] = 'Πλήθος Πελατών';
-$wb['limit_database_txt'] = 'Πλήθος Βάσεων Δεδομένων';
-$wb['limit_mailmailinglist_txt'] = 'Πλήθος λιστών mail';
+$wb['limit_maildomain_txt'] = 'Αριθμός email domains';
+$wb['limit_mailbox_txt'] = 'Αριθμός θυρίδων';
+$wb['limit_mailalias_txt'] = 'Αριθμός ψευδωνύμων email';
+$wb['limit_mailaliasdomain_txt'] = 'Αριθμός ψευδωνύμων domain';
+$wb['limit_mailforward_txt'] = 'Αριθμός email forwarders';
+$wb['limit_mailcatchall_txt'] = 'Αριθμός λογαριασμών email catchall';
+$wb['limit_mailrouting_txt'] = 'Αριθμός δρομολογήσεων email';
+$wb['limit_mailfilter_txt'] = 'Αριθμός φίλτρων email';
+$wb['limit_fetchmail_txt'] = 'Αριθμός λογαριασμών fetchmail';
+$wb['limit_spamfilter_wblist_txt'] = 'Αριθμός φίλτρων spamfilter white / blacklist';
+$wb['limit_spamfilter_user_txt'] = 'Αριθμός χρηστών spamfilter';
+$wb['limit_spamfilter_policy_txt'] = 'Αριθμός πολιτικών spamfilter';
+$wb['limit_cron_txt'] = 'Αριθμός εργασιών cron';
+$wb['limit_web_domain_txt'] = 'Αριθμός web domains';
+$wb['limit_web_aliasdomain_txt'] = 'Αριθμός ψευδωνύμων web domain';
+$wb['limit_web_subdomain_txt'] = 'Αριθμός web subdomains';
+$wb['limit_ftp_user_txt'] = 'Αριθμός χρηστών FTP';
+$wb['limit_dns_zone_txt'] = 'Αριθμός ζωνών DNS';
+$wb['limit_dns_slave_zone_txt'] = 'Αριθμός δευτερεύουσων ζωνών DNS';
+$wb['limit_dns_record_txt'] = 'Αριθμός εγγραφών DNS';
+$wb['limit_shell_user_txt'] = 'Αριθμός χρηστών Shell';
+$wb['limit_webdav_user_txt'] = 'Αριθμός χρηστών Webdav';
+$wb['limit_client_txt'] = 'Αριθμός Πελατών';
+$wb['limit_database_txt'] = 'Αριθμός Databases';
+$wb['limit_mailmailinglist_txt'] = 'Αριθμός λιστών ηλ. αλληλογραφίας';
 ?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng
index 0bea37b9598e7104d4ef0eb2b65580ee10eb32d5..1ab1e66658fbcab9841ac79a17eb76deb42e40a7 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['mailquota_txt'] = 'Όρια Mailbox';
-$wb['email_txt'] = 'Διεύθυνση Email';
-$wb['name_txt'] = 'Όνομα';
-$wb['used_txt'] = 'Χώρος σε χρήση';
-$wb['quota_txt'] = 'Όριο';
-$wb['no_email_accounts_txt'] = 'Δεν βρέθηκαν λογαριασμοί email.';
+$wb['mailquota_txt'] = 'Mailbox Quota';
+$wb['email_txt'] = 'Email Address';
+$wb['name_txt'] = 'Name';
+$wb['used_txt'] = 'Used Space';
+$wb['quota_txt'] = 'Quota';
+$wb['no_email_accounts_txt'] = 'No email accounts found.';
 ?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_quota.lng b/interface/web/dashboard/lib/lang/el_dashlet_quota.lng
index d56647b7ed95a3f37331998c4568cc125d6605b5..de7b5a893612c6c8abb9117bfe933d0eddd782af 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_quota.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_quota.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['quota_txt'] = 'Όρια χρήσης δίσκου για Website';
-$wb['domain_txt'] = 'Domain/Website';
-$wb['used_txt'] = 'Χώρος σε χρήση';
-$wb['hard_txt'] = 'Απόλυτο Όριο';
-$wb['soft_txt'] = 'Διαλακτικό Όριο';
-$wb['no_sites_txt'] = 'Δεν βρέθηκαν websites.';
+$wb['quota_txt'] = 'Website Harddisk Quota';
+$wb['domain_txt'] = 'Domain / Website';
+$wb['used_txt'] = 'Used space';
+$wb['hard_txt'] = 'Hard limit';
+$wb['soft_txt'] = 'Soft limit';
+$wb['no_sites_txt'] = 'No web sites found.';
 ?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
index 1ab1e66658fbcab9841ac79a17eb76deb42e40a7..d18317ce32fc74a6fe7ba2adce2dd4ba473c83d2 100644
--- a/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['mailquota_txt'] = 'Mailbox Quota';
-$wb['email_txt'] = 'Email Address';
-$wb['name_txt'] = 'Name';
-$wb['used_txt'] = 'Used Space';
+$wb['mailquota_txt'] = 'Quota de la boite mail';
+$wb['email_txt'] = 'Adresse Email';
+$wb['name_txt'] = 'Nom';
+$wb['used_txt'] = 'Espace utilisé';
 $wb['quota_txt'] = 'Quota';
-$wb['no_email_accounts_txt'] = 'No email accounts found.';
+$wb['no_email_accounts_txt'] = 'Aucun compte mail trouvé.';
 ?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng b/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng
index de7b5a893612c6c8abb9117bfe933d0eddd782af..674057e7f7a349e0164384314922c7a0aa50b380 100644
--- a/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['quota_txt'] = 'Website Harddisk Quota';
-$wb['domain_txt'] = 'Domain / Website';
-$wb['used_txt'] = 'Used space';
-$wb['hard_txt'] = 'Hard limit';
-$wb['soft_txt'] = 'Soft limit';
-$wb['no_sites_txt'] = 'No web sites found.';
+$wb['quota_txt'] = 'Quota disque dur du site Web';
+$wb['domain_txt'] = 'Domaine / Site Web';
+$wb['used_txt'] = 'Espace utilisé';
+$wb['hard_txt'] = 'Limite Hard';
+$wb['soft_txt'] = 'Limite Soft';
+$wb['no_sites_txt'] = 'Aucun site Web trouvé.';
 ?>
diff --git a/interface/web/designer/lib/lang/cz_module_edit.lng b/interface/web/designer/lib/lang/cz_module_edit.lng
index 302c6011b1d38ddba736f94452c2d5fd11f26c8a..972bc2ccf980f19117497b0b86df8cf1e4fb9cec 100644
--- a/interface/web/designer/lib/lang/cz_module_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_edit.lng
@@ -17,6 +17,6 @@ $wb['description_txt'] = '
 <b>NaviFrame:</b> If module_tree.tpl.htm selected as template file, enter here the path to the script file for the left frame.<br>
 <b>Default page:</b> These page will be shown when the module is opened.<br>
 <b>Tab width:</b> Width of the Tabs in the main navigation. The field is empty by default. You can enter values absolute in pixel (e.g 20) or relative (e.g 20%).<br>
-<b>Hint:</b> All paths are relative to the directory \"web\".
+<b>Hint:</b> All paths are relative to the directory \\"web\\".
 ';
 ?>
diff --git a/interface/web/designer/lib/lang/el_form_edit.lng b/interface/web/designer/lib/lang/el_form_edit.lng
index 2c2673a36032a2e4c28c77a51dc3602c235d4614..04ebc02db35408c553afe5003b5b6b5c25e7d218 100644
--- a/interface/web/designer/lib/lang/el_form_edit.lng
+++ b/interface/web/designer/lib/lang/el_form_edit.lng
@@ -16,9 +16,9 @@ $wb['db_history_txt'] = 'Ιστορικό Αναίρεσης';
 $wb['tab_default_txt'] = 'Προεπιλεγμένη Καρτέλα';
 $wb['list_default_txt'] = 'Προεπιλεγμένη Λίστα';
 $wb['auth_txt'] = 'Δικαιώματα';
-$wb['auth_preset_userid_txt'] = 'ID Χρήστη';
-$wb['auth_preset_groupid_txt'] = 'ID Ομάδας';
-$wb['auth_preset_perm_user_txt'] = 'Δικαιώμ. Χρήστη';
-$wb['auth_preset_perm_group_txt'] = 'Δικαιώμ. Ομάδας';
-$wb['auth_preset_perm_other_txt'] = 'Δικαιώμ. Άλλων';
+$wb['auth_preset_userid_txt'] = 'UserID';
+$wb['auth_preset_groupid_txt'] = 'GroupID';
+$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/fr_form_list.lng b/interface/web/designer/lib/lang/fr_form_list.lng
index a61e61af5593cf0dc49551f7bd67a51d48014513..316211598efffe4ee77abccf5ee3c0d3125eef7e 100644
--- a/interface/web/designer/lib/lang/fr_form_list.lng
+++ b/interface/web/designer/lib/lang/fr_form_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Formulaire dadministration';
+$wb['list_head_txt'] = 'Formulaire d\'administration';
 $wb['form_txt'] = 'Formulaire';
 $wb['module_txt'] = 'Module';
 $wb['title_txt'] = 'Titre';
diff --git a/interface/web/designer/lib/lang/fr_form_show.lng b/interface/web/designer/lib/lang/fr_form_show.lng
index 3cb420f47845200edd38f8155a5c3a5de5daaded..c2cd94be79056aed84bc60e66cd9a6605811a721 100644
--- a/interface/web/designer/lib/lang/fr_form_show.lng
+++ b/interface/web/designer/lib/lang/fr_form_show.lng
@@ -14,5 +14,5 @@ $wb['form_txt'] = 'Formulaire';
 $wb['description_txt'] = 'Description';
 $wb['module_del_txt'] = 'Effacer le module et tous ses sous-répertoires';
 $wb['menu_del_txt'] = 'Effacer le menu et toutes ses entrées';
-$wb['item_del_txt'] = 'Effacer lentrée';
+$wb['item_del_txt'] = 'Effacer l\'entrée';
 ?>
diff --git a/interface/web/designer/lib/lang/fr_module_list.lng b/interface/web/designer/lib/lang/fr_module_list.lng
index 927c65eb5f6536c5627c533813080f1d88d72a14..d493fdcb3fd41e00eca45d660c20105df19e88dc 100644
--- a/interface/web/designer/lib/lang/fr_module_list.lng
+++ b/interface/web/designer/lib/lang/fr_module_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Module dadministration';
+$wb['list_head_txt'] = 'Module d\'administration';
 $wb['module_txt'] = 'Module';
 $wb['title_txt'] = 'Titre';
 ?>
diff --git a/interface/web/designer/lib/lang/fr_module_show.lng b/interface/web/designer/lib/lang/fr_module_show.lng
index c9c85706f3a33b0fd9a48ef521a8ef5ceb62c35e..8c14adb3a1092a85faff80e988ff4cc9845c1511 100644
--- a/interface/web/designer/lib/lang/fr_module_show.lng
+++ b/interface/web/designer/lib/lang/fr_module_show.lng
@@ -10,7 +10,7 @@ $wb['new_txt'] = 'Nouveau';
 $wb['up_txt'] = 'Monter';
 $wb['down_txt'] = 'Descendre';
 $wb['module_txt'] = 'Module';
-$wb['module_del_txt'] = 'Voulez-vous supprimer le module et tous les fichiers et sous-dossier du module ';
-$wb['menu_del_txt'] = 'Voulez-vous supprimer le menu avec tous ses sous-menus ';
-$wb['item_del_txt'] = 'Voulez-vous supprimer lentrée de menu ';
+$wb['module_del_txt'] = 'Voulez-vous supprimer le module et tous les fichiers et sous-dossier du module ?';
+$wb['menu_del_txt'] = 'Voulez-vous supprimer le menu avec tous ses sous-menus ?';
+$wb['item_del_txt'] = 'Voulez-vous supprimer l\'entrée de menu ?';
 ?>
diff --git a/interface/web/dns/form/dns_srv.tform.php b/interface/web/dns/form/dns_srv.tform.php
index 2741a5f7f1218a7275242d9181e2f9ae1fe6f330..2f35fd53dda6ff14472edcb43f1b8c2831f7d436 100644
--- a/interface/web/dns/form/dns_srv.tform.php
+++ b/interface/web/dns/form/dns_srv.tform.php
@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
+					'regex' => '/^[a-zA-Z0-9\.\-_]{0,255}$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',
diff --git a/interface/web/dns/lib/lang/el.lng b/interface/web/dns/lib/lang/el.lng
index 3b3bfe84a71bc1780273d50169434e3d6b7261de..f76afed784a300b3fefefd12915a1585f93d5568 100644
--- a/interface/web/dns/lib/lang/el.lng
+++ b/interface/web/dns/lib/lang/el.lng
@@ -17,6 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT';
 $wb['DNS Wizard'] = 'Οδηγός DNS';
 $wb['Add DNS Zone'] = 'Νέα ζώνη DNS';
 $wb['Templates'] = 'Πρότυπα';
-$wb['Secondary Zones'] = 'Δευτερεύουσες Ζώνες';
-$wb['Import Zone File'] = 'Εισαγωγή Αρχείου Ζώνης';
+$wb['Secondary Zones'] = 'Secondary Zones';
+$wb['Import Zone File'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_alias.lng b/interface/web/dns/lib/lang/el_dns_alias.lng
index 178ee34919e58aaa53b0abc8b20924a0da004ba4..2e05e475da4aede8e81f17e0bf51dd7028c88725 100644
--- a/interface/web/dns/lib/lang/el_dns_alias.lng
+++ b/interface/web/dns/lib/lang/el_dns_alias.lng
@@ -11,6 +11,6 @@ $wb['no_zone_perm'] = 'Δεν έχετε δικαίωμα να προσθέσε
 $wb['name_error_empty'] = 'Το hostname δεν έχει οριστεί';
 $wb['name_error_regex'] = 'Το hostname έχει λάθος μορφοποίηση';
 $wb['data_error_empty'] = 'Το hostname Προορισμός δεν έχει οριστεί';
-$wb['data_error_regex'] = 'Το hostname Προορισμός δεν έχει σωστή μορφοποίηση';
+$wb['data_error_regex'] = 'Το hostname Προορισμός έχει λάθος μορφοποίηση';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_hinfo.lng b/interface/web/dns/lib/lang/el_dns_hinfo.lng
index 02fa662939293803b4edc4016bb8de3b5193c8dc..173b16f721a7febf9e9967573accbb80e631172d 100644
--- a/interface/web/dns/lib/lang/el_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/el_dns_hinfo.lng
@@ -11,6 +11,6 @@ $wb['no_zone_perm'] = 'Δεν έχετε δικαίωμα να προσθέσε
 $wb['name_error_empty'] = 'Το hostname δεν έχει οριστεί';
 $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοποίηση';
 $wb['data_error_empty'] = 'Οι πληροφορίες του Host είναι κενές';
-$wb['data_error_regex'] = 'Οι πληροφορίες Host δεν έχουν έγκυρη μορφοποίηση';
+$wb['data_error_regex'] = 'Οι πληροφορίες Host έχουν μη έγκυρη μορφοποίηση';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_import.lng b/interface/web/dns/lib/lang/el_dns_import.lng
index 84608d19509ffe1c16caaf8a4147e8850b77f2bf..2d1fe083ea4f8faf5627223d2e50f3e8df38fa21 100644
--- a/interface/web/dns/lib/lang/el_dns_import.lng
+++ b/interface/web/dns/lib/lang/el_dns_import.lng
@@ -1,14 +1,14 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['client_txt'] = 'Πελάτης';
-$wb['btn_save_txt'] = 'Εισαγωγή Αρχείου Ζώνης';
-$wb['btn_cancel_txt'] = 'Άκυρο';
+$wb['client_txt'] = 'Client';
+$wb['btn_save_txt'] = 'Import Zonefile';
+$wb['btn_cancel_txt'] = 'Cancel';
 $wb['domain_txt'] = 'Domain';
-$wb['zone_file_successfully_imported_txt'] = 'Το αρχείο ζώνης έχει εισαχθεί με επιτυχία!';
-$wb['error_no_valid_zone_file_txt'] = 'Φαίνεται ότι το αρχείο ζώνης δεν είναι έγκυρο!';
-$wb['zonefile_to_import_txt'] = 'Αρχείο Ζώνης';
-$wb['domain_field_desc_txt'] = 'Μπορεί να μείνει κενό αν το όνομα domain είναι στο όνομα αρχείου λη στα περιεχόμενά του.';
-$wb['title'] = 'Εισαγωγή Αρχείων Ζώνης';
-$wb['no_file_uploaded_error'] = 'Δεν μεταφορτώθηκε αρχείο ζώνης';
-$wb['zone_file_import_txt'] = 'Εισαγωγή Αρχείου Ζώνης';
+$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['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+$wb['zone_file_import_txt'] = 'Zone File Import';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng
index 4d514093b23f10505ae56318a65b3dda08564a10..fac88305b01d07c87fd64376f0941959e4d7601b 100644
--- a/interface/web/dns/lib/lang/el_dns_mx.lng
+++ b/interface/web/dns/lib/lang/el_dns_mx.lng
@@ -13,6 +13,6 @@ $wb['name_error_empty'] = 'Το hostname δεν έχει οριστεί.';
 $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοποίηση.';
 $wb['data_error_empty'] = 'Το hostname Mailserver δεν έχει οριστεί';
 $wb['data_error_regex'] = 'Mailserver hostname με μη έγκυρη μορφοποίηση';
-$wb['duplicate_mx_record_txt'] = 'Διπλοεγγραφή MX.';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_slave.lng b/interface/web/dns/lib/lang/el_dns_slave.lng
index 979c4668f28df8f01ecd22260087fbc0d9111eaf..64db9755e8e072f6b609c1fc03d4f185ea0d37bd 100644
--- a/interface/web/dns/lib/lang/el_dns_slave.lng
+++ b/interface/web/dns/lib/lang/el_dns_slave.lng
@@ -13,5 +13,5 @@ $wb['origin_error_regex'] = 'Η ζώνη δεν έχει έγκυρη μορφο
 $wb['ns_error_regex'] = 'Ο NS δεν έχει έγκυρη μορφοποίηση.';
 $wb['eg_domain_tld'] = 'π.χ. domain.tld.';
 $wb['ipv4_form_txt'] = 'μορφή IPv4 - π.χ. 1.2.3.4';
-$wb['secondary_zone_txt'] = 'Δευτερεύουσα Ζώνη DNS';
+$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng
index 045270a366e3e8fc7f153e43d56636292f756a18..87d5fc7ec53a81e6b611eac32f78cf2d3421d7a1 100644
--- a/interface/web/dns/lib/lang/el_dns_soa.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa.lng
@@ -28,11 +28,11 @@ $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';
-$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Το Domain Δεν μπορεί να αλλαχθεί. Παρακαλούμε επικοινωνήστε με τον Διαχειριστή σας αν θέλετε να γίνει η αλλαγή του ονόματος.';
-$wb['refresh_range_error'] = 'Ελάχιστος χρόνος Ανανέωσης είναι τα 60 δευτερόλεπτα.';
-$wb['retry_range_error'] = 'Ελάχιστος χρόνος Επανάληψης είναι τα 60 δευτερόλεπτα.';
-$wb['expire_range_error'] = 'Ελάχιστος χρόνος Λήξης είναι τα 60 δευτερόλεπτα.';
-$wb['minimum_range_error'] = 'Ελάχιστος χρόνος Ελαχίστου είναι τα 60 δευτερόλεπτα.';
-$wb['ttl_range_error'] = 'Ελάχιστος χρόνος TTL είναι τα 60 δευτερόλεπτα.';
-$wb['xfer_error_regex'] = 'Επιπλέον Ειδοποίηση: Παρακαλούμε χρησιμοποιείστε μια διεύθυσνη IP.';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
+$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.';
+$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
+$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
+$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_srv.lng b/interface/web/dns/lib/lang/el_dns_srv.lng
index 132c77e23d07429a2ad36a98a9f03cb32c225942..53f25afb87b0d11fc95a41bf377777dbf19d0db5 100644
--- a/interface/web/dns/lib/lang/el_dns_srv.lng
+++ b/interface/web/dns/lib/lang/el_dns_srv.lng
@@ -1,20 +1,20 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Ζώνη';
+$wb['zone_txt'] = 'Ζώνη';
 $wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'τύπος';
-$wb['target_txt'] = 'Στόχος';
-$wb['weight_txt'] = 'Βάρος';
-$wb['port_txt'] = 'Θύρα';
+$wb['type_txt'] = 'τ�πος';
+$wb['target_txt'] = 'Target';
+$wb['weight_txt'] = 'Weight';
+$wb['port_txt'] = 'Port';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Ενεργή';
-$wb['aux_txt'] = 'Προτερεότητα';
-$wb['limit_dns_record_txt'] = 'Έχετε φτάσει στο μέγιστο πλήθος εγγραφών DNS για τον λογιαριασμό σας.';
-$wb['no_zone_perm'] = 'Δεν έχετε δικαίωμα να προσθέσετε εγγραφές σε αυτή την ζώνη DNS.';
-$wb['name_error_empty'] = 'Το hostname είναι άδειο.';
-$wb['name_error_regex'] = 'Το hostname δεν έχει έγκυρη μορφοποίηση.';
-$wb['data_error_empty'] = 'Άδεια εγγραφή Server';
-$wb['data_error_regex'] = 'Η εγγραφή Server δεν έχει έγκυρη μορφοποίηση';
-$wb['srv_error_regex'] = 'Μη έγκυρη μορφοποίηση εγγραφής Server. Η εγγραφή Server πρέπει να περιέχει 3 κομμάτια χαρακτήρων χωρισμένα με κενά.';
+$wb['active_txt'] = 'Ενε�γή';
+$wb['aux_txt'] = 'Π�οτε�αιότητα';
+$wb['limit_dns_record_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των εγγ�αφών DNS για τον λογα�ιασμό σας.';
+$wb['no_zone_perm'] = 'Δεν έχετε δικαίωμα να π�οσθέσετε εγγ�αφές σε αυτή τη ζώνη.';
+$wb['name_error_empty'] = 'Το hostname δεν έχει ο�ιστεί.';
+$wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μο�φοποίηση.';
+$wb['data_error_empty'] = 'Η εγγ�αφή Server είναι κενή';
+$wb['data_error_regex'] = 'Εγγ�αφή  Server με μη έγκυ�η μο�φοποίηση';
+$wb['srv_error_regex'] = 'Εγγ�αφή  Server με μη έγκυ�η μο�φοποίηση. Η εγγ�αφή Server π�έπει να πε�ιέχει 3 λέξεις χω�ισμένες με κενά.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng
index 2b177e6c1924a1126d3d08ffc721c21e68cf37ed..96bea29deb35893ead3ddefd26f515bab2eb52f0 100644
--- a/interface/web/dns/lib/lang/el_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/el_dns_wizard.lng
@@ -28,13 +28,13 @@ $wb['error_domain_regex'] = 'Το Domain περιέχει μη επιτρεπό
 $wb['error_ns1_regex'] = 'Ο NS1 περιέχει μη επιτρεπόμενους χαρακτήρες';
 $wb['error_ns2_regex'] = 'Ο NS2 περιέχει μη επιτρεπόμενους χαρακτήρες';
 $wb['error_email_regex'] = 'Το Email δεν περιέχει μια έγκυρη διεύθυνση.';
-$wb['dns_zone_txt'] = 'Ζώνη DNS';
-$wb['globalsearch_resultslimit_of_txt'] = 'από';
-$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα';
-$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.';
-$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση';
-$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις';
-$wb['list_head_txt'] = 'Οδηγός Ζώνης DNS';
-$wb['list_desc_txt'] = 'Δημιουργία Ζώνης DNS Zone μέσω Οδηγού';
+$wb['dns_zone_txt'] = 'DNS Zone';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$wb['globalsearch_noresults_limit_txt'] = '0 results';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 ?>
diff --git a/interface/web/dns/lib/lang/fr.lng b/interface/web/dns/lib/lang/fr.lng
index 6ec30d3616a601b7519c7be3199401fea7db4a68..bfed1eb2bce63587c09a0f13abdba1a46b3556e7 100644
--- a/interface/web/dns/lib/lang/fr.lng
+++ b/interface/web/dns/lib/lang/fr.lng
@@ -17,6 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT';
 $wb['DNS Wizard'] = 'Assistant DNS';
 $wb['Add DNS Zone'] = 'Ajout zone DNS';
 $wb['Templates'] = 'Modèles';
-$wb['Secondary Zones'] = 'Secondary Zones';
-$wb['Import Zone File'] = 'Import Zone File';
+$wb['Secondary Zones'] = 'Zones secondaires';
+$wb['Import Zone File'] = 'Importer un fichier de Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_a_list.lng b/interface/web/dns/lib/lang/fr_dns_a_list.lng
index f0a535604cd275b40303e924980f607bf953061b..67eb1b7d42c27b396eebb84a5113ce2242011b7d 100644
--- a/interface/web/dns/lib/lang/fr_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/fr_dns_a_list.lng
@@ -11,5 +11,5 @@ $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement A';
 $wb['page_txt'] = 'Page';
 $wb['page_of_txt'] = 'de';
-$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement';
+$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_import.lng b/interface/web/dns/lib/lang/fr_dns_import.lng
index 6352c244354a313c4527b2fce7611880f0230709..24584c08e069263ffca561b0fa705429fbb61524 100644
--- a/interface/web/dns/lib/lang/fr_dns_import.lng
+++ b/interface/web/dns/lib/lang/fr_dns_import.lng
@@ -1,16 +1,16 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['client_txt'] = 'Client';
-$wb['btn_save_txt'] = 'Import Zonefile';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['domain_txt'] = 'Domain';
-$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['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
-$wb['title'] = 'Import Zone Files';
-$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
-$wb['zone_file_import_txt'] = 'Zone File Import';
 $wb['error_no_server_id'] = 'Aucun serveur fourni.';
 $wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
-?>
\ No newline at end of file
+$wb['btn_save_txt'] = 'Importer un fichier de Zone';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['domain_txt'] = 'Domaine';
+$wb['zone_file_successfully_imported_txt'] = 'Le fichier de Zone a été importé avec succès !';
+$wb['error_no_valid_zone_file_txt'] = 'Le fichier de Zone semble être invalide !';
+$wb['zonefile_to_import_txt'] = 'Fichier de Zone';
+$wb['domain_field_desc_txt'] = 'Peut-être laissé vide si le nom de domaine est dans le nom de fichier ou dans le contenu du fichier de Zone.';
+$wb['title'] = 'Importer des fichiers de Zone';
+$wb['no_file_uploaded_error'] = 'Aucun fichier de Zone téléchargé';
+$wb['zone_file_import_txt'] = 'Importer un fichier de Zone';
+?>
diff --git a/interface/web/dns/lib/lang/fr_dns_mx.lng b/interface/web/dns/lib/lang/fr_dns_mx.lng
index a8b0730b551f857da69baf0fa133c81ac151e2bb..2253ffe00b412bd435905aa22238335c2a80072c 100644
--- a/interface/web/dns/lib/lang/fr_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fr_dns_mx.lng
@@ -13,6 +13,6 @@ $wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
 $wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
 $wb['data_error_empty'] = 'Le nom d\'hôte du serveur mail est vide';
 $wb['data_error_regex'] = 'Le format du nom d\'hôte du serveur mail est invalide';
-$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
+$wb['duplicate_mx_record_txt'] = 'Enregistrement MX dupliqué.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_slave.lng b/interface/web/dns/lib/lang/fr_dns_slave.lng
index 6762a2110eb00e26a9e47904a29c54597a64dbb2..887cc7dcd4957752dc91eff71e70ef42c75c1e86 100644
--- a/interface/web/dns/lib/lang/fr_dns_slave.lng
+++ b/interface/web/dns/lib/lang/fr_dns_slave.lng
@@ -2,7 +2,7 @@
 $wb['server_id_txt'] = 'Serveur';
 $wb['origin_txt'] = 'Zone DNS';
 $wb['ns_txt'] = 'NS';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Actif';
 $wb['limit_dns_slave_zone_txt'] = 'Le nombre maximal de zones DNS secondaire pour votre compte est atteint.';
 $wb['client_txt'] = 'Client';
 $wb['xfer_txt'] = 'Autoriser les transferts de zone de <br />ces IPs (liste séparée par des virgules)';
@@ -13,5 +13,5 @@ $wb['origin_error_regex'] = 'Le format de la zone est invalide.';
 $wb['ns_error_regex'] = 'Le format de l\'enregistrement NS est invalide.';
 $wb['eg_domain_tld'] = 'ex. domain.tld.';
 $wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4';
-$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
+$wb['secondary_zone_txt'] = 'Zone DNS secondaire';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_soa.lng b/interface/web/dns/lib/lang/fr_dns_soa.lng
index 97e1ea0dd567cfb20932bf54beba03cb45c66b37..a3410ae132aec22df38a792c34130f3f1adb210e 100644
--- a/interface/web/dns/lib/lang/fr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/fr_dns_soa.lng
@@ -28,12 +28,12 @@ $wb['seconds_txt'] = 'Secondes';
 $wb['eg_domain_tld'] = 'ex. domain.tld';
 $wb['eg_ns1_domain_tld'] = 'ex. ns1.domain.tld';
 $wb['eg_webmaster_domain_tld'] = 'ex. webmaster@domain.tld';
-$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
-$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.';
-$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
-$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
-$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
-$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
-$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
 $wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
-?>
\ No newline at end of file
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Le domaine ne peut pas être modifié. Veuillez contacter votre administrateur si vous souhaitez modifier le nom de domaine.';
+$wb['refresh_range_error'] = 'Le temps de refresh minimum est 60 secondes.';
+$wb['retry_range_error'] = 'Le temps de retry minimum est 60 secondes.';
+$wb['expire_range_error'] = 'Le temps de expire minimum est 60 secondes.';
+$wb['minimum_range_error'] = 'Le temps Minimum minimum est 60 secondes.';
+$wb['ttl_range_error'] = 'La TTL minimum est 60 secondes.';
+$wb['xfer_error_regex'] = 'A noter également : Veuillez utiliser une adresse IP.';
+?>
diff --git a/interface/web/dns/lib/lang/fr_dns_srv.lng b/interface/web/dns/lib/lang/fr_dns_srv.lng
index 6d9dbf0bb0cc10e906aea794a42b98a4adf34e10..55f2484d7135640070f6ad5c2ace3f7f020f0872 100644
--- a/interface/web/dns/lib/lang/fr_dns_srv.lng
+++ b/interface/web/dns/lib/lang/fr_dns_srv.lng
@@ -3,8 +3,8 @@ $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Nom d\'hôte';
 $wb['type_txt'] = 'type';
-$wb['target_txt'] = 'Target';
-$wb['weight_txt'] = 'Weight';
+$wb['target_txt'] = 'Cible';
+$wb['weight_txt'] = 'Poids';
 $wb['port_txt'] = 'Port';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
diff --git a/interface/web/dns/lib/lang/fr_dns_wizard.lng b/interface/web/dns/lib/lang/fr_dns_wizard.lng
index 02f55f1f0cf3e3d33d992b90c81d357dd153079b..74c5d84879554b6a82ce86a8ff3988d8abf8c7ce 100644
--- a/interface/web/dns/lib/lang/fr_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/fr_dns_wizard.lng
@@ -29,15 +29,15 @@ $wb['error_domain_regex'] = 'Le domaine contient des caractères invalides.';
 $wb['error_ns1_regex'] = 'NS1 contient des caractères invalides.';
 $wb['error_ns2_regex'] = 'NS2 contient des caractères invalides.';
 $wb['error_email_regex'] = 'L\'email ne contient pas une adresse email valide.';
-$wb['dns_zone_txt'] = 'DNS Zone';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
+$wb['dns_zone_txt'] = 'Zone DNS';
+$wb['globalsearch_resultslimit_of_txt'] = 'de';
+$wb['globalsearch_resultslimit_results_txt'] = 'resultats';
+$wb['globalsearch_noresults_text_txt'] = 'Pas de résultat.';
+$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Chercher';
 $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
-$wb['list_head_txt'] = 'DNS Zone Wizard';
-$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['error_no_server_id'] = 'Aucun serveur fourni.';
 $wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
+$wb['list_head_txt'] = 'Assistant Zone DNS';
+$wb['list_desc_txt'] = 'Créer une Zone DNS via l\'assistant';
 ?>
diff --git a/interface/web/help/lib/lang/el_help_faq_list.lng b/interface/web/help/lib/lang/el_help_faq_list.lng
index 30405c58f0f5e6f3937a763c4bef392df32fb841..b6c7b460b9ecab5767e64a0b73350772e5a7027b 100644
--- a/interface/web/help/lib/lang/el_help_faq_list.lng
+++ b/interface/web/help/lib/lang/el_help_faq_list.lng
@@ -1,3 +1,3 @@
 <?php
-$wb['edit_txt'] = 'Επεξεργασία';
+$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
index b6c7b460b9ecab5767e64a0b73350772e5a7027b..6af86cfbbf53377018367869de0acb2e46c61446 100644
--- a/interface/web/help/lib/lang/fr_help_faq_list.lng
+++ b/interface/web/help/lib/lang/fr_help_faq_list.lng
@@ -1,3 +1,3 @@
 <?php
-$wb['edit_txt'] = 'Edit';
+$wb['edit_txt'] = 'Editer';
 ?>
diff --git a/interface/web/help/lib/lang/fr_help_faq_sections_list.lng b/interface/web/help/lib/lang/fr_help_faq_sections_list.lng
index a99ab07d616cd6a6c63cbee63b342915e4a9e0d8..a15c2ea9dc7c1768c48714ac9c5ec517cc088f95 100644
--- a/interface/web/help/lib/lang/fr_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/fr_help_faq_sections_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['faq_section_name_txt'] = 'Nome de la Section';
+$wb['faq_section_name_txt'] = 'Nom de la Section';
 $wb['faq_delete_txt'] = 'Supprimer';
 $wb['faq_edit_txt'] = 'Editer';
 $wb['faq_sections_txt'] = 'Sections';
diff --git a/interface/web/help/lib/lang/fr_support_message.lng b/interface/web/help/lib/lang/fr_support_message.lng
index 9f9dbe81ad622dcb57e0004c8984287c18086c7c..10d37a94174db1dab7e844d6823c617378a8508f 100644
--- a/interface/web/help/lib/lang/fr_support_message.lng
+++ b/interface/web/help/lib/lang/fr_support_message.lng
@@ -6,10 +6,10 @@ $wb['message_txt'] = 'Message';
 $wb['tstamp_txt'] = 'Timestamp';
 $wb['reply_txt'] = 'Répondre';
 $wb['date_txt'] = 'Date';
-$wb['support_request_subject_txt'] = 'Support Request';
-$wb['support_request_txt'] = 'You have got a support request. Please don\'t reply to this email, but process the support request inside ISPConfig.';
-$wb['answer_to_support_request_txt'] = 'You have got a reply to your support request. Please don\'t reply to this email, but process the message inside ISPConfig.';
+$wb['support_request_subject_txt'] = 'Demande d\'assistance';
+$wb['support_request_txt'] = 'Vous avez une demande d\'assistance. Merci de ne pas répondre directement à cet email, mais de gérer la demande d\'assistance dans ISPConfig.';
+$wb['answer_to_support_request_txt'] = 'Vous avez une réponse à votre demande d\'assistance. Merci de ne pas répondre directement à cet email, mais de gérer la demande d\'assistance dans ISPConfig.';
 $wb['answer_to_support_request_sent_txt'] = 'Your reply to the support request has been sent. Please don\'t reply to this email.';
-$wb['support_request_sent_txt'] = 'Your support request has been sent. Please don\'t reply to this email.';
-$wb['recipient_or_sender_email_address_not_valid_txt'] = 'The message could not be sent because the recipient and/or the sender email address is not valid.';
+$wb['support_request_sent_txt'] = 'Votre réponse à la demande d\'assistance a été envoyée. Merci de ne pas répondre à cet email.';
+$wb['recipient_or_sender_email_address_not_valid_txt'] = 'Le message n\'a pas pu être envoyé parce que l\'adresse email du destinataire et/ou de l\'émetteur est invalide.';
 ?>
diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng
index 2dc5ce507038c54d02cd93e9f073deeccd4fe7de..95e1db242f5057329ed2f35afe76a477e96c4f7f 100644
--- a/interface/web/login/lib/lang/el.lng
+++ b/interface/web/login/lib/lang/el.lng
@@ -14,14 +14,14 @@ $wb['pw_error_length'] = 'Το μέγεθος του συνθηματικού ε
 $wb['username_txt'] = 'Όνομα χρήστη';
 $wb['password_txt'] = 'Συνθηματικό';
 $wb['login_button_txt'] = 'Είσοδος';
-$wb['pw_lost_txt'] = 'Χαμένο Συνθηματικό';
-$wb['error_maintenance_mode'] = 'Αυτή η εγκατάσταση ISPConfig βρίσκεται σε κατάσταση συντήρησης. Ευχαριστούμε για την υπομονή σας.';
-$wb['login_txt'] = 'Είσοδος';
-$wb['pw_reset_txt'] = 'Αρχικοποίηση Συνθηματικού';
-$wb['pw_button_txt'] = 'Επαναποστολή Συνθηματικού';
+$wb['pw_lost_txt'] = 'Password lost';
+$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
+$wb['login_txt'] = 'Login';
+$wb['pw_reset_txt'] = 'Password reset';
+$wb['pw_button_txt'] = 'Resend password';
 $wb['email_txt'] = 'Email';
-$wb['theme_not_compatible'] = 'Η επιλεγμένη θεματική παραλλαγή δεν είναι συμβατη με την τρέχουσα έκδοση ISPConfig. Παρακαλούμε ελέξτε για πιο πρόσφατη έκδοση.<br />Η προεπιλεγμένη θεματική παραλλαγή ενεργοποιήθηκε αυτόματα.';
-$wb['back_txt'] = 'Επιστροφή';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
+$wb['back_txt'] = 'Back';
 $wb['email_error'] = 'Email contains unallowed characters or has a invalid format.';
 $wb['stay_logged_in_txt'] = 'Keep me logged in';
 ?>
diff --git a/interface/web/login/lib/lang/fr.lng b/interface/web/login/lib/lang/fr.lng
index 69ca7cda5b3b18626fa0848d3211bd7039bb1c4b..98aef7dd6de00589e0c01160471bab360369e425 100644
--- a/interface/web/login/lib/lang/fr.lng
+++ b/interface/web/login/lib/lang/fr.lng
@@ -1,7 +1,7 @@
 <?php
 $wb['error_user_password_empty'] = 'Le nom d\'utilisateur ou le mot de passe sont vides.';
 $wb['error_user_password_incorrect'] = 'Le nom d\'utilisateur ou le mot de passe sont incorrects.';
-$wb['error_user_blocked'] = 'Lutilisateur a été bloqué.';
+$wb['error_user_blocked'] = 'L\'utilisateur a été bloqué.';
 $wb['error_user_too_many_logins'] = 'Trop de tentatives effectuées, essayez dans 15 minutes.';
 $wb['pass_reset_txt'] = 'Un nouveau mot de passe vous sera envoyé à votre adresse e-mail si celle-ci correspond à celle dans votre espace client.';
 $wb['pw_reset'] = 'Le mot de passe a été réinitialisé, et vous a été envoyé à votre adresse e-mail.';
@@ -14,14 +14,14 @@ $wb['pw_error_length'] = 'Le nom d\'utilisateur contient plus de que 64 caractè
 $wb['username_txt'] = 'Nom d\'utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['login_button_txt'] = 'Connexion';
-$wb['pw_lost_txt'] = 'Password lost';
-$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
+$wb['pw_lost_txt'] = 'Mot de passe perdu';
+$wb['error_maintenance_mode'] = 'Cette installation de ISPConfig est actuellement en maintenance. Nous serons de retour bientôt. Merci pour votre patience.';
 $wb['login_txt'] = 'Login';
-$wb['pw_reset_txt'] = 'Password reset';
-$wb['pw_button_txt'] = 'Resend password';
+$wb['pw_reset_txt'] = 'Réinitialiser le mot de passe';
+$wb['pw_button_txt'] = 'Renvoyer le mot de passe';
 $wb['email_txt'] = 'Email';
-$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
-$wb['back_txt'] = 'Back';
+$wb['theme_not_compatible'] = 'Le thème choisi n\'est pas compatible avecla version courante de ISPConfig. Veuillez chercher une nouvelle version du thème.<br />Le thème par defaut a été automatiquement activé.';
+$wb['back_txt'] = 'Retour';
 $wb['email_error'] = 'Email contains unallowed characters or has a invalid format.';
 $wb['stay_logged_in_txt'] = 'Keep me logged in';
 ?>
diff --git a/interface/web/mail/lib/lang/ar_mail_get.lng b/interface/web/mail/lib/lang/ar_mail_get.lng
index 09ef84edf85a573dc3339cac5399ef4a0167df8b..8ae771215180aa53b712d7d0e6c6304ec1b80570 100644
--- a/interface/web/mail/lib/lang/ar_mail_get.lng
+++ b/interface/web/mail/lib/lang/ar_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'No destination selected.';
 $wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/bg_mail_get.lng b/interface/web/mail/lib/lang/bg_mail_get.lng
index c615c1d93999c4f0eb0bcc3f93c62270e0d78f9c..e1b1935d32828122f8fcb379071d097575c23b84 100644
--- a/interface/web/mail/lib/lang/bg_mail_get.lng
+++ b/interface/web/mail/lib/lang/bg_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'No destination selected.';
 $wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/br_mail_get.lng b/interface/web/mail/lib/lang/br_mail_get.lng
index 0593b1046c1a54d920a318ff2f11ed09f1981703..801aebcda365e524d5fa9bd2ee591d9ed7c1de7f 100644
--- a/interface/web/mail/lib/lang/br_mail_get.lng
+++ b/interface/web/mail/lib/lang/br_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Destino não selecionado.';
 $wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng
index 51b9f3403edb2cb37c835192860658706fc45e34..c0914dabed3d1e413809df214b72bc20f373f4fa 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Nevybrán žádný cíl.';
 $wb['source_server_error_regex'] = 'POP3/IMAP server není validní doménový název.';
 $wb['source_read_all_txt'] = 'Načíst všechny e-maily (včetně již přečtené pošty)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_get.lng b/interface/web/mail/lib/lang/de_mail_get.lng
index cf15a18ff755f259f7bbb3feeb8f10ef6bb051a1..38ff4f8a2944f43b986302bdd010a4f75a59fee1 100644
--- a/interface/web/mail/lib/lang/de_mail_get.lng
+++ b/interface/web/mail/lib/lang/de_mail_get.lng
@@ -5,7 +5,7 @@ $wb['source_server_txt'] = 'POP3/IMAP Server';
 $wb['source_username_txt'] = 'Benutzername';
 $wb['source_password_txt'] = 'Passwort';
 $wb['source_delete_txt'] = 'E-Mails nach Empfang löschen';
-$wb["source_delete_note_txt"] = 'Bitte prüfen Sie erst, ob das Abholen funktioniert, bevor Sie diese Option aktivieren.';
+$wb['source_delete_note_txt'] = 'Bitte prüfen Sie erst, ob das Abholen funktioniert, bevor Sie diese Option aktivieren.';
 $wb['destination_txt'] = 'Ziel';
 $wb['active_txt'] = 'Aktiv';
 $wb['limit_fetchmail_txt'] = 'Die maximale Anzahl an Sammelkonto Einträgen für Ihr Konto wurde erreicht.';
diff --git a/interface/web/mail/lib/lang/el.lng b/interface/web/mail/lib/lang/el.lng
index 74c51a8931af18b1676db977232f616b94c094b9..f8cadc62f009b1763e9c1ce6e0d7efc720834792 100644
--- a/interface/web/mail/lib/lang/el.lng
+++ b/interface/web/mail/lib/lang/el.lng
@@ -11,7 +11,7 @@ $wb['Email Forward'] = 'Email Προώθησης';
 $wb['Get Email'] = 'Λήψη Email';
 $wb['Spamfilter'] = 'Φίλτρο Spam';
 $wb['Email Routing'] = 'Δρομολόγηση Email';
-$wb['Email transport'] = 'Δρομολογήση Email';
+$wb['Email transport'] = 'Μεταφορά Email';
 $wb['Mailbox'] = 'Θυρίδα';
 $wb['Autoresponder'] = 'Αυτόματη απάντηση';
 $wb['Mail Filter'] = 'Φίλτρο Mail';
@@ -44,5 +44,5 @@ $wb['Content Filter'] = 'Φίλτρο Περιεχομένου';
 $wb['Global Filters'] = 'Καθολικά Φίλτρα';
 $wb['Domain Alias'] = 'Ψευδώνυμο Domain';
 $wb['Relay Recipients'] = 'Παραλήπτες Relay';
-$wb['Mailbox quota'] = 'Όριο θυρίδας Mail';
+$wb['Mailbox quota'] = 'Mailbox quota';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_alias.lng b/interface/web/mail/lib/lang/el_mail_alias.lng
index 48d35a01abf437c98b4431235cc884a92a4c11c8..7915af451cb689077198b4d93fcdc1d09ceeb263 100644
--- a/interface/web/mail/lib/lang/el_mail_alias.lng
+++ b/interface/web/mail/lib/lang/el_mail_alias.lng
@@ -9,6 +9,6 @@ $wb['destination_error_isemail'] = 'Η διεύθυνση Email παραλήπτ
 $wb['limit_mailalias_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των ψευδωνύμων email για τον λογαριασμό σας.';
 $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email';
 $wb['domain_txt'] = 'Domain';
-$wb['duplicate_email_alias_txt'] = 'Το ψευδώνυμο για το email υπάρχει ήδη.';
-$wb['source_txt'] = 'Ψευδώνυμο';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
+$wb['source_txt'] = 'Alias';
 ?>
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 fc5c0d7bb5ecc46faf446d2f455decfc53df3814..43c0bdf5658a522b34f3badebc2ddec1849d5c5d 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
@@ -6,6 +6,6 @@ $wb['domain_error_unique'] = 'Υπάρχει ήδη μία εγγραφή Catcha
 $wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα για αυτό το domain.';
 $wb['domain_error_regex'] = 'Μη έγκρυρο όνομα domain ή το όνομα περιέχει μη επιτρεπόμενους χαρακτήρες';
 $wb['limit_mailcatchall_txt'] = 'Το μέγιστο πλήθος των email catchall για τον λογαριασμό σας, έχει εξαντληθεί.';
-$wb['source_txt'] = 'Πηγή';
-$wb['destination_error_isemail'] = 'Ο προορισμός δεν είναι έγκυρη διεύθυνση email.';
+$wb['source_txt'] = 'Source';
+$wb['destination_error_isemail'] = 'Destination is no valid email address.';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_forward.lng b/interface/web/mail/lib/lang/el_mail_forward.lng
index 78ce691b0b6b616b47530d2059a22c10a031e966..ba166179d5abdc8fc76f27dddf5d8f62f37330d5 100644
--- a/interface/web/mail/lib/lang/el_mail_forward.lng
+++ b/interface/web/mail/lib/lang/el_mail_forward.lng
@@ -5,5 +5,5 @@ $wb['active_txt'] = 'Ενεργό';
 $wb['limit_mailforward_txt'] = 'Το μέγιστο πλήθος των email forwarders για τον λογαρισμό σας, έχει εξαντληθεί';
 $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email';
 $wb['domain_txt'] = 'Domain';
-$wb['source_txt'] = 'Πηγή Email';
+$wb['source_txt'] = 'Source Email';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_get.lng b/interface/web/mail/lib/lang/el_mail_get.lng
index 1ba5c20ab34ad23a36fca8de3e8f6ce9a55469f0..0ec9645c8fda02b9900ea85ff2d729d3c858ba8f 100644
--- a/interface/web/mail/lib/lang/el_mail_get.lng
+++ b/interface/web/mail/lib/lang/el_mail_get.lng
@@ -4,7 +4,7 @@ $wb['type_txt'] = 'Τύπος';
 $wb['source_server_txt'] = 'Pop3/Imap Server';
 $wb['source_username_txt'] = 'Όνομα Χρήστη';
 $wb['source_password_txt'] = 'Συνθηματικό';
-$wb['source_delete_txt'] = 'Διαγραφή email μετά την ανάκτηση';
+$wb['source_delete_txt'] = 'Διαγραφή email μετά την απόκτηση';
 $wb['destination_txt'] = 'Προορισμός';
 $wb['active_txt'] = 'Ενεργός';
 $wb['limit_fetchmail_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των εγγραφών Fetchmail για τον λογαριασμό σας.';
@@ -14,5 +14,6 @@ $wb['source_password_error_isempty'] = 'Το Συνθηματικό δεν έχ
 $wb['destination_error_isemail'] = 'Δεν επιλέχθηκε προορισμός.';
 $wb['source_server_error_regex'] = 'Το όνομα του Pop3/Imap Server δεν είναι έγκυρο.';
 $wb['source_read_all_txt'] = 'Ανάκτηση όλων των emails (συμπερ. αναγνωσμένων mails)';
-$wb['error_delete_read_all_combination'] = 'Μη έγκυρος συνδυασμός επιλογών. Δεν μπορείτε να χρησιμοποιήσετε την επιλογή  \\"Διαγραφή email μετά την ανάκτηση\\" = ΟΧΙ μαζί με \\"Ανάκτηση όλων των emails\\" = ΝΑΙ';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist.lng b/interface/web/mail/lib/lang/el_mail_mailinglist.lng
index 6384e115f24c984bfbaf670d1c2d01d721e83f0c..1942ea5a5bae9583b019e25cd93b242bc2b94473 100644
--- a/interface/web/mail/lib/lang/el_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/el_mail_mailinglist.lng
@@ -2,21 +2,21 @@
 $wb['limit_mailmailinglist_txt'] = 'Το όριο ξεπεράστηκε.';
 $wb['domain_error_empty'] = 'Το Domain είναι άδειο.';
 $wb['listname_error_empty'] = 'Η λίστα είναι άδεια.';
-$wb['domain_error_regex'] = 'Το όνομα domain δεν είναι έγκυρο';
+$wb['domain_error_regex'] = 'Το όνομα domain δεν είναι έγκυρο/';
 $wb['email_in_use_txt'] = 'Το email χρησιμοποιείται ήδη.';
 $wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα σε αυτό το domain.';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$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'] = 'Συνθηματικό';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.';
-$wb['listname_error_unique'] = 'Υπάρχει ήδη μια λίστα mail με αυτό το όνομα στον server. Παρακαλούμε επιλέξτε ένα διαφορετικό όνομα.';
-$wb['email_error_isemail'] = 'Η διεύθυνση email δεν είναι έγκυρη';
-$wb['mailinglist_txt'] = 'Λίστα Mail';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
+$wb['email_error_isemail'] = 'Email address is invalid.';
+$wb['mailinglist_txt'] = 'Mailing list';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter.lng b/interface/web/mail/lib/lang/el_mail_spamfilter.lng
index 5c6d90431fdb4ec6c8780d7152684454d89fa0d4..48c4eaa4cdf3c060c9bea1bcf795e73fe55ba737 100644
--- a/interface/web/mail/lib/lang/el_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/el_mail_spamfilter.lng
@@ -1,12 +1,12 @@
 <?php
 $wb['email_txt'] = 'Email';
-$wb['spam_rewrite_score_int_txt'] = 'Σκορ Επανεγγραφής';
+$wb['spam_rewrite_score_int_txt'] = 'Σκορ Επανεγγαφής';
 $wb['spam_redirect_score_int_txt'] = 'Σκορ Ανακατεύθυνσης';
 $wb['spam_delete_score_int_txt'] = 'Σκορ Διαγραφής';
-$wb['spam_rewrite_subject_txt'] = 'Επανεγγραφή τίτλου';
+$wb['spam_rewrite_subject_txt'] = 'Επανεγγαφή τίτλου';
 $wb['spam_redirect_maildir_txt'] = 'Ανακατεύθυνση θυρίδας';
 $wb['active_txt'] = 'Ενεργό';
-$wb['spam_rewrite_txt'] = 'Επανεγγραφή τίτλου πάνω από αυτό το σκορ.';
+$wb['spam_rewrite_txt'] = 'Επανεγγαφή τίτλου πάνω από αυτό το σκορ.';
 $wb['spam_redirect_txt'] = 'Ανακατεύθυνση email με μεγαλύτερο σκορ σε αυτή την θυρίδα.';
 $wb['spam_delete_txt'] = 'Διαγραφή email με μεγαλύτερο σκορ';
 $wb['disable_txt'] = 'Σημείωση: Για να απενεργοποιήσετε μια επιλογή φίλτρου, βάλτε για σκορ 0.00.';
diff --git a/interface/web/mail/lib/lang/el_mail_transport.lng b/interface/web/mail/lib/lang/el_mail_transport.lng
index 8f6c2903b313c42c78ef962762e069a3811c3cbe..1b1a5c7ab4a0229b7824bf031df672fd926d7a6e 100644
--- a/interface/web/mail/lib/lang/el_mail_transport.lng
+++ b/interface/web/mail/lib/lang/el_mail_transport.lng
@@ -7,5 +7,5 @@ $wb['mx_txt'] = 'Να μην γίνει lookup στον MX';
 $wb['sort_order_txt'] = 'Ταξινόμηση κατά';
 $wb['active_txt'] = 'Ενεργό';
 $wb['limit_mailrouting_txt'] = 'Το μέγιστο πλήθος των δρομολογήσεων email για τον λογαριασμό σας, εξαντλήθηκε.';
-$wb['transport_txt'] = 'Δρομολογήση';
+$wb['transport_txt'] = 'Transport';
 ?>
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 d809edf0b12d7ee357050d53ab4783629dedd129..249eee9e5cd1f6c6f99ce6be10dcfd599cc62396 100644
--- a/interface/web/mail/lib/lang/el_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_transport_list.lng
@@ -3,7 +3,7 @@ $wb['list_head_txt'] = 'Προχωρημένη Δρομολογήση Email ';
 $wb['active_txt'] = 'Ενεργό';
 $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
-$wb['transport_txt'] = 'Δρομολογήση';
+$wb['transport_txt'] = 'Μεταφορά';
 $wb['sort_order_txt'] = 'Ταξινόμηση κατά';
-$wb['add_new_record_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 e59dd1ce14de742ba499b911a86dd035176d236a..147874c53f501ee9d2ec252cb238997354151ae2 100644
--- a/interface/web/mail/lib/lang/el_mail_user.lng
+++ b/interface/web/mail/lib/lang/el_mail_user.lng
@@ -2,7 +2,7 @@
 $wb['custom_mailfilter_txt'] = 'Προσαρμοσμένο φίλτρο';
 $wb['email_txt'] = 'Email';
 $wb['cryptpwd_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
 $wb['active_txt'] = 'Ενεργό';
 $wb['email_error_isemail'] = 'Η διεύθυνση Email δεν είναι έγκυρη.';
 $wb['email_error_unique'] = 'Διπλή διεύθυνση Email.';
@@ -16,13 +16,13 @@ $wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα σε αυτό τ
 $wb['error_no_pwd'] = 'Το συνθηματικό δεν έχει οριστεί.';
 $wb['quota_error_isint'] = 'Το μέγεθος της θυρίδας πρέπει να είναι αριθμός.';
 $wb['quota_txt'] = 'Όριο χώρου';
-$wb['server_id_txt'] = 'Server_id';
+$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['no_policy'] = '- ανενεργή -';
 $wb['limit_mailbox_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των θυρίδων για τον λογαριασμό σας.';
 $wb['limit_mailquota_txt'] = 'Έχετε φτάσει στο μέγεστο χώρο της θυρίδα σας.Ο μέγιστος διαθέσιμος χώρος σε MB είναι';
 $wb['disableimap_txt'] = 'Απενεργοποίηση IMAP';
@@ -41,13 +41,13 @@ $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.';
-$wb['autoresponder_subject_txt'] = 'Θέμα Email';
-$wb['autoresponder_subject'] = 'Εκτός γραφείου';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.';
+$wb['autoresponder_subject_txt'] = 'Email Subject';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
-$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
 ?>
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 09613b4c4dd399a3160bff76f29d04f5457df0f5..7e3f57bb72ba25148d7f3734d25c18b18a78f890 100644
--- a/interface/web/mail/lib/lang/el_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_list.lng
@@ -4,5 +4,5 @@ $wb['email_txt'] = 'Email';
 $wb['autoresponder_txt'] = 'Αυτόματη απάντηση';
 $wb['add_new_record_txt'] = 'Νέα Θυρίδα';
 $wb['name_txt'] = 'Πραγματικό Όνομα';
-$wb['login_txt'] = 'Είσοδος';
+$wb['login_txt'] = 'Login';
 ?>
diff --git a/interface/web/mail/lib/lang/el_spamfilter_users.lng b/interface/web/mail/lib/lang/el_spamfilter_users.lng
index 1a39474fbeb8c751435c73277871d99d27d3358e..b6da2d1e15dc3ea54c0ce3c3d206d80fbd4065c3 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_users.lng
@@ -5,8 +5,8 @@ $wb['policy_id_txt'] = 'Πολιτική';
 $wb['email_txt'] = 'Email (Μοτίβο)';
 $wb['fullname_txt'] = 'Όνομα';
 $wb['local_txt'] = 'Τοπικός';
-$wb['email_error_notempty'] = 'Η διεύθυνση email δεν πρέπει να είναι κενή.';
-$wb['fullname_error_notempty'] = 'Το όνομα δεν πρέπει να είναι κενό.';
+$wb['email_error_notempty'] = 'The email address must not be empty.';
+$wb['fullname_error_notempty'] = 'The name must not be empty.';
 $wb['10 - highest'] = '10 - highest';
 $wb['5 - medium'] = '5 - medium';
 $wb['1 - lowest'] = '1 - lowest';
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 2e8651f89d4537a25b04bfbd5a04c0d4a96efec4..8c404070378f9d163321d732241fff91ab902e63 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
@@ -4,5 +4,5 @@ $wb['quota_txt'] = 'Όριο';
 $wb['name_txt'] = 'Όνομα';
 $wb['email_txt'] = 'Διεύθυνση Email';
 $wb['used_txt'] = 'Χώρος σε χρήση';
-$wb['percentage_txt'] = 'Χρήση %';
+$wb['percentage_txt'] = 'Used %';
 ?>
diff --git a/interface/web/mail/lib/lang/es_mail_get.lng b/interface/web/mail/lib/lang/es_mail_get.lng
index 64db403cc26c8d92dac8227101e9af0742064d35..91a4c26a4828e4495cea66cec56806def236973f 100644
--- a/interface/web/mail/lib/lang/es_mail_get.lng
+++ b/interface/web/mail/lib/lang/es_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'No se ha seleccionado el destino.';
 $wb['source_server_error_regex'] = 'Servidor POP3/IMAP no es un nombre de dominio válido.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \'Delete emails after retrieval\' = no together with \'Retrieve all emails\' = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/fi_mail_get.lng b/interface/web/mail/lib/lang/fi_mail_get.lng
index 065d149b951accf4ccb367dc8e10265ea7fb3f33..063a37bf04a8a9ab33532deb3cc8a78b5eabb515 100755
--- a/interface/web/mail/lib/lang/fi_mail_get.lng
+++ b/interface/web/mail/lib/lang/fi_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Ei kohdetta valittuna.';
 $wb['source_server_error_regex'] = 'Pop3/Imap-palvelin ei ole kelvollinen osoite.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_get.lng b/interface/web/mail/lib/lang/fr_mail_get.lng
index b0097458670e5ed717fa227b7c57cb63559c83ef..6779ce3c42a5f9b2924924f5235dd9334e83e4bc 100644
--- a/interface/web/mail/lib/lang/fr_mail_get.lng
+++ b/interface/web/mail/lib/lang/fr_mail_get.lng
@@ -14,5 +14,6 @@ $wb['source_password_error_isempty'] = 'Le mot de passe est vide.';
 $wb['destination_error_isemail'] = 'Pas de destination sélectionnée.';
 $wb['source_server_error_regex'] = 'Le serveur POP3 / IMAP n\'est pas un nom de domaine valide.';
 $wb['source_read_all_txt'] = 'Récupérer tous les emails (incl. les emails lus)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['error_delete_read_all_combination'] = 'Combinaison d\'options non autorisée. Vous ne pouvez pas utiliser \"Supprimer les emails après récupération\" = non avec \"Récupérer tous les emails\" = oui';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng
index 945fb8caa3d5b0aa704e8bcb539976e3d942cb3d..8ed01af532e956ab4e754be251d2dbe254c2132c 100644
--- a/interface/web/mail/lib/lang/fr_mail_user.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user.lng
@@ -53,7 +53,7 @@ $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
 $wb['monthly_backup_txt'] = 'Monthly';
+$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
-$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng b/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng
index 9e5b4b979fe18d95abba4ee7ac462ac638ca5880..8d3208350194690e95c0095e0e472f34e1ab83ed 100644
--- a/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng
@@ -4,5 +4,5 @@ $wb['email_txt'] = 'Email';
 $wb['this_month_txt'] = 'Le mois en cours';
 $wb['last_month_txt'] = 'Le mois dernier';
 $wb['this_year_txt'] = 'L\'année en cours';
-$wb['last_year_txt'] = 'Lannée dernière';
+$wb['last_year_txt'] = 'L\'année dernière';
 ?>
diff --git a/interface/web/mail/lib/lang/hr_mail_get.lng b/interface/web/mail/lib/lang/hr_mail_get.lng
index 6d14eabcc16b65755c7d871e66b3488e159069c9..18c53a4d532ac3d7ca68148a7017ab52a6867f91 100644
--- a/interface/web/mail/lib/lang/hr_mail_get.lng
+++ b/interface/web/mail/lib/lang/hr_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'No destination selected.';
 $wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/hu_mail_get.lng b/interface/web/mail/lib/lang/hu_mail_get.lng
index d3b2a12efd9ad72eb49f2fdb51052493c11d423b..59cb26dd6af809a4666862159fec4a37ad587f84 100644
--- a/interface/web/mail/lib/lang/hu_mail_get.lng
+++ b/interface/web/mail/lib/lang/hu_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Nem választott címzettet.';
 $wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/id_mail_get.lng b/interface/web/mail/lib/lang/id_mail_get.lng
index 1d191c08d4fb07e68c7913e3cd9c2383e078c8f9..cec2466f28865a33b73c1500dfde9029c290cbff 100644
--- a/interface/web/mail/lib/lang/id_mail_get.lng
+++ b/interface/web/mail/lib/lang/id_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Tidak ada tujuan yang dipilih.';
 $wb['source_server_error_regex'] = 'Server Pop3/Imap bukan merupakan nama domain yang valid.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_get.lng b/interface/web/mail/lib/lang/it_mail_get.lng
index 09ef84edf85a573dc3339cac5399ef4a0167df8b..8ae771215180aa53b712d7d0e6c6304ec1b80570 100644
--- a/interface/web/mail/lib/lang/it_mail_get.lng
+++ b/interface/web/mail/lib/lang/it_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'No destination selected.';
 $wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/ja_mail_get.lng b/interface/web/mail/lib/lang/ja_mail_get.lng
index d5f5c5c912f59e0d2d4a400832bd4e17ce25c0b7..3c5c9ec092f412cf245c1584fa2bf8574cf91c52 100644
--- a/interface/web/mail/lib/lang/ja_mail_get.lng
+++ b/interface/web/mail/lib/lang/ja_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = '宛先を選択してください。';
 $wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/nl_mail_get.lng b/interface/web/mail/lib/lang/nl_mail_get.lng
index e62b547ef4b2ff07e750522204739901f38d0a29..5cbeab14e71c65c41eed389fae10e3dda398b44f 100644
--- a/interface/web/mail/lib/lang/nl_mail_get.lng
+++ b/interface/web/mail/lib/lang/nl_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Geen bestemming geselecteerd.';
 $wb['source_server_error_regex'] = 'Pop3/Imap server is geen geldige domeinnaam.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng
index fdac040bf9b6957c0c37f765372ff02f7492b83c..8916449e465adb4d7e2c655c293675e74cde10a9 100644
--- a/interface/web/mail/lib/lang/pl_mail_get.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Nie wybrano elementu docelowego.';
 $wb['source_server_error_regex'] = 'Serwer Pop3/Imap nie jest poprawną nazwą domenową.';
 $wb['source_read_all_txt'] = 'Pobierz wszystkie maile (razem z przeczytanymi)';
 $wb['error_delete_read_all_combination'] = 'Nieprawidłowa kombinacja opcji. Nie możesz użyć jednocześnie opcji Delete emails after retrieval = no razem z Retrieve all emails = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/pt_mail_get.lng b/interface/web/mail/lib/lang/pt_mail_get.lng
index c52ed1b7152359e7a9751c678380ccb1f82ca778..883279a2d54f1776e29907b269f5b29493953e01 100644
--- a/interface/web/mail/lib/lang/pt_mail_get.lng
+++ b/interface/web/mail/lib/lang/pt_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Destino não seleccionado.';
 $wb['source_server_error_regex'] = 'Servidor Pop3/Imap não é um nome de domínio válido.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/ro_mail_get.lng b/interface/web/mail/lib/lang/ro_mail_get.lng
index fe58991ef5295e4efbb6d4e6a752cfb38cefe6e7..5e0a590f709180c7d897bb8e1b9987e9eedab3dd 100644
--- a/interface/web/mail/lib/lang/ro_mail_get.lng
+++ b/interface/web/mail/lib/lang/ro_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Nici o destinatie nu e selectata';
 $wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_mail_get.lng b/interface/web/mail/lib/lang/ru_mail_get.lng
index f805f11bf7684f869a3a6e3949f593fee0098910..dfc846b4cae7093d7081873db177251f60e30e3c 100644
--- a/interface/web/mail/lib/lang/ru_mail_get.lng
+++ b/interface/web/mail/lib/lang/ru_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Не выбран получатель.';
 $wb['source_server_error_regex'] = 'Неверное доменное имя для сервера Pop3/Imap.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/se_mail_get.lng b/interface/web/mail/lib/lang/se_mail_get.lng
index 09ef84edf85a573dc3339cac5399ef4a0167df8b..8ae771215180aa53b712d7d0e6c6304ec1b80570 100644
--- a/interface/web/mail/lib/lang/se_mail_get.lng
+++ b/interface/web/mail/lib/lang/se_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'No destination selected.';
 $wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/sk_mail_get.lng b/interface/web/mail/lib/lang/sk_mail_get.lng
index 96fc31c50f81b59f409ff89ad150d455a8c0fb00..e43899965deb6f01a585b232a306cddc19cf0f2d 100644
--- a/interface/web/mail/lib/lang/sk_mail_get.lng
+++ b/interface/web/mail/lib/lang/sk_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Žiadny Cieľ nebol vybraný.';
 $wb['source_server_error_regex'] = 'Pop3/Imap Server nie je valídne doménové meno.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/tr_mail_get.lng b/interface/web/mail/lib/lang/tr_mail_get.lng
index 18748afeb9fd6616d623e11e768af9e0b30af775..8acb36187e1ed15698741e3108d248ebd9c492b7 100644
--- a/interface/web/mail/lib/lang/tr_mail_get.lng
+++ b/interface/web/mail/lib/lang/tr_mail_get.lng
@@ -15,4 +15,5 @@ $wb['destination_error_isemail'] = 'Hedef seçilmedi.';
 $wb['source_server_error_regex'] = 'Pop3/Imap Sunucu geçerli bir domaine sahip değil.';
 $wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
 $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/el.lng b/interface/web/mailuser/lib/lang/el.lng
index fae2ad90617dd8ed3e5867eb5d1305ee45f20298..114dec9b9195adcaa18ca636b75e5d162569d6b1 100644
--- a/interface/web/mailuser/lib/lang/el.lng
+++ b/interface/web/mailuser/lib/lang/el.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['Email Account'] = 'Λογαριασμός Email';
-$wb['Overview'] = 'Επισκόπηση';
-$wb['Password'] = 'Συνθηματικό';
-$wb['Autoresponder'] = 'Αυτόματη Απάντηση';
-$wb['Send copy'] = 'Αποστολή Αντιγράφου';
-$wb['Spamfilter'] = 'Φίλτρο Spam';
-$wb['Email Filters'] = 'Φίλτρα Email';
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
 ?>
diff --git a/interface/web/mailuser/lib/lang/el_index.lng b/interface/web/mailuser/lib/lang/el_index.lng
index b182b45871d0cea5785f4e5874518803db331fcd..29fe9ea4f343d75e1f37cb820d2d1bbeff934e3a 100644
--- a/interface/web/mailuser/lib/lang/el_index.lng
+++ b/interface/web/mailuser/lib/lang/el_index.lng
@@ -1,12 +1,12 @@
 <?php
-$wb['page_head_txt'] = 'Ρυθμίσεις θυρίδας Email';
-$wb['page_desc_txt'] = 'Εδώ μπορείτε να ρυθμίσετε τον λογαριασμό email.';
-$wb['email_txt'] = 'Διεύθυνση Email';
-$wb['login_txt'] = 'Είσοδος';
-$wb['server_address_txt'] = 'Διεύθυνση Mailserver';
-$wb['cc_txt'] = 'Αποστολή αντιγράφου σε (CC)';
-$wb['quota_txt'] = 'Μέγεθος θυρίδας Email';
-$wb['unlimited_txt'] = 'Απεριόριστο';
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
 $wb['mb_txt'] = 'MB';
-$wb['none_txt'] = 'Κανένα';
+$wb['none_txt'] = 'None';
 ?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
index 529ba60cac83e9a7afcef265c9e1039cbba0bd4a..79f386a7dc9da88380ae34d006d729d79894b549 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
 <?php
-$wb['mailbox_autoresponder_txt'] = 'Αυτόματη Απάντηση';
-$wb['autoresponder_subject'] = 'Απάντηση όταν είστε εκτός γραφείου';
-$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['autoresponder_active'] = 'Ενεργοποίηση αυτόματης απάντησης';
-$wb['now_txt'] = 'Τώρα';
-$wb['autoresponder_subject_txt'] = 'Αυτόματη Απάντηση';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
+$wb['autoresponder_active'] = 'Enable the autoresponder';
+$wb['now_txt'] = 'Now';
+$wb['autoresponder_subject_txt'] = 'Betreff';
 ?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_cc.lng b/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
index 819101e2deffd356587a263e80ee0492cf396cfe..81877884cce3a2bda6651068a61e473fad2882ce 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['mailbox_cc_txt'] = 'Αποστολή αντιγράφου στο email';
-$wb['cc_txt'] = 'Αποστολή αντιγράφου σε';
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
 $wb['email_txt'] = 'Email';
-$wb['cc_error_isemail'] = 'Μη έγκυρη διεύθυνση Email στο πεδίο -Αποστολή αντιγράφου σε-';
-$wb['email_is_cc_error'] = 'Η διεύθυνση Email και η -Αποστολή αντιγράφου στο email- δεν μπορούν να είναι ίδιες.';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng
index bec79e639f1c66ee255a6485b2f6c3420f2316cf..2e74ffd4f748764a60687b3378f87cdf1bab01c3 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng
@@ -1,20 +1,20 @@
 <?php
-$wb['rulename_txt'] = 'Όνομα';
-$wb['action_txt'] = 'Ενέργεια';
-$wb['target_txt'] = 'Φάκελος';
-$wb['active_txt'] = 'Ενεργό';
-$wb['rulename_error_empty'] = 'Το όνομα είναι κενό.';
-$wb['searchterm_is_empty'] = 'Ο όρος αναζήτησης είναι κενός.';
-$wb['source_txt'] = 'Πηγή';
-$wb['target_error_regex'] = 'Ο στόχος μπορεί να περιέχει μόνο αυτούς τους χαρακτήρες: a-z, 0-9, -, ., _, και {κενό}';
-$wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος φίλτρων mail.';
-$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'] = 'Διαγραφή';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
+$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';
 ?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng
index dd2ae1d6cabf47dad1f7c41a08bf022f63d6da55..fb6b9dfa5d7523d6196446128aa96d6a564bfa42 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Κανόνες Φίλτρων Email';
-$wb['rulename_txt'] = 'Όνομα';
-$wb['add_new_record_txt'] = 'Προσθήκη νέου Φίλτρου';
-$wb['page_txt'] = 'Σελίδα';
-$wb['page_of_txt'] = 'από';
-$wb['delete_confirmation'] = 'Είστε σίγουροι ότι θέλετε να διαγράψετε το Φίλτρο Mail?';
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
 ?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_password.lng b/interface/web/mailuser/lib/lang/el_mail_user_password.lng
index 61b976191db4f18cbdcab19fe265ac3bf68ec647..cdf9674e702c16e13a9c7ab9760eea34097e2fce 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_password.lng
@@ -1,10 +1,10 @@
 <?php
-$wb['mailbox_password_txt'] = 'Συνθηματικό θυρίδας Mail';
-$wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Δϋναμη Συνθηματικού';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
 $wb['email_txt'] = 'Email';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng
index 15ea90c9b8afd2cacd8692da2d5dbbae5fee8ccd..be4bad90504b47914b13a01b95158a862024839e 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['mailbox_spamfilter_txt'] = 'Φίλτρο Spam';
-$wb['spamfilter_txt'] = 'Φίλτρο Spam';
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
 $wb['email_txt'] = 'Email';
-$wb['no_policy'] = '- ανενεργό -';
-$wb['policy_txt'] = 'Πολιτική';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
 ?>
diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng
index eb91a59960879d309dcb2120aa608fa79a733595..d840b6bb68aea1f5e9986e00bb1d93bcba660854 100644
--- a/interface/web/monitor/lib/lang/el.lng
+++ b/interface/web/monitor/lib/lang/el.lng
@@ -145,11 +145,11 @@ $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';
-$wb['monitor_serverstate_raidresync_txt'] = 'Το RAID βρίσκεται σε κατάσταση επανασυγχρονισμού';
-$wb['Show Monit'] = 'Εμφάνιση Monit';
-$wb['no_monit_url_defined_txt'] = 'Δεν καθορίστηκε URL για το Monit.';
-$wb['no_permissions_to_view_monit_txt'] = 'Δεν επιτρέπεται η πρόσβαση στο Monit.';
-$wb['Show Munin'] = 'Εμφάνιση Munin';
-$wb['no_munin_url_defined_txt'] = 'Δεν καθορίστηκε URL για το Munin.';
-$wb['no_permissions_to_view_munin_txt'] = 'Δεν επιτρέπεται η πρόσβαση στο Munin.';
+$wb['monitor_serverstate_raidresync_txt'] = 'Your RAID is in RESYNC mode';
+$wb['Show Monit'] = 'Show Monit';
+$wb['no_monit_url_defined_txt'] = 'No Monit URL defined.';
+$wb['no_permissions_to_view_monit_txt'] = 'You are not allowed to access Monit.';
+$wb['Show Munin'] = 'Show Munin';
+$wb['no_munin_url_defined_txt'] = 'No Munin URL defined.';
+$wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.';
 ?>
diff --git a/interface/web/monitor/lib/lang/el_datalog_list.lng b/interface/web/monitor/lib/lang/el_datalog_list.lng
index f2a5d32732640026a0fb7acaa60654e91a5333ec..8ad63ffd42b46c9c52357d5bcb5ef2f4e1cab9aa 100644
--- a/interface/web/monitor/lib/lang/el_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/el_datalog_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Ουρά Ενεργειών';
-$wb['tstamp_txt'] = 'Ημερομηνία';
+$wb['list_head_txt'] = 'Jobqueue';
+$wb['tstamp_txt'] = 'Date';
 $wb['server_id_txt'] = 'Server';
-$wb['dbtable_txt'] = 'Πίνακας DB';
-$wb['action_txt'] = 'Ενέργεια';
-$wb['status_txt'] = 'Κατάσταση';
+$wb['dbtable_txt'] = 'DB Table';
+$wb['action_txt'] = 'Action';
+$wb['status_txt'] = 'Status';
 ?>
diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng
index d98a6f65b457c9efd6898b32718f9aaed2cc176b..16d12d427d381e1dc740bc8d09895e44398a2e0a 100644
--- a/interface/web/monitor/lib/lang/fr.lng
+++ b/interface/web/monitor/lib/lang/fr.lng
@@ -5,8 +5,8 @@ $wb['System load 1 minute'] = 'Charge du système sur 1 minute';
 $wb['System load 5 minutes'] = 'Charge du système sur 5 minutes';
 $wb['System load 15 minutes'] = 'Charge du système sur 15 minutes';
 $wb['Server Load'] = 'Charge du serveur';
-$wb['Disk usage'] = 'Usage disque';
-$wb['Memory usage'] = 'Utilisation mémoire';
+$wb['Disk usage'] = 'Utilisation du disque';
+$wb['Memory usage'] = 'Utilisation de la mémoire';
 $wb['no_data_serverload_txt'] = 'Aucune donnée concernant la charge du serveur actuellement. Réésayez plus tard.';
 $wb['no_data_memusage_txt'] = 'Aucune donnée concernant lutilisation mémoire actuellement. Réésayez plus tard.';
 $wb['no_data_diskusage_txt'] = 'Aucune donnée concernant lusage disque actuellement. Réésayez plus tard.';
@@ -146,15 +146,15 @@ $wb['monitor_title_iptables_txt'] = 'Règles IPTables';
 $wb['monitor_title_beancounter_txt'] = 'Compteur OpenVz VE';
 $wb['monitor_updates_nosupport_txt'] = 'Votre distribution nest pas supportée par le moniteur';
 $wb['monitor_beancounter_nosupport_txt'] = 'Ce serveur n\'est pas un VE OpenVz et n\'a pas d\'information de compteur';
-$wb['Show Monit'] = 'Show Monit';
-$wb['no_monit_url_defined_txt'] = 'No Monit URL defined.';
-$wb['no_permissions_to_view_monit_txt'] = 'You are not allowed to access Monit.';
-$wb['Show Munin'] = 'Show Munin';
-$wb['no_munin_url_defined_txt'] = 'No Munin URL defined.';
-$wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.';
 $wb['no_data_database_size_txt'] = 'No data about the database usage available at the moment. Please check again later.';
 $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show Monit'] = 'Afficher Monit';
+$wb['no_monit_url_defined_txt'] = 'Aucune URL définie pour Monit.';
+$wb['no_permissions_to_view_monit_txt'] = 'Vous n\'avez pas la permission d\'accéder à Monit.';
+$wb['Show Munin'] = 'Afficher Munin';
+$wb['no_munin_url_defined_txt'] = 'Aucune URL définie pour Munin.';
+$wb['no_permissions_to_view_munin_txt'] = 'Vous n\'avez pas la permission d\'accéder à Munin.';
 ?>
diff --git a/interface/web/monitor/lib/lang/fr_datalog_list.lng b/interface/web/monitor/lib/lang/fr_datalog_list.lng
index e47b9f09e6c0631c039d7e3652bff5c92891159e..32fd5d9427330b320fd7b334e355bfab5f9f7380 100644
--- a/interface/web/monitor/lib/lang/fr_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/fr_datalog_list.lng
@@ -4,5 +4,5 @@ $wb['tstamp_txt'] = 'Date';
 $wb['server_id_txt'] = 'Serveur';
 $wb['dbtable_txt'] = 'Table DB';
 $wb['action_txt'] = 'Action';
-$wb['status_txt'] = 'Status';
+$wb['status_txt'] = 'Statut';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_cron.lng b/interface/web/sites/lib/lang/ar_cron.lng
index 01f418f56e42bfecf91bb8a0ac0aff58be3d4b32..369c3b8bbd70ca6152aeeaea9f5f1ce14102043d 100644
--- a/interface/web/sites/lib/lang/ar_cron.lng
+++ b/interface/web/sites/lib/lang/ar_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_cron.lng b/interface/web/sites/lib/lang/bg_cron.lng
index 64c431573e9d7d474e01b1965231d8c7b5ddf487..e44f26cce552280e771dce60645f6e0201ab368a 100644
--- a/interface/web/sites/lib/lang/bg_cron.lng
+++ b/interface/web/sites/lib/lang/bg_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Грешен формат за ден от се
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/br_cron.lng b/interface/web/sites/lib/lang/br_cron.lng
index 13592b3dd1fbe1440ac4f6dcf407e6def20b7f2b..dc7b49b7b4fb8430766d0d966b18610317dadfef 100644
--- a/interface/web/sites/lib/lang/br_cron.lng
+++ b/interface/web/sites/lib/lang/br_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Formato dos dias da semana inválido.';
 $wb['command_error_format'] = 'Formato de comando inválido. Somente endereços url http/https são permitidos.';
 $wb['unknown_fieldtype_error'] = 'Um tipo desconhecido de campo foi usado.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng
index fab238d56e3bab52fdbb6eba75a5bc1de47927ac..fd4ec4d0cfcbaa109454a0dbbd498990da2424e1 100644
--- a/interface/web/sites/lib/lang/cz_cron.lng
+++ b/interface/web/sites/lib/lang/cz_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Chybný formát pro dny týdne.';
 $wb['command_error_format'] = 'Chybná formát příkazu. V případě URL je povoleno volání pouze http/https.';
 $wb['unknown_fieldtype_error'] = 'Bylo použito pole neznámého typu.';
 $wb['server_id_error_empty'] = 'ID serveru je prázdné.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/el.lng b/interface/web/sites/lib/lang/el.lng
index f7d1e4f87262ce40cb9b38bd105137acd5c9122a..2d726140fd1ab7fbb29729f4f8016ba02f761288 100644
--- a/interface/web/sites/lib/lang/el.lng
+++ b/interface/web/sites/lib/lang/el.lng
@@ -4,17 +4,17 @@ $wb['Website'] = 'Website';
 $wb['Subdomain'] = 'Subdomain για το website';
 $wb['Aliasdomain'] = 'Ψευδώνυμο domain για το website';
 $wb['Database'] = 'Βάση Δεδομένων';
-$wb['Web Access'] = 'Πρόσβαση Web';
+$wb['Web Access'] = 'Web Access';
 $wb['FTP-User'] = 'Χρήστης FTP';
 $wb['Webdav-User'] = 'Χρήστης Webdav';
-$wb['Folder'] = 'Προστατευμένοι Φάκελοι';
-$wb['Folder users'] = 'Χρήστες Προστατευμένων Φακέλων';
-$wb['Command Line'] = 'Γραμμή Εντολών';
-$wb['Shell-User'] = 'Χρήστης Κελύφους';
+$wb['Folder'] = 'Protected Folders';
+$wb['Folder users'] = 'Protected Folder Users';
+$wb['Command Line'] = 'Command Line';
+$wb['Shell-User'] = 'Χρήστης Shell';
 $wb['Cron Jobs'] = 'Εργασίες Cron';
 $wb['Statistics'] = 'Στατιστικά';
 $wb['Web traffic'] = 'Κίνηση Web';
-$wb['Website quota (Harddisk)'] = 'Όριο δίσκου Website (Δίσκος)';
+$wb['Website quota (Harddisk)'] = 'Όριο δίσκου Website (Harddisk)';
 $wb['Cron'] = 'Cron';
 $wb['Stats'] = 'Στατιστικά';
 $wb['Shell'] = 'Shell';
@@ -25,11 +25,11 @@ $wb['Domain'] = 'Domain';
 $wb['Redirect'] = 'Ανακατεύθυνση';
 $wb['SSL'] = 'SSL';
 $wb['Sites'] = 'Sites';
-$wb['Database User'] = 'Χρήστες Βάσης Δεδομένων';
-$wb['APS Installer'] = 'Εγκαταστάτης APS';
-$wb['Available packages'] = 'Διαθέσιμα Πακέτα';
-$wb['Installed packages'] = 'Εγκατεστημένα Πακέτα';
-$wb['Update Packagelist'] = 'Ενημέρωση Λίστας Πακέτων';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
 $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)';
-$wb['error_proxy_requires_url'] = 'Ο τύπος ανακατεύθυνσης \\"proxy\\" απαιτεί ένα URL ως το μονοπάτι ανακατεύθυνσης.';
+$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
 ?>
diff --git a/interface/web/sites/lib/lang/el_aps.lng b/interface/web/sites/lib/lang/el_aps.lng
index ee6105eff38b1204ed9ca8655a03885c0c1e5e51..29fb7b6a40de911e18acadb73479b1da703cbfe9 100644
--- a/interface/web/sites/lib/lang/el_aps.lng
+++ b/interface/web/sites/lib/lang/el_aps.lng
@@ -1,58 +1,58 @@
 <?php
-$wb['overview_txt'] = 'Επισκόπηση';
-$wb['administration_txt'] = 'Διαχείριση';
-$wb['available_packages_txt'] = 'Διαθέσιμα Πακέτα';
-$wb['installed_packages_txt'] = 'Εγκατεστημένα Πακέτα';
-$wb['yes_txt'] = 'Ναι';
-$wb['no_txt'] = 'Όχι';
-$wb['invalid_id_txt'] = 'Δεν έχει εισαχθεί έγκυρο ID.';
-$wb['details_txt'] = 'Λεπτομέρειες';
-$wb['version_txt'] = 'Έκδοση';
-$wb['category_txt'] = 'Κατηγορία';
-$wb['homepage_txt'] = 'Αρχική Σελίδα';
-$wb['supported_languages_txt'] = 'Υποστηριζόμενες Γλώσσες';
-$wb['description_txt'] = 'Περιγραφή';
-$wb['config_script_txt'] = 'Script Ρυθμίσεων';
-$wb['installed_size_txt'] = 'Μέγεθος μετά την εγκατάσταση';
-$wb['license_txt'] = 'Άδεια Χρήσης';
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
 $wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Αρχείο αλλαγών έκδοσης';
-$wb['server_requirements_txt'] = 'Απαιτήσεις Server';
-$wb['php_extensions_txt'] = 'Επεκτάσεις PHP';
-$wb['php_settings_txt'] = 'Ρυθμίσεις PHP';
-$wb['supported_php_versions_txt'] = 'Υποστηριζόμενες Εκδόσεις PHP';
-$wb['database_txt'] = 'Βάση Δεδομένων';
-$wb['settings_txt'] = 'Ρυθμίσεις';
-$wb['install_package_txt'] = 'Εγκατάσταση Πακέτου';
-$wb['installation_txt'] = 'Εγκατάσταση';
-$wb['install_location_txt'] = 'Τοποθεσία Εγκατάστασης';
-$wb['acceptance_txt'] = 'Αποδοχή';
-$wb['acceptance_text_txt'] = 'Ναι, διάβασα την άδεια χρήσης και συμφωνώ.';
-$wb['install_language_txt'] = 'Γλώσσα διεπαφής';
-$wb['new_database_password_txt'] = 'Νέο συνθηματικό βάσης δεδομένων';
-$wb['basic_settings_txt'] = 'Βασικές Ρυθμίσεις';
-$wb['package_settings_txt'] = 'Ρυθμίσεις πακέτου';
-$wb['error_main_domain'] = 'ΤΟ domain της διαδρομής εγκατάστασης δεν είναι έγκυρο.';
-$wb['error_no_main_location'] = 'Δεν δώσατε έγκρυρη διαδρομή εγκατάστασης.';
-$wb['error_inv_main_location'] = 'Ο φάκελος στην τοποθεσία δεν είναι έγκυρος.';
-$wb['error_license_agreement'] = 'ΓΙα να συνεχίσετε πρέπει να αποδεχθείτε την άδεια χρήσης.';
-$wb['error_no_database_pw'] = 'Δεν δώσατε έγκυρο συνθηματικό Βάσης Δεδομένων.';
-$wb['error_short_database_pw'] = 'Παρακαλούμε, επιλέξτε μεγαλύτερο συνθηματικό Βάσης Δεδομένων.';
-$wb['error_no_value_for'] = 'Το πεδίο \\"%s\\" δεν πρέπει να είναι κενό.';
-$wb['error_short_value_for'] = 'Το πεδίο \\"%s\\" απαιτεί μεγαλύτερη τιμή.';
-$wb['error_long_value_for'] = 'Το πεδίο \\"%s\\" απαιτεί μικρότερη τιμή.';
-$wb['error_inv_value_for'] = 'Εισάγατε μη έγκυρη τιμή για το πεδίο \\"%s\\".';
-$wb['error_inv_email_for'] = 'Εισάγατε μη έγκυρη διεύθυνση mail για το πεδίο \\"%s\\".';
-$wb['error_inv_domain_for'] = 'Εισάγατε μη έγκυρο domain για το πεδίο \\"%s\\".';
-$wb['error_inv_integer_for'] = 'Εισάγατε μη έγκυρο ακέραιο αριθμό για το πεδίο \\"%s\\".';
-$wb['error_inv_float_for'] = 'Εισάγατε μη έγκυρο πραγματικό αριθμό για το πεδίο  \\"%s\\".';
-$wb['error_used_location'] = 'Η διαδρομή εγκατάστασης περιέχει ήδη ένα εγκατεστημένο πακέτο.';
-$wb['installation_task_txt'] = 'Η εγκατάσταση προγραμματίστηκε';
-$wb['installation_error_txt'] = 'Σφάλμα εγκατάστασης';
-$wb['installation_success_txt'] = 'Η εγκατάσταση έγινε';
-$wb['installation_remove_txt'] = 'Η απεγκατάσταση προγραμματίστηκε';
-$wb['packagelist_update_finished_txt'] = 'Η ενημέρωση της λίστας APS τελείωσε.';
-$wb['btn_install_txt'] = 'Εγκατάσταση';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['limit_aps_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος εγκαταστάσεων APS για τον λογαριασμό σας.';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
 ?>
diff --git a/interface/web/sites/lib/lang/el_aps_instances_list.lng b/interface/web/sites/lib/lang/el_aps_instances_list.lng
index 55e0aba1fa490593af7f8cd236fc57dfe371e04f..052d834a7174000d1bdc2e1d87354299a5906f2a 100644
--- a/interface/web/sites/lib/lang/el_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/el_aps_instances_list.lng
@@ -1,13 +1,13 @@
 <?php
-$wb['list_head_txt'] = 'Εγκατεστημένα Πακέτα';
-$wb['name_txt'] = 'Όνομα';
-$wb['version_txt'] = 'Έκδοση';
-$wb['customer_txt'] = 'Πελάτης';
-$wb['status_txt'] = 'Κατάσταση';
-$wb['install_location_txt'] = 'Τοποθεσία εγκατάστασης';
-$wb['pkg_delete_confirmation'] = 'Θέλετε οπωσδήποτε να διαγράψετε αυτή την εγκατάσταση?';
-$wb['pkg_reinstall_confirmation'] = 'Θέλετε οπωσδήποτε να ξανακάνετε την εγκατάσταση αυτού του πακέτου με τις ίδιες ρυθμίσεις?';
-$wb['filter_txt'] = 'Αναζήτηση';
-$wb['delete_txt'] = 'Διαγραφή';
-$wb['reinstall_txt'] = 'Επανεγκατάσταση';
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
 ?>
diff --git a/interface/web/sites/lib/lang/el_aps_packages_list.lng b/interface/web/sites/lib/lang/el_aps_packages_list.lng
index 4226d907bdcddb3e897f7dee1014d09c312b9ece..68c378085f9851f9aa50a68063b99c37a5f985ff 100644
--- a/interface/web/sites/lib/lang/el_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/el_aps_packages_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Διαθέσιμα Πακέτα';
-$wb['name_txt'] = 'Όνομα';
-$wb['version_txt'] = 'Έκδοση';
-$wb['category_txt'] = 'Κατηγορία';
-$wb['status_txt'] = 'Ξεκλείδωτο';
-$wb['filter_txt'] = 'Αναζήτηση';
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
 ?>
diff --git a/interface/web/sites/lib/lang/el_aps_update_packagelist.lng b/interface/web/sites/lib/lang/el_aps_update_packagelist.lng
index ffe73d0a96295dca2c2a4651da8bf0aca56be6aa..ce9fcf68fb3968052ec0f1edb1ab58b806e545d4 100644
--- a/interface/web/sites/lib/lang/el_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/el_aps_update_packagelist.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['head_txt'] = 'Ενημέρωση λίστας πακέτων';
+$wb['head_txt'] = 'Update Packagelist';
 $wb['list_desc_txt'] = '';
-$wb['btn_start_txt'] = 'Ενημέρωση λίστας πακέτων';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['legend_txt'] = 'Εδώ μπορείτε να ενημερώσετε την λίστα των διαθέσιμων πακέτων. Η εργασία μπορεί να διαρκέσει μέχρι και πέντε λεπτά. Μπορείτε να φύγετε από την σελίδα αν θέλετε,η εργασία θα συνεχίζεται στο παρασκήνιο.';
+$wb['btn_start_txt'] = 'Update Packagelist';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
 ?>
diff --git a/interface/web/sites/lib/lang/el_cron.lng b/interface/web/sites/lib/lang/el_cron.lng
index a83976090b2c05e8fc888dd1cec7f7213d2b62d1..0ee35b9047a282b3a3a1cc4dbfd1acbfe7c06320 100644
--- a/interface/web/sites/lib/lang/el_cron.lng
+++ b/interface/web/sites/lib/lang/el_cron.lng
@@ -17,6 +17,8 @@ $wb['run_mday_error_format'] = 'Η μορφοποίηση για τις μέρε
 $wb['run_month_error_format'] = 'Η μορφοποίηση για τους μήνες δεν είναι έγκυρη';
 $wb['run_wday_error_format'] = 'Η μορφοποίηση για τις ημέρες της εβδομάδας δεν είναι έγκυρη';
 $wb['command_error_format'] = 'Η μορφοποίηση για την εντολή δεν είναι έγκυρη. Παρακαλούμε σημειώστε ότι στην περίπτωση του url μόνο τα http/https επιτρέπονται.';
-$wb['unknown_fieldtype_error'] = 'Χρησιμοποιήθηκε άγνωστος τύπος πεδίου.';
+$wb['unknown_fieldtype_error'] = 'Χρησιμοποιήθηκε άγνωστός τύπος πεδίου.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng
index 4776b592176cb876f34585127c3b4d5be68a932e..14f05ea35354d9d3b7451ff0ad69ff6ff4bfe634 100644
--- a/interface/web/sites/lib/lang/el_database.lng
+++ b/interface/web/sites/lib/lang/el_database.lng
@@ -4,7 +4,7 @@ $wb['type_txt'] = 'Τύπος';
 $wb['database_name_txt'] = 'Όνομα Βάσης Δεδομένων';
 $wb['database_user_txt'] = 'Όνομα Χρήστη Βάσης Δεδομένων';
 $wb['database_password_txt'] = 'Συνθηματικό Βάσης Δεδομένων';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
 $wb['database_charset_txt'] = 'Κωδικοποίηση Χαρακτήρων Βάσης Δεδομένων';
 $wb['remote_access_txt'] = 'Απομακρυσμένη πρόσβαση';
 $wb['remote_ips_txt'] = 'Διευθύνσεις IP απομ. πρόσβασης (χωρισμένες με , και αφήστε κενό για  <i>οποιαδήποτε</i>)';
@@ -14,7 +14,7 @@ $wb['active_txt'] = 'Ενεργή';
 $wb['database_name_error_empty'] = 'Το όνομα της βάσης δεδομένων δεν έχει οριστεί.';
 $wb['database_name_error_unique'] = 'Υπάρχει ήδη μία βάση δεδομένων με αυτό το όνομα στον server. Για να φτιάξετε ένα μοναδικό όνομα, π.χ. βάλτε μπροστά από το όνομα της, το όνομα του domain.';
 $wb['database_name_error_regex'] = 'Μή έγκυρο όνομα βάσης δεδομένων. Το όνομα της βάσης μπορεί να περιέχει αυτούς τους χαρακτήρες: a-z, A-Z, 0-9 και την κάτω παύλα. Μέγεθος: 2 - 64 χαρακτήρες.';
-$wb['database_user_error_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί.';
+$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['limit_database_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των βάσεων δεδομένων.';
@@ -23,24 +23,24 @@ $wb['database_charset_change_txt'] = 'Η κωδικοποίηση χαρακτή
 $wb['database_name_error_len'] = 'Το όνομα της βάσης δεδομένων  - {db} - είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 64 χαρακτήρες.';
 $wb['database_user_error_len'] = 'Το όνομα χρήστη της βάσης δεδομένων - {user}- είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 16 χαρακτήρες.';
 $wb['parent_domain_id_txt'] = 'Site';
-$wb['database_site_error_empty'] = 'Επιλέξτε το site στο οποίο ανήκει η βάση δεδομένων.';
-$wb['select_site_txt'] = '- Επιλογή Site -';
-$wb['btn_save_txt'] = 'Αποθήκευση';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
-$wb['globalsearch_resultslimit_of_txt'] = 'από';
-$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα';
-$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.';
-$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση';
-$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις';
-$wb['database_ro_user_txt'] = 'Χρήστης Βάσης δεδομένων μόνο για άναγνωση';
-$wb['optional_txt'] = 'προαιρετικό';
-$wb['select_dbuser_txt'] = 'Επιλογή χρήστη Βάσης Δεδομένων';
-$wb['no_dbuser_txt'] = 'Κανένας';
-$wb['database_client_differs_txt'] = 'Ο πελάτης του γονικού website και η Βάση Δεδομένων δεν ταιριάζουν.';
-$wb['database_user_missing_txt'] = 'Παρακαλούμε επιλέξτε ένα χρήστη για αυτή την Βάση Δεδομένων.';
+$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
+$wb['select_site_txt'] = '- Select Site -';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$wb['globalsearch_noresults_limit_txt'] = '0 results';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
+$wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.';
+$wb['database_user_missing_txt'] = 'Please select a database user for this database.';
 ?>
diff --git a/interface/web/sites/lib/lang/el_database_user.lng b/interface/web/sites/lib/lang/el_database_user.lng
index e6d8e1397b2139d1e5884df86b064795adba49b0..66a0718349ba3afad8bc3b50d0da0a5a55318d41 100644
--- a/interface/web/sites/lib/lang/el_database_user.lng
+++ b/interface/web/sites/lib/lang/el_database_user.lng
@@ -1,23 +1,23 @@
 <?php
-$wb['database_user_txt'] = 'Όνομα Χρήστη Βάσης Δεδομένων';
-$wb['database_password_txt'] = 'Συνθηματικό Βάσης Δεδομένων';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
-$wb['client_txt'] = 'Πελάτης';
-$wb['active_txt'] = 'Ενεργή';
-$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_len'] = 'Το όνομα χρήστη της βάσης δεδομένων - {user}- είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 16 χαρακτήρες.';
-$wb['btn_save_txt'] = 'Αποθήκευση';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
-$wb['globalsearch_resultslimit_of_txt'] = 'από';
-$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα';
-$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.';
-$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση';
-$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις';
+$wb['database_user_txt'] = 'Database user';
+$wb['database_password_txt'] = 'Database password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Active';
+$wb['database_user_error_empty'] = 'Database user is empty.';
+$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$wb['globalsearch_noresults_limit_txt'] = '0 results';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 ?>
diff --git a/interface/web/sites/lib/lang/el_database_user_admin_list.lng b/interface/web/sites/lib/lang/el_database_user_admin_list.lng
index 02a4c412118ab454a872ace3e423967abd740bba..d7f88c4c360e87959fefa5ca1d3678425dbf0ef1 100644
--- a/interface/web/sites/lib/lang/el_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/el_database_user_admin_list.lng
@@ -1,6 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'Χρήστης Βάσης Δεδομένων';
-$wb['database_user_txt'] = 'Χρήστης Βάσης Δεδομένων';
-$wb['add_new_record_txt'] = 'Προσθήκη νέου χρήστη';
-$wb['sys_groupid_txt'] = 'Πελάτης';
+$wb['list_head_txt'] = 'Database User';
+$wb['database_user_txt'] = 'Database user';
+$wb['add_new_record_txt'] = 'Add new User';
+$wb['sys_groupid_txt'] = 'Client';
 ?>
diff --git a/interface/web/sites/lib/lang/el_database_user_list.lng b/interface/web/sites/lib/lang/el_database_user_list.lng
index b1bb3766b95cb278cde3e38922240320e0afa30c..8c226496a6a06a6b2c70db300f35aaac7619d223 100644
--- a/interface/web/sites/lib/lang/el_database_user_list.lng
+++ b/interface/web/sites/lib/lang/el_database_user_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Χρήστης Βάσης Δεδομένων';
-$wb['database_user_txt'] = 'Χρήστης Βάσης Δεδομένων';
-$wb['add_new_record_txt'] = 'Προσθήκη νέου χρήστη';
+$wb['list_head_txt'] = 'Database user';
+$wb['database_user_txt'] = 'Database user';
+$wb['add_new_record_txt'] = 'Add new user';
 ?>
diff --git a/interface/web/sites/lib/lang/el_ftp_user.lng b/interface/web/sites/lib/lang/el_ftp_user.lng
index d65aef5ebef56596523b5bc5891d07790068a22e..2f89d27bdf3e3e1cc620f6c880cb5c7b22397ad6 100644
--- a/interface/web/sites/lib/lang/el_ftp_user.lng
+++ b/interface/web/sites/lib/lang/el_ftp_user.lng
@@ -12,7 +12,7 @@ $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['username_txt'] = 'Όνομα Χρήστη';
 $wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικου';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικου';
 $wb['quota_size_txt'] = 'Όριο χρήσης αποθηκευτικού χώρου';
 $wb['active_txt'] = 'Ενεργός';
 $wb['limit_ftp_user_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των χρηστών FTP για τον λογαριασμό σας.';
@@ -25,10 +25,10 @@ $wb['directory_error_empty'] = 'Ο Φάκελος δεν έχει οριστεί
 $wb['directory_error_notinweb'] = 'Ο φάκελος δεν βρίσκεται μέσα στον ριζικό φάκελο web.';
 $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.';
 $wb['quota_size_error_regex'] = 'Όριο: εισάγετε -1 για απεριόριστα ή έναν αριθμό > 0';
-$wb['dir_dot_error'] = 'Δεν επιτρέπονται .. στη διαδρομη.';
-$wb['dir_slashdot_error'] = 'Δεν επιτρέπεται ./ στη διαδρομη.';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
 ?>
diff --git a/interface/web/sites/lib/lang/el_shell_user.lng b/interface/web/sites/lib/lang/el_shell_user.lng
index 6513f99121797805f884535cda67e846dda3c3a3..3c3ea316ce78c95fa2aa59f6d8783064a548c2cf 100644
--- a/interface/web/sites/lib/lang/el_shell_user.lng
+++ b/interface/web/sites/lib/lang/el_shell_user.lng
@@ -1,14 +1,14 @@
 <?php
 $wb['puser_txt'] = 'Όνομα χρήστη Web';
 $wb['pgroup_txt'] = 'Ομάδα Web';
-$wb['shell_txt'] = 'Κέλυφος';
+$wb['shell_txt'] = 'Shell';
 $wb['dir_txt'] = 'Φάκελος';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Site';
 $wb['username_txt'] = 'Όνομα χρήστη';
 $wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
-$wb['chroot_txt'] = 'Κέλυφος Chroot';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
+$wb['chroot_txt'] = 'Chroot Shell';
 $wb['quota_size_txt'] = 'Όρια';
 $wb['active_txt'] = 'Ενεργός';
 $wb['username_error_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί';
@@ -20,12 +20,12 @@ $wb['directory_error_empty'] = 'Ο φάκελος δεν έχει οριστεί
 $wb['limit_shell_user_txt'] = 'Φτάσατε το μέγιστο πλήθος τον λογαριασμών Shell';
 $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website';
 $wb['ssh_rsa_txt'] = 'Δημόσιο Κλειδί SSH-RSA (για key-based logins)';
-$wb['dir_dot_error'] = 'Δεν επιτρέπονται .. στη διαδρομη.';
-$wb['dir_slashdot_error'] = 'Δεν επιτρέπεται ./ στη διαδρομη.';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
 $wb['username_must_not_exceed_32_chars_txt'] = 'The username must not exceed 32 characters.';
 $wb['username_not_allowed_txt'] = 'The username is not allowed.';
 ?>
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 d0b7a169b40a1e728f3cc24d9b34f6efa73a2bab..5468905bbf0d02448aa40d1bb529eb753ad6e4f6 100644
--- a/interface/web/sites/lib/lang/el_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/el_shell_user_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Χρήστης Κελύφους';
+$wb['list_head_txt'] = 'Χρήστης Shell';
 $wb['active_txt'] = 'Ενεργός';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Site';
 $wb['username_txt'] = 'Όνομα Χρήστη';
-$wb['add_new_record_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 5b83022fedbada5f908b50af0d8aa26595a62ae7..a4b080eecd0284546787e71eb97d5c7220b0c635 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
@@ -5,5 +5,5 @@ $wb['system_user_txt'] = 'Χρήστης Linux';
 $wb['used_txt'] = 'Χρησιμοποιούμενος χώρος';
 $wb['hard_txt'] = 'Απόλυτο όριο';
 $wb['soft_txt'] = 'Διαλακτικό όριο';
-$wb['files_txt'] = 'Μεμονωμένα Αρχεία';
+$wb['files_txt'] = 'Single files';
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_backup_list.lng b/interface/web/sites/lib/lang/el_web_backup_list.lng
index 2fa2a77cb13cdf441948c3c90f6700695b812500..9a10ca6d07c27791935d9c0b47cb7357fa4e170a 100644
--- a/interface/web/sites/lib/lang/el_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/el_web_backup_list.lng
@@ -1,15 +1,15 @@
 <?php
-$wb['list_head_txt'] = 'Υπάρχοντα Αντίγραφα Ασφαλείας';
-$wb['date_txt'] = 'Ημερομηνία';
-$wb['backup_type_txt'] = 'Τύπος';
-$wb['filename_txt'] = 'Αρχείο Αντιγράφου Ασφαλείας';
-$wb['restore_backup_txt'] = 'Επαναφορά Αντιγράφου Ασφαλείας';
-$wb['download_backup_txt'] = 'Μεταφόρτωση Αντιγράφου Ασφαλείας';
-$wb['download_info_txt'] = 'Το Αντιγράφου Ασφαλείας θα είναι διαθέσιμο για μεταφόρτωση στον φάκελο Αντιγράφων Ασφαλείας του website σε λίγα λεπτά.';
-$wb['restore_info_txt'] = 'Η επαναφορά του Αντιγράφου Ασφαλείας ξεκίνησε. Η ενέργεια απαιτεί πολλά λεπτά για την ολοκλήρωσή της.';
-$wb['restore_confirm_txt'] = 'Η επαναφορά θα αντικαταστήσει αρχεία στο website. Είστε σίγουροι ότι θέλετε να κάνετε επαναφορά του Αντιγράφου Ασφαλείας?';
-$wb['download_pending_txt'] = 'Υπάρχει ήδη σε αναμονή μια εργασία μεταφόρτωσης Αντιγράφου Ασφαλείας.';
-$wb['restore_pending_txt'] = 'Υπάρχει ήδη σε αναμονή μια εργασία επαναφοράς Αντιγράφου Ασφαλείας.';
-$wb['backup_type_mysql'] = 'Βάση Δεδομένων MySQL';
-$wb['backup_type_web'] = 'Αρχεία Website';
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore backup';
+$wb['download_backup_txt'] = 'Download backup';
+$wb['download_info_txt'] = 'The backup file will be available for download in the backup folder of the website in a few minutes.';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring will overwrite existing files in your website. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['backup_type_mysql'] = 'MySQL Database';
+$wb['backup_type_web'] = 'Website files';
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_childdomain.lng b/interface/web/sites/lib/lang/el_web_childdomain.lng
index b57387285c9b9e15c89e2ae460a69ebf8a75d16b..b9d97b7c9716e93f5c903a0919fd7f453db19953 100644
--- a/interface/web/sites/lib/lang/el_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain.lng
@@ -4,6 +4,10 @@ $wb['ssl_locality_txt'] = 'Τοποθεσία';
 $wb['ssl_organisation_txt'] = 'Οργανισμός';
 $wb['ssl_organisation_unit_txt'] = 'Τμήμα οργανισμού';
 $wb['ssl_country_txt'] = 'Χώρα';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
 $wb['ssl_request_txt'] = 'SSL Request';
 $wb['ssl_cert_txt'] = 'SSL Certificate';
 $wb['ssl_bundle_txt'] = 'SSL Bundle';
@@ -71,7 +75,7 @@ $wb['ssl_organistaion_unit_error_regex'] = 'Άκυρη μονάδα οργανι
 $wb['ssl_country_error_regex'] = 'Άκυρη Χώρα SSL. Έγκυροι χαρακτήρες: A-Z';
 $wb['limit_traffic_quota_free_txt'] = 'Μέγιστο Όριο μεταφοράς δεδομένων';
 $wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Ξεπεράστηκε το όριο μεταφοράς δεδομένων';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
 $wb['ruby_txt'] = 'Ruby';
 $wb['stats_user_txt'] = 'Όνομα Χρήστη Στατιστικών Web';
 $wb['stats_type_txt'] = 'Πρόγραμμα Στατιστικών Web';
@@ -82,7 +86,7 @@ $wb['save_certificate_txt'] = 'Αποθήκευση Πιστοποιητικού
 $wb['create_certificate_txt'] = 'Δημιουργία Πιστοποιητικού';
 $wb['delete_certificate_txt'] = 'Διαγραφή Πιστοποιητικού';
 $wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'Ανακατεύθυνση SEO';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
 $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';
@@ -115,5 +119,4 @@ $wb['available_php_directive_snippets_txt'] = 'Διαθέσιμα PHP Directive
 $wb['available_apache_directive_snippets_txt'] = 'Διαθέσιμα Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Διαθέσιμα nginx Directive Snippets:';
 $wb['Domain'] = 'Ψευδώνυμο domain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_childdomain_list.lng b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
index 1d0a54b54049f480db524e0f64350b0670af4709..a868b5b772bd2c6b9894292d49c0bff01ad70956 100644
--- a/interface/web/sites/lib/lang/el_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
@@ -11,5 +11,4 @@ $wb['domain_error_regex'] = 'Το όνομα Domain δεν είναι έγκυρ
 $wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
 $wb['no_flag_txt'] = 'Χωρίς σημαία';
 $wb['none_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 e55f9577fd30288c74f623e160b454c0fc503454..2dc42574ad1df4fe7e39820b1a924cd3db3a1c30 100644
--- a/interface/web/sites/lib/lang/el_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/el_web_folder_user.lng
@@ -4,11 +4,11 @@ $wb['username_txt'] = 'Όνομα Χρήστη';
 $wb['password_txt'] = 'Συνθηματικό';
 $wb['active_txt'] = 'Ενεργός';
 $wb['folder_error_empty'] = 'Δεν επιλέχθηκε φάκελος web.';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
 $wb['no_folder_perm'] = 'You have no permission for this folder.';
 $wb['error_user_exists_already_txt'] = 'There is already a record for this user.';
 ?>
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 dc58324fdaa173407f1eba0b56229f107f9b1f9f..9916646017e94839e1e27d6e193a5c55ca71f1a2 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
@@ -5,5 +5,5 @@ $wb['this_month_txt'] = 'Αυτό το μήνα';
 $wb['last_month_txt'] = 'Το τελευταίο μήνα';
 $wb['this_year_txt'] = 'Αυτό το χρόνο';
 $wb['last_year_txt'] = 'Τον τελευταίο χρόνο';
-$wb['sum_txt'] = 'Σύνολο';
+$wb['sum_txt'] = 'Sum';
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng
index fa8b6cc937d9edfd6ef946df03a5c61bd09bc658..660bc0c761646a396854ec6678cd85b22c628047 100644
--- a/interface/web/sites/lib/lang/el_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['backup_interval_txt'] = 'Προγραμματισμός Αντιγράφων Ασφαλείας';
+$wb['backup_interval_txt'] = 'Προγραμματισμός Backup';
 $wb['backup_copies_txt'] = 'Πλήθος αντιγράφων';
 $wb['ssl_state_txt'] = 'Κατάσταση';
 $wb['ssl_locality_txt'] = 'Τοποθεσία';
@@ -24,11 +24,11 @@ $wb['system_group_txt'] = 'Ομάδα Linux';
 $wb['ip_address_txt'] = 'Διεύθυνση IP';
 $wb['vhost_type_txt'] = 'VHost Type';
 $wb['hd_quota_txt'] = 'Όριο αποθηκευτικού χώρου';
-$wb['traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων';
+$wb['traffic_quota_txt'] = 'Όριο κίνησης';
 $wb['cgi_txt'] = 'CGI';
 $wb['ssi_txt'] = 'SSI';
 $wb['errordocs_txt'] = 'Προσωπικά έγγραφα σφάλματος';
-$wb['subdomain_txt'] = 'Αυτόματο-Subdomain';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
 $wb['ssl_txt'] = 'SSL';
 $wb['suexec_txt'] = 'SuEXEC';
 $wb['php_txt'] = 'PHP';
@@ -41,7 +41,7 @@ $wb['domain_error_empty'] = 'Το Domain δεν έχει οριστεί.';
 $wb['domain_error_unique'] = 'Υπάρχει ήδη ένα website ή ένα sub / aliasdomain με αυτό το όνομα domain.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
 $wb['hd_quota_error_empty'] = 'Το όριο αποθηκευτικού χώρου είναι 0 ή δεν έχει οριστεί.';
-$wb['traffic_quota_error_empty'] = 'Το όριο μεταφοράς δεδομένων δεν έχει οριστεί.';
+$wb['traffic_quota_error_empty'] = 'Το όριο κίνησης δεν έχει οριστεί.';
 $wb['error_ssl_state_empty'] = 'Κενή περιφέρεια SSL.';
 $wb['error_ssl_locality_empty'] = 'Κενή τοποθεσία SSL.';
 $wb['error_ssl_organisation_empty'] = 'Ο Οργανισμός SSL δεν έχει οριστεί.';
@@ -57,10 +57,10 @@ $wb['ssl_locality_error_regex'] = 'Άκυρο SSL Locality. Έγκυροι χα
 $wb['ssl_organisation_error_regex'] = 'Άκυρος Οργανισμός  SSL. Έγκυροι χαρακτήρες: a-z, 0-9 and .,-_';
 $wb['ssl_organistaion_unit_error_regex'] = 'Άκυρη μονάδα οργανισμού SSL. Έγκυροι χαρακτήρες: a-z, 0-9 and .,-_';
 $wb['ssl_country_error_regex'] = 'Άκυρη Χώρα SSL. Έγκυροι χαρακτήρες: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Όριο μεταφοράς δεδομένων';
+$wb['limit_traffic_quota_free_txt'] = 'Όριο κίνησης';
 $wb['redirect_error_regex'] = 'Μη έγκυρη διαδρομή ανακατεύθυνσης. Έγκυρες τιμές είναι: /test/ ή http://www.domain.tld/test/';
 $wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Ξεπεράστηκε το όριο μεταφοράς δεδομένων';
+$wb['traffic_quota_exceeded_txt'] = 'Ξεπεράστηκε το όριο κίνησης δεδομένων';
 $wb['ruby_txt'] = 'Ruby';
 $wb['stats_user_txt'] = 'Όνομα Χρήστη Στατιστικών Web';
 $wb['stats_type_txt'] = 'Πρόγραμμα Στατιστικών Web';
@@ -89,29 +89,29 @@ $wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive
 $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
 $wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
 $wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Το όριο χρήσης δίσκου δεν είναι έγκυρο.';
-$wb['traffic_quota_error_regex'] = 'Το όριο μεταφοράς δεδομένων δεν είναι έγκυρο.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
 $wb['ssl_key_txt'] = 'SSL Key';
 $wb['perl_txt'] = 'Perl';
-$wb['fastcgi_php_version_txt'] = 'Έκδοση PHP';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
 $wb['pm_txt'] = 'PHP-FPM Process Manager';
 $wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
 $wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
 $wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
 $wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
 $wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
-$wb['web_folder_error_regex'] = 'Εισάγατε μη έγκυρο φάκελο. Μην εισάγετε την κάθετο';
-$wb['domain_error_autosub'] = 'Υπάρχει ήδη ένα subdomain με αυτές τις ρυθμίσεις.';
-$wb['available_php_directive_snippets_txt'] = 'Διαθέσιμα PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Διαθέσιμα Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Διαθέσιμα nginx Directive Snippets:';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Διαθέσιμα Proxy Directive Snippets:';
-$wb['no_server_error'] = 'Δεν επιλέχθηκε server.';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
diff --git a/interface/web/sites/lib/lang/el_webdav_user.lng b/interface/web/sites/lib/lang/el_webdav_user.lng
index bf7e10f2eb1b8874b92f949aeba2b73b72cb19d4..b33b553f8fc7ab52caaf8a9f0d12bef7ab2c54e9 100644
--- a/interface/web/sites/lib/lang/el_webdav_user.lng
+++ b/interface/web/sites/lib/lang/el_webdav_user.lng
@@ -4,7 +4,7 @@ $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['username_txt'] = 'Όνομα Χρήστη';
 $wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
 $wb['active_txt'] = 'Ενεργός';
 $wb['limit_webdav_user_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των webdav users για τον λογαριασμό σας.';
 $wb['username_error_empty'] = 'Όνομα Χρήστη δεν έχει οριστεί.';
@@ -12,10 +12,10 @@ $wb['username_error_unique'] = 'Το Όνομα Χρήστη πρέπει να 
 $wb['username_error_regex'] = 'Το Όνομα Χρήστη περιέχει μη επιτρεπόμενους χαρακτήρες.';
 $wb['directory_error_empty'] = 'Ο φάκελος δεν έχει οριστεί.';
 $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.';
-$wb['dir_dot_error'] = 'Δεν επιτρέπονται οι .. στην διαδρομή.';
-$wb['dir_slashdot_error'] = 'Δεν επιτρέπεται το ./ στην διαδρομή.';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
 ?>
diff --git a/interface/web/sites/lib/lang/es_cron.lng b/interface/web/sites/lib/lang/es_cron.lng
index 46a0abd01043485483d8903e52f32838a6bcabf0..436c947f0772cc6dd1733911ea0166bca3c42aa0 100644
--- a/interface/web/sites/lib/lang/es_cron.lng
+++ b/interface/web/sites/lib/lang/es_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Formato no válido para los días de la semana.'
 $wb['command_error_format'] = 'Formato de comando no válido. En el caso de las llamadas a URLs sólo se permite http o https.';
 $wb['unknown_fieldtype_error'] = 'Se ha usado un tipo de campo desconocido.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_cron.lng b/interface/web/sites/lib/lang/fi_cron.lng
index ef6a5a34dc2a3a02d505d048f229f003d21cf12c..f07ea7bf060fb4cc847af88ff12cdb5c135d850c 100644
--- a/interface/web/sites/lib/lang/fi_cron.lng
+++ b/interface/web/sites/lib/lang/fi_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Viikonpäivä-asetus on vääranlainen';
 $wb['command_error_format'] = 'Komento-asetus on vääranlainen. Huomaa että url-komennoissa vain http/https-osoitteet ovat sallittuja.';
 $wb['unknown_fieldtype_error'] = 'Käytetty tuntematonta kenttätyyppiä.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr.lng b/interface/web/sites/lib/lang/fr.lng
index a7f4576fe19ee15696723aeee15eb68959b372f6..c914ef002fb30c96824e8c7cca697e4b62ebd75d 100644
--- a/interface/web/sites/lib/lang/fr.lng
+++ b/interface/web/sites/lib/lang/fr.lng
@@ -4,12 +4,12 @@ $wb['Website'] = 'Sites web';
 $wb['Subdomain'] = 'Sous-domaine';
 $wb['Aliasdomain'] = 'Alias';
 $wb['Database'] = 'Base de données';
-$wb['Web Access'] = 'Web Access';
+$wb['Web Access'] = 'Accès aux sites Web';
 $wb['FTP-User'] = 'Utilisateur FTP';
 $wb['Webdav-User'] = 'Utilisateur WebDav';
-$wb['Folder'] = 'Protected Folders';
-$wb['Folder users'] = 'Protected Folder Users';
-$wb['Command Line'] = 'Command Line';
+$wb['Folder'] = 'Dossiers protégés';
+$wb['Folder users'] = 'Utilisateurs de dossiers protégés';
+$wb['Command Line'] = 'Ligne de commande';
 $wb['Shell-User'] = 'Utilisateur Shell';
 $wb['Cron Jobs'] = 'Tâches cron';
 $wb['Statistics'] = 'Statistiques';
@@ -25,11 +25,11 @@ $wb['Domain'] = 'Domaine';
 $wb['Redirect'] = 'Redirection';
 $wb['SSL'] = 'SSL';
 $wb['Sites'] = 'Sites';
-$wb['Database User'] = 'Database Users';
-$wb['APS Installer'] = 'APS Installer';
-$wb['Available packages'] = 'Available packages';
-$wb['Installed packages'] = 'Installed packages';
-$wb['Update Packagelist'] = 'Update Packagelist';
-$wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
+$wb['Database User'] = 'Utilisateurs de bases de données';
+$wb['APS Installer'] = 'Installeur APS';
+$wb['Available packages'] = 'Packages disponibles';
+$wb['Installed packages'] = 'Packages installés';
+$wb['Update Packagelist'] = 'Mise à jour de la liste des packages';
+$wb['Subdomain (Vhost)'] = 'Sous-domaine (Vhost)';
+$wb['error_proxy_requires_url'] = 'Type de redirection \"proxy\" nécessite une URL comme chemin de redirection.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_aps.lng b/interface/web/sites/lib/lang/fr_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..eb268b0266a483786bae2f48e277d548f4be6d52 100644
--- a/interface/web/sites/lib/lang/fr_aps.lng
+++ b/interface/web/sites/lib/lang/fr_aps.lng
@@ -1,58 +1,58 @@
 <?php
-$wb['overview_txt'] = 'Overview';
+$wb['overview_txt'] = 'Vue d\'ensemble';
 $wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['available_packages_txt'] = 'Packages disponibles';
+$wb['installed_packages_txt'] = 'Packages installés';
+$wb['yes_txt'] = 'Oui';
+$wb['no_txt'] = 'Non';
+$wb['invalid_id_txt'] = 'Aucun ID valide n\'a été fourni.';
 $wb['details_txt'] = 'Details';
 $wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
+$wb['category_txt'] = 'Categorie';
+$wb['homepage_txt'] = 'Page d\'accueil';
+$wb['supported_languages_txt'] = 'Langues supportées';
 $wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
+$wb['config_script_txt'] = 'Script de configuration';
+$wb['installed_size_txt'] = 'Taille après installation';
+$wb['license_txt'] = 'Licence';
 $wb['screenshots_txt'] = 'Screenshots';
 $wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
+$wb['server_requirements_txt'] = 'Configuration serveur requise';
+$wb['php_extensions_txt'] = 'Extensions PHP';
+$wb['php_settings_txt'] = 'Configuration PHP';
+$wb['supported_php_versions_txt'] = 'Versions PHP supportées';
+$wb['database_txt'] = 'Base de données';
+$wb['settings_txt'] = 'Configuration';
+$wb['install_package_txt'] = 'Installer ce package';
 $wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
-$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-$wb['btn_install_txt'] = 'Install';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['install_location_txt'] = 'Chemin d\'installation';
+$wb['acceptance_txt'] = 'Conditions d\'utilisation (licence)';
+$wb['acceptance_text_txt'] = 'Oui, j\'ai lu les conditions d\'utilisation (licence) et les accepte.';
+$wb['install_language_txt'] = 'Langue de l\'interface';
+$wb['new_database_password_txt'] = 'Nouveau mot de passe BDD';
+$wb['basic_settings_txt'] = 'Configuration de base';
+$wb['package_settings_txt'] = 'Configuration du package';
+$wb['error_main_domain'] = 'Le domaine du chemin d\'installation est invalide.';
+$wb['error_no_main_location'] = 'Vous n\'avez fourni aucun chemin d\'installation valide.';
+$wb['error_inv_main_location'] = 'Le dossier d\'installation choisi est invalide.';
+$wb['error_license_agreement'] = 'Avant de continuer, vous devez accepter les conditions d\'utilisation (licence).';
+$wb['error_no_database_pw'] = 'Vous n\'avez pas renseigné de mot de passe BDD valide.';
+$wb['error_short_database_pw'] = 'Veuillez saisir un mot de passe BDD plus long.';
+$wb['error_no_value_for'] = 'Le champ \"%s\" ne peut pas être vide.';
+$wb['error_short_value_for'] = 'Le champ \"%s\" nécessite une valeur plus longue.';
+$wb['error_long_value_for'] = 'Le champ \"%s\" nécessite une valeur plus courte.';
+$wb['error_inv_value_for'] = 'Vous avez saisi une valeur invalide pour le champ \"%s\".';
+$wb['error_inv_email_for'] = 'L\'adresse email saisie pour le champ \"%s\" est invalide.';
+$wb['error_inv_domain_for'] = 'Le domaine saisi pour le champ \"%s\" est invalide.';
+$wb['error_inv_integer_for'] = 'Le nombre saisi pour le champ \"%s\" est invalide.';
+$wb['error_inv_float_for'] = 'La décimale saisie pour le champ \"%s\" est invalide.';
+$wb['error_used_location'] = 'Le chemin de destination contient déjà un package d\'installation.';
+$wb['installation_task_txt'] = 'Installation prévue';
+$wb['installation_error_txt'] = 'Erreur d\'installation';
+$wb['installation_success_txt'] = 'Installé';
+$wb['installation_remove_txt'] = 'Désinstallation prévue';
+$wb['packagelist_update_finished_txt'] = 'Mise à jour APS Packagelist terminée.';
+$wb['btn_install_txt'] = 'Installer';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['limit_aps_txt'] = 'Le nombre max d\'instances APS pour votre compte a été atteint.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_aps_instances_list.lng b/interface/web/sites/lib/lang/fr_aps_instances_list.lng
index 052d834a7174000d1bdc2e1d87354299a5906f2a..6a2dba1e84c72745faac5cfdb30e456f2e598556 100644
--- a/interface/web/sites/lib/lang/fr_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/fr_aps_instances_list.lng
@@ -1,13 +1,13 @@
 <?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
+$wb['list_head_txt'] = 'Packages installés';
+$wb['name_txt'] = 'Nom';
 $wb['version_txt'] = 'Version';
 $wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
+$wb['status_txt'] = 'Statut';
+$wb['install_location_txt'] = 'Chemin d\'installation';
+$wb['pkg_delete_confirmation'] = 'Etes-vous sûr de vouloir supprimer cette installation ?';
+$wb['pkg_reinstall_confirmation'] = 'Etes-vous sûr de vouloir réinstaller ce package avec la même configuration ?';
+$wb['filter_txt'] = 'Chercher';
+$wb['delete_txt'] = 'Supprimer';
+$wb['reinstall_txt'] = 'Réinstaller';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_aps_packages_list.lng b/interface/web/sites/lib/lang/fr_aps_packages_list.lng
index 68c378085f9851f9aa50a68063b99c37a5f985ff..24fb0b9c72f352db3556f058f958c2b87dafcf7e 100644
--- a/interface/web/sites/lib/lang/fr_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/fr_aps_packages_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
+$wb['list_head_txt'] = 'Packages disponibles';
+$wb['name_txt'] = 'Nom';
 $wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
+$wb['category_txt'] = 'Categorie';
+$wb['status_txt'] = 'Dévérouillé';
+$wb['filter_txt'] = 'Chercher';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_cron.lng b/interface/web/sites/lib/lang/fr_cron.lng
index 7520548f06f082ef38547df45f0a04ea53fb859f..41a0b82cf20397b2e4cb138beeb686986ebb387a 100644
--- a/interface/web/sites/lib/lang/fr_cron.lng
+++ b/interface/web/sites/lib/lang/fr_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Format invalide pour les jours du mois.';
 $wb['command_error_format'] = 'Format de la commande invalide.';
 $wb['unknown_fieldtype_error'] = 'Un champ inconnu a été utilisé';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_ftp_user.lng b/interface/web/sites/lib/lang/fr_ftp_user.lng
index 9d52e3eb06e6b30504abe7cf512f5d01d23edf11..5d00f4b7804c5ceef881fe65b23a2619ad99f930 100644
--- a/interface/web/sites/lib/lang/fr_ftp_user.lng
+++ b/interface/web/sites/lib/lang/fr_ftp_user.lng
@@ -25,10 +25,10 @@ $wb['quota_files_unity_txt'] = 'Fichiers';
 $wb['directory_error_notinweb'] = 'Le répertoire nest pas dans la racine web.';
 $wb['parent_domain_id_error_empty'] = 'Pas de site web sélectionné.';
 $wb['quota_size_error_regex'] = 'Quota: entrez -1 pour illimité ou un nombre > 0';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['dir_dot_error'] = 'Les .. sont interdits.';
+$wb['dir_slashdot_error'] = 'Les ./ sont interdits.';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_shell_user.lng b/interface/web/sites/lib/lang/fr_shell_user.lng
index 1fbc93cc9020d1d57421d1dce5b97438e20a4d05..3f967f852d1c09626d22a266442dd89c7c4c6cd2 100644
--- a/interface/web/sites/lib/lang/fr_shell_user.lng
+++ b/interface/web/sites/lib/lang/fr_shell_user.lng
@@ -6,7 +6,7 @@ $wb['parent_domain_id_txt'] = 'Site';
 $wb['username_txt'] = 'Nom d\'utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
-$wb['chroot_txt'] = 'Chrotter le shell';
+$wb['chroot_txt'] = 'Chrooter le shell';
 $wb['quota_size_txt'] = 'Quota';
 $wb['active_txt'] = 'Actif';
 $wb['username_error_empty'] = 'Le nom d\'utilisateur est vide.';
@@ -20,12 +20,12 @@ $wb['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.';
 $wb['puser_txt'] = 'Utilisateur web';
 $wb['pgroup_txt'] = 'Groupe web';
 $wb['ssh_rsa_txt'] = 'Clé publique SSH-RSA (pour les authentifications par clé)';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_must_not_exceed_32_chars_txt'] = 'The username must not exceed 32 characters.';
-$wb['username_not_allowed_txt'] = 'The username is not allowed.';
+$wb['dir_dot_error'] = 'Les .. sont interdits.';
+$wb['dir_slashdot_error'] = 'Les ./ sont interdits.';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['username_must_not_exceed_32_chars_txt'] = 'Le nom d\'utilisateur ne doit pas dépasser 32 caractères.';
+$wb['username_not_allowed_txt'] = 'Le nom d\'utilisateur est interdit.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng b/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng
index f21d0bf336608370eef99066925ef73cff75eff5..2d8f4962d92f4ead7a20c76798ae207c22a8c830 100644
--- a/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng
@@ -5,5 +5,5 @@ $wb['system_user_txt'] = 'Utilisateur Linux';
 $wb['used_txt'] = 'Espace utilisé';
 $wb['hard_txt'] = 'Limite dure';
 $wb['soft_txt'] = 'Limite douce';
-$wb['files_txt'] = 'Single files';
+$wb['files_txt'] = 'Fichiers individuels';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_folder_user.lng b/interface/web/sites/lib/lang/fr_web_folder_user.lng
index a4c0704040cb4710a0e6d697b09b60a26a40473a..560d07ef2bfce877bfb4167eba8c29dddeb2cbd5 100644
--- a/interface/web/sites/lib/lang/fr_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/fr_web_folder_user.lng
@@ -4,11 +4,11 @@ $wb['username_txt'] = 'Nom de \'utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['active_txt'] = 'Actif';
 $wb['folder_error_empty'] = 'Aucun dossier web sélectionné.';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['no_folder_perm'] = 'You have no permission for this folder.';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['no_folder_perm'] = 'Vous n\'avez pas les permissions pour ce dossier.';
 $wb['error_user_exists_already_txt'] = 'There is already a record for this user.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
index f465bb6ccceca0bde3ecc87afa3582664c5231e2..af02be4558dd5c6300d7bda044526bfdf4c763c0 100644
--- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
@@ -2,7 +2,7 @@
 $wb['ssl_state_txt'] = 'État/département';
 $wb['ssl_locality_txt'] = 'Localité';
 $wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
+$wb['ssl_organisation_unit_txt'] = 'Unité d\'organisation';
 $wb['ssl_country_txt'] = 'Pays';
 $wb['ssl_request_txt'] = 'Requête SSL';
 $wb['ssl_cert_txt'] = 'Certificat SSL';
@@ -38,8 +38,8 @@ $wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
 $wb['hd_quota_error_empty'] = 'Le quota disque est vide.';
 $wb['error_ssl_state_empty'] = 'Létat du SSL est vide.';
 $wb['error_ssl_locality_empty'] = 'La localité du SSL est vide.';
-$wb['error_ssl_organisation_empty'] = 'Lorganisation du SSL est vide.';
-$wb['error_ssl_organisation_unit_empty'] = 'Lunité dorganisation du SSL est vide.';
+$wb['error_ssl_organisation_empty'] = 'L\'organisation du SSL est vide.';
+$wb['error_ssl_organisation_unit_empty'] = 'L\'unité d\'organisation du SSL est vide.';
 $wb['error_ssl_country_empty'] = 'Le pays du SSL est vide.';
 $wb['subdomain_txt'] = 'Auto sous-domaine';
 $wb['client_group_id_txt'] = 'Client';
@@ -74,51 +74,51 @@ $wb['save_certificate_txt'] = 'Enregister le certificat';
 $wb['create_certificate_txt'] = 'Créer le certificat';
 $wb['delete_certificate_txt'] = 'Supprimer le certificat';
 $wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['seo_redirect_txt'] = 'Redirection 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';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['php_fpm_use_socket_txt'] = 'Utiliser Socket pour PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI pour SSL n\'est pas activé sur ce serveur. Vous ne pouvez activer qu\'un seul certificat SSL par adresse IP.';
 $wb['python_txt'] = 'Python';
 $wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
 $wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
 $wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
 $wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['ssl_key_txt'] = 'SSL Key';
+$wb['error_php_fpm_pm_settings_txt'] = 'Les valeurs de configuration de PHP-FPM pm doivent être comme suit : pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'La valeur PHP-FPM pm.max_children doit être un entier positif.';
+$wb['pm_start_servers_error_regex'] = 'La valeur de PHP-FPM pm.start_servers doit être un entier positif.';
+$wb['pm_min_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.min_spare_servers doit être un entier positif.';
+$wb['pm_max_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.max_spare_servers doit être un entier positif.';
+$wb['hd_quota_error_regex'] = 'Le quota de disque dur est invalide.';
+$wb['traffic_quota_error_regex'] = 'Le quota de trafic est invalide.';
+$wb['ssl_key_txt'] = 'Clé SSL';
 $wb['perl_txt'] = 'Perl';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['fastcgi_php_version_txt'] = 'Version de PHP';
+$wb['pm_txt'] = 'Manager de process PHP-FPM';
 $wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
 $wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['no_server_error'] = 'No server selected.';
-$wb['no_backup_txt'] = 'No backup';
-$wb['daily_backup_txt'] = 'Daily';
-$wb['weekly_backup_txt'] = 'Weekly';
-$wb['monthly_backup_txt'] = 'Monthly';
-$wb['rewrite_rules_txt'] = 'Rewrite Rules';
-$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
-$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['pm_process_idle_timeout_error_regex'] = 'La valeur de PHP-FPM pm.process_idle_timeout doit être un entier positif.';
+$wb['pm_max_requests_error_regex'] = 'La valeur de PHP-FPM pm.max_requests doit être un entier positif >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Votre version de PHP doit être >= 5.3.9 pour utiliser le manager de process ondemand. Si vous choisissez ondemand avec une version de PHP plus ancienne, PHP ne pourra plus démarrer !';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['web_folder_error_regex'] = 'Le dossier saisi est invalide. Ne saisissez pas de ./ (slash).';
+$wb['domain_error_autosub'] = 'Un sous-domaine avec cette configuration existe déjà.';
+$wb['available_php_directive_snippets_txt'] = 'Directives PHP Snippets disponibles :';
+$wb['available_apache_directive_snippets_txt'] = 'Directives Apache Snippets disponibles :';
+$wb['available_nginx_directive_snippets_txt'] = 'Directives nginx Snippets disponibles :';
+$wb['proxy_directives_txt'] = 'Directives Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Directives Proxy Snippets disponibles :';
+$wb['no_server_error'] = 'Aucun serveur sélectionné.';
+$wb['no_backup_txt'] = 'Pas de Backup';
+$wb['daily_backup_txt'] = 'Quotidien';
+$wb['weekly_backup_txt'] = 'Hebdomadaire';
+$wb['monthly_backup_txt'] = 'Mensuel';
+$wb['rewrite_rules_txt'] = 'Règles de réécriture';
+$wb['invalid_rewrite_rules_txt'] = 'Règles de réécriture incorrectes';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Directives autorisées :';
 $wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
 $wb['server_chosen_not_ok'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
 $wb['web_folder_txt'] = 'Web folder';
@@ -134,4 +134,4 @@ $wb['backup_excludes_txt'] = 'Excluded Directories';
 $wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
 $wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
 $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/fr_webdav_user.lng b/interface/web/sites/lib/lang/fr_webdav_user.lng
index 2397093abe1be0503c80d75689b8ce17a60eb691..e8bf197bd38e95dd4fe02f1e664ccc3316a140e3 100644
--- a/interface/web/sites/lib/lang/fr_webdav_user.lng
+++ b/interface/web/sites/lib/lang/fr_webdav_user.lng
@@ -12,10 +12,10 @@ $wb['username_error_unique'] = 'Le nom d\'utilisateur doit être unique';
 $wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères non autorisés.';
 $wb['directory_error_empty'] = 'Dossier vide.';
 $wb['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['dir_dot_error'] = 'Les .. ne sont pas autorisés.';
+$wb['dir_slashdot_error'] = 'Les ./ ne sont pas autorisés.';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
 ?>
diff --git a/interface/web/sites/lib/lang/hr_cron.lng b/interface/web/sites/lib/lang/hr_cron.lng
index 4d7af06955d5b7d608a800f456ef2cc3064f15f6..de37668bde22fbb7992d34fa5e8ed0c3739e4fd3 100644
--- a/interface/web/sites/lib/lang/hr_cron.lng
+++ b/interface/web/sites/lib/lang/hr_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Pogrešan format za dane u tjednu.';
 $wb['command_error_format'] = 'Pogrešan format komande. U slučaju pozivanja URL-a koristite samo http/https.';
 $wb['unknown_fieldtype_error'] = 'Koristi se nepoznata vrsta polja.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_cron.lng b/interface/web/sites/lib/lang/hu_cron.lng
index 5a4518167f46d36436ae3104538cae92b24aacd4..fdb2f23e8a914382cf4f90f882f7390c64a62d57 100644
--- a/interface/web/sites/lib/lang/hu_cron.lng
+++ b/interface/web/sites/lib/lang/hu_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/id_cron.lng b/interface/web/sites/lib/lang/id_cron.lng
index 074e0a5421b8f7f7c335f144fa05d610cd2caced..ce2bfee0e3c9b8ee19fe9be3bb67b985f0f074f4 100644
--- a/interface/web/sites/lib/lang/id_cron.lng
+++ b/interface/web/sites/lib/lang/id_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Format hari tidak valid.';
 $wb['command_error_format'] = 'Format perintah tidak valid. Harap dicatat untuk kasus pemanggilan url hanya http/https yang diizinkan.';
 $wb['unknown_fieldtype_error'] = 'Telah digunakan tipe kolom yang tidak dikenal.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/it_cron.lng b/interface/web/sites/lib/lang/it_cron.lng
index 01f418f56e42bfecf91bb8a0ac0aff58be3d4b32..369c3b8bbd70ca6152aeeaea9f5f1ce14102043d 100644
--- a/interface/web/sites/lib/lang/it_cron.lng
+++ b/interface/web/sites/lib/lang/it_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_cron.lng b/interface/web/sites/lib/lang/ja_cron.lng
index 01f418f56e42bfecf91bb8a0ac0aff58be3d4b32..369c3b8bbd70ca6152aeeaea9f5f1ce14102043d 100644
--- a/interface/web/sites/lib/lang/ja_cron.lng
+++ b/interface/web/sites/lib/lang/ja_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_cron.lng b/interface/web/sites/lib/lang/nl_cron.lng
index 8767000d9880296a91c33db9ee9b80820afdf826..caa712dec677bbb1aed58ebfe5eec6f9e48f6f22 100644
--- a/interface/web/sites/lib/lang/nl_cron.lng
+++ b/interface/web/sites/lib/lang/nl_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Ongeldig format voor dagen van de week.';
 $wb['command_error_format'] = 'Ongeldig commando formaat. Opmerking: in het geval van een url call, alleen http/https is toegestaan.';
 $wb['unknown_fieldtype_error'] = 'Een onbekend veld type is gebruikt.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng
index 2e64b06ac570d211a860edd6e23671ea7463920c..853091cd3511b3a0c5a142d5b08e1b9668783e9e 100644
--- a/interface/web/sites/lib/lang/pl_cron.lng
+++ b/interface/web/sites/lib/lang/pl_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Niepoprawny format dni w tygodniu.';
 $wb['command_error_format'] = 'Niepoprawny format polecenia. W zbiorze url może być tylko adres http/https który ma pozwolenie.';
 $wb['unknown_fieldtype_error'] = 'Został użyty niepoprawny format pola.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_cron.lng b/interface/web/sites/lib/lang/pt_cron.lng
index 99454e2d98231b82974f1636de307030b803a370..a8f1abdf9bdf81c6c33352a09986dfde9a5eb85f 100644
--- a/interface/web/sites/lib/lang/pt_cron.lng
+++ b/interface/web/sites/lib/lang/pt_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Formato dos dias da semana inválido.';
 $wb['command_error_format'] = 'Formato de comando inválido. Apenas endereços url http/https são permitidos.';
 $wb['unknown_fieldtype_error'] = 'Um tipo desconhecido de campo foi usado.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_cron.lng b/interface/web/sites/lib/lang/ro_cron.lng
index 01f418f56e42bfecf91bb8a0ac0aff58be3d4b32..369c3b8bbd70ca6152aeeaea9f5f1ce14102043d 100644
--- a/interface/web/sites/lib/lang/ro_cron.lng
+++ b/interface/web/sites/lib/lang/ro_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_cron.lng b/interface/web/sites/lib/lang/ru_cron.lng
index 08592d39d19a11453e75348e7c14b4f87a6560af..a439d366c357a96e23539931442ce7ec533a18c4 100644
--- a/interface/web/sites/lib/lang/ru_cron.lng
+++ b/interface/web/sites/lib/lang/ru_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Неверный формат для дня не
 $wb['command_error_format'] = 'Неверный формат команды. Учтите, что тип вызов url может быть только http/https.';
 $wb['unknown_fieldtype_error'] = 'Неверный тип поля был использован.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/se_cron.lng b/interface/web/sites/lib/lang/se_cron.lng
index 01f418f56e42bfecf91bb8a0ac0aff58be3d4b32..369c3b8bbd70ca6152aeeaea9f5f1ce14102043d 100644
--- a/interface/web/sites/lib/lang/se_cron.lng
+++ b/interface/web/sites/lib/lang/se_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_cron.lng b/interface/web/sites/lib/lang/sk_cron.lng
index 8fda8ae3564781119685c2f473fbb77a6e71d239..364fe81c4d755358929072b1f549b34ac1bc9d19 100644
--- a/interface/web/sites/lib/lang/sk_cron.lng
+++ b/interface/web/sites/lib/lang/sk_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Neplatn
 $wb['command_error_format'] = 'Neplatn� form�t pr�kazu. Upozor?ujeme, �e v pr�pade url volania iba http / https, s� povolen�.';
 $wb['unknown_fieldtype_error'] = 'Nezn�my druh pola bol pou�it�.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_cron.lng b/interface/web/sites/lib/lang/tr_cron.lng
index 6b11491262c023e58696a58217b5c2f21f2daede..1f61554da562464b35c8880c3d77fb856f2dcda1 100644
--- a/interface/web/sites/lib/lang/tr_cron.lng
+++ b/interface/web/sites/lib/lang/tr_cron.lng
@@ -19,4 +19,6 @@ $wb['run_wday_error_format'] = 'Haftanın günü için geçersiz format.';
 $wb['command_error_format'] = 'Komut formatı geçersiz. Url sadece http/https çağırabilir.';
 $wb['unknown_fieldtype_error'] = 'Bilinmeyen bir alan tipi kullanıldı.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
 ?>
diff --git a/interface/web/tools/interface_settings.php b/interface/web/tools/interface_settings.php
index bc9c7800abcae671f9025f63466a56553f48e441..d7a1333b592dbe1147290055b16f03376956ec4a 100644
--- a/interface/web/tools/interface_settings.php
+++ b/interface/web/tools/interface_settings.php
@@ -126,7 +126,7 @@ class page_action extends tform_actions {
 			print '<script type="text/javascript">document.location.reload();</script>';
 			exit;
 		}
-		else parent::onShow();
+		//else parent::onShow();
 	}
 
 
diff --git a/interface/web/tools/lib/lang/el.lng b/interface/web/tools/lib/lang/el.lng
index 80e62959344fa00b92f6701147b2919872d07d3d..0f44f7013a9b5e8e256485c650ae379c80c02eb1 100644
--- a/interface/web/tools/lib/lang/el.lng
+++ b/interface/web/tools/lib/lang/el.lng
@@ -4,10 +4,10 @@ $wb['Settings'] = 'Ρυθμίσεις';
 $wb['ISPConfig Tools'] = 'Εργαλεία ISPConfig';
 $wb['Password and Language'] = 'Συνθηματικό και Γλώσσα';
 $wb['ispconfig_tools_note'] = 'Το άρθρωμα σας επιτρέπει να αλλάξετε το συνθηματικό και την γλώσσα και να ξεκινήσετε έναν επανασυγχρονισμό των εγγραφών DNS.';
-$wb['Resync'] = 'Επανασυγχρονισμός';
-$wb['Sync Tools'] = 'Εργαλεία Συγχρονισμού';
-$wb['Import'] = 'Εισαγωγή';
+$wb['Resync'] = 'Resync';
+$wb['Sync Tools'] = 'Sync Tools';
+$wb['Import'] = 'Import';
 $wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail';
 $wb['PDNS Tupa'] = 'PowerDNS Tupa';
-$wb['Interface'] = 'Διεπαφή';
+$wb['Interface'] = 'Interface';
 ?>
diff --git a/interface/web/tools/lib/lang/el_import_ispconfig.lng b/interface/web/tools/lib/lang/el_import_ispconfig.lng
index 1c80ac6db1f55a0e09d4a2ae727ab466108a81d4..ce47c4da4d24b0709be26b5ec28b82ef2ec33b79 100644
--- a/interface/web/tools/lib/lang/el_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/el_import_ispconfig.lng
@@ -1,23 +1,23 @@
 <?php
-$wb['head_txt'] = 'Εισαγωγή ρυθμίσεων email από ISPConfig 3';
-$wb['legend_txt'] = 'Λεπτομέρειες σύνδεσης απομακρυσμένου server';
-$wb['legend2_txt'] = 'Εισαγωγή domain email';
-$wb['resync_sites_txt'] = 'Επανασυγχρονισμός Websites';
-$wb['resync_ftp_txt'] = 'Επανασυγχρονισμός χρηστών FTP';
-$wb['resync_shell_txt'] = 'Επανασυγχρονισμός χρηστών shell';
-$wb['resync_cron_txt'] = 'Επανασυγχρονισμός εργασιών cron';
-$wb['resync_db_txt'] = 'Επανασυγχρονισμός ρυθμίσεων ΒΔ πελατών';
-$wb['resync_mailbox_txt'] = 'Επανασυγχρονισμός θυρίδων Mail';
-$wb['resync_dns_txt'] = 'Επανασυγχρονισμός εγγραφών DNS';
-$wb['btn_start_txt'] = 'Εκκίνηση Εισαγωγής';
-$wb['btn_connect_txt'] = 'Σύνδεση στον απομακρυσμένο server';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['client_group_id_txt'] = 'Τοπικός πελάτης';
-$wb['mail_domain_txt'] = 'Απομακρυσμένο domain email';
-$wb['import_mailbox_txt'] = 'Εισαγωγή θυρίδας mail';
-$wb['import_aliasdomain_txt'] = 'Εισαγωγή ψευδωνύμου domain';
-$wb['import_alias_txt'] = 'Εισαγωγή ψευδωνύμου email';
-$wb['import_forward_txt'] = 'Εισαγωγή προώθησης';
-$wb['import_user_filter_txt'] = 'Εισαγωγή φίλτρων χρήστη';
-$wb['import_spamfilter_txt'] = 'Εισαγωγή φίλτρων spam';
+$wb['head_txt'] = 'Import email configuration from ISPConfig 3';
+$wb['legend_txt'] = 'Remote server connection details';
+$wb['legend2_txt'] = 'Import email domain';
+$wb['resync_sites_txt'] = 'Resync Websites';
+$wb['resync_ftp_txt'] = 'Resync FTP users';
+$wb['resync_shell_txt'] = 'Resync shell users';
+$wb['resync_cron_txt'] = 'Resync cronjobs';
+$wb['resync_db_txt'] = 'Resync clientdb config';
+$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
+$wb['resync_dns_txt'] = 'Resync DNS records';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['client_group_id_txt'] = 'Local client';
+$wb['mail_domain_txt'] = 'Remote email domain';
+$wb['import_mailbox_txt'] = 'Import mailbox';
+$wb['import_aliasdomain_txt'] = 'Import alias domain';
+$wb['import_alias_txt'] = 'Import email alias';
+$wb['import_forward_txt'] = 'Import forward';
+$wb['import_user_filter_txt'] = 'Import user filter';
+$wb['import_spamfilter_txt'] = 'Import spamfilter';
 ?>
diff --git a/interface/web/tools/lib/lang/el_index.lng b/interface/web/tools/lib/lang/el_index.lng
index ce794cc9df88a9b5bf98866ccec8964bf38c2cc8..a3ef38f21934a9d02669da2c2722feefc3f64325 100644
--- a/interface/web/tools/lib/lang/el_index.lng
+++ b/interface/web/tools/lib/lang/el_index.lng
@@ -1,4 +1,4 @@
 <?php
-$wb['page_head_txt'] = 'Εργαλεία ISPConfig';
-$wb['page_desc_txt'] = 'Αλλαγή ρυθμίσεων χρήστη';
+$wb['page_head_txt'] = 'ISPConfig Tools';
+$wb['page_desc_txt'] = 'Change user settings';
 ?>
diff --git a/interface/web/tools/lib/lang/el_interface.lng b/interface/web/tools/lib/lang/el_interface.lng
index 9b53146eebbb69e044a871a288ef8dbefd8ac40f..aab4fc89ffe72aab7529d850c4e1dc3bbd92dc77 100644
--- a/interface/web/tools/lib/lang/el_interface.lng
+++ b/interface/web/tools/lib/lang/el_interface.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['interface_head_txt'] = 'Ρυθμίσεις διεπαφής';
-$wb['interface_desc_txt'] = 'Τροποποιήστε την διεπαφή σας';
-$wb['language_txt'] = 'Γλώσσα';
-$wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης';
-$wb['app_theme_txt'] = 'Σχεδίαση';
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
 ?>
diff --git a/interface/web/tools/lib/lang/el_resync.lng b/interface/web/tools/lib/lang/el_resync.lng
index 8194fe5d992d35530d897fc88ca55784282724c1..dd8a216c7665b7ce169af5c17b7d83a4b6ed11f6 100644
--- a/interface/web/tools/lib/lang/el_resync.lng
+++ b/interface/web/tools/lib/lang/el_resync.lng
@@ -1,14 +1,14 @@
 <?php
-$wb['head_txt'] = 'Εργαλείο επανασυγχρονισμού';
-$wb['legend_txt'] = 'Επανασυγχρονισμός';
-$wb['resync_sites_txt'] = 'Επανασυγχρονισμός Websites';
-$wb['resync_ftp_txt'] = 'Επανασυγχρονισμός χρηστών FTP';
-$wb['resync_shell_txt'] = 'Επανασυγχρονισμός χρηστών shell';
-$wb['resync_cron_txt'] = 'Επανασυγχρονισμός εργασιών cron';
-$wb['resync_db_txt'] = 'Επανασυγχρονισμός ρυθμίσεων ΒΔ πελατών';
-$wb['resync_mailbox_txt'] = 'Επανασυγχρονισμός θυρίδων Mail';
-$wb['resync_dns_txt'] = 'Επανασυγχρονισμός εγγραφών DNS';
-$wb['btn_start_txt'] = 'Εκκίνηση';
-$wb['btn_cancel_txt'] = 'Άκυρο';
+$wb['head_txt'] = 'Resync Tool';
+$wb['legend_txt'] = 'Resync';
+$wb['resync_sites_txt'] = 'Resync Websites';
+$wb['resync_ftp_txt'] = 'Resync FTP users';
+$wb['resync_shell_txt'] = 'Resync shell users';
+$wb['resync_cron_txt'] = 'Resync cronjobs';
+$wb['resync_db_txt'] = 'Resync clientdb config';
+$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
+$wb['resync_dns_txt'] = 'Resync DNS records';
+$wb['btn_start_txt'] = 'Start';
+$wb['btn_cancel_txt'] = 'Cancel';
 $wb['resync_client_txt'] = 'Resync Client records';
 ?>
diff --git a/interface/web/tools/lib/lang/el_tpl_default.lng b/interface/web/tools/lib/lang/el_tpl_default.lng
index 45c78e9a4684251920778b69e68e4a4e60d309ab..c06246304d016300490b28f50eb168cff4cdbc4e 100644
--- a/interface/web/tools/lib/lang/el_tpl_default.lng
+++ b/interface/web/tools/lib/lang/el_tpl_default.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Προεπιλεγμένες ρυθμίσεις θεματικής παραλλαγής';
-$wb['list_desc_txt'] = 'Παραμετροποίηση  ρυθμίσεων Προεπιλεγμένης θεματικής παραλλαγής';
-$wb['no_settings_txt'] = 'Δεν υπάρχουν ρυθμίσεις για την Προεπιλεγμένη θεματική παραλλαγή.';
-$wb['btn_start_txt'] = 'Αποθήκευση';
-$wb['btn_cancel_txt'] = 'Επιστροφή';
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
 ?>
diff --git a/interface/web/tools/lib/lang/el_usersettings.lng b/interface/web/tools/lib/lang/el_usersettings.lng
index 55f24e9db031a091650a366468b422aae15d32c6..d2321b04bc134fd130c2ea462d88ec726b4de7e8 100644
--- a/interface/web/tools/lib/lang/el_usersettings.lng
+++ b/interface/web/tools/lib/lang/el_usersettings.lng
@@ -1,12 +1,12 @@
 <?php
 $wb['passwort_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
 $wb['language_txt'] = 'Γλώσσα';
 $wb['password_mismatch'] = 'Το συνθηματικό στο δεύτερο πεδίο δεν ταιριάζει με το συνθηματικό στο πρώτο πεδίο.';
 $wb['Form to edit the user password and language.'] = 'Φόρμα επεξεργασίας συνθηματικού και γλώσσας';
 $wb['Settings'] = 'Ρυθμίσεις';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
 ?>
diff --git a/interface/web/vm/lib/lang/el_openvz_ip.lng b/interface/web/vm/lib/lang/el_openvz_ip.lng
index a602f6d1f997e0a67a0968f336f9813d3f14586b..8aecd92058ad6ab26b62918c4e889cdca91d3294 100644
--- a/interface/web/vm/lib/lang/el_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ip.lng
@@ -2,7 +2,7 @@
 $wb['server_id_txt'] = 'Hostserver';
 $wb['ip_address_txt'] = 'Διεύθυνση IP';
 $wb['vm_id_txt'] = 'Εικονικός server';
-$wb['reserved_txt'] = 'Κατειλημμένη';
+$wb['reserved_txt'] = 'Reserved';
 $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 168100ce88710abd3f2a3ddf702dadfef4be5179..5af2ea055bc9042997d8729be2e8b7f4414ef446 100644
--- a/interface/web/vm/lib/lang/el_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ip_list.lng
@@ -2,6 +2,6 @@
 $wb['list_head_txt'] = 'Διευθύνσεις IP OpenVZ';
 $wb['server_id_txt'] = 'Server';
 $wb['ip_address_txt'] = 'Διεύθυνση IP';
-$wb['reserved_txt'] = 'Σε χρήση';
+$wb['reserved_txt'] = 'Reserved';
 $wb['vm_id_txt'] = 'VM';
 ?>
diff --git a/interface/web/vm/lib/lang/el_openvz_template.lng b/interface/web/vm/lib/lang/el_openvz_template.lng
index 94425463d56e3505c119ad5366162b561d6e1055..afe2bcda65ec3e081c340f6f5714e86759a6817c 100644
--- a/interface/web/vm/lib/lang/el_openvz_template.lng
+++ b/interface/web/vm/lib/lang/el_openvz_template.lng
@@ -23,20 +23,20 @@ $wb['numiptent_txt'] = 'Numiptent';
 $wb['swappages_txt'] = 'Swappages';
 $wb['hostname_txt'] = 'Hostname';
 $wb['nameserver_txt'] = 'Nameserver(s)';
-$wb['nameserver_desc_txt'] = '(Διαχωρισμός με κενό)';
-$wb['capability_txt'] = 'Δυνατότητα';
-$wb['template_name_txt'] = 'Όνομα Προτύπου';
-$wb['diskspace_txt'] = 'Χώρος Δϊσκου';
-$wb['ram_txt'] = 'RAM (εγγυημένη)';
-$wb['ram_burst_txt'] = 'RAM (στιγμιαία)';
+$wb['nameserver_desc_txt'] = '(separated by whitespace)';
+$wb['capability_txt'] = 'Capability';
+$wb['template_name_txt'] = 'Template name';
+$wb['diskspace_txt'] = 'Diskspace';
+$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['ram_burst_txt'] = 'RAM (burst)';
 $wb['cpu_units_txt'] = 'Μονάδες CPU';
 $wb['cpu_num_txt'] = 'Αριθμός CPU';
 $wb['cpu_limit_txt'] = 'Όριο CPU %';
 $wb['io_priority_txt'] = 'Προτεραιότητα Ε/Ε';
-$wb['active_txt'] = 'Εν Ενεργεία';
+$wb['active_txt'] = 'Active';
 $wb['description_txt'] = 'Περιγραφή';
 $wb['numproc_desc_txt'] = 'Πλήθος διεργασιών και νημάτων.';
-$wb['numtcpsock_desc_txt'] = 'Πλήθος TCP sockets.';
+$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.';
 $wb['kmemsize_desc_txt'] = 'Size of unswappable kernel memory, allocated for processes in this container.';
@@ -88,6 +88,6 @@ $wb['numsiginfo_error_empty'] = 'Numsiginfo is empty.';
 $wb['dcachesize_error_empty'] = 'Dcachesize is empty.';
 $wb['numiptent_error_empty'] = 'Numiptent is empty.';
 $wb['swappages_error_empty'] = 'Swappages is empty.';
-$wb['Template'] = 'Πρότυπο';
-$wb['Advanced'] = 'Για προχωρημένους';
+$wb['Template'] = 'Template';
+$wb['Advanced'] = 'Advanced';
 ?>
diff --git a/interface/web/vm/lib/lang/el_openvz_vm.lng b/interface/web/vm/lib/lang/el_openvz_vm.lng
index 37c7ce0838d7c72ac492e58e92383e14c5276ceb..4c7950af36056e064ea15af0d96e75641117eef2 100644
--- a/interface/web/vm/lib/lang/el_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/el_openvz_vm.lng
@@ -27,12 +27,12 @@ $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'] = 'Το Χώρος Δίσκου είναι κενό.';
+$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['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';
diff --git a/interface/web/vm/lib/lang/fr_openvz_action.lng b/interface/web/vm/lib/lang/fr_openvz_action.lng
index 52f73285824f2d6c4107d8c9eec5980a251d505c..22b6b07d2fa00077ed42e80dd0fef7deb076fa92 100644
--- a/interface/web/vm/lib/lang/fr_openvz_action.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_action.lng
@@ -1,16 +1,16 @@
 <?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['head_txt'] = 'Serveur virtuel actions pour la VM :';
+$wb['start_txt'] = 'Démarrer le serveur virtuel';
+$wb['stop_txt'] = 'Arrêter le serveur virtuel';
+$wb['restart_txt'] = 'Redémarrer le serveur virtuel';
+$wb['ostemplate_txt'] = 'Créer un modèle OS (OSTemplate)';
+$wb['ostemplate_desc_txt'] = '(exemple: debian-6.0-i386-custom)';
+$wb['btn_save_txt'] = 'Lancer l\'action sélectionnée';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['start_exec_txt'] = 'La commande de démarrage a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne démarre.';
+$wb['stop_exec_txt'] = 'La commande d\'arrêt a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne s\'arrête.';
+$wb['restart_exec_txt'] = 'La commande de redémarrage a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne redémarre.';
+$wb['ostemplate_name_error'] = 'Le nom de modèle OS (OSTemplate) contient des caractères interdits.';
+$wb['ostemplate_name_unique_error'] = 'Un modèle OS (OSTemplate) avec ce nom existe déjà.';
+$wb['ostemplate_exec_txt'] = 'La commande pour créer un modèle OS (OSTemplate) a été envoyée au serveur hôte. Cela peut prendre 1 minutes avant que le modèle OS (OSTemplate) ne soit créé.';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_ip.lng b/interface/web/vm/lib/lang/fr_openvz_ip.lng
index 6016681df89f13323f60379acff5e7abd98f4c77..9aa6f97ea79c466017aabe7c4e5b368998860331 100644
--- a/interface/web/vm/lib/lang/fr_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_ip.lng
@@ -1,9 +1,9 @@
 <?php
 $wb['server_id_txt'] = 'Hostserver';
-$wb['ip_address_txt'] = 'IP address';
-$wb['vm_id_txt'] = 'Virtual server';
-$wb['reserved_txt'] = 'Reserved';
-$wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
-$wb['ip_error_unique'] = 'This IP address does already exist.';
-$wb['IP address'] = 'IP address';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['vm_id_txt'] = 'Serveur virtuel';
+$wb['reserved_txt'] = 'Reservé';
+$wb['ip_error_wrong'] = 'Renseignez une adresse IPv4 valide.';
+$wb['ip_error_unique'] = 'L\'adresse IP existe déjà.';
+$wb['IP address'] = 'Adresse IP';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_ip_list.lng b/interface/web/vm/lib/lang/fr_openvz_ip_list.lng
index e6a3a68c2c3b9cad34982f035b86d4446ea68439..4f1d3706b74a29bb417087ca7052c5570a331438 100644
--- a/interface/web/vm/lib/lang/fr_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_ip_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'OpenVZ IP addresses';
-$wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP address';
-$wb['reserved_txt'] = 'Reserved';
+$wb['list_head_txt'] = 'Adresses IP OpenVZ';
+$wb['server_id_txt'] = 'Serveur';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['reserved_txt'] = 'Reservé';
 $wb['vm_id_txt'] = 'VM';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng b/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng
index 256750f19a0cf4d459214a327d3f86773f9312d7..ba9193da2fd671af2016991bf00234f1891f160a 100644
--- a/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng
@@ -1,11 +1,11 @@
 <?php
-$wb['template_name_txt'] = 'Template name';
-$wb['template_file_txt'] = 'Template filename';
-$wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
-$wb['active_txt'] = 'Active';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['template_file_txt'] = 'Nom de fichier modèle';
+$wb['server_id_txt'] = 'Serveur';
+$wb['allservers_txt'] = 'Existe sur tous les serveurs';
+$wb['active_txt'] = 'Actif';
 $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['template_name_error_empty'] = 'Le modèle est vide.';
+$wb['template_file_error_empty'] = 'Le nom de fichier modèle est vide.';
+$wb['Template'] = 'Modèle';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng
index 6471ec0e277b63b6e110ef8deef7ca35511a2a52..377713cb9a60881c0d2366d46d86b335c5d951aa 100644
--- a/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng
@@ -1,8 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'OpenVZ OSTemplate';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
-$wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
+$wb['active_txt'] = 'Actif';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['server_id_txt'] = 'Serveur';
+$wb['allservers_txt'] = 'Existe sur tous les serveurs';
 $wb['ostemplate_id_txt'] = 'ID';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_template.lng b/interface/web/vm/lib/lang/fr_openvz_template.lng
index d285512dcab15fffb604da4ce421f5e5e056d485..d33091bd993af4b1c0a8640763256b456bc815f3 100644
--- a/interface/web/vm/lib/lang/fr_openvz_template.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_template.lng
@@ -21,73 +21,73 @@ $wb['numsiginfo_txt'] = 'Numsiginfo';
 $wb['dcachesize_txt'] = 'Dcachesize';
 $wb['numiptent_txt'] = 'Numiptent';
 $wb['swappages_txt'] = 'Swappages';
-$wb['hostname_txt'] = 'Hostname';
+$wb['hostname_txt'] = 'Nom de domaine';
 $wb['nameserver_txt'] = 'Nameserver(s)';
-$wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Capability';
-$wb['template_name_txt'] = 'Template name';
-$wb['diskspace_txt'] = 'Diskspace';
-$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['nameserver_desc_txt'] = '(séparés par des espaces)';
+$wb['capability_txt'] = 'Capacité';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['diskspace_txt'] = 'Espace disque';
+$wb['ram_txt'] = 'RAM (garantie)';
 $wb['ram_burst_txt'] = 'RAM (burst)';
-$wb['cpu_units_txt'] = 'CPU units';
-$wb['cpu_num_txt'] = 'CPU cores';
-$wb['cpu_limit_txt'] = 'CPU limit %';
-$wb['io_priority_txt'] = 'I/O priority';
-$wb['active_txt'] = 'Active';
+$wb['cpu_units_txt'] = 'Nombre de CPU';
+$wb['cpu_num_txt'] = 'Coeurs CPU';
+$wb['cpu_limit_txt'] = 'Limite CPU en %';
+$wb['io_priority_txt'] = 'I/O priorité';
+$wb['active_txt'] = 'Actif';
 $wb['description_txt'] = 'Description';
-$wb['numproc_desc_txt'] = 'Number of processes and threads.';
-$wb['numtcpsock_desc_txt'] = 'Number of TCP sockets.';
-$wb['numothersock_desc_txt'] = 'Number of sockets other than TCP.';
-$wb['vmguarpages_desc_txt'] = 'Memory allocation guarantee, in pages.';
-$wb['kmemsize_desc_txt'] = 'Size of unswappable kernel memory, allocated for processes in this container.';
-$wb['tcpsndbuf_desc_txt'] = 'Total size of TCP send buffers.';
-$wb['tcprcvbuf_desc_txt'] = 'Total size of TCP receive buffers.';
-$wb['othersockbuf_desc_txt'] = 'Total size of UNIX-domain socket buffers, UDP and other datagram protocol send buffers.';
-$wb['dgramrcvbuf_desc_txt'] = 'Receive buffers of UDP and other datagram protocols.';
-$wb['oomguarpages_desc_txt'] = 'The guaranteed amount of memory for the case the memory is over-booked (out-of-memory kill guarantee), in pages.';
-$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['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['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 cores 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['numproc_error_empty'] = 'Numproc is empty.';
-$wb['numtcpsock_error_empty'] = 'Numtcpsock is empty.';
-$wb['numothersock_error_empty'] = 'Numothersock is empty.';
-$wb['vmguarpages_error_empty'] = 'Vmguarpages is empty.';
-$wb['kmemsize_error_empty'] = 'Kmemsize is empty.';
-$wb['tcpsndbuf_error_empty'] = 'Tcpsndbuf is empty.';
-$wb['tcprcvbuf_error_empty'] = 'Tcprcvbuf is empty.';
-$wb['othersockbuf_error_empty'] = 'Othersockbuf is empty.';
-$wb['dgramrcvbuf_error_empty'] = 'Dgramrcvbuf is empty.';
-$wb['oomguarpages_error_empty'] = 'Oomguarpages is empty.';
-$wb['privvmpages_error_empty'] = 'Privvmpages is empty.';
-$wb['lockedpages_error_empty'] = 'Lockedpages is empty.';
-$wb['shmpages_error_empty'] = 'Shmpages is empty.';
-$wb['physpages_error_empty'] = 'Physpages is empty.';
-$wb['numfile_error_empty'] = 'Numfile is empty.';
-$wb['avnumproc_error_empty'] = 'Avnumproc is empty.';
-$wb['numflock_error_empty'] = 'Numflock is empty.';
-$wb['numpty_error_empty'] = 'Numpty is empty.';
-$wb['numsiginfo_error_empty'] = 'Numsiginfo is empty.';
-$wb['dcachesize_error_empty'] = 'Dcachesize is empty.';
-$wb['numiptent_error_empty'] = 'Numiptent is empty.';
-$wb['swappages_error_empty'] = 'Swappages is empty.';
-$wb['Template'] = 'Template';
-$wb['Advanced'] = 'Advanced';
+$wb['numproc_desc_txt'] = 'Nombre de process et de threads.';
+$wb['numtcpsock_desc_txt'] = 'Nombre de sockets TCP.';
+$wb['numothersock_desc_txt'] = 'Nombre de sockets autres que TCP.';
+$wb['vmguarpages_desc_txt'] = 'Allocation de la mémoire garantie, en pages.';
+$wb['kmemsize_desc_txt'] = 'Taille de la mémoire du noyau non swappable, allouée pour les processus dans ce conteneur.';
+$wb['tcpsndbuf_desc_txt'] = 'Taille totale des tampons d\'envois TCP.';
+$wb['tcprcvbuf_desc_txt'] = 'Taille totale des tampons de réceptions TCP.';
+$wb['othersockbuf_desc_txt'] = 'Taille totale de tampons sockets UNIX-domain, UDP et autres protocoles tampons d\'envois datagram.';
+$wb['dgramrcvbuf_desc_txt'] = 'Tampons de réceptions UDP et autres protocoles datagram.';
+$wb['oomguarpages_desc_txt'] = 'La quantité de mémoire garantie dans la cas ou la mémoire est saturée (suppression de l\'excédent de mémoire garantie), en pages.';
+$wb['privvmpages_desc_txt'] = 'Allocation mémoire limite, en pages.';
+$wb['lockedpages_desc_txt'] = 'Les process de pages ne sont pas autorisés au swap (pages vérouillées par mlock(2)).';
+$wb['shmpages_desc_txt'] = 'Taille totale de la mémoire partagée (IPC, mappings anonymes partagés et objets TMPFS), en pages.';
+$wb['physpages_desc_txt'] = 'Taille totale de la RAM utilisée par les process.';
+$wb['numfile_desc_txt'] = 'Nombre de fichiers ouverts.';
+$wb['numflock_desc_txt'] = 'Nombre de fichiers vérouillés.';
+$wb['numpty_desc_txt'] = 'Nombre de pseudo-terminals.';
+$wb['numsiginfo_desc_txt'] = 'Nombre de structures siginfo.';
+$wb['dcachesize_desc_txt'] = 'Taille totale de dentry et structures inode vérouillés en mémoire.';
+$wb['numiptent_desc_txt'] = 'Nombre d\'entrées NETFILTER (IP packet filtering).';
+$wb['swappages_desc_txt'] = 'Quantité d\'espace de swap à afficher dans le conteneur.';
+$wb['create_dns_txt'] = 'Créer un DNS pour le nom de domaine.';
+$wb['template_name_error_empty'] = 'Le nom de modèle est vide.';
+$wb['diskspace_error_empty'] = 'L\'espace disque est vide.';
+$wb['ram_error_empty'] = 'RAM (garantie) est vide.';
+$wb['ram_burst_error_empty'] = 'RAM (burst) est vide.';
+$wb['cpu_units_error_empty'] = 'Le nombre de CPU est vide.';
+$wb['cpu_num_error_empty'] = 'Le nombre de coeursCPU est vide.';
+$wb['cpu_limit_error_empty'] = 'La limite de CPU en % est vide.';
+$wb['io_priority_error_empty'] = 'La priorité I/O est vide.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s) est vide.';
+$wb['numproc_error_empty'] = 'Numproc est vide.';
+$wb['numtcpsock_error_empty'] = 'Numtcpsock est vide.';
+$wb['numothersock_error_empty'] = 'Numothersock est vide.';
+$wb['vmguarpages_error_empty'] = 'Vmguarpages est vide.';
+$wb['kmemsize_error_empty'] = 'Kmemsize est vide.';
+$wb['tcpsndbuf_error_empty'] = 'Tcpsndbuf est vide.';
+$wb['tcprcvbuf_error_empty'] = 'Tcprcvbuf est vide.';
+$wb['othersockbuf_error_empty'] = 'Othersockbuf est vide.';
+$wb['dgramrcvbuf_error_empty'] = 'Dgramrcvbuf est vide.';
+$wb['oomguarpages_error_empty'] = 'Oomguarpages est vide.';
+$wb['privvmpages_error_empty'] = 'Privvmpages est vide.';
+$wb['lockedpages_error_empty'] = 'Lockedpages est vide.';
+$wb['shmpages_error_empty'] = 'Shmpages est vide.';
+$wb['physpages_error_empty'] = 'Physpages est vide.';
+$wb['numfile_error_empty'] = 'Numfile est vide.';
+$wb['avnumproc_error_empty'] = 'Avnumproc est vide.';
+$wb['numflock_error_empty'] = 'Numflock est vide.';
+$wb['numpty_error_empty'] = 'Numpty est vide.';
+$wb['numsiginfo_error_empty'] = 'Numsiginfo est vide.';
+$wb['dcachesize_error_empty'] = 'Dcachesize est vide.';
+$wb['numiptent_error_empty'] = 'Numiptent est vide.';
+$wb['swappages_error_empty'] = 'Swappages est vide.';
+$wb['Template'] = 'Modèle';
+$wb['Advanced'] = 'Avancé';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_template_list.lng b/interface/web/vm/lib/lang/fr_openvz_template_list.lng
index de4045c36a75506c0452b17c1e9d61080b534ce2..c4ce4edd5fe15b7df96e2ba445c467f78ab4c6ee 100644
--- a/interface/web/vm/lib/lang/fr_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_template_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
+$wb['list_head_txt'] = 'Modèle de machine virtuelle OpenVZ';
+$wb['active_txt'] = 'Actif';
+$wb['template_name_txt'] = 'Nom du modèle';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_vm.lng b/interface/web/vm/lib/lang/fr_openvz_vm.lng
index f2be022dd0ae060ae8688cdcaa356b4200185d7c..f3d69c10e3daf5529a877f73ab7a8b91ad560539 100644
--- a/interface/web/vm/lib/lang/fr_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_vm.lng
@@ -1,40 +1,40 @@
 <?php
-$wb['diskspace_txt'] = 'Diskspace';
-$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['diskspace_txt'] = 'Espace disque';
+$wb['ram_txt'] = 'RAM (garantie)';
 $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'] = 'Unités CPU';
+$wb['cpu_num_txt'] = 'Nombre de CPU';
+$wb['cpu_limit_txt'] = 'Limite CPU';
+$wb['io_priority_txt'] = 'Priorités I/O';
 $wb['nameserver_txt'] = 'Nameserver(s)';
-$wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Capability';
+$wb['nameserver_desc_txt'] = '(séparés par un espace)';
+$wb['capability_txt'] = 'Capacité';
 $wb['server_id_txt'] = 'Hostserver';
-$wb['ostemplate_id_txt'] = 'OSTemplate';
-$wb['template_id_txt'] = 'Template';
-$wb['ip_address_txt'] = 'IP address';
+$wb['ostemplate_id_txt'] = 'Modèle OS (OSTemplate)';
+$wb['template_id_txt'] = 'Modèle';
+$wb['ip_address_txt'] = 'Adresse IP';
 $wb['hostname_txt'] = 'Hostname';
-$wb['vm_password_txt'] = 'VM Password';
-$wb['start_boot_txt'] = 'Start at boot';
-$wb['active_txt'] = 'Active';
+$wb['vm_password_txt'] = 'Mot de passe de la VM';
+$wb['start_boot_txt'] = 'Lancer au démarrage';
+$wb['active_txt'] = 'Actif';
 $wb['description_txt'] = 'Description';
 $wb['client_group_id_txt'] = 'Client';
 $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'] = 'Créer un DNS pour le nom de domaine';
+$wb['active_until_date_txt'] = 'Actif jusqu\'à';
+$wb['ip_address_error_empty'] = 'L\'addresse IP est vide.';
+$wb['hostname_error_empty'] = 'Hostname est vide.';
+$wb['vm_password_error_empty'] = 'Le mot de passe de la VM est vide.';
+$wb['veid_error_empty'] = 'VEID est vide.';
+$wb['veid_error_unique'] = 'VEID existe déjà.';
+$wb['diskspace_error_empty'] = 'L\'espace disque est vide.';
+$wb['ram_error_empty'] = 'RAM (garantie) est vide.';
+$wb['ram_burst_error_empty'] = 'RAM (burst) est vide.';
+$wb['cpu_units_error_empty'] = 'Unités CPU est vide.';
+$wb['cpu_num_error_empty'] = 'Le nombre de CPU est vide.';
+$wb['cpu_limit_error_empty'] = 'La limite CPU est vide.';
+$wb['io_priority_error_empty'] = 'Les priorités I/O sont vides.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s) est vide.';
+$wb['Virtual server'] = 'Serveur virtuel';
+$wb['Advanced'] = 'Avancé';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_vm_list.lng b/interface/web/vm/lib/lang/fr_openvz_vm_list.lng
index 2238e2b8f4fa4db72f1b785d6e0849e356922faf..9a6f78f581edb1eb61149c880a181d02bc5f10a1 100644
--- a/interface/web/vm/lib/lang/fr_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_vm_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Virtual server';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Serveur virtuel';
+$wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Hostserver';
-$wb['ostemplate_id_txt'] = 'OSTemplate';
-$wb['template_id_txt'] = 'Template';
+$wb['ostemplate_id_txt'] = 'Modèle OS (OSTemplate)';
+$wb['template_id_txt'] = 'Modèle';
 $wb['hostname_txt'] = 'Hostname';
-$wb['ip_address_txt'] = 'IP address';
+$wb['ip_address_txt'] = 'Adresse IP';
 $wb['veid_txt'] = 'VEID';
 ?>
diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
index b12644c62ff57154703896920f1114a2f925450a..a7a4c64154d9ae02c8eb25f68de05c74899982f9 100644
--- a/server/conf/php_fpm_pool.conf.master
+++ b/server/conf/php_fpm_pool.conf.master
@@ -8,7 +8,7 @@ listen.allowed_clients = 127.0.0.1
 listen = <tmpl_var name='fpm_socket'>
 listen.owner = <tmpl_var name='fpm_user'>
 listen.group = <tmpl_var name='fpm_group'>
-listen.mode = 0600
+listen.mode = <tmpl_vare name='fpm_listen_mode'>
 </tmpl_if>
 
 user = <tmpl_var name='fpm_user'>
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index 680b592857156dabdbbe25d1e79cef8554a3eddf..c31aa671123271f59ddfd689a9ff64e3df6ddbee 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -235,6 +235,18 @@ class web_module {
 		} else {
 			$path_parts = pathinfo($init_script);
 			$initcommand = $app->system->getinitcommand($path_parts['basename'], $action, $path_parts['dirname']);
+			
+			if($action == 'reload' && $init_script == $conf['init_scripts'].'/'.$web_config['php_fpm_init_script']) {
+				// we have to do a workaround because of buggy ubuntu fpm reload handling
+				// @see: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1242376
+				if(file_exists('/etc/os-release')) {
+					$tmp = file_get_contents('/etc/os-release');
+					if(preg_match('/^ID=ubuntu/m', $tmp) && preg_match('/^VERSION_ID="14\.04"/m', $tmp)) {
+						$initcommand = '/sbin/start-stop-daemon --stop --signal USR2 --quiet --pidfile /var/run/php5-fpm.pid --name php5-fpm';
+					}
+					unset($tmp);
+				}
+			}
 		}
 
 		$retval = array('output' => '', 'retval' => 0);
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 18c4ded613db72a55d0ade0544954ce5d51896b5..5e3bf85e0fd44b7c9b6e65ba2d6efddc472cf25e 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -444,13 +444,26 @@ class apache2_plugin {
 
 		$web_folder = 'web';
 		$log_folder = 'log';
+		$old_web_folder = 'web';
+		$old_log_folder = 'log';
 		if($data['new']['type'] == 'vhostsubdomain' || $data['new']['type'] == 'vhostalias') {
+			// new one
 			$tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($data['new']['parent_domain_id']));
 			$subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['new']['domain']);
 			if($subdomain_host == '') $subdomain_host = 'web'.$data['new']['domain_id'];
 			$web_folder = $data['new']['web_folder'];
 			$log_folder .= '/' . $subdomain_host;
 			unset($tmp);
+			
+			if(isset($data['old']['parent_domain_id'])) {
+				// old one
+				$tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($data['old']['parent_domain_id']));
+				$subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['old']['domain']);
+				if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id'];
+				$old_web_folder = $data['old']['web_folder'];
+				$old_log_folder .= '/' . $subdomain_host;
+				unset($tmp);
+			}
 		}
 
 		// Create group and user, if not exist
@@ -562,9 +575,9 @@ class apache2_plugin {
 			if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
 
 			//* Change the log mount
-			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.'    none    bind';
+			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.'    none    bind';
 			$app->system->removeLine('/etc/fstab', $fstab_line);
-			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.'    none    bind,nobootwait';
+			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.'    none    bind,nobootwait';
 			$app->system->removeLine('/etc/fstab', $fstab_line);
 			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait,_netdev    0 0';
 			$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
@@ -596,14 +609,14 @@ class apache2_plugin {
 		// Remove the symlink for the site, if site is renamed
 		if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
 			if(is_dir('/var/log/ispconfig/httpd/'.$data['old']['domain'])) exec('rm -rf /var/log/ispconfig/httpd/'.$data['old']['domain']);
-			if(is_link($data['old']['document_root'].'/'.$log_folder)) $app->system->unlink($data['old']['document_root'].'/'.$log_folder);
+			if(is_link($data['old']['document_root'].'/'.$old_log_folder)) $app->system->unlink($data['old']['document_root'].'/'.$old_log_folder);
 
 			//* remove old log mount
-			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.'    none    bind';
+			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.'    none    bind';
 			$app->system->removeLine('/etc/fstab', $fstab_line);
 
 			//* Unmount log directory
-			exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+			exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
 		}
 
 		//* Create the log dir if nescessary and mount it
@@ -1713,7 +1726,6 @@ class apache2_plugin {
 
 		//* Unset action to clean it for next processed vhost.
 		$this->action = '';
-
 	}
 
 	function delete($event_name, $data) {
@@ -2770,6 +2782,7 @@ class apache2_plugin {
 
 		$fpm_socket = $socket_dir.$pool_name.'.sock';
 		$tpl->setVar('fpm_socket', $fpm_socket);
+		$tpl->setVar('fpm_listen_mode', '0600');
 
 		$tpl->setVar('fpm_pool', $pool_name);
 		$tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1);
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 851a251ad96f660ff7f0e582a9f0cf9d83ba1ef0..05120416bfde3a2b92b193ba0a7eea2cf1eb7c69 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -362,13 +362,26 @@ class nginx_plugin {
 
 		$web_folder = 'web';
 		$log_folder = 'log';
+		$old_web_folder = 'web';
+		$old_log_folder = 'log';
 		if($data['new']['type'] == 'vhostsubdomain' || $data['new']['type'] == 'vhostalias') {
+			// new one
 			$tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($data['new']['parent_domain_id']));
 			$subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['new']['domain']);
 			if($subdomain_host == '') $subdomain_host = 'web'.$data['new']['domain_id'];
 			$web_folder = $data['new']['web_folder'];
 			$log_folder .= '/' . $subdomain_host;
 			unset($tmp);
+			
+			if(isset($data['old']['parent_domain_id'])) {
+				// old one
+				$tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($data['old']['parent_domain_id']));
+				$subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['old']['domain']);
+				if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id'];
+				$old_web_folder = $data['old']['web_folder'];
+				$old_log_folder .= '/' . $subdomain_host;
+				unset($tmp);
+			}
 		}
 
 		// Create group and user, if not exist
@@ -477,9 +490,9 @@ class nginx_plugin {
 			if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
 
 			//* Change the log mount
-			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.'    none    bind';
+			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.'    none    bind';
 			$app->system->removeLine('/etc/fstab', $fstab_line);
-			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.'    none    bind,nobootwait';
+			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.'    none    bind,nobootwait';
 			$app->system->removeLine('/etc/fstab', $fstab_line);
 			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait,_netdev    0 0';
 			$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
@@ -511,14 +524,14 @@ class nginx_plugin {
 		// Remove the symlink for the site, if site is renamed
 		if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
 			if(is_dir('/var/log/ispconfig/httpd/'.$data['old']['domain'])) exec('rm -rf /var/log/ispconfig/httpd/'.$data['old']['domain']);
-			if(is_link($data['old']['document_root'].'/'.$log_folder)) $app->system->unlink($data['old']['document_root'].'/'.$log_folder);
+			if(is_link($data['old']['document_root'].'/'.$old_log_folder)) $app->system->unlink($data['old']['document_root'].'/'.$old_log_folder);
 
 			//* remove old log mount
-			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.'    none    bind';
+			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.'    none    bind';
 			$app->system->removeLine('/etc/fstab', $fstab_line);
 
 			//* Unmount log directory
-			exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+			exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
 		}
 
 		//* Create the log dir if nescessary and mount it
@@ -2353,6 +2366,7 @@ class nginx_plugin {
 
 		$fpm_socket = $socket_dir.$pool_name.'.sock';
 		$tpl->setVar('fpm_socket', $fpm_socket);
+		$tpl->setVar('fpm_listen_mode', '0660');
 
 		$tpl->setVar('fpm_pool', $pool_name);
 		$tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1);