From f2851d17638c18984387c1bcca3b80152ad4b21a Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 25 Mar 2014 12:55:40 -0400
Subject: [PATCH]  Merge branch 'master' into 'master'

---
 interface/web/sites/lib/lang/fr_web_childdomain.lng  |    4 ++--
 interface/web/sites/lib/lang/fr_web_vhost_domain.lng |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/web/sites/lib/lang/fr_web_childdomain.lng b/interface/web/sites/lib/lang/fr_web_childdomain.lng
index 3811620..c7878b3 100644
--- a/interface/web/sites/lib/lang/fr_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/fr_web_childdomain.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['ssl_state_txt'] = 'Pays';
+$wb['ssl_state_txt'] = 'État/département';
 $wb['ssl_locality_txt'] = 'Lieu';
 $wb['ssl_organisation_txt'] = 'Organisation';
 $wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
@@ -116,4 +116,4 @@
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
 
-?>
+?>
\ No newline at end of file
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 626b625..f465bb6 100644
--- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['ssl_state_txt'] = 'Pays';
+$wb['ssl_state_txt'] = 'État/département';
 $wb['ssl_locality_txt'] = 'Localité';
 $wb['ssl_organisation_txt'] = 'Organisation';
 $wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
@@ -134,4 +134,4 @@
 $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

--
Gitblit v1.9.1