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/client/lib/lang/fr_client_message_template.lng |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/client/lib/lang/fr_client_message_template.lng b/interface/web/client/lib/lang/fr_client_message_template.lng
index 65e5fbf..8cbc0a5 100644
--- a/interface/web/client/lib/lang/fr_client_message_template.lng
+++ b/interface/web/client/lib/lang/fr_client_message_template.lng
@@ -7,5 +7,5 @@
 $wb['Settings'] = 'Setting';
 $wb['variables_txt'] = 'Variables';
 $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)';
-$wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.';
+$wb['duplicate_welcome_error'] = 'There can be only one default welcome e-mail template. Please edit the existing template instead of adding a new one.';
 ?>

--
Gitblit v1.9.1