From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/tools/lib/lang/fr_import_ispconfig.lng |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/interface/web/tools/lib/lang/fr_import_ispconfig.lng b/interface/web/tools/lib/lang/fr_import_ispconfig.lng
index 65ea145..babc728 100644
--- a/interface/web/tools/lib/lang/fr_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/fr_import_ispconfig.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['head_txt'] = 'Import email configuration from ISPConfig 3';
+$wb['head_txt'] = 'Import e-mail configuration from ISPConfig 3';
 $wb['legend_txt'] = 'Remote server connection details';
-$wb['legend2_txt'] = 'Import email domain';
+$wb['legend2_txt'] = 'Import e-mail domain';
 $wb['resync_sites_txt'] = 'Resync Websites';
 $wb['resync_ftp_txt'] = 'Resync FTP users';
 $wb['resync_shell_txt'] = 'Resync shell users';
@@ -13,12 +13,11 @@
 $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['mail_domain_txt'] = 'Remote e-mail domain';
 $wb['import_mailbox_txt'] = 'Import mailbox';
 $wb['import_aliasdomain_txt'] = 'Import alias domain';
-$wb['import_alias_txt'] = 'Import email alias';
+$wb['import_alias_txt'] = 'Import e-mail alias';
 $wb['import_forward_txt'] = 'Import forward';
 $wb['import_user_filter_txt'] = 'Import user filter';
 $wb['import_spamfilter_txt'] = 'Import spamfilter';
-
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1