From cec8d8b3e649d6cf946e427730793260f2c6296f Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 20 Jul 2011 13:56:21 -0700
Subject: FIX INTL-58 set25, light set4 translation for 6 languages

---
 indra/newview/skins/default/xui/es/menu_viewer.xml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/es/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 0824e386d5..049a89aa06 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -31,6 +31,7 @@
 		<menu_item_call label="Mis grupos" name="My Groups"/>
 		<menu_item_check label="Chat" name="Nearby Chat"/>
 		<menu_item_call label="Gente cerca" name="Active Speakers"/>
+		<menu_item_check label="Chat de voz" name="Nearby Voice"/>
 	</menu>
 	<menu label="Mundo" name="World">
 		<menu_item_check label="Minimapa" name="Mini-Map"/>
@@ -63,8 +64,24 @@
 			<menu_item_call label="Mediodía" name="Noon"/>
 			<menu_item_call label="Atardecer" name="Sunset"/>
 			<menu_item_call label="Medianoche" name="Midnight"/>
-			<menu_item_call label="Hora del Estado" name="Revert to Region Default"/>
-			<menu_item_call label="Editor del entorno" name="Environment Editor"/>
+		</menu>
+		<menu label="Editor de entorno" name="Enviroment Editor">
+			<menu_item_call label="Configuración de entorno..." name="Enviroment Settings"/>
+			<menu label="Agua predefinida" name="Water Presets">
+				<menu_item_call label="Nuevo predefinido..." name="new_water_preset"/>
+				<menu_item_call label="Editar predefinido..." name="edit_water_preset"/>
+				<menu_item_call label="Eliminar predefinido..." name="delete_water_preset"/>
+			</menu>
+			<menu label="Cielos predefinidos" name="Sky Presets">
+				<menu_item_call label="Nuevo predefinido..." name="new_sky_preset"/>
+				<menu_item_call label="Editar predefinido..." name="edit_sky_preset"/>
+				<menu_item_call label="Eliminar predefinido..." name="delete_sky_preset"/>
+			</menu>
+			<menu label="Días predefinidos" name="Day Presets">
+				<menu_item_call label="Nuevo predefinido..." name="new_day_preset"/>
+				<menu_item_call label="Editar predefinido..." name="edit_day_preset"/>
+				<menu_item_call label="Eliminar predefinido..." name="delete_day_preset"/>
+			</menu>
 		</menu>
 	</menu>
 	<menu label="Construir" name="BuildTools">
-- 
cgit v1.2.3


From 3c8f1dac14aa86025b5ab8eb53cbc302184015b5 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 15 Aug 2011 19:01:28 +0300
Subject: STORM-782 FIXED Removing the useless 'Compress snapshots to disk'
 item from the Advanced menu.

Removing the corresponding setting as well because it's not used anywhere.
---
 indra/newview/skins/default/xui/es/menu_viewer.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/es/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 049a89aa06..b0d16d1ca4 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -159,7 +159,6 @@
 		<menu_item_check label="Desactivar los límites de la cámara" name="Disable Camera Distance"/>
 		<menu_item_check label="Foto en Alta Resolución" name="HighResSnapshot"/>
 		<menu_item_check label="Silenciar el Guardar una foto" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="Comprimir las fotos para el disco duro" name="CompressSnapshotsToDisk"/>
 		<menu label="Herramientas de rendimiento" name="Performance Tools">
 			<menu_item_call label="Medidor de lag" name="Lag Meter"/>
 			<menu_item_check label="Estadísticas" name="Statistics Bar"/>
-- 
cgit v1.2.3