From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/interface/web/tools/lib/lang/fr_import_ispconfig.lng b/interface/web/tools/lib/lang/fr_import_ispconfig.lng
index ce47c4d..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,10 +13,10 @@
 $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';

--
Gitblit v1.9.1