From 49952f1d78f50b9c15c1b5f101eec40be8d3d4f9 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 31 Aug 2010 14:53:28 -0400
Subject: set default build notices to show changes since last_sprint tag

---
 BuildParams | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BuildParams b/BuildParams
index d481072185..8ca056db49 100644
--- a/BuildParams
+++ b/BuildParams
@@ -19,7 +19,7 @@ email_status_this_is_os = true
 # ========================================
 
 # Report changes since...
-viewer-development.show_changes_since = 2-1-release
+viewer-development.show_changes_since = last_sprint
 
 # Build Settings
 viewer-development_coverity.coverity_product = viewer
-- 
cgit v1.2.3


From 34b045180603189a867d93cace54abf88709c221 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 31 Aug 2010 13:37:30 -0700
Subject: CT-575 WIP FR linguistic

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

diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index de8d25a494..7828d2df97 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -19,7 +19,7 @@
 		Prévisualiser
 	</floater.string>
 	<floater.string name="none_text">
-		-Aucun choix-
+		- Choisir -
 	</floater.string>
 	<floater.string name="Title">
 		Geste : [NAME]
-- 
cgit v1.2.3


From 3cabca8df62ae8ee815dd7d885f14f5a7d0ea98d Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 31 Aug 2010 13:46:13 -0700
Subject: CT-575 WIP FR linguistic; restore 1 missing string

---
 indra/newview/skins/default/xui/fr/menu_object.xml | 6 ++++--
 indra/newview/skins/default/xui/fr/strings.xml     | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
index 6492a83e06..257c44795f 100644
--- a/indra/newview/skins/default/xui/fr/menu_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Object Pie">
-	<menu_item_call label="Toucher" name="Object Touch"/>
-	<menu_item_call label="Éditer" name="Edit..."/>
+	<menu_item_call label="Toucher" name="Object Touch">
+		<on_enable parameter="Toucher" name="EnableTouch"/>
+	</menu_item_call>
+	<menu_item_call label="Modifier" name="Edit..."/>
 	<menu_item_call label="Construire" name="Build"/>
 	<menu_item_call label="Ouvrir" name="Open"/>
 	<menu_item_call label="M&apos;asseoir ici" name="Object Sit"/>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 1204d3325a..f221e42e9a 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1062,9 +1062,9 @@
 	<string name="Sound" value=" Son :"/>
 	<string name="Wait" value=" --- Attendre :"/>
 	<string name="AnimFlagStop" value=" Arrêter l&apos;animation :"/>
-	<string name="AnimFlagStart" value=" Démarrer l&apos;animation :"/>
+	<string name="AnimFlagStart" value=" Lancer l&apos;animation :"/>
 	<string name="Wave" value=" Faire signe"/>
-	<string name="GestureActionNone" value="Aucune"/>
+	<string name="GestureActionNone" value="À choisir"/>
 	<string name="HelloAvatar" value=" Bonjour, avatar !"/>
 	<string name="ViewAllGestures" value="  Tout afficher &gt;&gt;"/>
 	<string name="GetMoreGestures" value="Plus &gt;&gt;"/>
-- 
cgit v1.2.3