From 5c6bdf5fea2a574eff2c5be4f37b5e7674c58281 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Sun, 24 Jan 2016 13:18:20 +0100
Subject: [PATCH] Enable French language in preferences

---
 indra/newview/app_settings/settings.xml                         | 1 +
 .../newview/skins/default/xui/en/panel_preferences_general.xml  | 2 --
 .../newview/skins/default/xui/pl/panel_preferences_general.xml  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ce87f0f54b..5c6f0cd03d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -23563,6 +23563,7 @@ Change of this parameter will affect the layout of buttons in notification toast
         <string>de</string>
         <string>en</string>
         <string>es</string>
+        <string>fr</string>
         <string>it</string>
         <string>ja</string>
         <string>pl</string>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index b33ff99ed9..5fac029a89 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -58,13 +58,11 @@
          label="Español (Spanish) - Beta"
          name="Spanish"
          value="es" />
-        <!--
         <combo_box.item
          enabled="true"
          label="Français (French) - Beta"
          name="French"
          value="fr" />
-        -->
         <combo_box.item
          enabled="true"
          label="Italiano (Italian) - Beta"
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
index 7ec877f5c6..32d024eec1 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
@@ -9,7 +9,7 @@
 		<!-- <combo_box.item label="Dansk (Duński) - Beta" name="Danish"/> -->
 		<combo_box.item label="Deutsch (Niemiecki)" name="Deutsch(German)"/>
 		<combo_box.item label="Español (Hiszpański) - Beta" name="Spanish"/>
-		<!-- <combo_box.item label="Français (Francuski) - Beta" name="French"/> -->
+		<combo_box.item label="Français (Francuski) - Beta" name="French"/>
 		<combo_box.item label="Italiano (Włoski) - Beta" name="Italian"/>
 		<combo_box.item label="Polski" name="Polish"/>
 		<!-- <combo_box.item label="Português (Portugalski) - Beta" name="Portugese"/> -->