From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml

(limited to 'indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml')

diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 9f56dad9582c8585a92c54baf28c928b2d3bb7d2 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 3 Apr 2013 15:35:45 -0700
Subject: FIX INTL-114 translation for 9 languages of major update from CHUI
 and other projects

---
 indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml')

diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index f86c1a4217..eace67026c 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
 	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Aperçu direct" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Aperçu désactivé"/>
 	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
 	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
-- 
cgit v1.2.3


From 80772aa1ad62a89129f24508e2005b20fec88854 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 24 Apr 2013 13:49:11 -0700
Subject: sync with viewer-development (per DRTVWR-309)

---
 indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml')

diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index eace67026c..f86c1a4217 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
 	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Aperçu direct" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Aperçu désactivé"/>
 	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
 	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
-- 
cgit v1.2.3


From 774277e9cf3b6b55c7aaaa9dadfe2ef2ddb0b0c2 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 24 Apr 2013 13:56:53 -0700
Subject: FIX INTL-114 translation for 9 languages of major update from CHUI
 (based on latest merge with viewer-development)

---
 indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml')

diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index f86c1a4217..eace67026c 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
 	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Aperçu direct" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Aperçu désactivé"/>
 	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
 	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
-- 
cgit v1.2.3