From f17d4edbe883fb886b22443158604a503d003c30 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 28 Apr 2016 10:53:15 -0400
Subject: clean up terminology for jelly dolls / avatar complexity

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml    | 2 +-
 indra/newview/skins/default/xui/en/notifications.xml                  | 4 ++--
 .../skins/default/xui/fr/floater_preferences_graphics_advanced.xml    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 7ffb4e0d99..2bd3aa8bcc 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -117,7 +117,7 @@
 
   <slider
     control_name="IndirectMaxComplexity"
-    tool_tip="Controls at what point a visually complex avatar is drawn as a jellybaby"
+    tool_tip="Controls at what point a visually complex avatar is drawn as a jelly doll"
     follows="left|top"
     height="16"
     initial_value="101"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 10cce8432b..3c84f5edc6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3317,7 +3317,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
    <unique combine = "cancel_old">
      <context>AgentComplexityNotice</context>
    </unique>
-Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visual complexity] is [AGENT_COMPLEXITY].
+Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY].
 [OVERLIMIT_MSG]
   </notification>
 
@@ -3329,7 +3329,7 @@ Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Renderin
    <unique combine = "cancel_old">
      <context>AgentComplexityNotice</context>
    </unique>
-Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visual complexity] is [AGENT_COMPLEXITY].
+Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY].
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
index 73d6546a80..5c5af022ca 100644
--- a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
 	<text name="AvatarText">
 		Avatar
 	</text>
-	<slider label="Complexité max. :" name="IndirectMaxComplexity" tool_tip="Contrôle à quel moment un avatar complexe est représenté comme un « jelly baby » (forme de couleur unie)"/>
+	<slider label="Complexité max. :" name="IndirectMaxComplexity" tool_tip="Contrôle à quel moment un avatar complexe est représenté comme un « jelly doll » (forme de couleur unie)"/>
 	<text name="IndirectMaxComplexityText">
 		0
 	</text>
-- 
cgit v1.2.3