From 4296542cd062af425d7744c88d6dd2bd00daf532 Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Tue, 7 Oct 2008 22:49:00 +0000
Subject: Roll back of r98854 Accidentally commited merge in progress

---
 .../skins/default/xui/fr/floater_image_preview.xml | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
index a93547f240..262c1bb656 100644
--- a/indra/newview/skins/default/xui/fr/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Image Preview" title="">
 	<text name="name_label">
-		Nom :
+		Nom :
 	</text>
 	<text name="description_label">
 		Description :
 	</text>
 	<text name="preview_label">
-		Prévisualiser comme :
+		Aperçu de l&apos;image :
 	</text>
-	<combo_box label="Habits" name="clothing_type_combo">
+	<combo_box label="Type d&apos;habillement" name="clothing_type_combo">
 		<combo_item name="Image">
 			Image
 		</combo_item>
@@ -17,22 +17,22 @@
 			Cheveux
 		</combo_item>
 		<combo_item name="FemaleHead">
-			Tête de femme
+			Tête féminine
 		</combo_item>
 		<combo_item name="FemaleUpperBody">
-			Corps de femme (haut)
+			Haut du corps féminin
 		</combo_item>
 		<combo_item name="FemaleLowerBody">
-			Corps de femme (bas)
+			Bas du corps féminin
 		</combo_item>
 		<combo_item name="MaleHead">
-			Tête d&apos;homme
+			Tête masculine
 		</combo_item>
 		<combo_item name="MaleUpperBody">
-			Corps d&apos;homme (haut)
+			Haut du corps masculin
 		</combo_item>
 		<combo_item name="MaleLowerBody">
-			Corps d&apos;homme (bas)
+			Bas du corps masculin
 		</combo_item>
 		<combo_item name="Skirt">
 			Jupe
@@ -42,11 +42,11 @@
 		</combo_item>
 	</combo_box>
 	<text name="bad_image_text">
-		Impossible de lire l&apos;image.
-
-Sauvegardez en Targa 24 bit (.tga).
+		Unable to read image.
+	
+	Try saving image as 24 bit Targa (.tga).
 	</text>
 	<check_box label="Utiliser une compression sans perte" name="lossless_check" />
 	<button label="Annuler" name="cancel_btn" />
-	<button label="Charger ([AMOUNT] $L)" name="ok_btn" />
+	<button label="Uploader (L$[AMOUNT])" name="ok_btn" />
 </floater>
-- 
cgit v1.2.3