From 9dbe107f4e547d1aec0a234eaa0e6f83dd987898 Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Thu, 18 Feb 2010 20:37:37 -0500
Subject: move base back to default because doing it as a backout was causing
 merge errors

---
 .../skins/default/xui/fr/floater_texture_ctrl.xml  | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 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
new file mode 100644
index 0000000000..381bcceb00
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="texture picker" title="CHOISIR : TEXTURE">
+	<string name="choose_picture">
+		Cliquez pour sélectionner une image
+	</string>
+	<text name="Multiple">
+		Textures multiples
+	</text>
+	<text name="unknown">
+		Taille : [DIMENSIONS]
+	</text>
+	<button label="Défaut" label_selected="Défaut" name="Default" width="60"/>
+	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
+	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
+	<check_box label="Afficher les dossiers" name="show_folders_check"/>
+	<search_editor label="Filtrer les textures" name="inventory search editor"/>
+	<check_box label="Appliquer maintenant" name="apply_immediate_check"/>
+	<button bottom="-240" label="" label_selected="" name="Pipette"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<button label="OK" label_selected="OK" name="Select"/>
+	<string name="pick title">
+		Choisir :
+	</string>
+</floater>
-- 
cgit v1.2.3