From 36a428c020bae579bc2eccf659f741d1e93d447c Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 3 Mar 2010 14:48:34 +0200
Subject: fixed EXT-5902 [TRANSLATED BUT IN EN] - In the IM window "Pay" needs
 translation (panel_im_control_panel.xml)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_im_control_panel.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 28c4adf67c..88566ea037 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -111,7 +111,7 @@
          layout="topleft"
          min_height="25"
          width="100"
-         name="share_btn_panel"
+         name="pay_btn_panel"
          user_resize="false">
            <button
              auto_resize="true"
-- 
cgit v1.2.3


From b5df36f81f21cf490695b8f5f47e29b334083925 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 3 Mar 2010 15:02:04 +0200
Subject: Fixed normal bug EXT-5885 ([HARD CODED] - The busy response should be
 localized. hard coded in llviewermessage.cpp).

- It wasn't hardcoded in llviewermessage.cpp, but xml which contains it is not localizable. Added string with default busy message to strings.xml
and used it in LLFloaterPreference::cleanupBadSetting().

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 455b4be264..2510d8b49f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2104,6 +2104,9 @@ Clears (deletes) the media and all params from the given face.
 	<!-- panel contents -->
 	<string name="PanelContentsNewScript">New Script</string>
 
+  <!-- panel preferences general -->
+  <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+
 	<!-- Mute -->
 	<string name="MuteByName">(by name)</string>
 	<string name="MuteAgent">(Resident)</string>
-- 
cgit v1.2.3