From 485f9abde6b728a923070e392e40c16ea9f05226 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 27 May 2010 12:53:53 +0100
Subject: EXT-7138 WIP Changed UI text to use "Voice Morph" everywhere instead
 of "Voice Effect". Revised wording in preview floater (DEV-50573). Added
 tool-tip for Voice Morphing control in Nearby Voice (DEV-50608).

---
 .../skins/default/xui/en/floater_voice_effect.xml       | 17 +++++++++--------
 indra/newview/skins/default/xui/en/notifications.xml    | 14 +++++++-------
 .../newview/skins/default/xui/en/panel_voice_effect.xml |  5 +++--
 3 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 4f4b20066d..207397d3dc 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="400"
+ height="420"
  name="voice_effects"
  help_topic="voice_effects"
  title="PREVIEW VOICE MORPHING"
@@ -11,10 +11,10 @@
  label="Places"
  layout="topleft"
  min_height="350"
- min_width="300"
+ min_width="330"
  width="455">
   <string name="no_voice_effect">
-    (No Voice Effect)
+    (No Voice Morph)
   </string>
   <string name="active_voice_effect">
     (Active)
@@ -23,7 +23,7 @@
     (New!)
   </string>
   <text
-   height="40"
+   height="68"
    word_wrap="true"
    use_ellipses="true"
    type="string"
@@ -33,8 +33,9 @@
    name="status_text"
    right="-10"
    top="25">
-Record a sample of your voice, and then select an effect to preview.
-Close this window to return to in-world voice.
+To preview any of the Voice Morphing effects, click the Record button to record a short snippet of voice, then click any Voice Morph in the list to hear how it will sound.
+
+To reconnect to Nearby Voice simply close this window.
   </text>
   <button
    follows="left|top"
@@ -84,9 +85,9 @@ Close this window to return to in-world voice.
    name="voice_effect_list"
    right="-10"
    tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="100">
+   top="128">
     <scroll_list.columns
-     label="Voice Effect"
+     label="Voice Morph"
      name="name" relative_width="0.41"/>
     <scroll_list.columns
      dynamic_width="true"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b997dee30c..99896e46c9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5962,8 +5962,8 @@ We are creating a voice channel for you. This may take up to one minute.
    sound="UISndAlert"
    persist="true"
    type="notify">
-Subscribed Voice Effects have expired.
-[[URL] Renew your subscription] to reactivate them.
+One or more of your subscribed Voice Morphs has expired.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 
@@ -5973,8 +5973,8 @@ Subscribed Voice Effects have expired.
    sound="UISndAlert"
    persist="true"
    type="notify">
-The active Voice Effect has expired, your normal voice settings have been applied.
-[[URL] Renew your subscription] to reactivate it.
+The active Voice Morph has expired, your normal voice settings have been applied.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 
@@ -5984,8 +5984,8 @@ The active Voice Effect has expired, your normal voice settings have been applie
    sound="UISndAlert"
    persist="true"
    type="notify">
-Voice Effects will expire in less than [INTERVAL] days.
-[[URL] Renew your subscription] or they will be removed.
+One or more of your Voice Morphs will expire in less than [INTERVAL] days.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 		LLNotificationsUtil::add("VoiceEffectsNew");
@@ -5996,7 +5996,7 @@ Voice Effects will expire in less than [INTERVAL] days.
    sound="UISndAlert"
    persist="true"
    type="notify">
-New Voice Effects are available!
+New Voice Morphs are available!
     <unique/>
   </notification>
 
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index 9b6548ef9c..c575ca468c 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -6,7 +6,7 @@
  name="panel_voice_effect"
  width="200">
   <string name="no_voice_effect">
-    No Voice Effect
+    No Voice Morph
   </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
@@ -19,10 +19,11 @@
    follows="left|top|right"
    height="23"
    name="voice_effect"
+   tool_tip="Select a Voice Morphing effect to change your voice."
    top_pad="0"
    width="200">
     <combo_box.item
-     label="No Voice Effect"
+     label="No Voice Morph"
      name="no_voice_effect"
 	 top_pad="0"
      value="0" />
-- 
cgit v1.2.3