From c2ce72ed94f6b7c68ce50a312e3b3c98edf2f22e Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 20 Jan 2013 10:15:23 -0500
Subject: [PATCH] Issue 604: Reset Button for inventory

Attempted Spanish translation.
Nomade Zhao provided French.
---
 .../default/xui/en-us/floater_inventory.xml    |  6 ++++--
 .../skins/default/xui/es/floater_inventory.xml |  5 +++--
 .../skins/default/xui/fr/floater_inventory.xml | 18 +++++-------------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 28da7d9a7..d06bc23ba 100644
--- a/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -11,8 +11,10 @@
    <button left="28" bottom_delta="0" height="22" width="22" follows="left|top" halign="center"
     label="" image_overlay="inv_expand_all.tga" name="Inventory.ExpandAll" mouse_opaque="true" font="SansSerif"
     tool_tip="Expand All"/>
+   <button left="50" bottom_delta="0" height="22" width="22" follows="left|top" label="" scale_image="true"
+    image_selected="UIImgBtnClosePressedUUID" image_unselected="UIImgBtnCloseActiveUUID" name="Inventory.ResetAll" tool_tip="Reset inventory: clear filters and collapse all folders."/>
  <text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
-		height="16" left="43" bottom_delta="2" right="108">Quick Filter:</text>
+    height="16" left="43" bottom_delta="2" right="108">Type:</text>
 	<!-- Inventory Type Filter Labels -->
 	<string name="filter_type_all">All Types</string>
 	<string name="filter_type_animation">Animations</string>
@@ -27,7 +29,7 @@
 	<string name="filter_type_texture">Textures</string>
 	<string name="filter_type_snapshot">Snapshots</string>
 	<string name="filter_type_custom">Custom...</string>
-	<combo_box name="Quick Filter" label="Quick Filter" follows="left|top|right" height="20" left="110" right="-6" bottom_delta="0">
+	<combo_box name="Quick Filter" tool_tip="Filter by type" follows="left|top|right" height="20" left="110" right="-6" bottom_delta="0">
 		<combo_item name="filter_type_all">All Types</combo_item>
 		<separator />
 		<combo_item name="filter_type_animation">Animations</combo_item>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory.xml b/indra/newview/skins/default/xui/es/floater_inventory.xml
index f3d2c9180..f0af949d5 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory.xml
@@ -3,8 +3,9 @@
 	<search_editor label="Escribe aquí para buscar" name="inventory search editor"/>
 	<button label="" name="collapse_btn" tool_tip="Cerrar Todo" />
 	<button label="" name="Inventory.ExpandAll" tool_tip="Expandir Todo"/>	  
+   <button name="Inventory.ResetAll" tool_tip="Cerrar Todo y Limpiar Filtros"/>
 	<text name="group_titles_textbox">
-		Filtro Rápido:
+		Tipos:
 	</text>
 	<!-- Inventory Type Filter Labels -->
 	<string name="filter_type_all">
@@ -46,7 +47,7 @@
 	<string name="filter_type_custom">
 		Personalizado...
 	</string>
-	<combo_box name="Quick Filter" label="Filtro Rápido">
+	<combo_box name="Quick Filter" tool_tip="Filtro Rápido">
 		<combo_item name="filter_type_all">
 			Todos los Tipos
 		</combo_item>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory.xml b/indra/newview/skins/default/xui/fr/floater_inventory.xml
index 6a8d63525..6d577963f 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="Inventaire">
 	<search_editor label="Saisir votre recherche ici" name="inventory search editor"/>
-  <button left="6" bottom_delta="-26" height="22" width="22" follows="left|top" halign="center"
-    label="" image_overlay="inv_collapse_all.tga" name="collapse_btn" mouse_opaque="true" font="SansSerif"
-    tool_tip="Collapse All" />
-   <button left="28" bottom_delta="0" height="22" width="22" follows="left|top" halign="center"
-    label="" image_overlay="inv_expand_all.tga" name="Inventory.ExpandAll" mouse_opaque="true" font="SansSerif"
-    tool_tip="Expand All"/>
- <text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
-		height="16" left="43" bottom_delta="2" right="108">Filtre rapide</text>
+  <button name="collapse_btn" tool_tip="Collapse All" />
+   <button name="Inventory.ExpandAll" tool_tip="Expand All"/>
+   <button name="Inventory.ResetAll" tool_tip="Réinitialisation de l'inventaire : Nettoye les filtres et réduit l'inventaire"/>
 	<!-- Inventory Type Filter Labels -->
 	<string name="filter_type_all">TOUT</string>
 	<string name="filter_type_animation">Animations</string>
@@ -23,7 +18,7 @@
 	<string name="filter_type_texture">Textures</string>
 	<string name="filter_type_snapshot">Photos</string>
 	<string name="filter_type_custom">Personnalis&#xE9;</string>
-	<combo_box name="Quick Filter" label="Filtre Rapide" follows="left|top|right" height="20" left="110" right="-6" bottom_delta="0">
+	<combo_box name="Quick Filter" tool_tip="filtrer par genre">
 		<combo_item name="filter_type_all">TOUT</combo_item>
 		<separator />
 		<combo_item name="filter_type_animation">Animations</combo_item>
@@ -47,7 +42,6 @@
 	</tab_container>
 	<menu_bar name="Inventory Menu">
 		<menu label="Fichier" name="File">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
 			<menu_item_call label="Ouvrir" name="Open"/>
 			<menu_item_call label="Nouvelle fenêtre" name="New Window"/>
 			<menu_item_call label="Afficher les filtres" name="Show Filters"/>
@@ -57,7 +51,6 @@
 			<menu_item_call label="Rafraichir l'inventaire" name="Refresh Inventory"/>
 		</menu>
 		<menu label="Créer" name="Create">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
 			<menu_item_call label="Nouveau dossier" name="New Folder"/>
 			<menu_item_call label="Nouveau script" name="New Script"/>
 			<menu_item_call label="Nouvelle note" name="New Note"/>
@@ -79,9 +72,9 @@
 				<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
 				<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
 			</menu>
+			<menu_item_call label="Nouvel ensemble" name="New Outfit"/>
 		</menu>
 		<menu label="Trier" name="Sort">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
 			<menu_item_check label="Par nom" name="By Name"/>
 			<menu_item_check label="Par date" name="By Date"/>
 			<menu_item_check label="Trier les dossiers par nom" name="Folders Always By Name"/>
@@ -93,7 +86,6 @@
 			<menu_item_check label="par créateur" name="Item creatorr"/>
 		</menu>
 		<menu label="Filters" name="Filters">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
 			<menu_item_check label="Modifier actuel" name="Modify Current"/>
 			<menu_item_call label="Réinitialiser actuel" name="Reset Current"/>
 		</menu>