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_nearby_chat_bar.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml

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

diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
new file mode 100644
index 0000000000..1df45108ab
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="chat_bar">
+	<string name="min_width">
+		192
+	</string>
+	<string name="max_width">
+		320
+	</string>
+	<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
+	<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
+</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_nearby_chat_bar.xml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml

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

diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
deleted file mode 100644
index 1df45108ab..0000000000
--- a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
-	<string name="min_width">
-		192
-	</string>
-	<string name="max_width">
-		320
-	</string>
-	<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
-	<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
-</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_nearby_chat_bar.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml

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

diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
new file mode 100644
index 0000000000..1df45108ab
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="chat_bar">
+	<string name="min_width">
+		192
+	</string>
+	<string name="max_width">
+		320
+	</string>
+	<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
+	<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
+</panel>
-- 
cgit v1.2.3


From acc97bd55fbdaecb16f47ae53e896eb0ca7d53c5 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 24 Feb 2010 16:41:28 +0200
Subject: Work on major bug EXT-5589 (Notifications button falls under side
 panel) Applayed Eugene Mutavchi's patch: -- removed min/max width params from
 xml <string> tags -- "min_width" for nearby chat bar now is got from the an
 appropriate layout panel params -- "max_width" for nearby chat bar is moved
 to constant.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml | 6 ------
 1 file changed, 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
index 1df45108ab..af2b6e920b 100644
--- a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="chat_bar">
-	<string name="min_width">
-		192
-	</string>
-	<string name="max_width">
-		320
-	</string>
 	<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
 	<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
 </panel>
-- 
cgit v1.2.3