From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 04 May 2016 07:27:53 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/client/lib/lang/fr_client_template.lng |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng
index 4309067..84b1e77 100644
--- a/interface/web/client/lib/lang/fr_client_template.lng
+++ b/interface/web/client/lib/lang/fr_client_template.lng
@@ -81,7 +81,7 @@
 $wb['web_limits_txt'] = 'Limite Web';
 $wb['email_limits_txt'] = 'Limite d’e-mails';
 $wb['database_limits_txt'] = 'Limite de bases de données';
-$wb['cron_job_limits_txt'] = 'Limite de tâches CROn';
+$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';
@@ -114,4 +114,7 @@
 $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
 $wb['limit_xmpp_status_txt'] = 'Status host available';
 $wb['dns_servers_txt'] = 'DNS servers';
+$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
+$wb['limit_directive_snippets_txt'] = 'Show web server config selection';
+$wb['limit_database_user_txt'] = 'Max. Database users';
 ?>

--
Gitblit v1.9.1