From da1b478dc73bec369d5573662936ffad22354e0d Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Thu, 18 Aug 2011 21:34:33 -0400
Subject: [PATCH] FIRE-2663, Bottom tray menu improvements/FR translation,
 Albatroz Hird

---
 .../skins/default/xui/en/menu_bottomtray.xml  |  3 +
 .../skins/default/xui/fr/menu_bottomtray.xml  | 75 ++++++++++++++-----
 2 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
index 4285610a7a..b85c8f1422 100644
--- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--alba: added tear_off and label-->
 <menu
+ tear_off="true"
+ label="Button Bar"
  height="201"
  layout="topleft"
  left="100"
diff --git a/indra/newview/skins/default/xui/fr/menu_bottomtray.xml b/indra/newview/skins/default/xui/fr/menu_bottomtray.xml
index ce80e906f6..3168c19ba3 100644
--- a/indra/newview/skins/default/xui/fr/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/fr/menu_bottomtray.xml
@@ -1,21 +1,56 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-<<<<<<< local
-	<menu_item_check label="Voix activée" name="EnableVoiceChat"/>
-=======
-	<menu_item_check label="Bouton Parler" name="EnableVoiceChat"/>
->>>>>>> other
-	<menu_item_check label="Bouton Geste" name="ShowGestureButton"/>
-	<menu_item_check label="Bouton Bouger" name="ShowMoveButton"/>
-	<menu_item_check label="Bouton Affichage" name="ShowCameraButton"/>
-	<menu_item_check label="Bouton Photo" name="ShowSnapshotButton"/>
-	<menu_item_check label="Bouton Construire" name="ShowBuildButton"/>
-	<menu_item_check label="Bouton Rechercher" name="ShowSearchButton"/>
-	<menu_item_check label="Bouton Carte" name="ShowWorldMapButton"/>
-	<menu_item_check label="Bouton Mini-carte" name="ShowMiniMapButton"/>
-	<menu_item_call label="Couper" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Copier" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Coller" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Supprimer" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Tout sélectionner" name="NearbyChatBar_Select_All"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--alba-->
+<menu name="hide_camera_move_controls_menu"
+	label="Barre de boutons">
+
+    <menu_item_chek name="ShowSpeakButton"
+         label="Parler"/>
+	<menu_item_check name="ShowGestureButton"
+         label="Gestes / Ctl-G"/>
+    <menu_item_check name="ShowMoveButton"
+         label="Contrôle Mouv."/>
+    <menu_item_check name="ShowCameraButton"
+         label="Contrôle Caméra"/>
+    <menu_item_check name="ShowSnapshotButton"
+         label="Photo / Ctl-Maj-S"/>
+    <menu_item_check name="ShowBuildButton"
+		label="Construire / Ctl-B"/>
+    <menu_item_check name="ShowSearchButton"
+		label="Recherche / Ctl-F"/>
+    <menu_item_check name="ShowWorldMapButton"
+		label="Carte / Ctl-M"/>
+    <menu_item_check name="ShowMiniMapButton"
+		label="Mini carte / Ctl-Maj-M"/>
+    <menu_item_check name="ShowHomeButton"
+		label="Domicile / Ctl-Maj-H"/>
+    <menu_item_check name="ShowMeButton"
+		label="Profil / Clic-dr. s/soi"/>
+    <menu_item_check name="ShowPlacesButton"
+		label="Endroits"/>
+<!-- ## Zi: Animation Overrider -->
+    <menu_item_check name="ShowAOButton"
+		label="AO"/>
+<!-- ## Zi: Animation Overrider -->
+<!-- Quick Preferences panel -Wolf -->
+	<menu_item_check name="ShowQuickPrefsButton"
+		label="Préférences rapides"/>
+<!-- Quick Preferences panel -Wolf -->
+	<menu_item_check name="ShowPeopleButton"
+		label="Personnes / Ctl-F"/>
+    <menu_item_check name="ShowAppearanceButton"
+		label="Apparence / Clic-dr. s/soi"/>
+    <menu_item_check name="ShowInventoryButton"
+		label="Inventaire Ctl-I"/>
+<!--???-->
+    <menu_item_call name="NearbyChatBar_Cut"
+		label="Couper Ctl-X"/>
+    <menu_item_call name="NearbyChatBar_Copy"
+		label="Copier Ctl-C"/>
+    <menu_item_call name="NearbyChatBar_Paste"
+		label="Coller Ctl-V"/>
+    <menu_item_call name="NearbyChatBar_Delete"
+		label="Supprimer Del"/>
+    <menu_item_call name="NearbyChatBar_Select_All"
+		label="Tout sélect. Ctl-A"/>
+
 </menu>