From 9cfc4c07267234ee4f218d100f7d4f27d6e3e000 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 17 Feb 2010 16:05:12 +0800
Subject: EXT-2183 viewer 2.0 community translation ES set1 through set6.

---
 indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml

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

diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..6f30286216
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<panel name="panel_call_buttons">
+		<button label="Llamar" name="call_btn"/>
+		<button label="Colgar" name="end_call_btn"/>
+		<button label="Controles de la voz" name="voice_ctrls_btn"/>
+	</panel>
+</panel>
-- 
cgit v1.2.3


From 366aa236f2964855bcb6f8b95f52e8bdad902651 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 17 Feb 2010 14:37:28 -0800
Subject: EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds
 corrupts 1.23s UI

reviewed by Leyla
---
 indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml

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

diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
deleted file mode 100644
index 6f30286216..0000000000
--- a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<panel name="panel_call_buttons">
-		<button label="Llamar" name="call_btn"/>
-		<button label="Colgar" name="end_call_btn"/>
-		<button label="Controles de la voz" name="voice_ctrls_btn"/>
-	</panel>
-</panel>
-- 
cgit v1.2.3


From 9dbe107f4e547d1aec0a234eaa0e6f83dd987898 Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Thu, 18 Feb 2010 20:37:37 -0500
Subject: move base back to default because doing it as a backout was causing
 merge errors

---
 indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml

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

diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..6f30286216
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<panel name="panel_call_buttons">
+		<button label="Llamar" name="call_btn"/>
+		<button label="Colgar" name="end_call_btn"/>
+		<button label="Controles de la voz" name="voice_ctrls_btn"/>
+	</panel>
+</panel>
-- 
cgit v1.2.3