From cb0031880d72cde1d129175276391e91ddadae66 Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Tue, 20 Oct 2015 09:22:47 -0700
Subject: SL-113: viewer message from simulator on illegal attachment point

---
 indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f847c73287..30e7caad76 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10258,6 +10258,14 @@ Not enough script resources available to attach object!
     Cannot attach object because it is already being removed.
   </notification>
 
+  <notification
+  icon="alertmodal.tga"
+  name="IllegalAttachment"
+  type="notify">
+   <tag>fail</tag>
+   The attachment point specified is not valid and the item has been attached to the default location: chest.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CantDropItemTrialUser"
-- 
cgit v1.2.3


From d365aa10f16c022970cefbfac8651fe01b5a9de8 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 21 Oct 2015 16:47:03 -0400
Subject: SL-234 WIP - moved LLSkinningUtil funcs to separate class/files.
 Remap weights where needed. Warn that related debug settings require restart
 to take effect.

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 70ba4d5077..ab027ac600 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1422,6 +1422,13 @@ Note: This will clear the cache.
 Port settings take effect after you restart [APP_NAME].
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ChangeDeferredDebugSetting"
+   type="alertmodal">
+This debug setting change will take effect after you restart [APP_NAME].
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ChangeSkin"
-- 
cgit v1.2.3


From 3b702b6616854d19c9432e568197dc60fc772d9c Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Mon, 26 Oct 2015 11:05:58 -0700
Subject: SL-113: use product approved message string

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 30e7caad76..bc051ca1ad 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10263,7 +10263,7 @@ Not enough script resources available to attach object!
   name="IllegalAttachment"
   type="notify">
    <tag>fail</tag>
-   The attachment point specified is not valid and the item has been attached to the default location: chest.
+   The attachment has requested a nonexistent point on the avatar. It has been attached to the chest instead.
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 94d7d6a623d755424c2bd8c2526bff0d46101915 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 17 Nov 2015 16:41:55 -0500
Subject: SL-271 WIP, SL-201 WIP - add support for end point to joints, use for
 debug rendering display to show bones.

---
 .../skins/default/xui/en/floater_notifications_tabbed.xml   |  6 +++---
 indra/newview/skins/default/xui/en/menu_viewer.xml          | 10 ++++++++++
 .../skins/default/xui/en/panel_notification_list_item.xml   | 13 ++++++-------
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
index afc609de52..c17d2a1f37 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
@@ -136,15 +136,15 @@
     </tab_container>
     
     <layout_stack width="336" height="26" enabled="true" orientation="horizontal"  follows="left|right" name="ButtonsStack">
-      <layout_panel width="336" height="30" enabled="true" orientation="horizontal" name="CondenseAllButtonPanel">
+      <layout_panel width="336" height="30" enabled="true" name="CondenseAllButtonPanel">
         <button width="93" height="21" left="2" label="Collapse all" name="collapse_all_button">
         </button>
       </layout_panel>
-      <layout_panel width="336" height="30" enabled="true" orientation="horizontal" name="GapLayoutPanel">
+      <layout_panel width="336" height="30" enabled="true" name="GapLayoutPanel">
         <panel width="90" height="21" left="2" label="Gap Panel" border="false" name="GapPanel">
         </panel>
       </layout_panel>
-      <layout_panel width="336" height="30" enabled="true" orientation="horizontal" name="DeleteAllButtonPanel">
+      <layout_panel width="336" height="30" enabled="true" name="DeleteAllButtonPanel">
         <button width="93" height="21" left="2" label="Delete all" name="delete_all_button">
         </button>
       </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3f557d0d0f..3b5f3a3184 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3554,6 +3554,16 @@
                  function="Advanced.ToggleInfoDisplay"
                  parameter="collision skeleton" />
             </menu_item_check>
+            <menu_item_check
+             label="Show Bones"
+             name="Show Bones">
+                <menu_item_check.on_check
+                 function="Advanced.CheckInfoDisplay"
+                 parameter="joints" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleInfoDisplay"
+                 parameter="joints" />
+            </menu_item_check>
             <menu_item_check
              label="Display Agent Target"
              name="Display Agent Target">
diff --git a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
index a909028f9f..efaaefd0e4 100644
--- a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
@@ -9,7 +9,6 @@
   left="0"
   width="331"
   height="202"
-  can_resize="true"
   layout="topleft"
   follows="left|top|right|bottom" >
   <!-- background_opaque="false" -->
@@ -45,12 +44,12 @@
       <layout_panel top="0" left="0" height="30" follows="left|top|right|bottom" layout="topleft" name="layout_panel_condensed_view" visible="false" background_opaque="false" background_visible="true" bg_alpha_color="SysWellItemUnselected">
         <panel border="true" top="0" left="5" height="30" bevel_style="none" layout="topleft" follows="left|top|right|bottom" name="panel_condensed_view">
           <layout_stack top="0" left="0" width="325" height="50" orientation="horizontal" follows="left|top|right|bottom" name="horizontal_stack">
-            <layout_panel width="30" height="39" orientation="horizontal" follows="left|top|right|bottom" name="layout_panel_right">
+            <layout_panel width="30" height="39" follows="left|top|right|bottom" name="layout_panel_right">
               <group_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="group_icon" tool_tip="Group" default_icon_name="Generic_Group" visible="true"/>
               <avatar_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="avatar_icon" tool_tip="Avatar" default_icon_name="Generic_Person" visible="false"/>
               <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="system_notification_icon" tool_tip="Icon" image_name="System_Notification" visible="false"/>
             </layout_panel>
-            <layout_panel width="260" height="50" orientation="horizontal" name="layout_panel_middle">
+            <layout_panel width="260" height="50" name="layout_panel_middle">
               <panel border="false" top="0" width="260" height="38" bevel_style="none" follows="left|top|right" layout="topleft" name="main_info_panel">
                 <panel border="false" top="0" left="0" width="260" height="19" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="notification_title_panel">
                   <text allow_scroll="false" font="SansSerifSmall" top="6" left="0" width="260" height="12" layout="topleft" follows="right|left" text_color="White"
@@ -69,7 +68,7 @@
                 </panel>
               </panel>
             </layout_panel>
-            <layout_panel width="18" height="48" orientation="horizontal" follows="right|top|bottom" name="layout_panel_right">
+            <layout_panel width="18" height="48" follows="right|top|bottom" name="layout_panel_right">
               <panel top="0" left="0" width="17"  height="39" follows="left|top|right|bottom" layout="topleft" name="close_expand_panel">
                 <button top="0" left="0" width="17" height="17" layout="topleft" follows="top" name="close_btn" mouse_opaque="true"
                   tab_stop="false" image_unselected="Icon_Close_Foreground" image_selected="Icon_Close_Press" />
@@ -83,13 +82,13 @@
       <layout_panel top="0" left="0" height="196" follows="left|top|right|bottom" layout="topleft" name="layout_panel_expanded_view" visible="true" background_opaque="false" background_visible="true" bg_alpha_color="SysWellItemUnselected">
         <panel border="true" top="0" left="5" height="196" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="panel_expanded_view">
           <layout_stack top="0" left="0" width="325" height="196" orientation="horizontal" follows="left|top|right|bottom" name="horizontal_stack">
-            <layout_panel width="30" height="170" orientation="horizontal" follows="left|top|bottom" name="layout_panel_right_exp">
+            <layout_panel width="30" height="170" follows="left|top|bottom" name="layout_panel_right_exp">
               <group_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="group_icon_exp" tool_tip="Group" default_icon_name="Generic_Group" visible="true"/>
               <avatar_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="avatar_icon_exp" tool_tip="Avatar" default_icon_name="Generic_Person" visible="false"/>
               <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="system_notification_icon_exp" tool_tip="Icon" image_name="System_Notification" visible="false"/>
               <icon left="12" top="144" width="20" height="20" name="attachment_icon_exp" tool_tip="Attachment" image_name="Icon_Attachment_Large" follows="left" mouse_opaque="true" visible="false"/>
             </layout_panel>
-            <layout_panel width="230" height="196" orientation="horizontal" follows="left|top|right|bottom" name="layout_panel_middle_exp">
+            <layout_panel width="230" height="196" follows="left|top|right|bottom" name="layout_panel_middle_exp">
               <panel border="false" top="0" width="230" height="196" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="main_info_panel_expanded">
               <panel border="false" top="0" left="0" width="230" height="30" bevel_style="none" follows="left|top|right" layout="topleft" name="notification_title_panel_exp" >
                       <text allow_scroll="false" font="SansSerif" top="6" left="0" width="233" height="10" layout="topleft" follows="right|left" text_color="White"
@@ -128,7 +127,7 @@
                    </panel>
               </panel>              
             </layout_panel>             
-            <layout_panel width="18" orientation="horizontal" follows="right|top|bottom" name="layout_panel_left_exp">
+            <layout_panel width="18" follows="right|top|bottom" name="layout_panel_left_exp">
               <panel top="0" left="0" width="17" follows="left|top|right|bottom" layout="topleft" name="close_expand_panel_exp">
                 <button top="0" left="2" width="17" height="17" layout="topleft" follows="top" name="close_expanded_btn" mouse_opaque="true"
                   tab_stop="false" image_unselected="Icon_Close_Foreground" image_selected="Icon_Close_Press" />
-- 
cgit v1.2.3


From cd24237a5bb4a0028f18833e527d5268570f6483 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 2 Dec 2015 15:02:37 -0500
Subject: SL-238 WIP - added checkbox for enhanced skeleton.

---
 .../skins/default/xui/en/floater_preferences.xml      |  6 +++---
 .../default/xui/en/panel_preferences_graphics1.xml    | 19 ++++++++++++++++---
 .../skins/default/xui/en/panel_preferences_sound.xml  |  2 +-
 3 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index bd6faf4ed8..502c6e0f1f 100755
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  positioning="centered"
  default_tab_group="1"
- height="460"
+ height="512"
  layout="topleft"
  name="Preferences"
  help_topic="preferences"
@@ -19,7 +19,7 @@
      layout="topleft"
      right="-105"
      name="OK"
-     top="433"
+     top="473"
      width="90">
         <button.commit_callback
          function="Pref.OK" />
@@ -40,7 +40,7 @@
     <tab_container
      follows="all"
      halign="left"
-     height="410"
+     height="440"
      layout="topleft"
      left="0"
      name="pref core"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 6c485c0595..923e1f1b06 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="left|top|right|bottom"
- height="418"
+ height="438"
  label="Graphics"
  layout="topleft"
  left="102"
@@ -812,6 +812,19 @@
           <check_box.commit_callback
            function="Pref.VertexShaderEnable" />
       </check_box>
+      <check_box
+       control_name="RenderAvatarEnhancedSkeleton"
+       height="16"
+       initial_value="true"
+       label="Enhanced skeleton"
+       layout="topleft"
+       left_delta="0"
+       name="AvatarEnhancedSkeleton"
+       top_pad="1"
+       width="256">
+          <check_box.commit_callback
+           function="Pref.EnhancedSkeletonEnable" />
+      </check_box>
       <check_box
        control_name="RenderAvatarCloth"
        height="16"
@@ -869,7 +882,7 @@
      layout="topleft"
      left="10"
      name="Apply"
-     top="390"
+     top="400"
      width="115">
         <button.commit_callback
          function="Pref.Apply" />
@@ -881,7 +894,7 @@
      layout="topleft"
      left_pad="3"
      name="Defaults"
-     top="390"
+     top="400"
      width="115">
         <button.commit_callback
          function="Pref.HardwareDefaults" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 615abbaa89..53b74fa645 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="408"
+ height="438"
  label="Sounds"
  layout="topleft"
  left="102"
-- 
cgit v1.2.3


From 12d7411a16ea220c5fbc389b68f5f002b2423659 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 14 Dec 2015 11:48:23 -0500
Subject: SL-278 WIP - Attachment points for new joints

---
 indra/newview/skins/default/xui/en/strings.xml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4eb6e2462d..a5d279254a 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2254,6 +2254,7 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="BodyPartsLeftLeg">Left Leg</string>
 	<string name="BodyPartsTorso">Torso</string>
 	<string name="BodyPartsRightLeg">Right Leg</string>
+    <string name="BodyPartsEnhancedSkeleton">Enhanced Skeleton</string>
 
 	<!-- slider -->
 	<string name="GraphicsQualityLow">Low</string>
@@ -2475,8 +2476,21 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="Stomach">Stomach</string>
 	<string name="Left Pec">Left Pec</string>
 	<string name="Right Pec">Right Pec</string>
-        <string name="Neck">Neck</string>
-        <string name="Avatar Center">Avatar Center</string>
+    <string name="Neck">Neck</string>
+    <string name="Avatar Center">Avatar Center</string>
+    <string name="Left Ring Finger">Left Ring Finger</string>
+    <string name="Right Ring Finger">Right Ring Finger</string>
+    <string name="Tail Base">Tail Base</string>
+    <string name="Tail Tip">Tail Tip</string>
+    <string name="Left Wing">Left Wing</string>
+    <string name="Right Wing">Right Wing</string>
+    <string name="Jaw">Jaw</string>
+    <string name="Alt Left Ear">Alt Left Ear</string>
+    <string name="Alt Right Ear">Alt Right Ear</string>
+    <string name="Alt Left Eye">Alt Left Eye</string>
+    <string name="Alt Right Eye">Alt Right Eye</string>
+    <string name="Tongue">Tongue</string>
+    <string name="Groin">Groin</string>
 	<string name="Invalid Attachment">Invalid Attachment Point</string>
 	<string name="ATTACHMENT_MISSING_ITEM">Error: missing item</string>
 	<string name="ATTACHMENT_MISSING_BASE_ITEM">Error: missing base item</string>
-- 
cgit v1.2.3


From 37752e2fadf8604dc926feb9f70fbbb574bad875 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 19 Jan 2016 17:11:08 +0200
Subject: MAINT-6008 FIXED Button "Clear History" overlaps lower checkbox, in
 Preferences.

---
 indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 323da2be38..284688d4d1 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -16,7 +16,7 @@
   </panel.string>
 
   <button
-      follows="left|bottom"
+      follows="left|top"
       height="23"
       label="Clear History"
       tool_tip="Clear login image, last location, teleport history, web, and texture cache"
@@ -75,7 +75,7 @@
      top_pad="10"
      width="350" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="23"
      label="Block list"
      layout="topleft"
-- 
cgit v1.2.3


From ef02c9ea694a1f0ddc830a66f23555c6316afdc7 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 3 Feb 2016 08:59:25 -0500
Subject: SL-315 - context strings, comments, debugging. joint_test temporarily
 disabled.

---
 indra/newview/skins/default/xui/en/panel_notification.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 94c468e1bb..756b8f8102 100755
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -10,7 +10,6 @@
   left="0"
   name="notification_panel"
   chrome="true"
-  show_title="false"
   top="0"
   	height="140"
   translate="false"
-- 
cgit v1.2.3


From 88cb6814f0883cdce15ca1942409da708ab07af5 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 7 Mar 2016 11:24:48 -0500
Subject: SL-315 WIP - more call stack tracing, initial hooks for avatar reset
 skeleton option.

---
 indra/newview/skins/default/xui/en/menu_attachment_other.xml | 9 +++++++++
 indra/newview/skins/default/xui/en/menu_attachment_self.xml  | 7 +++++++
 indra/newview/skins/default/xui/en/menu_avatar_other.xml     | 9 +++++++++
 indra/newview/skins/default/xui/en/menu_avatar_self.xml      | 6 ++++++
 4 files changed, 31 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index ba91b0b5d9..c3c6701d01 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -39,6 +39,15 @@
       <menu_item_call.on_click
          function="Avatar.InviteToGroup" />
       </menu_item_call>
+   <menu_item_separator />
+
+     <menu_item_call label="Reset Skeleton"
+       layout="topleft"
+       name="Reset Skeleton">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeleton" />
+     </menu_item_call>
+
    <menu_item_separator />
     <menu_item_call
      enabled="false"
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index c6ae844d67..ced0dd37b1 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -99,6 +99,13 @@ name="Edit Outfit">
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
   </menu_item_call>
+  <menu_item_call label="Reset Skeleton"
+       layout="topleft"
+       name="Reset Skeleton">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeleton" />
+  </menu_item_call>
+
   <menu_item_call
     label="My Friends"
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index cfbbe41f95..f04a70d0a5 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -40,6 +40,15 @@
          function="Avatar.InviteToGroup" />
       </menu_item_call>
     
+   <menu_item_separator />
+
+     <menu_item_call label="Reset Skeleton"
+       layout="topleft"
+       name="Reset Skeleton">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeleton" />
+     </menu_item_call>
+
    <menu_item_separator />
    
      <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index d3b0b07f70..924e8b8454 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -237,6 +237,12 @@
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
    </menu_item_call>
+   <menu_item_call label="Reset Skeleton"
+     layout="topleft"
+     name="Reset Skeleton">
+     <menu_item_call.on_click
+      function="Avatar.ResetSkeleton" />
+   </menu_item_call>
    <menu_item_call
      label="My Friends"
      layout="topleft"
-- 
cgit v1.2.3


From 535a3b3b2edd902cd814050344f5ee62cf55abd6 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 7 Apr 2016 11:50:16 -0400
Subject: SL-344 - added attachment points for hind feet

---
 indra/newview/skins/default/xui/en/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b221c81f7b..7db836923d 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2491,6 +2491,8 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
     <string name="Alt Right Eye">Alt Right Eye</string>
     <string name="Tongue">Tongue</string>
     <string name="Groin">Groin</string>
+    <string name="Left Hind Foot">Left Hind Foot</string>
+    <string name="Right Hind Foot">Right Hind Foot</string>
 	<string name="Invalid Attachment">Invalid Attachment Point</string>
 	<string name="ATTACHMENT_MISSING_ITEM">Error: missing item</string>
 	<string name="ATTACHMENT_MISSING_BASE_ITEM">Error: missing base item</string>
-- 
cgit v1.2.3


From 24e1a20609de80e69e478d98d36a9c8ee020cccf Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 29 Apr 2016 16:20:52 -0400
Subject: SL-368 - removed enhanced skeleton option from preference dialog.
 Underlying code is still there but may or may not work with the current
 skeleton (spine joints?)

---
 .../skins/default/xui/en/panel_preferences_graphics1.xml    | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 923e1f1b06..5725a5095a 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -812,19 +812,6 @@
           <check_box.commit_callback
            function="Pref.VertexShaderEnable" />
       </check_box>
-      <check_box
-       control_name="RenderAvatarEnhancedSkeleton"
-       height="16"
-       initial_value="true"
-       label="Enhanced skeleton"
-       layout="topleft"
-       left_delta="0"
-       name="AvatarEnhancedSkeleton"
-       top_pad="1"
-       width="256">
-          <check_box.commit_callback
-           function="Pref.EnhancedSkeletonEnable" />
-      </check_box>
       <check_box
        control_name="RenderAvatarCloth"
        height="16"
-- 
cgit v1.2.3


From 76bb16364b6529b520f7febf3220977714b63a03 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 10 May 2016 16:21:04 -0400
Subject: add location names for attachment points

---
 indra/newview/skins/default/xui/en/strings.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 72a6f09f92..a4869b5503 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2681,6 +2681,21 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string>
 	<string name="ATTACH_NECK">Neck</string>
 	<string name="ATTACH_AVATAR_CENTER">Avatar Center</string>
+    <string name="ATTACH_LHAND_RING1">Left Ring Finger</string>
+    <string name="ATTACH_RHAND_RING1">Right Ring Finger</string>
+    <string name="ATTACH_TAIL_BASE">Tail Base</string>
+    <string name="ATTACH_TAIL_TIP">Tail Tip</string>
+    <string name="ATTACH_LWING">Left Wing</string>
+    <string name="ATTACH_RWING">Right Wing</string>
+    <string name="ATTACH_FACE_JAW">Jaw</string>
+    <string name="ATTACH_FACE_LEAR">Alt Left Ear</string>
+    <string name="ATTACH_FACE_REAR">Alt Right Ear</string>
+    <string name="ATTACH_FACE_LEYE">Alt Left Eye</string>
+    <string name="ATTACH_FACE_REYE">Alt Right Eye</string>
+    <string name="ATTACH_FACE_TONGUE">Tongue</string>
+    <string name="ATTACH_GROIN">Groin</string>
+    <string name="ATTACH_HIND_LFOOT">Left Hind Foot</string>
+    <string name="ATTACH_HIND_RFOOT">Right Hind Foot</string>
 
 	<!-- script editor -->
 	<string name="CursorPos">Line [LINE], Column [COLUMN]</string>
-- 
cgit v1.2.3


From 5ebf9b3caeb95f6f196786c37847d409e94df415 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 29 Jun 2016 09:41:06 -0400
Subject: SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics
 for investigation

---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a4869b5503..e7d4491e0f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2669,8 +2669,8 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="ATTACH_LULEG">Left Upper Leg</string>
 	<string name="ATTACH_LLLEG">Left Lower Leg</string>
 	<string name="ATTACH_BELLY">Belly</string>
-	<string name="ATTACH_RPEC">Right Pec</string>
-	<string name="ATTACH_LPEC">Left Pec</string>
+	<string name="ATTACH_LEFT_PEC">Left Pec</string>
+	<string name="ATTACH_RIGHT_PEC">Right Pec</string>
 	<string name="ATTACH_HUD_CENTER_2">HUD Center 2</string>
 	<string name="ATTACH_HUD_TOP_RIGHT">HUD Top Right</string>
 	<string name="ATTACH_HUD_TOP_CENTER">HUD Top Center</string>
-- 
cgit v1.2.3


From 7104ededb5f224839a6c8d276a3e578ef570ca94 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Tue, 16 Aug 2016 17:47:49 -0700
Subject: FIX INTL-224 Viewer Set45 translation for bento-box in 9 languages

---
 .../de/floater_preferences_graphics_advanced.xml   |   2 +-
 .../skins/default/xui/de/menu_attachment_other.xml |   1 +
 .../skins/default/xui/de/menu_attachment_self.xml  |   1 +
 .../skins/default/xui/de/menu_avatar_other.xml     |   1 +
 .../skins/default/xui/de/menu_avatar_self.xml      |   1 +
 indra/newview/skins/default/xui/de/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/de/notifications.xml |  44 +++++---
 .../default/xui/de/panel_preferences_alerts.xml    |   3 +-
 .../default/xui/de/panel_preferences_graphics1.xml |   5 +
 .../skins/default/xui/de/panel_sound_devices.xml   |   4 +-
 indra/newview/skins/default/xui/de/strings.xml     | 113 ++++++++++++++++++-
 .../es/floater_preferences_graphics_advanced.xml   |   2 +-
 .../skins/default/xui/es/menu_attachment_other.xml |   1 +
 .../skins/default/xui/es/menu_attachment_self.xml  |   1 +
 .../skins/default/xui/es/menu_avatar_other.xml     |   1 +
 .../skins/default/xui/es/menu_avatar_self.xml      |   1 +
 indra/newview/skins/default/xui/es/menu_viewer.xml |   1 +
 .../newview/skins/default/xui/es/notifications.xml |  46 +++++---
 .../default/xui/es/panel_preferences_alerts.xml    |   3 +-
 .../default/xui/es/panel_preferences_graphics1.xml |   5 +
 .../skins/default/xui/es/panel_sound_devices.xml   |   4 +-
 indra/newview/skins/default/xui/es/strings.xml     | 115 +++++++++++++++++++-
 .../fr/floater_preferences_graphics_advanced.xml   |   2 +-
 .../skins/default/xui/fr/menu_attachment_other.xml |   1 +
 .../skins/default/xui/fr/menu_attachment_self.xml  |   1 +
 .../skins/default/xui/fr/menu_avatar_other.xml     |   1 +
 .../skins/default/xui/fr/menu_avatar_self.xml      |   1 +
 indra/newview/skins/default/xui/fr/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/fr/notifications.xml |  48 ++++++---
 .../default/xui/fr/panel_preferences_alerts.xml    |   3 +-
 .../default/xui/fr/panel_preferences_graphics1.xml |   5 +
 .../skins/default/xui/fr/panel_sound_devices.xml   |   4 +-
 indra/newview/skins/default/xui/fr/strings.xml     | 113 ++++++++++++++++++-
 .../it/floater_preferences_graphics_advanced.xml   |   2 +-
 .../skins/default/xui/it/menu_attachment_other.xml |   1 +
 .../skins/default/xui/it/menu_attachment_self.xml  |   1 +
 .../skins/default/xui/it/menu_avatar_other.xml     |   1 +
 .../skins/default/xui/it/menu_avatar_self.xml      |   1 +
 indra/newview/skins/default/xui/it/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/it/notifications.xml |  44 +++++---
 .../default/xui/it/panel_preferences_alerts.xml    |   3 +-
 .../default/xui/it/panel_preferences_graphics1.xml |   5 +
 .../skins/default/xui/it/panel_sound_devices.xml   |   4 +-
 indra/newview/skins/default/xui/it/strings.xml     | 113 ++++++++++++++++++-
 .../ja/floater_preferences_graphics_advanced.xml   |   2 +-
 .../skins/default/xui/ja/menu_attachment_other.xml |   1 +
 .../skins/default/xui/ja/menu_attachment_self.xml  |   1 +
 .../skins/default/xui/ja/menu_avatar_other.xml     |   1 +
 .../skins/default/xui/ja/menu_avatar_self.xml      |   1 +
 indra/newview/skins/default/xui/ja/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/ja/notifications.xml |  46 +++++---
 .../default/xui/ja/panel_preferences_alerts.xml    |   3 +-
 .../default/xui/ja/panel_preferences_graphics1.xml |   5 +
 .../skins/default/xui/ja/panel_sound_devices.xml   |   4 +-
 indra/newview/skins/default/xui/ja/strings.xml     | 120 +++++++++++++++++++--
 .../pt/floater_preferences_graphics_advanced.xml   |   2 +-
 .../skins/default/xui/pt/menu_attachment_other.xml |   1 +
 .../skins/default/xui/pt/menu_attachment_self.xml  |   1 +
 .../skins/default/xui/pt/menu_avatar_other.xml     |   1 +
 .../skins/default/xui/pt/menu_avatar_self.xml      |   1 +
 indra/newview/skins/default/xui/pt/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/pt/notifications.xml |  46 +++++---
 .../default/xui/pt/panel_preferences_alerts.xml    |   3 +-
 .../default/xui/pt/panel_preferences_graphics1.xml |   5 +
 .../skins/default/xui/pt/panel_sound_devices.xml   |   4 +-
 indra/newview/skins/default/xui/pt/strings.xml     | 115 +++++++++++++++++++-
 .../skins/default/xui/ru/menu_attachment_other.xml |   1 +
 .../skins/default/xui/ru/menu_attachment_self.xml  |   1 +
 .../skins/default/xui/ru/menu_avatar_other.xml     |   1 +
 .../skins/default/xui/ru/menu_avatar_self.xml      |   1 +
 indra/newview/skins/default/xui/ru/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/ru/notifications.xml |  44 +++++---
 .../default/xui/ru/panel_preferences_alerts.xml    |   3 +-
 .../default/xui/ru/panel_preferences_graphics1.xml |   5 +
 .../skins/default/xui/ru/panel_sound_devices.xml   |   4 +-
 indra/newview/skins/default/xui/ru/strings.xml     | 111 +++++++++++++++++--
 .../tr/floater_preferences_graphics_advanced.xml   |   2 +-
 .../skins/default/xui/tr/menu_attachment_other.xml |   1 +
 .../skins/default/xui/tr/menu_attachment_self.xml  |   1 +
 .../skins/default/xui/tr/menu_avatar_other.xml     |   1 +
 .../skins/default/xui/tr/menu_avatar_self.xml      |   1 +
 indra/newview/skins/default/xui/tr/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/tr/notifications.xml |  46 +++++---
 .../default/xui/tr/panel_preferences_alerts.xml    |   3 +-
 .../default/xui/tr/panel_preferences_graphics1.xml |   5 +
 .../skins/default/xui/tr/panel_sound_devices.xml   |   4 +-
 indra/newview/skins/default/xui/tr/strings.xml     | 119 ++++++++++++++++++--
 .../zh/floater_preferences_graphics_advanced.xml   |   2 +-
 .../skins/default/xui/zh/menu_attachment_other.xml |   1 +
 .../skins/default/xui/zh/menu_attachment_self.xml  |   1 +
 .../skins/default/xui/zh/menu_avatar_other.xml     |   1 +
 .../skins/default/xui/zh/menu_avatar_self.xml      |   1 +
 indra/newview/skins/default/xui/zh/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/zh/notifications.xml |  48 ++++++---
 .../default/xui/zh/panel_preferences_alerts.xml    |   3 +-
 .../default/xui/zh/panel_preferences_graphics1.xml |   5 +
 .../skins/default/xui/zh/panel_sound_devices.xml   |   4 +-
 indra/newview/skins/default/xui/zh/strings.xml     | 113 ++++++++++++++++++-
 98 files changed, 1389 insertions(+), 232 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml
index 2c141f616f..65a7e255f9 100644
--- a/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
 	<text name="AvatarText">
 		Avatar
 	</text>
-	<slider label="Maximale Komplexität:" name="IndirectMaxComplexity" tool_tip="Bestimmt, an welchem Punkt ein visuell komplexer Avatar als „Gummibärchen“ dargestellt wird"/>
+	<slider label="Maximale Komplexität:" name="IndirectMaxComplexity" tool_tip="Bestimmt, an welchem Punkt ein visuell komplexer Avatar als JellyDoll dargestellt wird"/>
 	<text name="IndirectMaxComplexityText">
 		0
 	</text>
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_other.xml b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
index ddb1e7b0b1..ba1b36db06 100644
--- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="Anrufen" name="Call"/>
 	<menu_item_call label="In Gruppe einladen" name="Invite..."/>
+	<menu_item_call label="Skelett zurücksetzen" name="Reset Skeleton"/>
 	<menu_item_call label="Ignorieren" name="Avatar Mute"/>
 	<menu_item_call label="Melden" name="abuse"/>
 	<menu_item_call label="Einfrieren" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_self.xml b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
index e0f37b28af..cd24e6ad3f 100644
--- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
@@ -9,6 +9,7 @@
 	<menu_item_call label="Mein Outfit bearbeiten" name="Edit Outfit"/>
 	<menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/>
 	<menu_item_call label="Schwebehöhe" name="Hover Height"/>
+	<menu_item_call label="Skelett zurücksetzen" name="Reset Skeleton"/>
 	<menu_item_call label="Meine Freunde" name="Friends..."/>
 	<menu_item_call label="Meine Gruppen" name="Groups..."/>
 	<menu_item_call label="Mein Profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_other.xml b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
index 7242ba1495..447655cde7 100644
--- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="Anrufen" name="Call"/>
 	<menu_item_call label="In Gruppe einladen" name="Invite..."/>
+	<menu_item_call label="Skelett zurücksetzen" name="Reset Skeleton"/>
 	<menu_item_call label="Ignorieren" name="Avatar Mute"/>
 	<menu_item_call label="Melden" name="abuse"/>
 	<menu_item_call label="Einfrieren" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_self.xml b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
index b53f8cd6af..f4a3cc17b8 100644
--- a/indra/newview/skins/default/xui/de/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
@@ -26,6 +26,7 @@
 	<menu_item_call label="Mein Outfit bearbeiten" name="Edit Outfit"/>
 	<menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/>
 	<menu_item_call label="Schwebehöhe" name="Hover Height"/>
+	<menu_item_call label="Skelett zurücksetzen" name="Reset Skeleton"/>
 	<menu_item_call label="Meine Freunde" name="Friends..."/>
 	<menu_item_call label="Meine Gruppen" name="Groups..."/>
 	<menu_item_call label="Mein Profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index d83a6071f6..319162db34 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -22,7 +22,6 @@
 			<menu_item_check label="Nicht stören" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="L$ kaufen..." name="Buy and Sell L$"/>
-		<menu_item_call label="Händler-Outbox..." name="MerchantOutbox"/>
 		<menu_item_call label="Marktplatz-Auflistungen..." name="MarketplaceListings"/>
 		<menu_item_call label="Kontoübersicht..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=de"/>
@@ -415,6 +414,7 @@
 			<menu_item_check label="LOD deaktiveren" name="Disable LOD"/>
 			<menu_item_check label="Fehler für sichtbare Agenten beseitigen" name="Debug Character Vis"/>
 			<menu_item_check label="Gelenkpunkte anzeigen" name="Show Collision Skeleton"/>
+			<menu_item_check label="Knochen anzeigen" name="Show Bones"/>
 			<menu_item_check label="Agent-Ziel anzeigen" name="Display Agent Target"/>
 			<menu_item_call label="Anhänge ausgeben" name="Dump Attachments"/>
 			<menu_item_call label="Fehler in Avatar-Texturen beseitigen" name="Debug Avatar Textures"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 6fcd025a94..0af00ab705 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -487,6 +487,9 @@ Der Outfit-Ordner enthält keine Kleidung, Körperteile oder Anhänge.
 	<notification name="CannotWearInfoNotComplete">
 		Sie können das Objekt nicht anziehen, weil es noch nicht geladen wurde. Warten Sie kurz und versuchen Sie es dann noch einmal.
 	</notification>
+	<notification name="MustEnterPasswordToLogIn">
+		Bitte geben Sie zur Anmeldung Ihr Kennwort ein.
+	</notification>
 	<notification name="MustHaveAccountToLogIn">
 		Sue haben ein Feld leer gelassen.
 Sie müssen den Benutzernamen Ihres Avatars eingeben.
@@ -555,6 +558,9 @@ Hinweis: Der Cache wird dabei gelöscht/geleert.
 	<notification name="ChangeConnectionPort">
 		Die Port-Einstellungen werden nach einem Neustart von [APP_NAME] wirksam.
 	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		Die Debug-Einstellung tritt nach Neustart von [APP_NAME] in Kraft.
+	</notification>
 	<notification name="ChangeSkin">
 		Die neue Benutzeroberfläche wird nach einem Neustart von [APP_NAME] angezeigt.
 	</notification>
@@ -1380,12 +1386,13 @@ Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt
 			<ignore name="ignore" text="Das Herunterladen der Kleidung dauert lange"/>
 		</form>
 	</notification>
-	<notification name="RegionAndAgentComplexity">
-		Ihre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visuelle Komplexität] ist [AGENT_COMPLEXITY].
+	<notification name="AgentComplexityWithVisibility">
+		Ihre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Avatarkomplexität] ist [AGENT_COMPLEXITY].
 [OVERLIMIT_MSG]
+		<usetemplate ignoretext="Warnen, falls Avatarkomplexität zu hoch ist" name="notifyignore"/>
 	</notification>
 	<notification name="AgentComplexity">
-		Ihre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visuelle Komplexität] ist [AGENT_COMPLEXITY].
+		Ihre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Avatarkomplexität] ist [AGENT_COMPLEXITY].
 	</notification>
 	<notification name="FirstRun">
 		Installation von [APP_NAME] vollständig abgeschlossen.
@@ -1501,6 +1508,10 @@ Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 un
 		Möchten Sie das aktuelle Terrain formen, es zum Mittelpunkt der oberen und unteren Terraingrenzen und zum Standard des „Zurücksetzen“-Tools machen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmTextureHeights">
+		Sie sind dabei, für Höhenbereiche untere Werte anzugeben, die größer sind als die oberen Werte. Fortfahren?
+		<usetemplate canceltext="Nicht fragen" name="yesnocancelbuttons" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		Es sind maximal [MAX_AGENTS] zulässige Einwohner erlaubt.
 	</notification>
@@ -1735,14 +1746,6 @@ Diese Gruppe verlassen?
 		Sie können die Gruppe nicht verlassen, da Sie der letzte Besitzer der Gruppe sind. Weisen Sie die Besitzerrolle zuerst einem anderen Mitglied zu.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="GroupDepartError">
-		Kann Gruppe nicht verlassen: [reason].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepart">
-		Sie haben die Gruppe „[group_name]“ verlassen.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmKick">
 		Möchten Sie WIRKLICH alle Benutzer aus dem Grid werfen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Alle Benutzer hinauswerfen"/>
@@ -2415,6 +2418,10 @@ Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion a
 		Sind Sie sicher, dass Sie den Inhalt Ihres Papierkorbs löschen möchten?
 		<usetemplate ignoretext="Bestätigen, bevor der Ordner Papierkorb im Inventar geleert wird" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
+	<notification name="TrashIsFull">
+		Ihr Papierkorb läuft über. Dies kann zu Anmeldeproblemen führen.
+		<usetemplate name="okcancelbuttons" notext="Papierkorb später leeren" yestext="Papierkorb jetzt leeren"/>
+	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Sind Sie sicher, dass Sie Ihren Reise-, Internet- und Suchverlauf löschen möchten?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
@@ -3272,11 +3279,15 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt.
 	<notification name="AttachmentSaved">
 		Der Anhang wurde gespeichert.
 	</notification>
-	<notification name="PresetNotSaved">
-		Fehler beim Speichern der Voreinstellung [NAME].
+	<notification name="AppearanceToXMLSaved">
+		Erscheinungsbild als XML in [PATH] gespeichert
 	</notification>
-	<notification name="PresetNotDeleted">
-		Fehler beim Löschen der Voreinstellung [NAME].
+	<notification name="AppearanceToXMLFailed">
+		Fehler beim Speichern des Erscheinungsbilds als XML.
+    icon=&quot;notifytip.tga&quot;
+	name=&quot;PresetNotDeleted&quot;
+    type=&quot;notifytip&quot;&gt;
+Fehler beim Löschen der Voreinstellung [NAME].
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Hilfethema für dieses Element wurde nicht gefunden.
@@ -4089,6 +4100,9 @@ Warten Sie kurz und versuchen Sie es noch einmal.
 	<notification name="CantAttachNotEnoughScriptResources">
 		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
 	</notification>
+	<notification name="IllegalAttachment">
+		Der Anhang hat einen nicht vorhandenen Punkt auf dem Avatar angefordert. Der Anhang wurde stattdessen auf der Brust angebracht.
+	</notification>
 	<notification name="CantDropItemTrialUser">
 		Ablegen von Objekten hier nicht möglich; versuchen Sie es mit dem kostenlosen Testbereich.
 	</notification>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
index fcb45e26be..508e87a8b7 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
@@ -3,8 +3,9 @@
 	<text name="tell_me_label">
 		Anzeigen:
 	</text>
-	<check_box label="Wenn ich L$ ausgebe oder erhalte" name="notify_money_change_checkbox"/>
+	<check_box label="Wenn ich L$ ausgebe" name="notify_money_spend_checkbox"/>
 	<check_box label="Wenn meine Freunde sich an- oder abmelden" name="friends_online_notify_checkbox"/>
+	<check_box label="Wenn ich L$ erhalte" name="notify_money_received_checkbox"/>
 	<text name="show_label">
 		Immer anzeigen:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index 06fd22141f..74fb4d0f85 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -24,10 +24,15 @@
 	<text name="BetterText">
 		Besser
 	</text>
+	<slider label="Maximale Avatarkomplexität:" name="IndirectMaxComplexity" tool_tip="Bestimmt, an welchem Punkt ein visuell komplexer Avatar als JellyDoll dargestellt wird"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
 	<check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
 	<check_box initial_value="true" label="Erweitertes Beleuchtungsmodell" name="UseLightShaders"/>
 	<button label="Einstellungen als Voreinstellung speichern..." name="PrefSaveButton"/>
 	<button label="Voreinstellung laden..." name="PrefLoadButton"/>
+	min_val=&quot;0.125&quot;
 	<button label="Voreinstellung löschen..." name="PrefDeleteButton"/>
 	<button label="Auf empfohlene Einstellungen zurücksetzen" name="Defaults"/>
 	<button label="Erweiterte Einstellungen..." name="AdvancedSettings"/>
diff --git a/indra/newview/skins/default/xui/de/panel_sound_devices.xml b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
index b739b6197f..df4b30383e 100644
--- a/indra/newview/skins/default/xui/de/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
@@ -16,9 +16,9 @@
 		Ausgabe
 	</text>
 	<text name="My volume label">
-		Meine Lautstärke:
+		Mikrofonlautstärke:
 	</text>
-	<slider_bar initial_value="1,0" name="mic_volume_slider" tool_tip="Lautstärke mit diesem Regler ändern"/>
+	<slider_bar initial_value="1,0" name="mic_volume_slider" tool_tip="Mit diesem Schieberegler können Sie den Mikrofonpegel ändern"/>
 	<text name="wait_text">
 		Bitte warten
 	</text>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 810022525a..9dd94d2230 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -41,6 +41,9 @@
 		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</string>
+	<string name="BuildConfig">
+		Build-Konfiguration [BUILD_CONFIG]
+	</string>
 	<string name="AboutPosition">
 		Sie befinden sich an [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] auf &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
@@ -72,6 +75,9 @@ Voice-Server-Version: [VOICE_VERSION]
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		Fehler beim Abrufen der URL für die Server-Versionshinweise.
 	</string>
+	<string name="BuildConfiguration">
+		Build-Konfiguration
+	</string>
 	<string name="ProgressRestoring">
 		Wird wiederhergestellt...
 	</string>
@@ -1390,6 +1396,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="BodyPartsRightLeg">
 		Rechtes Bein
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		Erweitertes Skelett
+	</string>
 	<string name="GraphicsQualityLow">
 		Niedrig
 	</string>
@@ -1838,6 +1847,51 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="Avatar Center">
 		Avatar-Mitte
 	</string>
+	<string name="Left Ring Finger">
+		Linker Ringfinger
+	</string>
+	<string name="Right Ring Finger">
+		Rechter Ringfinger
+	</string>
+	<string name="Tail Base">
+		Schwanzansatz
+	</string>
+	<string name="Tail Tip">
+		Schwanzspitze
+	</string>
+	<string name="Left Wing">
+		Linker Flügel
+	</string>
+	<string name="Right Wing">
+		Rechter Flügel
+	</string>
+	<string name="Jaw">
+		Kiefer
+	</string>
+	<string name="Alt Left Ear">
+		Alt. linkes Ohr
+	</string>
+	<string name="Alt Right Ear">
+		Alt. rechtes Ohr
+	</string>
+	<string name="Alt Left Eye">
+		Alt. linkes Auge
+	</string>
+	<string name="Alt Right Eye">
+		Alt. rechtes Auge
+	</string>
+	<string name="Tongue">
+		Zunge
+	</string>
+	<string name="Groin">
+		Leiste
+	</string>
+	<string name="Left Hind Foot">
+		Linker hinterer Fuß
+	</string>
+	<string name="Right Hind Foot">
+		Rechter hinterer Fuß
+	</string>
 	<string name="Invalid Attachment">
 		Ungültige Stelle für Anhang
 	</string>
@@ -2227,12 +2281,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ATTACH_BELLY">
 		Bauch
 	</string>
-	<string name="ATTACH_RPEC">
-		Rechts
-	</string>
-	<string name="ATTACH_LPEC">
+	<string name="ATTACH_LEFT_PEC">
 		Linke Brust
 	</string>
+	<string name="ATTACH_RIGHT_PEC">
+		Rechte Brust
+	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		HUD Mitte 2
 	</string>
@@ -2263,6 +2317,51 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ATTACH_AVATAR_CENTER">
 		Avatar-Mitte
 	</string>
+	<string name="ATTACH_LHAND_RING1">
+		Linker Ringfinger
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		Rechter Ringfinger
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		Schwanzansatz
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		Schwanzspitze
+	</string>
+	<string name="ATTACH_LWING">
+		Linker Flügel
+	</string>
+	<string name="ATTACH_RWING">
+		Rechter Flügel
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		Kiefer
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		Alt. linkes Ohr
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		Alt. rechtes Ohr
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		Alt. linkes Auge
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		Alt. rechtes Auge
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		Zunge
+	</string>
+	<string name="ATTACH_GROIN">
+		Leiste
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		Linker hinterer Fuß
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		Rechter hinterer Fuß
+	</string>
 	<string name="CursorPos">
 		Zeile [LINE], Spalte [COLUMN]
 	</string>
@@ -4252,6 +4351,12 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="OfflineStatus">
 		Offline
 	</string>
+	<string name="not_online_msg">
+		Benutzer nicht online – Nachricht wird gespeichert und später zugestellt.
+	</string>
+	<string name="not_online_inventory">
+		Benutzer nicht online – Inventar gespeichert.
+	</string>
 	<string name="answered_call">
 		Ihr Anruf wurde entgegengenommen
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml
index dda95ad070..84b256c8e3 100644
--- a/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
 	<text name="AvatarText">
 		Avatar
 	</text>
-	<slider label="Complejidad máxima:" name="IndirectMaxComplexity" tool_tip="Controla en qué momento un avatar visualmente complejo se dibuja como una sombra de color sólido"/>
+	<slider label="Complejidad máxima:" name="IndirectMaxComplexity" tool_tip="Controla en qué momento un avatar visualmente complejo se dibuja como un &quot;JellyDoll&quot;"/>
 	<text name="IndirectMaxComplexityText">
 		0
 	</text>
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_other.xml b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
index 772b27c9ba..c92583cfc3 100644
--- a/indra/newview/skins/default/xui/es/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="MI" name="Send IM..."/>
 	<menu_item_call label="Llamada" name="Call"/>
 	<menu_item_call label="Invitar al grupo" name="Invite..."/>
+	<menu_item_call label="Restablecer esqueleto" name="Reset Skeleton"/>
 	<menu_item_call label="Ignorar" name="Avatar Mute"/>
 	<menu_item_call label="Denunciar" name="abuse"/>
 	<menu_item_call label="Congelar" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
index 02819e6816..a4d09a44ab 100644
--- a/indra/newview/skins/default/xui/es/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
@@ -9,6 +9,7 @@
 	<menu_item_call label="Editar mi vestuario" name="Edit Outfit"/>
 	<menu_item_call label="Editar mi anatomía" name="Edit My Shape"/>
 	<menu_item_call label="Altura del avatar" name="Hover Height"/>
+	<menu_item_call label="Restablecer esqueleto" name="Reset Skeleton"/>
 	<menu_item_call label="Mis amigos" name="Friends..."/>
 	<menu_item_call label="Mis grupos" name="Groups..."/>
 	<menu_item_call label="Mi perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_other.xml b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
index 75cbf5a022..e5aef03911 100644
--- a/indra/newview/skins/default/xui/es/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="MI" name="Send IM..."/>
 	<menu_item_call label="Llamada" name="Call"/>
 	<menu_item_call label="Invitar al grupo" name="Invite..."/>
+	<menu_item_call label="Restablecer esqueleto" name="Reset Skeleton"/>
 	<menu_item_call label="Ignorar" name="Avatar Mute"/>
 	<menu_item_call label="Denunciar" name="abuse"/>
 	<menu_item_call label="Congelar" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
index d60a3434cf..ab14966217 100644
--- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
@@ -26,6 +26,7 @@
 	<menu_item_call label="Editar mi vestuario" name="Edit Outfit"/>
 	<menu_item_call label="Editar mi anatomía" name="Edit My Shape"/>
 	<menu_item_call label="Altura del avatar" name="Hover Height"/>
+	<menu_item_call label="Restablecer esqueleto" name="Reset Skeleton"/>
 	<menu_item_call label="Mis amigos" name="Friends..."/>
 	<menu_item_call label="Mis grupos" name="Groups..."/>
 	<menu_item_call label="Mi perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index fd248116b8..07c358615c 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -367,6 +367,7 @@
 			<menu_item_check label="Animation Info" name="Animation Info"/>
 			<menu_item_check label="Disable Level Of Detail" name="Disable LOD"/>
 			<menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/>
+			<menu_item_check label="Mostrar los huesos" name="Show Bones"/>
 			<menu_item_check label="Display Agent Target" name="Display Agent Target"/>
 			<menu_item_call label="Debug Avatar Textures" name="Debug Avatar Textures"/>
 		</menu>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index b52497eb85..a67e410814 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -477,6 +477,9 @@ Se ha superado el límite máximo de [MAX_ATTACHMENTS] objetos. Por favor, quít
 	<notification name="CannotWearInfoNotComplete">
 		No puedes vestirte este ítem porque aún no se ha cargado. Por favor, inténtalo de nuevo en un minuto.
 	</notification>
+	<notification name="MustEnterPasswordToLogIn">
+		Escribe la contraseña para poder iniciar sesión.
+	</notification>
 	<notification name="MustHaveAccountToLogIn">
 		Lo sentimos. Se ha quedado algún espacio en blanco.
 Tienes que volver a introducir el nombre de usuario de tu avatar.
@@ -545,6 +548,9 @@ Nota: esto vaciará la caché.
 	<notification name="ChangeConnectionPort">
 		La configuración del puerto tendrá efecto cuando reinicies [APP_NAME].
 	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		El cambio de configuración del depurador se activará cuando reinicies [APP_NAME].
+	</notification>
 	<notification name="ChangeSkin">
 		Verás la nueva apariencia cuando reinicies [APP_NAME].
 	</notification>
@@ -1370,12 +1376,13 @@ Puedes usar [SECOND_LIFE] de forma normal; los demás residentes te verán corre
 			<ignore name="ignore" text="La ropa está tardando mucho en descargarse"/>
 		</form>
 	</notification>
-	<notification name="RegionAndAgentComplexity">
-		Tu [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complejidad visual] es [AGENT_COMPLEXITY].
+	<notification name="AgentComplexityWithVisibility">
+		La [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complejidad de tu avatar] es [AGENT_COMPLEXITY]. 
 [OVERLIMIT_MSG]
+		<usetemplate ignoretext="Avisarme si la complejidad de mi avatar puede ser excesiva" name="notifyignore"/>
 	</notification>
 	<notification name="AgentComplexity">
-		Tu [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complejidad visual] es [AGENT_COMPLEXITY].
+		La [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complejidad de tu avatar] es [AGENT_COMPLEXITY].
 	</notification>
 	<notification name="FirstRun">
 		Se ha completado la instalación de [SECOND_LIFE].
@@ -1492,6 +1499,10 @@ Cambia la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pu
 		¿Realmente quieres predeterminar el terreno actual, haciéndolo el centro de los limites para elevarlo y rebajarlo, y el terreno por defecto para la herramienta &apos;Revertir&apos;?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmTextureHeights">
+		Vas a usar valores inferiores más grandes que los de Intervalos de elevación. ¿Quieres continuar?
+		<usetemplate canceltext="No preguntar" name="yesnocancelbuttons" notext="Cancelar" yestext="Aceptar"/>
+	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		Sólo puedes tener [MAX_AGENTS] residentes autorizados.
 	</notification>
@@ -1729,14 +1740,6 @@ Si estás impaciente por probar las nuevas funciones y correcciones, lee la pág
 		No es posible abandonar el grupo. No puedes abandonarlo porque eres su último propietario. Antes tienes que asignar el papel de propietario a otro miembro.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="GroupDepartError">
-		No se puede abandonar el grupo: [reason].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepart">
-		Has abandonado el grupo [group_name].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmKick">
 		¿Quieres realmente expulsar a todos los residentes de la cuadrícula?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los Residentes"/>
@@ -2409,6 +2412,10 @@ Linden Lab
 		¿Estás seguro de que quieres borrar de forma permanente el contenido de la Papelera?
 		<usetemplate ignoretext="Confirmar antes de vaciar la Papelera del inventario" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 	</notification>
+	<notification name="TrashIsFull">
+		La papelera está completamente llena. Esto puede causar problemas a la hora de iniciar sesión.
+		<usetemplate name="okcancelbuttons" notext="Vaciaré la papelera más adelante" yestext="Vaciar la papelera"/>
+	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		¿Estás seguro de que quieres borrar tu historial web, de viajes y de búsquedas?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
@@ -2996,7 +3003,7 @@ Si permaneces en esta región serás desconectado.
 
 [MESSAGE]
 
-Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME_SLURL]
+De objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME_SLURL]
 		<form name="form">
 			<button name="Gotopage" text="Cargar"/>
 			<button name="Cancel" text="Cancelar"/>
@@ -3258,11 +3265,15 @@ Por tu seguridad, serán bloqueadas durante unos segundos.
 	<notification name="AttachmentSaved">
 		Se ha guardado el adjunto.
 	</notification>
-	<notification name="PresetNotSaved">
-		Error al guardar el valor predefinido [NAME].
+	<notification name="AppearanceToXMLSaved">
+		El aspecto se ha guardado como XML en [PATH]
 	</notification>
-	<notification name="PresetNotDeleted">
-		Error al eliminar el valor predefinido [NAME].
+	<notification name="AppearanceToXMLFailed">
+		Error al guardar el aspecto como XML.
+    icon=&quot;notifytip.tga&quot;
+	name=&quot;PresetNotDeleted&quot;
+    type=&quot;notifytip&quot;&gt;
+Error al eliminar el valor predefinido [NAME].
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		No se ha podido encontrar un tema de ayuda para este elemento.
@@ -4074,6 +4085,9 @@ Prueba otra vez dentro de un minuto.
 	<notification name="CantAttachNotEnoughScriptResources">
 		No hay suficientes recursos de script disponibles para anexar el objeto
 	</notification>
+	<notification name="IllegalAttachment">
+		El anexo ha solicitado un punto que no existe en el avatar. Por tanto, se ha anexado al pecho.
+	</notification>
 	<notification name="CantDropItemTrialUser">
 		No se pueden soltar objetos aquí; inténtalo en la zona de prueba gratuita.
 	</notification>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
index f34edf149e..c5b27ae766 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
@@ -3,8 +3,9 @@
 	<text name="tell_me_label">
 		Avisarme:
 	</text>
-	<check_box label="Cuando gaste o consiga L$" name="notify_money_change_checkbox"/>
+	<check_box label="Cuando gaste L$" name="notify_money_spend_checkbox"/>
 	<check_box label="Cuando mis amigos se conecten o desconecten" name="friends_online_notify_checkbox"/>
+	<check_box label="Cuando gane L$" name="notify_money_received_checkbox"/>
 	<text name="show_label" width="300">
 		Mostrar siempre:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index f7fb8ab70d..2db4274e44 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -24,10 +24,15 @@
 	<text name="BetterText">
 		Más calidad
 	</text>
+	<slider label="Complejidad máxima de avatar:" name="IndirectMaxComplexity" tool_tip="Controla en qué momento un avatar visualmente complejo se dibuja como un &quot;JellyDoll&quot;"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
 	<check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
 	<check_box initial_value="true" label="Modelo de iluminación avanzado" name="UseLightShaders"/>
 	<button label="Guardar configuración como valor predefinido..." name="PrefSaveButton"/>
 	<button label="Cargar predefinido..." name="PrefLoadButton"/>
+	min_val=&quot;0.125&quot;
 	<button label="Eliminar predefinido..." name="PrefDeleteButton"/>
 	<button label="Restablecer la configuración recomendada" name="Defaults"/>
 	<button label="Configuración avanzada..." name="AdvancedSettings"/>
diff --git a/indra/newview/skins/default/xui/es/panel_sound_devices.xml b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
index 9531b99cc8..109dcb565a 100644
--- a/indra/newview/skins/default/xui/es/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
@@ -16,9 +16,9 @@
 		Salida
 	</text>
 	<text name="My volume label">
-		Mi volumen:
+		Volumen de mic.:
 	</text>
-	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia el volumen usando este deslizable"/>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia el volumen del micrófono con este controlador deslizante"/>
 	<text name="wait_text">
 		Por favor, espera
 	</text>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index ea6cea060b..4e20793d86 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -32,6 +32,9 @@
 		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</string>
+	<string name="BuildConfig">
+		Configuración de constitución [BUILD_CONFIG]
+	</string>
 	<string name="AboutPosition">
 		Estás en la posición [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1], de [REGION], alojada en &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
@@ -55,7 +58,7 @@ Tarjeta gráfica: [GRAPHICS_CARD]
 Versión de J2C Decoder: [J2C_VERSION]
 Versión de Audio Driver: [AUDIO_DRIVER_VERSION]
 Versión de LLCEFLib/CEF: [LLCEFLIB_VERSION]
-Versión del servidor de voz: [VOICE_VERSION]
+Versión de Voice Server: [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
 		Paquetes perdidos: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
@@ -63,6 +66,9 @@ Versión del servidor de voz: [VOICE_VERSION]
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		Error al obtener la URL de las notas de la versión del servidor.
 	</string>
+	<string name="BuildConfiguration">
+		Configuración de constitución
+	</string>
 	<string name="ProgressRestoring">
 		Restaurando...
 	</string>
@@ -1372,6 +1378,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="BodyPartsRightLeg">
 		Pierna der.
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		Esqueleto mejorado
+	</string>
 	<string name="GraphicsQualityLow">
 		Bajo
 	</string>
@@ -1814,6 +1823,51 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="Avatar Center">
 		Centro del avatar
 	</string>
+	<string name="Left Ring Finger">
+		Dedo anular izquierdo
+	</string>
+	<string name="Right Ring Finger">
+		Dedo anular derecho
+	</string>
+	<string name="Tail Base">
+		Base de la cola
+	</string>
+	<string name="Tail Tip">
+		Extremo de la cola
+	</string>
+	<string name="Left Wing">
+		Ala izquierda
+	</string>
+	<string name="Right Wing">
+		Ala derecha
+	</string>
+	<string name="Jaw">
+		Mandíbula
+	</string>
+	<string name="Alt Left Ear">
+		Oreja izquierda alternativa
+	</string>
+	<string name="Alt Right Ear">
+		Oreja derecha alternativa
+	</string>
+	<string name="Alt Left Eye">
+		Ojo izquierdo alternativo
+	</string>
+	<string name="Alt Right Eye">
+		Ojo derecho alternativo
+	</string>
+	<string name="Tongue">
+		Lengua
+	</string>
+	<string name="Groin">
+		Ingle
+	</string>
+	<string name="Left Hind Foot">
+		Pata trasera izquierda
+	</string>
+	<string name="Right Hind Foot">
+		Pata trasera derecha
+	</string>
 	<string name="Invalid Attachment">
 		Punto de colocación no válido
 	</string>
@@ -2203,11 +2257,11 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ATTACH_BELLY">
 		Vientre
 	</string>
-	<string name="ATTACH_RPEC">
-		Pecho derecho
+	<string name="ATTACH_LEFT_PEC">
+		Pectoral izquierdo
 	</string>
-	<string name="ATTACH_LPEC">
-		Pecho izquierdo
+	<string name="ATTACH_RIGHT_PEC">
+		Pectoral derecho
 	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		HUD: Centro 2
@@ -2239,6 +2293,51 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ATTACH_AVATAR_CENTER">
 		Centro del avatar
 	</string>
+	<string name="ATTACH_LHAND_RING1">
+		Dedo anular izquierdo
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		Dedo anular derecho
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		Base de la cola
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		Extremo de la cola
+	</string>
+	<string name="ATTACH_LWING">
+		Ala izquierda
+	</string>
+	<string name="ATTACH_RWING">
+		Ala derecha
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		Mandíbula
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		Oreja izquierda alternativa
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		Oreja derecha alternativa
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		Ojo izquierdo alternativo
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		Ojo derecho alternativo
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		Lengua
+	</string>
+	<string name="ATTACH_GROIN">
+		Ingle
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		Pata trasera izquierda
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		Pata trasera derecha
+	</string>
 	<string name="CursorPos">
 		Línea [LINE], Columna [COLUMN]
 	</string>
@@ -4165,6 +4264,12 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="OfflineStatus">
 		Desconectado/a
 	</string>
+	<string name="not_online_msg">
+		El usuario no está conectado: el mensaje se almacenará para entregárselo más tarde.
+	</string>
+	<string name="not_online_inventory">
+		El usuario no está conectado: el inventario se ha guardado.
+	</string>
 	<string name="answered_call">
 		Han respondido a tu llamada
 	</string>
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 5c5af022ca..d3c4dcfa27 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 doll » (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 baby »"/>
 	<text name="IndirectMaxComplexityText">
 		0
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
index 20de34250a..fd8112429e 100644
--- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="Appeler" name="Call"/>
 	<menu_item_call label="Inviter dans le groupe" name="Invite..."/>
+	<menu_item_call label="Réinitialiser le squelette" name="Reset Skeleton"/>
 	<menu_item_call label="Ignorer" name="Avatar Mute"/>
 	<menu_item_call label="Signaler" name="abuse"/>
 	<menu_item_call label="Figer" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
index 1ccba08099..f3089ad3bb 100644
--- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
@@ -9,6 +9,7 @@
 	<menu_item_call label="Modifier ma tenue" name="Edit Outfit"/>
 	<menu_item_call label="Modifier ma silhouette" name="Edit My Shape"/>
 	<menu_item_call label="Hauteur de sustentation" name="Hover Height"/>
+	<menu_item_call label="Réinitialiser le squelette" name="Reset Skeleton"/>
 	<menu_item_call label="Mes amis" name="Friends..."/>
 	<menu_item_call label="Mes groupes" name="Groups..."/>
 	<menu_item_call label="Mon profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
index d31f205efb..b97c4b0f48 100644
--- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="Appeler" name="Call"/>
 	<menu_item_call label="Inviter dans le groupe" name="Invite..."/>
+	<menu_item_call label="Réinitialiser le squelette" name="Reset Skeleton"/>
 	<menu_item_call label="Ignorer" name="Avatar Mute"/>
 	<menu_item_call label="Signaler" name="abuse"/>
 	<menu_item_call label="Figer" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
index 1c768a078c..a4c1df8cee 100644
--- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
@@ -26,6 +26,7 @@
 	<menu_item_call label="Modifier ma tenue" name="Edit Outfit"/>
 	<menu_item_call label="Modifier ma silhouette" name="Edit My Shape"/>
 	<menu_item_call label="Hauteur de sustentation" name="Hover Height"/>
+	<menu_item_call label="Réinitialiser le squelette" name="Reset Skeleton"/>
 	<menu_item_call label="Mes amis" name="Friends..."/>
 	<menu_item_call label="Mes groupes" name="Groups..."/>
 	<menu_item_call label="Mon profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 9b1f195391..3c9f5c2aa9 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -22,7 +22,6 @@
 			<menu_item_check label="Ne pas déranger" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="Acheter des L$..." name="Buy and Sell L$"/>
-		<menu_item_call label="Boîte d&apos;envoi vendeur..." name="MerchantOutbox"/>
 		<menu_item_call label="Annonces de Place du marché..." name="MarketplaceListings"/>
 		<menu_item_call label="Page d&apos;accueil du compte..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/>
@@ -421,6 +420,7 @@
 			<menu_item_check label="Désactiver LOD" name="Disable LOD"/>
 			<menu_item_check label="Debogage Character Vis" name="Debug Character Vis"/>
 			<menu_item_check label="Afficher le squelette de collision" name="Show Collision Skeleton"/>
+			<menu_item_check label="Voir les os" name="Show Bones"/>
 			<menu_item_check label="Afficher la cible de l&apos;avatar" name="Display Agent Target"/>
 			<menu_item_call label="Dump Attachments" name="Dump Attachments"/>
 			<menu_item_call label="Débogage des textures des avatars" name="Debug Avatar Textures"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 080ea741c5..2310fc5611 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -479,6 +479,9 @@ La limite de [MAX_ATTACHMENTS] objets joints a été dépassée. Veuillez commen
 	<notification name="CannotWearInfoNotComplete">
 		Vous ne pouvez pas porter cet article car il n&apos;a pas encore été chargé. Veuillez réessayer dans une minute.
 	</notification>
+	<notification name="MustEnterPasswordToLogIn">
+		Veuillez saisir votre mot de passe pour vous connecter.
+	</notification>
 	<notification name="MustHaveAccountToLogIn">
 		Zut ! Vous avez oublié de fournir certaines informations.
 Vous devez saisir le nom d&apos;utilisateur de votre avatar.
@@ -547,6 +550,9 @@ Remarque : cela videra le cache.
 	<notification name="ChangeConnectionPort">
 		Les paramètres du port prendront effet après le redémarrage de [APP_NAME].
 	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		Le changement de paramètre de débogage sera effectué au redémarrage de [APP_NAME].
+	</notification>
 	<notification name="ChangeSkin">
 		Le nouveau thème apparaîtra après le redémarrage de [APP_NAME].
 	</notification>
@@ -1361,12 +1367,13 @@ Vous pouvez utiliser [SECOND_LIFE] normalement, les autres résidents vous voien
 			<ignore name="ignore" text="Vos habits prennent du temps à télécharger"/>
 		</form>
 	</notification>
-	<notification name="RegionAndAgentComplexity">
-		Votre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexité visuelle] est [AGENT_COMPLEXITY].
+	<notification name="AgentComplexityWithVisibility">
+		Votre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexité de l&apos;avatar] est [AGENT_COMPLEXITY].
 [OVERLIMIT_MSG]
+		<usetemplate ignoretext="M&apos;avertir si la complexité de l&apos;avatar est trop élevée" name="notifyignore"/>
 	</notification>
 	<notification name="AgentComplexity">
-		Votre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexité visuelle] est [AGENT_COMPLEXITY].
+		Votre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexité de l&apos;avatar] est [AGENT_COMPLEXITY].
 	</notification>
 	<notification name="FirstRun">
 		L&apos;installation de [APP_NAME] est terminée.
@@ -1483,6 +1490,10 @@ suivant votre vitesse de connexion.
 		Etes-vous sûr(e) de vouloir figer le relief actuel, en faire le point central des limites d&apos;élévation/abaissement de relief et la valeur par défaut du bouton Annuler modification ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmTextureHeights">
+		Vous vous apprêtez à utiliser des valeurs plus élevées que les limites d&apos;élévation supérieures. Continuer ?
+		<usetemplate canceltext="Ne pas demander" name="yesnocancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		Vous ne pouvez pas autoriser plus de [MAX_AGENTS] résidents.
 	</notification>
@@ -1720,14 +1731,6 @@ Quitter le groupe ?
 		Impossible de quitter le groupe. Vous ne pouvez pas quitter le groupe car vous en êtes le dernier propriétaire. Vous devez d&apos;abord affecter le rôle de propriétaire à un autre membre.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="GroupDepartError">
-		Impossible de quitter le groupe : [reason].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepart">
-		Vous avez quitté le groupe [group_name].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmKick">
 		Souhaitez-vous vraiment éjecter tous les résidents de la grille ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Éjecter tous les résidents"/>
@@ -2400,6 +2403,10 @@ Voulez-vous désactiver Ne pas déranger avant de terminer cette transaction ?
 		Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente ?
 		<usetemplate ignoretext="Confirmer avant de vider la corbeille" name="okcancelignore" notext="Annuler" yestext="OK"/>
 	</notification>
+	<notification name="TrashIsFull">
+		Votre corbeille déborde. Cela risque de provoquer des problèmes lors de la connexion.
+		<usetemplate name="okcancelbuttons" notext="Je viderai la corbeille plus tard" yestext="Vider la corbeille"/>
+	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Êtes-vous certain de vouloir supprimer l&apos;historique de vos visites et recherches ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
@@ -2984,11 +2991,11 @@ Si vous restez dans cette région, vous serez déconnecté(e).
 Si vous restez dans cette région, vous serez déconnecté(e).
 	</notification>
 	<notification name="LoadWebPage">
-		Charger la page Web [URL] ?
+		Charger la page Web [URL] ?
 
 [MESSAGE]
 
-Venant de l&apos;objet : &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propriétaire : [NAME_SLURL]
+Venant de l&apos;objet : &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propriétaire : [NAME_SLURL]
 		<form name="form">
 			<button name="Gotopage" text="Charger"/>
 			<button name="Cancel" text="Annuler"/>
@@ -3257,11 +3264,15 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité.
 	<notification name="AttachmentSaved">
 		L&apos;élément joint a été sauvegardé.
 	</notification>
-	<notification name="PresetNotSaved">
-		Erreur d’enregistrement du préréglage [NAME].
+	<notification name="AppearanceToXMLSaved">
+		L&apos;apparence a été enregistrée en XML vers [PATH]
 	</notification>
-	<notification name="PresetNotDeleted">
-		Erreur de suppression du préréglage [NAME].
+	<notification name="AppearanceToXMLFailed">
+		Échec d&apos;enregistrement de l&apos;apparence en XML.
+    icon=&quot;notifytip.tga&quot;
+	name=&quot;PresetNotDeleted&quot;
+    type=&quot;notifytip&quot;&gt;
+Erreur de suppression du préréglage [NAME].
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Impossible de trouver l&apos;aide.
@@ -4075,6 +4086,9 @@ Veuillez réessayer dans une minute.
 	<notification name="CantAttachNotEnoughScriptResources">
 		Ressources de script insuffisantes pour attacher cet objet.
 	</notification>
+	<notification name="IllegalAttachment">
+		La pièce jointe a demandé un point non existant sur l&apos;avatar. Il a été fixé sur la poitrine.
+	</notification>
 	<notification name="CantDropItemTrialUser">
 		Vous ne pouvez pas déposer d&apos;objets ici. Essayez la zone de période d&apos;essai gratuite.
 	</notification>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
index 901a92ed1b..85cd958f49 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
@@ -3,8 +3,9 @@
 	<text name="tell_me_label">
 		Me prévenir :
 	</text>
-	<check_box label="Quand je dépense ou que je reçois des L$" name="notify_money_change_checkbox"/>
+	<check_box label="Quand je dépense des L$" name="notify_money_spend_checkbox"/>
 	<check_box label="Quand mes amis se connectent ou se déconnectent" name="friends_online_notify_checkbox"/>
+	<check_box label="Quand je reçois des L$" name="notify_money_received_checkbox"/>
 	<text name="show_label">
 		Toujours afficher :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 01d89f03f8..2b1e613fe4 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -24,10 +24,15 @@
 	<text name="BetterText">
 		Meilleure
 	</text>
+	<slider label="Complexité max. de l&apos;avatar :" name="IndirectMaxComplexity" tool_tip="Contrôle à quel moment un avatar complexe est représenté comme un « jelly baby »"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
 	<check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
 	<check_box initial_value="true" label="Modèle d’éclairage avancé" name="UseLightShaders"/>
 	<button label="Enregistrer les paramètres comme préréglage..." name="PrefSaveButton"/>
 	<button label="Charger un préréglage..." name="PrefLoadButton"/>
+	min_val=&quot;0,125&quot;
 	<button label="Supprimer un préréglage..." name="PrefDeleteButton"/>
 	<button label="Réinitialiser les paramètres recommandés" name="Defaults"/>
 	<button label="Paramètres avancés" name="AdvancedSettings"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
index 460b269f7c..720aaaf3e0 100644
--- a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
@@ -16,9 +16,9 @@
 		Sortie
 	</text>
 	<text name="My volume label">
-		Mon volume :
+		Volume du micro :
 	</text>
-	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Régler le volume avec le curseur."/>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Régler le volume du micro avec le curseur."/>
 	<text name="wait_text">
 		Veuillez patienter
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index ae091aba39..843467df96 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -41,6 +41,9 @@
 		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
 [[VIEWER_RELEASE_NOTES_URL] [Notes de version]]
 	</string>
+	<string name="BuildConfig">
+		Configuration de la construction [BUILD_CONFIG]
+	</string>
 	<string name="AboutPosition">
 		Vous êtes à [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] dans [REGION], se trouvant à &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 SLURL : &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
@@ -72,6 +75,9 @@ Version serveur vocal : [VOICE_VERSION]
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		Erreur lors de la récupération de l&apos;URL des notes de version du serveur.
 	</string>
+	<string name="BuildConfiguration">
+		Configuration de la construction
+	</string>
 	<string name="ProgressRestoring">
 		Restauration...
 	</string>
@@ -1390,6 +1396,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="BodyPartsRightLeg">
 		Jambe droite
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		Squelette amélioré
+	</string>
 	<string name="GraphicsQualityLow">
 		Faible
 	</string>
@@ -1838,6 +1847,51 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="Avatar Center">
 		Centre de l&apos;avatar
 	</string>
+	<string name="Left Ring Finger">
+		Annulaire gauche
+	</string>
+	<string name="Right Ring Finger">
+		Annulaire droit
+	</string>
+	<string name="Tail Base">
+		Base de la queue
+	</string>
+	<string name="Tail Tip">
+		Bout de la queue
+	</string>
+	<string name="Left Wing">
+		Aile gauche
+	</string>
+	<string name="Right Wing">
+		Aile droite
+	</string>
+	<string name="Jaw">
+		Mâchoire
+	</string>
+	<string name="Alt Left Ear">
+		Oreille gauche différente
+	</string>
+	<string name="Alt Right Ear">
+		Oreille droite différente
+	</string>
+	<string name="Alt Left Eye">
+		Œil gauche différent
+	</string>
+	<string name="Alt Right Eye">
+		Œil droit différent
+	</string>
+	<string name="Tongue">
+		Langue
+	</string>
+	<string name="Groin">
+		Aine
+	</string>
+	<string name="Left Hind Foot">
+		Pied arrière gauche
+	</string>
+	<string name="Right Hind Foot">
+		Pied arrière droit
+	</string>
 	<string name="Invalid Attachment">
 		Point d&apos;attache non valide
 	</string>
@@ -2227,12 +2281,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ATTACH_BELLY">
 		Ventre
 	</string>
-	<string name="ATTACH_RPEC">
-		Pectoral droit
-	</string>
-	<string name="ATTACH_LPEC">
+	<string name="ATTACH_LEFT_PEC">
 		Pectoral gauche
 	</string>
+	<string name="ATTACH_RIGHT_PEC">
+		Pectoral droit
+	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		HUD centre 2
 	</string>
@@ -2263,6 +2317,51 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ATTACH_AVATAR_CENTER">
 		Centre de l&apos;avatar
 	</string>
+	<string name="ATTACH_LHAND_RING1">
+		Annulaire gauche
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		Annulaire droit
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		Base de la queue
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		Bout de la queue
+	</string>
+	<string name="ATTACH_LWING">
+		Aile gauche
+	</string>
+	<string name="ATTACH_RWING">
+		Aile droite
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		Mâchoire
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		Oreille gauche différente
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		Oreille droite différente
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		Œil gauche différent
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		Œil droit différent
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		Langue
+	</string>
+	<string name="ATTACH_GROIN">
+		Aine
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		Pied arrière gauche
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		Pied arrière droit
+	</string>
 	<string name="CursorPos">
 		Ligne [LINE], colonne [COLUMN]
 	</string>
@@ -4252,6 +4351,12 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="OfflineStatus">
 		Hors ligne
 	</string>
+	<string name="not_online_msg">
+		Utilisateur non connecté -  le message sera enregistré et livré plus tard.
+	</string>
+	<string name="not_online_inventory">
+		Utilisateur non connecté - l&apos;inventaire a été enregistré
+	</string>
 	<string name="answered_call">
 		Votre appel a fait l&apos;objet d&apos;une réponse
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
index 5baba9fced..0568891264 100644
--- a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
 	<text name="AvatarText">
 		Avatar
 	</text>
-	<slider label="Complessità massima:" name="IndirectMaxComplexity" tool_tip="Definisce il punto in cui un avatar dall&apos;aspetto complesso viene visualizzato come una forma senza dettagli"/>
+	<slider label="Complessità massima:" name="IndirectMaxComplexity" tool_tip="Definisce il punto in cui un avatar dall&apos;aspetto complesso viene visualizzato come JellyDoll"/>
 	<text name="IndirectMaxComplexityText">
 		0
 	</text>
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_other.xml b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
index 60cdd2a91d..5c017a92b5 100644
--- a/indra/newview/skins/default/xui/it/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="Chiama" name="Call"/>
 	<menu_item_call label="Invita al gruppo" name="Invite..."/>
+	<menu_item_call label="Ripristina scheletro" name="Reset Skeleton"/>
 	<menu_item_call label="Blocca" name="Avatar Mute"/>
 	<menu_item_call label="Segnala" name="abuse"/>
 	<menu_item_call label="Congela" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
index 1539fbafa1..b1ca55b093 100644
--- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
@@ -9,6 +9,7 @@
 	<menu_item_call label="Modifica il mio vestiario" name="Edit Outfit"/>
 	<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
 	<menu_item_call label="Altezza di volo" name="Hover Height"/>
+	<menu_item_call label="Ripristina scheletro" name="Reset Skeleton"/>
 	<menu_item_call label="I miei amici..." name="Friends..."/>
 	<menu_item_call label="I miei gruppi" name="Groups..."/>
 	<menu_item_call label="Il mio profilo" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_other.xml b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
index 7042e52943..12e808195e 100644
--- a/indra/newview/skins/default/xui/it/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="Chiama" name="Call"/>
 	<menu_item_call label="Invita al gruppo" name="Invite..."/>
+	<menu_item_call label="Ripristina scheletro" name="Reset Skeleton"/>
 	<menu_item_call label="Blocca" name="Avatar Mute"/>
 	<menu_item_call label="Segnala" name="abuse"/>
 	<menu_item_call label="Congela" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
index 0c9663fd4c..e48449a04c 100644
--- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
@@ -26,6 +26,7 @@
 	<menu_item_call label="Modifica il mio vestiario" name="Edit Outfit"/>
 	<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
 	<menu_item_call label="Altezza di volo" name="Hover Height"/>
+	<menu_item_call label="Ripristina scheletro" name="Reset Skeleton"/>
 	<menu_item_call label="I miei amici..." name="Friends..."/>
 	<menu_item_call label="I miei gruppi" name="Groups..."/>
 	<menu_item_call label="Il mio profilo" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index d52b022c49..90ea601259 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -22,7 +22,6 @@
 			<menu_item_check label="Non disturbare" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="Acquista L$..." name="Buy and Sell L$"/>
-		<menu_item_call label="Casella venditore in uscita..." name="MerchantOutbox"/>
 		<menu_item_call label="Annunci Marketplace..." name="MarketplaceListings"/>
 		<menu_item_call label="Dashboard dell&apos;account..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=it"/>
@@ -368,6 +367,7 @@
 			<menu_item_check label="Informazioni sull&apos;animazione" name="Animation Info"/>
 			<menu_item_check label="Disabilita livello di dettaglio" name="Disable LOD"/>
 			<menu_item_check label="Mostra schemi collisione" name="Show Collision Skeleton"/>
+			<menu_item_check label="Mostra ossa" name="Show Bones"/>
 			<menu_item_check label="Mostra bersaglio" name="Display Agent Target"/>
 			<menu_item_call label="Debug texture dell&apos;avatar" name="Debug Avatar Textures"/>
 		</menu>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 358f38a137..3a29e4d32f 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -480,6 +480,9 @@ Superato il limite di oggetti collegati [MAX_ATTACHMENTS]. Per favore prima stac
 	<notification name="CannotWearInfoNotComplete">
 		Non puoi indossare quell&apos;elemento perchè non è ancora stato caricato. Riprova fra un minuto.
 	</notification>
+	<notification name="MustEnterPasswordToLogIn">
+		Inserisci la tua password per accedere.
+	</notification>
 	<notification name="MustHaveAccountToLogIn">
 		Spiacenti. Un campo è vuoto.
 Inserisci il Nome utente del tuo avatar.
@@ -548,6 +551,9 @@ Nota: questa operazione cancellerà la cache.
 	<notification name="ChangeConnectionPort">
 		Le impostazioni della porta avranno effetto dopo il riavvio di [APP_NAME].
 	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		La modifica della impostazione di debug avrà effetto dopo il riavvio di [APP_NAME].
+	</notification>
 	<notification name="ChangeSkin">
 		La nuova pelle comparirà dopo il riavvio di [APP_NAME].
 	</notification>
@@ -1366,12 +1372,13 @@ Puoi comunque usare [SECOND_LIFE] normalmente e gli altri residenti ti vedranno
 			<ignore name="ignore" text="Lo scaricamento sta richiedendo parecchio tempo"/>
 		</form>
 	</notification>
-	<notification name="RegionAndAgentComplexity">
-		La tua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complessità visiva] è [AGENT_COMPLEXITY].
+	<notification name="AgentComplexityWithVisibility">
+		La [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complessità del tuo avatar] è [AGENT_COMPLEXITY].
 [OVERLIMIT_MSG]
+		<usetemplate ignoretext="Avvisami se la complessità del mio avatar è eccessiva" name="notifyignore"/>
 	</notification>
 	<notification name="AgentComplexity">
-		La tua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complessità visiva] è [AGENT_COMPLEXITY].
+		La [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complessità del tuo avatar] è [AGENT_COMPLEXITY].
 	</notification>
 	<notification name="FirstRun">
 		L&apos;installazione di [APP_NAME] è terminata.
@@ -1486,6 +1493,10 @@ Sostituisci la texture [TEXTURE_NUM] con una a 24-bit 512x512 oppure con una imm
 		Vuoi veramente impostare come base il terreno corrente, impostarlo come riferimento per i limiti dei rialzi/abbassamenti di tutto il territorio ed il suo valore impostato come base per lo strumento &apos;Ripristina&apos;?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmTextureHeights">
+		Stai per usare valori bassi maggiori dei valori alti di Intervalli altitudine. Vuoi procedere?
+		<usetemplate canceltext="Non chiedere" name="yesnocancelbuttons" notext="Annulla" yestext="OK"/>
+	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		Puoi avere al massimo [MAX_AGENTS] residenti consentiti.
 	</notification>
@@ -1724,14 +1735,6 @@ Lasciare il gruppo?
 		Impossibile abbandonare il gruppo. Non puoi abbandonare il gruppo perché sei l&apos;ultimo proprietario del gruppo. Devi prima assegnare a un altro membro il ruolo di proprietario.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="GroupDepartError">
-		Impossibile abbandonare il gruppo: [reason].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepart">
-		Hai abbandonato il gruppo [group_name].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmKick">
 		Vuoi veramente espellere tutti i residenti dalla griglia?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Espelli tutti i residenti"/>
@@ -2406,6 +2409,10 @@ Vuoi disattivare la modalità Non disturbare prima di completare questa transazi
 		Vuoi veramente eliminare in modo permanente il contenuto del tuo Cestino?
 		<usetemplate ignoretext="Conferma prima di svuotare la cartella del Cestino inventario" name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
+	<notification name="TrashIsFull">
+		Il cestino è troppo pieno. Ciò potrebbe causare problemi durante l&apos;accesso.
+		<usetemplate name="okcancelbuttons" notext="Svuota il cestino più tardi" yestext="Svuota il cestino adesso"/>
+	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Vuoi veramente eliminare la cronologia viaggi, web e ricerche fatte?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
@@ -3262,11 +3269,15 @@ Per sicurezza, verranno bloccati per alcuni secondi.
 	<notification name="AttachmentSaved">
 		L&apos;elemento da collegare è stato salvato.
 	</notification>
-	<notification name="PresetNotSaved">
-		Errore durante il salvataggio del valore predefinito [NAME].
+	<notification name="AppearanceToXMLSaved">
+		L&apos;aspetto è stato salvato in XML su [PATH]
 	</notification>
-	<notification name="PresetNotDeleted">
-		Errore durante l&apos;eliminazione del valore predefinito [NAME].
+	<notification name="AppearanceToXMLFailed">
+		L&apos;aspetto non è stato salvato in XML.
+    icon=&quot;notifytip.tga&quot;
+	name=&quot;PresetNotDeleted&quot;
+    type=&quot;notifytip&quot;&gt;
+Errore nella cancellazione del valore predefinito [NAME].
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Impossibile trovare l&apos;argomento nell&apos;aiuto per questo elemento.
@@ -4081,6 +4092,9 @@ Riprova tra un minuto.
 	<notification name="CantAttachNotEnoughScriptResources">
 		Risorse di script non sufficienti per collegare l&apos;oggetto.
 	</notification>
+	<notification name="IllegalAttachment">
+		Il collegamento ha richiesto un punto sull&apos;avatar che non esiste. È stato collegato al petto.
+	</notification>
 	<notification name="CantDropItemTrialUser">
 		Non puoi lasciare oggetti qui, prova la zona Prova gratuita.
 	</notification>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
index fd1fd57761..ca83490b02 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
@@ -3,8 +3,9 @@
 	<text name="tell_me_label">
 		Avvisami:
 	</text>
-	<check_box label="Quando spendo o ottengo L$" name="notify_money_change_checkbox"/>
+	<check_box label="Quando spendo $" name="notify_money_spend_checkbox"/>
 	<check_box label="Quando i miei amici entrano o escono da Second Life" name="friends_online_notify_checkbox"/>
+	<check_box label="Quando ottengo $" name="notify_money_received_checkbox"/>
 	<text name="show_label">
 		Mostra sempre:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index a042c43431..4fa1835b0e 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -24,10 +24,15 @@
 	<text name="BetterText">
 		Migliore
 	</text>
+	<slider label="Massima conplessità dell&apos;avatar:" name="IndirectMaxComplexity" tool_tip="Definisce il punto in cui un avatar dall&apos;aspetto complesso viene visualizzato come JellyDoll"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
 	<check_box initial_value="true" label="Shader atmosfera..." name="WindLightUseAtmosShaders"/>
 	<check_box initial_value="true" label="Modello illuminazione avanzato" name="UseLightShaders"/>
 	<button label="Salva impostazioni come valori predefiniti..." name="PrefSaveButton"/>
 	<button label="Carica valore predefinito..." name="PrefLoadButton"/>
+	min_val=&quot;0.125&quot;
 	<button label="Elimina valore predefinito..." name="PrefDeleteButton"/>
 	<button label="Ripristina impostazioni consigliate" name="Defaults"/>
 	<button label="Impostazioni avanzate..." name="AdvancedSettings"/>
diff --git a/indra/newview/skins/default/xui/it/panel_sound_devices.xml b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
index b1934fd515..83df46f381 100644
--- a/indra/newview/skins/default/xui/it/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
@@ -16,9 +16,9 @@
 		Output
 	</text>
 	<text name="My volume label">
-		Il mio volume:
+		Volume microfono:
 	</text>
-	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia il volume utilizzando questa barra"/>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia il livello del microfono utilizzando questa barra"/>
 	<text name="wait_text">
 		Attendi
 	</text>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index effd6f5040..bb2f221db9 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -38,6 +38,9 @@
 		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</string>
+	<string name="BuildConfig">
+		Configurazione struttura [BUILD_CONFIG]
+	</string>
 	<string name="AboutPosition">
 		Tu sei a [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] che si trova a &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
@@ -69,6 +72,9 @@ Versione server voce: [VOICE_VERSION]
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		Errore nel recupero URL note rilascio versione
 	</string>
+	<string name="BuildConfiguration">
+		Costruisci configurazione
+	</string>
 	<string name="ProgressRestoring">
 		Ripristino in corso...
 	</string>
@@ -1381,6 +1387,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="BodyPartsRightLeg">
 		Gamba destra
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		Scheletro avanzato
+	</string>
 	<string name="GraphicsQualityLow">
 		Basso
 	</string>
@@ -1823,6 +1832,51 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="Avatar Center">
 		Centro avatar
 	</string>
+	<string name="Left Ring Finger">
+		Anulare sinistro
+	</string>
+	<string name="Right Ring Finger">
+		Anulare destro
+	</string>
+	<string name="Tail Base">
+		Base della coda
+	</string>
+	<string name="Tail Tip">
+		Punta della coda
+	</string>
+	<string name="Left Wing">
+		Ala sinistra
+	</string>
+	<string name="Right Wing">
+		Ala destra
+	</string>
+	<string name="Jaw">
+		Mandibola
+	</string>
+	<string name="Alt Left Ear">
+		Altro orecchio sinistro
+	</string>
+	<string name="Alt Right Ear">
+		Altro orecchio destro
+	</string>
+	<string name="Alt Left Eye">
+		Altro occhio sinistro
+	</string>
+	<string name="Alt Right Eye">
+		Altro occhio destro
+	</string>
+	<string name="Tongue">
+		Lingua
+	</string>
+	<string name="Groin">
+		Inguine
+	</string>
+	<string name="Left Hind Foot">
+		Piede posteriore sinistro
+	</string>
+	<string name="Right Hind Foot">
+		Piede posteriore destro
+	</string>
 	<string name="Invalid Attachment">
 		Punto di collegamento non valido
 	</string>
@@ -2212,12 +2266,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ATTACH_BELLY">
 		Addome
 	</string>
-	<string name="ATTACH_RPEC">
-		Petto destro
-	</string>
-	<string name="ATTACH_LPEC">
+	<string name="ATTACH_LEFT_PEC">
 		Petto sinistro
 	</string>
+	<string name="ATTACH_RIGHT_PEC">
+		Petto destro
+	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		HUD in centro 2
 	</string>
@@ -2248,6 +2302,51 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ATTACH_AVATAR_CENTER">
 		Centro avatar
 	</string>
+	<string name="ATTACH_LHAND_RING1">
+		Anulare sinistro
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		Anulare destro
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		Base della coda
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		Punta della coda
+	</string>
+	<string name="ATTACH_LWING">
+		Ala sinistra
+	</string>
+	<string name="ATTACH_RWING">
+		Ala destra
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		Mandibola
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		Altro orecchio sinistro
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		Altro orecchio destro
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		Altro occhio sinistro
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		Altro occhio destro
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		Lingua
+	</string>
+	<string name="ATTACH_GROIN">
+		Inguine
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		Piede posteriore sinistro
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		Piede posteriore destro
+	</string>
 	<string name="CursorPos">
 		Riga [LINE], Colonna [COLUMN]
 	</string>
@@ -4174,6 +4273,12 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="OfflineStatus">
 		Offline
 	</string>
+	<string name="not_online_msg">
+		Utente non online - il messaggio verrà memorizzato e inviato più tardi.
+	</string>
+	<string name="not_online_inventory">
+		Utente non online - l&apos;inventario è stato salvato
+	</string>
 	<string name="answered_call">
 		Risposto alla chiamata
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
index a95c45c275..db4e086c13 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
 	<text name="AvatarText">
 		アバター
 	</text>
-	<slider label="最大の複雑さ：" name="IndirectMaxComplexity" tool_tip="どの時点で複雑な表示のアバターをベタ色の人形として表示するかを管理します"/>
+	<slider label="最大の複雑さ：" name="IndirectMaxComplexity" tool_tip="どの点で視覚的に複雑なアバターを JellyDoll として描くかを制御します"/>
 	<text name="IndirectMaxComplexityText">
 		0
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
index 7705dd9090..78c36a4392 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="コール" name="Call"/>
 	<menu_item_call label="グループに招待" name="Invite..."/>
+	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
 	<menu_item_call label="ブロック" name="Avatar Mute"/>
 	<menu_item_call label="報告" name="abuse"/>
 	<menu_item_call label="フリーズ" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
index e7aa3cfc30..ba46f91504 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -9,6 +9,7 @@
 	<menu_item_call label="アウトフィットの編集" name="Edit Outfit"/>
 	<menu_item_call label="シェイプの編集" name="Edit My Shape"/>
 	<menu_item_call label="ホバー高さ" name="Hover Height"/>
+	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
 	<menu_item_call label="フレンド" name="Friends..."/>
 	<menu_item_call label="グループ" name="Groups..."/>
 	<menu_item_call label="プロフィール" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
index 482f2bdaa5..b7e0537866 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="コール" name="Call"/>
 	<menu_item_call label="グループに招待" name="Invite..."/>
+	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
 	<menu_item_call label="ブロック" name="Avatar Mute"/>
 	<menu_item_call label="報告" name="abuse"/>
 	<menu_item_call label="フリーズ" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
index a14cfd5876..a3847ed555 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -26,6 +26,7 @@
 	<menu_item_call label="アウトフィットを編集" name="Edit Outfit"/>
 	<menu_item_call label="シェイプを編集" name="Edit My Shape"/>
 	<menu_item_call label="ホバー高さ" name="Hover Height"/>
+	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
 	<menu_item_call label="フレンド" name="Friends..."/>
 	<menu_item_call label="グループ" name="Groups..."/>
 	<menu_item_call label="プロフィール" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 3c2e294868..c2ae77bef2 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -22,7 +22,6 @@
 			<menu_item_check label="着信拒否" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="L$ の購入..." name="Buy and Sell L$"/>
-		<menu_item_call label="マーチャントアウトボックス..." name="MerchantOutbox"/>
 		<menu_item_call label="マーケティングプレイスのリスト..." name="MarketplaceListings"/>
 		<menu_item_call label="マイアカウント..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/>
@@ -421,6 +420,7 @@
 			<menu_item_check label="LOD を無効にする" name="Disable LOD"/>
 			<menu_item_check label="キャラクター Vis のデバッグ" name="Debug Character Vis"/>
 			<menu_item_check label="骨組みの衝突判定を表示する" name="Show Collision Skeleton"/>
+			<menu_item_check label="骨を表示" name="Show Bones"/>
 			<menu_item_check label="エージェントのターゲットを表示する" name="Display Agent Target"/>
 			<menu_item_call label="アタッチメントをダンプ" name="Dump Attachments"/>
 			<menu_item_call label="アバターテクスチャをデバッグ" name="Debug Avatar Textures"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index a573e86e5f..54e5f29621 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -498,6 +498,9 @@ L$ が不足しているのでこのグループに参加することができ
 	<notification name="CannotWearInfoNotComplete">
 		まだ読み込まれていないため、そのアイテムを装着できません。後でやり直してください。
 	</notification>
+	<notification name="MustEnterPasswordToLogIn">
+		ログインするためにパスワードを入力してください
+	</notification>
 	<notification name="MustHaveAccountToLogIn">
 		注意：記入漏れの箇所があります。
 アバターのユーザー名を入力してください。
@@ -566,6 +569,9 @@ L$ が不足しているのでこのグループに参加することができ
 	<notification name="ChangeConnectionPort">
 		ポートの設定は [APP_NAME] を再起動後に反映されます。
 	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		デバッグ設定の変更は [APP_NAME] を再起動後に反映されます。
+	</notification>
 	<notification name="ChangeSkin">
 		新しいスキンは [APP_NAME] を再起動後に表示されます。
 	</notification>
@@ -1395,12 +1401,13 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してく
 			<ignore name="ignore" text="衣類がダウンロードされるまで時間がかかっているとき"/>
 		</form>
 	</notification>
-	<notification name="RegionAndAgentComplexity">
-		ご使用の [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示の複雑さ] は [AGENT_COMPLEXITY] です。
+	<notification name="AgentComplexityWithVisibility">
+		あなたの [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] は [AGENT_COMPLEXITY] です。
 [OVERLIMIT_MSG]
+		<usetemplate ignoretext="アバターの複雑度が高すぎる場合は警告する" name="notifyignore"/>
 	</notification>
 	<notification name="AgentComplexity">
-		ご使用の [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示の複雑さ] は [AGENT_COMPLEXITY] です。
+		あなたの [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] は [AGENT_COMPLEXITY] です。
 	</notification>
 	<notification name="FirstRun">
 		[APP_NAME] のインストールが完了しました。
@@ -1519,6 +1526,10 @@ SHA1 フィンガープリント： [MD5_DIGEST]
 操作を続行しますか？
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmTextureHeights">
+		使用しようとしている隆起範囲の低い値は高い値よりも大きくなっています。それでも続けますか？
+		<usetemplate canceltext="聞かないでください" name="yesnocancelbuttons" notext="取り消し" yestext="Ok"/>
+	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		許可住人は [MAX_AGENTS] 人までです。
 	</notification>
@@ -1754,14 +1765,6 @@ http://secondlife.com/download から最新バージョンをダウンロード
 		グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="GroupDepartError">
-		グループを抜けることができません: [reason]。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepart">
-		グループ [group_name] を抜けました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmKick">
 		本当に住人全員をグリッドから追い出しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す"/>
@@ -2442,6 +2445,10 @@ Linden Lab
 		ごみ箱の中身をすべて削除しますか？
 		<usetemplate ignoretext="インベントリのごみ箱フォルダを空にする前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
 	</notification>
+	<notification name="TrashIsFull">
+		ゴミ箱があふれています。これはログイン時に問題を引き起こします。
+		<usetemplate name="okcancelbuttons" notext="後でゴミ箱を空にする" yestext="今すぐゴミ箱を空にする"/>
+	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		トラベル、Web、検索の履歴をすべて削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
@@ -3032,7 +3039,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 
 [MESSAGE]
 
-送信元のオブジェクト：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;、所有者：[NAME_SLURL]
+送信元のオブジェクト：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;、所有者:[NAME_SLURL]
 		<form name="form">
 			<button name="Gotopage" text="ページに移動"/>
 			<button name="Cancel" text="取り消し"/>
@@ -3298,11 +3305,15 @@ M キーを押して変更します。
 	<notification name="AttachmentSaved">
 		アタッチメントが保存されました。
 	</notification>
-	<notification name="PresetNotSaved">
-		プリセット [NAME] の保存中にエラーが発生しました。
+	<notification name="AppearanceToXMLSaved">
+		外観が XML で [PATH] に保存されました
 	</notification>
-	<notification name="PresetNotDeleted">
-		プリセット [NAME] の削除中にエラーが発生しました。
+	<notification name="AppearanceToXMLFailed">
+		外観を XML に保存できませんでした。
+    icon=&quot;notifytip.tga&quot;
+	name=&quot;PresetNotDeleted&quot;
+    type=&quot;notifytip&quot;&gt;
+プリセット [NAME] の削除エラー。
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		ヘルプトピックが見つかりませんでした。
@@ -4111,6 +4122,9 @@ M キーを押して変更します。
 	<notification name="CantAttachNotEnoughScriptResources">
 		オブジェクトの着用に使用できるスクリプトリソースが足りません。
 	</notification>
+	<notification name="IllegalAttachment">
+		添付ファイルはアバターの存在しない点を要求しました。代わりに胸に添付されていました。
+	</notification>
 	<notification name="CantDropItemTrialUser">
 		オブジェクトをここにドロップできません。フリートライアル領域をお試しください。
 	</notification>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
index 7fd2e31698..4c2906cc18 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
@@ -3,8 +3,9 @@
 	<text name="tell_me_label">
 		知らせる：
 	</text>
-	<check_box label="リンデンドルを使用・受け取るとき" name="notify_money_change_checkbox"/>
+	<check_box label="L$ を使用する場合" name="notify_money_spend_checkbox"/>
 	<check_box label="フレンドがログイン・ログアウトするとき" name="friends_online_notify_checkbox"/>
+	<check_box label="L$ を手に入れる場合" name="notify_money_received_checkbox"/>
 	<text name="show_label" width="300">
 		常に表示するメッセージ：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 8fbe9b56b9..61d914135d 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -24,10 +24,15 @@
 	<text name="BetterText">
 		遅い
 	</text>
+	<slider label="アバターの最大複雑度:" name="IndirectMaxComplexity" tool_tip="どの点で視覚的に複雑なアバターを JellyDoll として描くかを制御します"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
 	<check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
 	<check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
 	<button label="設定をプリセットとして保存..." name="PrefSaveButton"/>
 	<button label="プリセットをロード..." name="PrefLoadButton"/>
+	min_val=&quot;0.125&quot;
 	<button label="事前設定を削除..." name="PrefDeleteButton"/>
 	<button label="推奨設定にリセット" name="Defaults"/>
 	<button label="詳細設定..." name="AdvancedSettings"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
index 0824504235..d57e6c796c 100644
--- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
@@ -16,9 +16,9 @@
 		出力
 	</text>
 	<text name="My volume label">
-		私の音量：
+		マイク音量:
 	</text>
-	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="スライダーを使って音量を調節します"/>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="スライダーを使ってマイクレベルを調節します"/>
 	<text name="wait_text">
 		しばらくお待ちください。
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 1ad977fe88..904ce3880a 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -38,7 +38,11 @@
 		グラフィックを初期化できませんでした。グラフィックドライバを更新してください。
 	</string>
 	<string name="AboutHeader">
-		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
+		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
+[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</string>
+	<string name="BuildConfig">
+		ビルド構成 [BUILD_CONFIG]
 	</string>
 	<string name="AboutPosition">
 		あなたの現在地は、[POSITION_LOCAL_0,number,1]、[POSITION_LOCAL_1,number,1]、[POSITION_LOCAL_2,number,1] の [REGION] です。位置は &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; です。（[HOSTIP]）
@@ -62,8 +66,8 @@ OS バージョン：[OS_VERSION]
 
 J2C デコーダバージョン：[J2C_VERSION]
 オーディオドライババージョン：[AUDIO_DRIVER_VERSION]
-LLCEFLib/CEF バージョン： [LLCEFLIB_VERSION]
-ボイスサーバーバージョン： [VOICE_VERSION]
+LLCEFLib/CEF バージョン: [LLCEFLIB_VERSION]
+ボイスサーバーバージョン:[VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
 		パケットロス：[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] （[PACKETS_PCT,number,1]%）
@@ -71,6 +75,9 @@ LLCEFLib/CEF バージョン： [LLCEFLIB_VERSION]
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		サーバーのリリースノートの URL を取得中にエラーが発生しました。
 	</string>
+	<string name="BuildConfiguration">
+		ビルド構成
+	</string>
 	<string name="ProgressRestoring">
 		復元中です...
 	</string>
@@ -1389,6 +1396,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="BodyPartsRightLeg">
 		右脚
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		拡張スケルトン
+	</string>
 	<string name="GraphicsQualityLow">
 		低
 	</string>
@@ -1837,6 +1847,51 @@ support@secondlife.com にお問い合わせください。
 	<string name="Avatar Center">
 		アバターの中央
 	</string>
+	<string name="Left Ring Finger">
+		左薬指
+	</string>
+	<string name="Right Ring Finger">
+		右薬指
+	</string>
+	<string name="Tail Base">
+		しっぽのベース
+	</string>
+	<string name="Tail Tip">
+		しっぽの先
+	</string>
+	<string name="Left Wing">
+		左の翼
+	</string>
+	<string name="Right Wing">
+		右の翼
+	</string>
+	<string name="Jaw">
+		顎
+	</string>
+	<string name="Alt Left Ear">
+		代わりの左耳
+	</string>
+	<string name="Alt Right Ear">
+		代わりの右耳
+	</string>
+	<string name="Alt Left Eye">
+		代わりの左目
+	</string>
+	<string name="Alt Right Eye">
+		代わりの右目
+	</string>
+	<string name="Tongue">
+		舌
+	</string>
+	<string name="Groin">
+		脚の付け根
+	</string>
+	<string name="Left Hind Foot">
+		左後足
+	</string>
+	<string name="Right Hind Foot">
+		右後足
+	</string>
 	<string name="Invalid Attachment">
 		装着先が正しくありません
 	</string>
@@ -2226,12 +2281,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="ATTACH_BELLY">
 		お腹
 	</string>
-	<string name="ATTACH_RPEC">
-		右胸筋
-	</string>
-	<string name="ATTACH_LPEC">
+	<string name="ATTACH_LEFT_PEC">
 		左胸筋
 	</string>
+	<string name="ATTACH_RIGHT_PEC">
+		右胸筋
+	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		HUD（中央 2）
 	</string>
@@ -2262,6 +2317,51 @@ support@secondlife.com にお問い合わせください。
 	<string name="ATTACH_AVATAR_CENTER">
 		アバターの中央
 	</string>
+	<string name="ATTACH_LHAND_RING1">
+		左薬指
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		右薬指
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		しっぽのベース
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		しっぽの先
+	</string>
+	<string name="ATTACH_LWING">
+		左の翼
+	</string>
+	<string name="ATTACH_RWING">
+		右の翼
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		顎
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		代わりの左耳
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		代わりの右耳
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		代わりの左目
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		代わりの右目
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		舌
+	</string>
+	<string name="ATTACH_GROIN">
+		脚の付け根
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		左後足
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		右後足
+	</string>
 	<string name="CursorPos">
 		[LINE] 行目、[COLUMN] 列目
 	</string>
@@ -4251,6 +4351,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="OfflineStatus">
 		オフライン
 	</string>
+	<string name="not_online_msg">
+		ユーザーがオンラインでありません - メッセージは保存され、後で配信されます。
+	</string>
+	<string name="not_online_inventory">
+		ユーザーがオンラインでありません - インベントリが保存されました。
+	</string>
 	<string name="answered_call">
 		相手がコールを受けました
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml
index c5e19b2281..6fa25262ea 100644
--- a/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
 	<text name="AvatarText">
 		Avatar
 	</text>
-	<slider label="Complexidade máxima:" name="IndirectMaxComplexity" tool_tip="Controla o ponto no qual um avatar visualmente complexo é desenhado como avatar de cor sólida"/>
+	<slider label="Complexidade máxima:" name="IndirectMaxComplexity" tool_tip="Controla o ponto no qual um avatar visualmente complexo é desenhado como uma JellyDoll"/>
 	<text name="IndirectMaxComplexityText">
 		0
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
index 031f6b605a..760197cfb9 100644
--- a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="MI" name="Send IM..."/>
 	<menu_item_call label="Ligar" name="Call"/>
 	<menu_item_call label="Convidar para entrar no grupo" name="Invite..."/>
+	<menu_item_call label="Redefinir esqueleto" name="Reset Skeleton"/>
 	<menu_item_call label="Bloquear" name="Avatar Mute"/>
 	<menu_item_call label="Denunciar" name="abuse"/>
 	<menu_item_call label="Congelar" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
index ac79422110..766c8b9754 100644
--- a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
@@ -9,6 +9,7 @@
 	<menu_item_call label="Editar meu look" name="Edit Outfit"/>
 	<menu_item_call label="Editar meu corpo" name="Edit My Shape"/>
 	<menu_item_call label="Altura de foco" name="Hover Height"/>
+	<menu_item_call label="Redefinir esqueleto" name="Reset Skeleton"/>
 	<menu_item_call label="Meus amigos" name="Friends..."/>
 	<menu_item_call label="Meus grupos" name="Groups..."/>
 	<menu_item_call label="Meu perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
index e32f9059f5..170525cbe6 100644
--- a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="MI" name="Send IM..."/>
 	<menu_item_call label="Ligar" name="Call"/>
 	<menu_item_call label="Convidar para entrar no grupo" name="Invite..."/>
+	<menu_item_call label="Redefinir esqueleto" name="Reset Skeleton"/>
 	<menu_item_call label="Bloquear" name="Avatar Mute"/>
 	<menu_item_call label="Denunciar" name="abuse"/>
 	<menu_item_call label="Congelar" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
index a0ac71e018..e826a57b46 100644
--- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
@@ -26,6 +26,7 @@
 	<menu_item_call label="Editar meu look" name="Edit Outfit"/>
 	<menu_item_call label="Editar meu corpo" name="Edit My Shape"/>
 	<menu_item_call label="Altura de foco" name="Hover Height"/>
+	<menu_item_call label="Redefinir esqueleto" name="Reset Skeleton"/>
 	<menu_item_call label="Meus amigos" name="Friends..."/>
 	<menu_item_call label="Meus grupos" name="Groups..."/>
 	<menu_item_call label="Meu perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 2df78c6287..7bdcb74a54 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -22,7 +22,6 @@
 			<menu_item_check label="Não perturbe" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
-		<menu_item_call label="Caixa de saída do lojista..." name="MerchantOutbox"/>
 		<menu_item_call label="Listagens do Marketplace..." name="MarketplaceListings"/>
 		<menu_item_call label="Painel da conta..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=pt"/>
@@ -368,6 +367,7 @@
 			<menu_item_check label="Dados da animação" name="Animation Info"/>
 			<menu_item_check label="Disable Level Of Detail" name="Disable LOD"/>
 			<menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/>
+			<menu_item_check label="Exibir ossos" name="Show Bones"/>
 			<menu_item_check label="Display Agent Target" name="Display Agent Target"/>
 			<menu_item_call label="Depurar texturas do avatar" name="Debug Avatar Textures"/>
 		</menu>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index cf7400117d..bb428ad5a5 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -477,6 +477,9 @@ Ele ultrapassa o limite de anexos, de [MAX_ATTACHMENTS] objetos. Remova um objet
 	<notification name="CannotWearInfoNotComplete">
 		Você não pode vestir este item porque ele ainda não carregou. Tente novamente em um minuto.
 	</notification>
+	<notification name="MustEnterPasswordToLogIn">
+		Informe sua senha para fazer o login.
+	</notification>
 	<notification name="MustHaveAccountToLogIn">
 		Opa! Alguma coisa ficou em branco.
 Digite o nome de usuário de seu avatar.
@@ -545,6 +548,9 @@ Nota: Este procedimento limpa o cache.
 	<notification name="ChangeConnectionPort">
 		Reinicie o [APP_NAME] para ativar a reconfiguração da porta.
 	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		Essa alteração nas configurações de depuração será aplicada depois que você reiniciar o [APP_NAME].
+	</notification>
 	<notification name="ChangeSkin">
 		Reinicie o [APP_NAME] para ativar a pele nova.
 	</notification>
@@ -1359,12 +1365,13 @@ Enquando isso, use o [SECOND_LIFE] normalmente. Seu visual será exibido correta
 			<ignore name="ignore" text="A roupa está demorando para chegar"/>
 		</form>
 	</notification>
-	<notification name="RegionAndAgentComplexity">
-		Sua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexidade visual] é [AGENT_COMPLEXITY].
+	<notification name="AgentComplexityWithVisibility">
+		Sua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] é [AGENT_COMPLEXITY].
 [OVERLIMIT_MSG]
+		<usetemplate ignoretext="Avise-me se a complexidade do meu avatar for muito alta" name="notifyignore"/>
 	</notification>
 	<notification name="AgentComplexity">
-		Sua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexidade visual] é [AGENT_COMPLEXITY].
+		Sua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] é [AGENT_COMPLEXITY].
 	</notification>
 	<notification name="FirstRun">
 		A instalação do [APP_NAME] está pronta.
@@ -1478,6 +1485,10 @@ Substituir textura [TEXTURE_NUM], com uma imagem de 24-bit 512x512 ou menor e em
 		Você realmente deseja nivelar o terreno selecionado a partir do centro elevando/reduzindo os limites e o padrão para a ferramenta ´Reverter´?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Executar"/>
 	</notification>
+	<notification name="ConfirmTextureHeights">
+		Você está prestes a usar valores baixos maiores que os valores altos para os intervalos de elevação. Deseja prosseguir?
+		<usetemplate canceltext="Não perguntar" name="yesnocancelbuttons" notext="Cancelar" yestext="Ok"/>
+	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		Você pode ter somente [MAX_AGENTS] residentes permitidos.
 	</notification>
@@ -1714,14 +1725,6 @@ Se você estiver muito ansioso para experimentar os novos recursos e correções
 		Não foi possível deixar o grupo. Você não pode deixar o grupo pois é o último proprietário dele. Primeiramente, atribua outro membro à função de proprietário.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="GroupDepartError">
-		Não foi possível deixar o grupo: [reason].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepart">
-		Você deixou o grupo [group_name].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmKick">
 		Tem CERTEZA de que deseja expulsar todos os residentes do grid?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Chutar todos"/>
@@ -2393,6 +2396,10 @@ Deseja desativar o Não perturbe antes de concluir esta transação?
 		Tem certeza de que deseja excluir o conteúdo da Lixeira? Para sempre?
 		<usetemplate ignoretext="Confirmar antes de esvaziar a pasta Lixeira" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="TrashIsFull">
+		Sua lixeira está transbordando. Isso pode causar problemas no logon.
+		<usetemplate name="okcancelbuttons" notext="Esvaziarei a lixeira mais tarde" yestext="Esvaziar lixeira agora"/>
+	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Tem certeza de que quer apagar todo o histórico de viagens, web e buscas?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="OK"/>
@@ -2977,7 +2984,7 @@ Se permanecer aqui, você será desconectado.
 
 [MESSAGE]
 
-Do objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, de: [NAME_SLURL]
+Do objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, proprietário: [NAME_SLURL]
 		<form name="form">
 			<button name="Gotopage" text="Carregar"/>
 			<button name="Cancel" text="Cancelar"/>
@@ -3246,11 +3253,15 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes.
 	<notification name="AttachmentSaved">
 		Anexo salvo.
 	</notification>
-	<notification name="PresetNotSaved">
-		Erro ao salvar predefinição [NAME].
+	<notification name="AppearanceToXMLSaved">
+		A aparência foi salva como XML em [PATH]
 	</notification>
-	<notification name="PresetNotDeleted">
-		Erro ao excluir a predefinição [NAME].
+	<notification name="AppearanceToXMLFailed">
+		Falha ao salvar a aparência como XML.
+    icon=&quot;notifytip.tga&quot;
+	name=&quot;PresetNotDeleted&quot;
+    type=&quot;notifytip&quot;&gt;
+Erro ao excluir a predefinição [NAME].
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Nenhum tópico de ajuda foi encontrado com relação a este elemento.
@@ -4063,6 +4074,9 @@ Tente novamente em instantes.
 	<notification name="CantAttachNotEnoughScriptResources">
 		Não há recursos de script disponíveis suficientes para anexar objeto!
 	</notification>
+	<notification name="IllegalAttachment">
+		O anexo solicitou um ponto não existente no avatar. Ele foi anexado ao peito.
+	</notification>
 	<notification name="CantDropItemTrialUser">
 		Não é possível largar objetos aqui. Tente a área de Avaliação grátis.
 	</notification>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
index 2ffe720ccf..c865de0d08 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
@@ -3,8 +3,9 @@
 	<text name="tell_me_label">
 		Avisar:
 	</text>
-	<check_box label="Quando eu gasto ou recebo L$" name="notify_money_change_checkbox"/>
+	<check_box label="Quando eu gastar L$" name="notify_money_spend_checkbox"/>
 	<check_box label="Quando meus amigos entram e saem" name="friends_online_notify_checkbox"/>
+	<check_box label="Quando eu receber L$" name="notify_money_received_checkbox"/>
 	<text name="show_label">
 		Mostrar sempre:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 4d3fb89b37..fa17a4ff11 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -25,10 +25,15 @@ rápido
 	<text name="BetterText">
 		Melhor
 	</text>
+	<slider label="Complexidade máxima do avatar:" name="IndirectMaxComplexity" tool_tip="Controla o ponto no qual um avatar visualmente complexo é desenhado como uma JellyDoll"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
 	<check_box initial_value="true" label="Tonalidades atmosféricas" name="WindLightUseAtmosShaders"/>
 	<check_box initial_value="true" label="Modelo avançado de luzes" name="UseLightShaders"/>
 	<button label="Salvar configurações como predefinição..." name="PrefSaveButton"/>
 	<button label="Carregar predefinição..." name="PrefLoadButton"/>
+	min_val=&quot;0.125&quot;
 	<button label="Excluir predefinição..." name="PrefDeleteButton"/>
 	<button label="Redefinir para configurações recomendadas" left="110" name="Defaults"/>
 	<button label="Configurações avançadas..." name="AdvancedSettings"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
index 66db89f48f..97d6c0ef36 100644
--- a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
@@ -16,9 +16,9 @@
 		Saída
 	</text>
 	<text name="My volume label">
-		Meu volume:
+		Volume do microfone:
 	</text>
-	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Mude o volume usando o controle deslizante"/>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Mude o volume do microfone usando o controle deslizante"/>
 	<text name="wait_text">
 		Aguarde
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 50bb9b7e66..b3cb50a01e 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -30,7 +30,10 @@
 	</string>
 	<string name="AboutHeader">
 		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [Notas da versão]]
+[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</string>
+	<string name="BuildConfig">
+		Configuração do corpo [BUILD_CONFIG]
 	</string>
 	<string name="AboutPosition">
 		Você está em [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] em [REGION] localizado em &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
@@ -63,6 +66,9 @@ Versão do servidor de voz: [VOICE_VERSION]
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		Erro ao obter URL de notas de versão do servidor.
 	</string>
+	<string name="BuildConfiguration">
+		Configuração do corpo
+	</string>
 	<string name="ProgressRestoring">
 		Restaurando...
 	</string>
@@ -1336,6 +1342,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="BodyPartsRightLeg">
 		Perna direita
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		Esqueleto aprimorado
+	</string>
 	<string name="GraphicsQualityLow">
 		Baixo
 	</string>
@@ -1778,6 +1787,51 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="Avatar Center">
 		Centro do avatar
 	</string>
+	<string name="Left Ring Finger">
+		Anelar esquerdo
+	</string>
+	<string name="Right Ring Finger">
+		Anelar direito
+	</string>
+	<string name="Tail Base">
+		Base do rabo
+	</string>
+	<string name="Tail Tip">
+		Ponta do rabo
+	</string>
+	<string name="Left Wing">
+		Asa esquerda
+	</string>
+	<string name="Right Wing">
+		Asa direita
+	</string>
+	<string name="Jaw">
+		Maxilar
+	</string>
+	<string name="Alt Left Ear">
+		Orelha esquerda alt.
+	</string>
+	<string name="Alt Right Ear">
+		Orelha direita alt.
+	</string>
+	<string name="Alt Left Eye">
+		Olho esquerdo alt.
+	</string>
+	<string name="Alt Right Eye">
+		Olho direito alt.
+	</string>
+	<string name="Tongue">
+		Língua
+	</string>
+	<string name="Groin">
+		Virilha
+	</string>
+	<string name="Left Hind Foot">
+		Pata esq. traseira
+	</string>
+	<string name="Right Hind Foot">
+		Pata dir. traseira
+	</string>
 	<string name="Invalid Attachment">
 		Ponto de encaixe inválido
 	</string>
@@ -2167,12 +2221,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ATTACH_BELLY">
 		Barriga
 	</string>
-	<string name="ATTACH_RPEC">
-		Peitorais D
-	</string>
-	<string name="ATTACH_LPEC">
+	<string name="ATTACH_LEFT_PEC">
 		Peitorais E
 	</string>
+	<string name="ATTACH_RIGHT_PEC">
+		Peitorais D
+	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		HUD Central 2
 	</string>
@@ -2203,6 +2257,51 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ATTACH_AVATAR_CENTER">
 		Centro do avatar
 	</string>
+	<string name="ATTACH_LHAND_RING1">
+		Anelar esquerdo
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		Anelar direito
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		Base do rabo
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		Ponta do rabo
+	</string>
+	<string name="ATTACH_LWING">
+		Asa esquerda
+	</string>
+	<string name="ATTACH_RWING">
+		Asa direita
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		Maxilar
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		Orelha esquerda alt.
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		Orelha direita alt.
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		Olho esquerdo alt.
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		Olho direito alt.
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		Língua
+	</string>
+	<string name="ATTACH_GROIN">
+		Virilha
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		Pata esq. traseira
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		Pata dir. traseira
+	</string>
 	<string name="CursorPos">
 		Linha [LINE], Coluna [COLUMN]
 	</string>
@@ -4128,6 +4227,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="OfflineStatus">
 		Desconectado
 	</string>
+	<string name="not_online_msg">
+		O usuário não está online. As mensagens serão armazenadas e enviadas mais tarde.
+	</string>
+	<string name="not_online_inventory">
+		O usuário não está online. O inventário foi salvo.
+	</string>
 	<string name="answered_call">
 		Ligação atendida
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
index bd1ed8d1fa..b7ffb0e9fc 100644
--- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="Звонок" name="Call"/>
 	<menu_item_call label="Пригласить в группу" name="Invite..."/>
+	<menu_item_call label="Сброс скелета" name="Reset Skeleton"/>
 	<menu_item_call label="Заблокировать" name="Avatar Mute"/>
 	<menu_item_call label="Пожаловаться" name="abuse"/>
 	<menu_item_call label="Заморозить" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
index 033d36484b..eb38371e28 100644
--- a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
@@ -9,6 +9,7 @@
 	<menu_item_call label="Изменить костюм" name="Edit Outfit"/>
 	<menu_item_call label="Изменить фигуру" name="Edit My Shape"/>
 	<menu_item_call label="Высота парения" name="Hover Height"/>
+	<menu_item_call label="Сброс скелета" name="Reset Skeleton"/>
 	<menu_item_call label="Мои друзья" name="Friends..."/>
 	<menu_item_call label="Мои группы" name="Groups..."/>
 	<menu_item_call label="Мой профиль" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
index 74f1a39658..cffb4bbe7b 100644
--- a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="Звонок" name="Call"/>
 	<menu_item_call label="Пригласить в группу" name="Invite..."/>
+	<menu_item_call label="Сброс скелета" name="Reset Skeleton"/>
 	<menu_item_call label="Заблокировать" name="Avatar Mute"/>
 	<menu_item_call label="Пожаловаться" name="abuse"/>
 	<menu_item_call label="Заморозить" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
index 8feaa3b99a..97e2a8b295 100644
--- a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
@@ -26,6 +26,7 @@
 	<menu_item_call label="Изменить костюм" name="Edit Outfit"/>
 	<menu_item_call label="Изменить фигуру" name="Edit My Shape"/>
 	<menu_item_call label="Высота парения" name="Hover Height"/>
+	<menu_item_call label="Сброс скелета" name="Reset Skeleton"/>
 	<menu_item_call label="Мои друзья" name="Friends..."/>
 	<menu_item_call label="Мои группы" name="Groups..."/>
 	<menu_item_call label="Мой профиль" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 2044844c58..6158363e5d 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -22,7 +22,6 @@
 			<menu_item_check label="Не беспокоить" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="Купить L$..." name="Buy and Sell L$"/>
-		<menu_item_call label="Торговые исходящие..." name="MerchantOutbox"/>
 		<menu_item_call label="Списки товаров торгового центра..." name="MarketplaceListings"/>
 		<menu_item_call label="Информационная панель аккаунта..." name="Manage My Account"/>
 		<menu_item_call label="Настройки..." name="Preferences"/>
@@ -418,6 +417,7 @@
 			<menu_item_check label="Отключить детализацию" name="Disable LOD"/>
 			<menu_item_check label="Отладка видимости персонажа" name="Debug Character Vis"/>
 			<menu_item_check label="Показать скелет" name="Show Collision Skeleton"/>
+			<menu_item_check label="Показать кости" name="Show Bones"/>
 			<menu_item_check label="Отобразить действие агента" name="Display Agent Target"/>
 			<menu_item_call label="Вывод присоединений" name="Dump Attachments"/>
 			<menu_item_call label="Отладка текстур аватара" name="Debug Avatar Textures"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index fabc064525..5e7c2ed7d0 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -480,6 +480,9 @@
 	<notification name="CannotWearInfoNotComplete">
 		Нельзя надеть эту вещь, так как она еще не загружена. Повторите попытку через минуту.
 	</notification>
+	<notification name="MustEnterPasswordToLogIn">
+		Введите пароль для входа в мир.
+	</notification>
 	<notification name="MustHaveAccountToLogIn">
 		Ай-яй-яй! Что-то осталось незаполненным.
 Необходимо ввести имя пользователя для вашего аватара.
@@ -548,6 +551,9 @@
 	<notification name="ChangeConnectionPort">
 		Настройки порта начнут действовать после перезапуска [APP_NAME].
 	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		Эта настройка отладки вступит в силу после перезапуска [APP_NAME].
+	</notification>
 	<notification name="ChangeSkin">
 		Новая кожа будет видна после перезапуска [APP_NAME].
 	</notification>
@@ -1366,12 +1372,13 @@
 			<ignore name="ignore" text="Загрузка одежды занимает значительное время"/>
 		</form>
 	</notification>
-	<notification name="RegionAndAgentComplexity">
-		Ваша [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 визуальная сложность]: [AGENT_COMPLEXITY].
+	<notification name="AgentComplexityWithVisibility">
+		Ваша [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 сложность аватара]: [AGENT_COMPLEXITY].
 [OVERLIMIT_MSG]
+		<usetemplate ignoretext="Предупреждать о превышении сложности аватара" name="notifyignore"/>
 	</notification>
 	<notification name="AgentComplexity">
-		Ваша [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 визуальная сложность]: [AGENT_COMPLEXITY].
+		Ваша [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 сложность аватара]: [AGENT_COMPLEXITY].
 	</notification>
 	<notification name="FirstRun">
 		Установка [APP_NAME] завершена.
@@ -1486,6 +1493,10 @@
 		Вы действительно хотите зафиксировать текущий ландшафт, сделать его высоту средней точкой для верхней и нижней точек ландшафта и принять по умолчанию для функции «Вернуть»?
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmTextureHeights">
+		Вы собираетесь использовать минимальные значения, которые больше, чем максимальные для диапазона высот. Начать?
+		<usetemplate canceltext="Не спрашивать" name="yesnocancelbuttons" notext="Отмена" yestext="OK"/>
+	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		У вас может быть не более [MAX_AGENTS] допущенных жителей.
 	</notification>
@@ -1723,14 +1734,6 @@ http://secondlife.com/download.
 		Невозможно покинуть группу. Вы не можете покинуть группу, так как вы ее последний владелец. Сначала назначьте владельцем другого участника.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="GroupDepartError">
-		Невозможно покинуть группу: [reason].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepart">
-		Вы покинули группу [group_name].
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmKick">
 		Вы ДЕЙСТВИТЕЛЬНО хотите выбросить всех жителей с сетки?
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Выбросить всех жителей"/>
@@ -2400,6 +2403,10 @@ http://secondlife.com/download.
 		Вы действительно хотите необратимо удалить содержимое корзины?
 		<usetemplate ignoretext="Подтверждать перед опорожнением корзины инвентаря" name="okcancelignore" notext="Отмена" yestext="OK"/>
 	</notification>
+	<notification name="TrashIsFull">
+		Ваша корзина переполнена. Это может вызвать проблемы при входе.
+		<usetemplate name="okcancelbuttons" notext="Я очищу корзину позже" yestext="Очистить корзину сейчас"/>
+	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Вы действительно хотите удалить журнал своих перемещений, веб-страниц и поиска?
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
@@ -3257,11 +3264,15 @@ http://secondlife.com/download.
 	<notification name="AttachmentSaved">
 		Присоединение сохранено.
 	</notification>
-	<notification name="PresetNotSaved">
-		Ошибка при сохранении пресета [NAME].
+	<notification name="AppearanceToXMLSaved">
+		Внешность сохранена в формате XML в [PATH]
 	</notification>
-	<notification name="PresetNotDeleted">
-		Ошибка при удалении пресета [NAME].
+	<notification name="AppearanceToXMLFailed">
+		Не удалось сохранить внешность в XML.
+    icon=&quot;notifytip.tga&quot;
+	name=&quot;PresetNotDeleted&quot;
+    type=&quot;notifytip&quot;&gt;
+Ошибка при удалении пресета [NAME].
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Невозможно найти раздел справки для этого элемента.
@@ -4075,6 +4086,9 @@ http://secondlife.com/download.
 	<notification name="CantAttachNotEnoughScriptResources">
 		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
 	</notification>
+	<notification name="IllegalAttachment">
+		Прикрепляемый объект потребовал несуществующей точки на аватаре. Он был прикреплен к груди.
+	</notification>
 	<notification name="CantDropItemTrialUser">
 		Здесь нельзя сбрасывать объекты; перейдите в бесплатную область для гостей.
 	</notification>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
index 9d7ae546fd..48e03b98e8 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
@@ -3,8 +3,9 @@
 	<text name="tell_me_label">
 		Сообщать мне:
 	</text>
-	<check_box label="о расходах и доходах" name="notify_money_change_checkbox"/>
+	<check_box label="О расходах" name="notify_money_spend_checkbox"/>
 	<check_box label="о входе и выходе моих друзей" name="friends_online_notify_checkbox"/>
+	<check_box label="О доходах" name="notify_money_received_checkbox"/>
 	<text name="show_label">
 		Всегда показывать:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
index 31c9b2135d..200241bd4d 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
@@ -24,10 +24,15 @@
 	<text name="BetterText">
 		Качественней
 	</text>
+	<slider label="Максимальная сложность аватара:" name="IndirectMaxComplexity" tool_tip="Указывает расстояние, начиная с которого визуально сложный аватар рисуется как мармеладный мишка"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
 	<check_box initial_value="true" label="Атмосферные шейдеры" name="WindLightUseAtmosShaders"/>
 	<check_box initial_value="true" label="Расширенная модель освещения" name="UseLightShaders"/>
 	<button label="Сохранить настройки как пресет..." name="PrefSaveButton"/>
 	<button label="Загрузить пресет..." name="PrefLoadButton"/>
+	min_val=&quot;0,125&quot;
 	<button label="Удалить пресет..." name="PrefDeleteButton"/>
 	<button label="Вернуть рекомендуемые настройки" name="Defaults"/>
 	<button label="Расширенные настройки..." name="AdvancedSettings"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
index 98dab288a3..3de84fb937 100644
--- a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
@@ -16,9 +16,9 @@
 		Выход
 	</text>
 	<text name="My volume label">
-		Моя громкость:
+		Громкость микрофона:
 	</text>
-	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Измените значение, используя ползунок"/>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Измените уровень в микрофоне, используя ползунок"/>
 	<text name="wait_text">
 		Подождите
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 04bb55c965..da03af055c 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -41,6 +41,9 @@
 		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</string>
+	<string name="BuildConfig">
+		Конфигурация построения [BUILD_CONFIG]
+	</string>
 	<string name="AboutPosition">
 		Вы в точке [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] в регионе «[REGION]», расположенном на &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
@@ -72,6 +75,9 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		Ошибка при получении URL-адреса заметок о выпуске сервера.
 	</string>
+	<string name="BuildConfiguration">
+		Конфигурация построения
+	</string>
 	<string name="ProgressRestoring">
 		Восстановление...
 	</string>
@@ -1387,6 +1393,9 @@ support@secondlife.com.
 	<string name="BodyPartsRightLeg">
 		Правая нога
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		Улучшенный скелет
+	</string>
 	<string name="GraphicsQualityLow">
 		низкая
 	</string>
@@ -1835,6 +1844,51 @@ support@secondlife.com.
 	<string name="Avatar Center">
 		Центр аватара
 	</string>
+	<string name="Left Ring Finger">
+		Левый безымянный палец
+	</string>
+	<string name="Right Ring Finger">
+		Правый безымянный палец
+	</string>
+	<string name="Tail Base">
+		Основание хвоста
+	</string>
+	<string name="Tail Tip">
+		Кончик хвоста
+	</string>
+	<string name="Left Wing">
+		Левое крыло
+	</string>
+	<string name="Right Wing">
+		Правое крыло
+	</string>
+	<string name="Jaw">
+		Пасть
+	</string>
+	<string name="Alt Left Ear">
+		Альт. левое ухо
+	</string>
+	<string name="Alt Right Ear">
+		Альт. правое ухо
+	</string>
+	<string name="Alt Left Eye">
+		Альт. левый глаз
+	</string>
+	<string name="Alt Right Eye">
+		Альт. правый глаз
+	</string>
+	<string name="Tongue">
+		Язык
+	</string>
+	<string name="Groin">
+		Пах
+	</string>
+	<string name="Left Hind Foot">
+		Левая задняя нога
+	</string>
+	<string name="Right Hind Foot">
+		Правая задняя нога
+	</string>
 	<string name="Invalid Attachment">
 		Неверная точка присоединения
 	</string>
@@ -2224,12 +2278,12 @@ support@secondlife.com.
 	<string name="ATTACH_BELLY">
 		Живот
 	</string>
-	<string name="ATTACH_RPEC">
-		Правая грудь
-	</string>
-	<string name="ATTACH_LPEC">
+	<string name="ATTACH_LEFT_PEC">
 		Левая грудь
 	</string>
+	<string name="ATTACH_RIGHT_PEC">
+		Правая грудь
+	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		Данные в игре в центре 2
 	</string>
@@ -2260,6 +2314,51 @@ support@secondlife.com.
 	<string name="ATTACH_AVATAR_CENTER">
 		Центр аватара
 	</string>
+	<string name="ATTACH_LHAND_RING1">
+		Левый безымянный палец
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		Правый безымянный палец
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		Основание хвоста
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		Кончик хвоста
+	</string>
+	<string name="ATTACH_LWING">
+		Левое крыло
+	</string>
+	<string name="ATTACH_RWING">
+		Правое крыло
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		Пасть
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		Альт. левое ухо
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		Альт. правое ухо
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		Альт. левый глаз
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		Альт. правый глаз
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		Язык
+	</string>
+	<string name="ATTACH_GROIN">
+		Пах
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		Левая задняя нога
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		Правая задняя нога
+	</string>
 	<string name="CursorPos">
 		Строка [LINE], столбец [COLUMN]
 	</string>
@@ -4247,10 +4346,10 @@ support@secondlife.com.
 		Оффлайн
 	</string>
 	<string name="not_online_msg">
-		Пользователь оффлайн - сообщение будет сохранено и доставлено позже.
+		Пользователь не в онлайне - сообщение будет сохранено и доставлено позже.
 	</string>
 	<string name="not_online_inventory">
-		Пользователь оффлайн - инвентарь сохранен.
+		Пользователь не в онлайне - инвентарь сохранен.
 	</string>
 	<string name="answered_call">
 		На ваш звонок ответили
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
index 53938117fd..867e15a3ca 100644
--- a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
 	<text name="AvatarText">
 		Avatar
 	</text>
-	<slider label="Maksimum karmaşıklık:" name="IndirectMaxComplexity" tool_tip="Görsel olarak karmaşık yapıdaki bir avatarın hangi noktada jelibon gibi tek renkli olarak çizileceğini kontrol eder"/>
+	<slider label="Maksimum karmaşıklık:" name="IndirectMaxComplexity" tool_tip="Görsel olarak karmaşık bir avatarın hangi noktadan itibaren JellyDolll olarak çizileceğini kontrol eder"/>
 	<text name="IndirectMaxComplexityText">
 		0
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
index 8a669a28f7..d09174dcc0 100644
--- a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="Aİ" name="Send IM..."/>
 	<menu_item_call label="Ara" name="Call"/>
 	<menu_item_call label="Gruba Davet Et" name="Invite..."/>
+	<menu_item_call label="İskeleti Sıfırla" name="Reset Skeleton"/>
 	<menu_item_call label="Engelle" name="Avatar Mute"/>
 	<menu_item_call label="Raporla" name="abuse"/>
 	<menu_item_call label="Dondur" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
index c49f817a45..9027f09d8e 100644
--- a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
@@ -9,6 +9,7 @@
 	<menu_item_call label="Dış Görünümümü Düzenle" name="Edit Outfit"/>
 	<menu_item_call label="Şeklimi Düzenle" name="Edit My Shape"/>
 	<menu_item_call label="Konum Yüksekliği" name="Hover Height"/>
+	<menu_item_call label="İskeleti Sıfırla" name="Reset Skeleton"/>
 	<menu_item_call label="Arkadaşlarım" name="Friends..."/>
 	<menu_item_call label="Gruplarım" name="Groups..."/>
 	<menu_item_call label="Profilim" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
index e4ba3a5616..9e95b3033a 100644
--- a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="Aİ" name="Send IM..."/>
 	<menu_item_call label="Ara" name="Call"/>
 	<menu_item_call label="Gruba Davet Et" name="Invite..."/>
+	<menu_item_call label="İskeleti Sıfırla" name="Reset Skeleton"/>
 	<menu_item_call label="Engelle" name="Avatar Mute"/>
 	<menu_item_call label="Raporla" name="abuse"/>
 	<menu_item_call label="Dondur" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
index 4dfa42c347..3078733478 100644
--- a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
@@ -26,6 +26,7 @@
 	<menu_item_call label="Dış Görünümümü Düzenle" name="Edit Outfit"/>
 	<menu_item_call label="Şeklimi Düzenle" name="Edit My Shape"/>
 	<menu_item_call label="Konum Yüksekliği" name="Hover Height"/>
+	<menu_item_call label="İskeleti Sıfırla" name="Reset Skeleton"/>
 	<menu_item_call label="Arkadaşlarım" name="Friends..."/>
 	<menu_item_call label="Gruplarım" name="Groups..."/>
 	<menu_item_call label="Profilim" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 324e549a75..39636f2ebf 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -22,7 +22,6 @@
 			<menu_item_check label="Rahatsız Etme" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="L$ Satın Al..." name="Buy and Sell L$"/>
-		<menu_item_call label="Satıcı Giden Kutusu..." name="MerchantOutbox"/>
 		<menu_item_call label="Pazaryeri ilanları..." name="MarketplaceListings"/>
 		<menu_item_call label="Hesap kontrol paneli..." name="Manage My Account"/>
 		<menu_item_call label="Tercihler..." name="Preferences"/>
@@ -419,6 +418,7 @@
 			<menu_item_check label="Ayrıntı Seviyesi Bilgisini Devre Dışı Bırak" name="Disable LOD"/>
 			<menu_item_check label="Debug Character Vis" name="Debug Character Vis"/>
 			<menu_item_check label="Çarpışma İskeletini Göster" name="Show Collision Skeleton"/>
+			<menu_item_check label="Kemikleri Göster" name="Show Bones"/>
 			<menu_item_check label="Aracı Hedefini Göster" name="Display Agent Target"/>
 			<menu_item_call label="Aksesuarların Dökümünü Al" name="Dump Attachments"/>
 			<menu_item_call label="Avatar Dokuları İçin Hata Ayıklama" name="Debug Avatar Textures"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index a982dc03ed..fb38486a9e 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -480,6 +480,9 @@ Dış görünüm klasöründe hiç giysi, vücut bölümü ya da aksesuar yok.
 	<notification name="CannotWearInfoNotComplete">
 		Bu öğe henüz yüklenmediği için kullanamazsınız. Lütfen bir dakika sonra tekrar deneyin.
 	</notification>
+	<notification name="MustEnterPasswordToLogIn">
+		Oturum açmak için lütfen parolanızı girin.
+	</notification>
 	<notification name="MustHaveAccountToLogIn">
 		Hata! Boş bırakılan alan(lar) var.
 Avatarınızın Kullanıcı adını girmeniz gerekmektedir.
@@ -548,6 +551,9 @@ Not: Bu işlem önbelleği temizleyecek.
 	<notification name="ChangeConnectionPort">
 		Port ayarları, [APP_NAME] uygulamasını yeniden başlattıktan sonra geçerli olur.
 	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		Bu hata ayıklama ayarı değişikliği [APP_NAME] uygulamasını yeniden başlattıktan sonra geçerli olacak.
+	</notification>
 	<notification name="ChangeSkin">
 		Yeni dış katman [APP_NAME] uygulamasını yeniden başlattıktan sonra görüntülenecek.
 	</notification>
@@ -1366,12 +1372,13 @@ Yeni bir ana konum ayarlamak isteyebilirsiniz.
 			<ignore name="ignore" text="Giysilerin karşıdan yüklenmesi uzun zaman alıyor"/>
 		</form>
 	</notification>
-	<notification name="RegionAndAgentComplexity">
-		[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Görsel karmaşıklık] seviyeniz: [AGENT_COMPLEXITY].
+	<notification name="AgentComplexityWithVisibility">
+		[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] düzeyiniz [AGENT_COMPLEXITY].
 [OVERLIMIT_MSG]
+		<usetemplate ignoretext="Avatarımın karmaşıklık düzeyi çok yüksekse beni uyar" name="notifyignore"/>
 	</notification>
 	<notification name="AgentComplexity">
-		[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Görsel karmaşıklık] seviyeniz: [AGENT_COMPLEXITY].
+		[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] düzeyiniz [AGENT_COMPLEXITY].
 	</notification>
 	<notification name="FirstRun">
 		[APP_NAME] yüklemesi tamamlandı.
@@ -1486,6 +1493,10 @@ Lütfen sadece bir nesne seçin ve tekrar deneyin.
 		Geçerli yüzeyi bu şekilde kaydetmeyi, yüzey yükseltme/alçaltma sınırları için merkez olarak kullanmayı ve &apos;Geri Çevir&apos; aracı için varsayılan olarak ayarlamayı gerçekten istiyor musunuz?
 		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
 	</notification>
+	<notification name="ConfirmTextureHeights">
+		Yükselti Ayarları için girdiğiniz düşük değer, yüksek değerden daha fazla. Devam edilsin mi?
+		<usetemplate canceltext="Tekrar Sorma" name="yesnocancelbuttons" notext="İptal Et" yestext="Tamam"/>
+	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		Sadece [MAX_AGENTS] tane İzin Verilen Sakin belirleyebilirsiniz.
 	</notification>
@@ -1723,14 +1734,6 @@ Gruptan ayrılmak istiyor musunuz?
 		Gruptan ayrılınamıyor. Gruptan ayrılamazsınız çünkü grubun son sahibisiniz. Lütfen önce sahip rolüne başka bir üye atayın.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="GroupDepartError">
-		Gruptan ayrılma işlemi yapılamıyor: [reason].
-		<usetemplate name="okbutton" yestext="Tamam"/>
-	</notification>
-	<notification name="GroupDepart">
-		[group_name] grubundan ayrıldınız.
-		<usetemplate name="okbutton" yestext="Tamam"/>
-	</notification>
 	<notification name="ConfirmKick">
 		Tüm Sakinleri GERÇEKTEN ağ dışına çıkarmak istiyor musunuz?
 		<usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tüm Sakinleri Çıkar"/>
@@ -2400,6 +2403,10 @@ Bu işlemi tamamlamadan önce Rahatsız Etme&apos;yi kapatmak ister misiniz?
 		Çöp kutunuzun içeriğini kalıcı olarak silmek istediğinize emin misiniz?
 		<usetemplate ignoretext="Envanter Çöp Kutusu klasörünü boşaltmadan önce doğrulama iste" name="okcancelignore" notext="İptal" yestext="Tamam"/>
 	</notification>
+	<notification name="TrashIsFull">
+		Çöpte yer kalmamış. Bu durum oturum açma sırasında sorun yaşamanıza neden olabilir.
+		<usetemplate name="okcancelbuttons" notext="Çöpü daha sonra boşaltacağım" yestext="Çöp kutusunu şimdi boşalt"/>
+	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Seyahat, web ve arama geçmişinizi silmek istediğinize emin misiniz?
 		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
@@ -2984,7 +2991,7 @@ Bu bölgede kalmaya devam ederseniz oturumunuz sonlandırılacak.
 Bu bölgede kalmaya devam ederseniz oturumunuz sonlandırılacak.
 	</notification>
 	<notification name="LoadWebPage">
-		[URL] web sayfası yüklensin mi?
+		Bu web sayfası yüklensin mi: [URL] ?
 
 [MESSAGE]
 
@@ -3257,11 +3264,15 @@ Güvenliğiniz için birkaç saniye engellenecek.
 	<notification name="AttachmentSaved">
 		Aksesuar kaydedildi.
 	</notification>
-	<notification name="PresetNotSaved">
-		[NAME] ön ayarı kaydedilirken hata oluştu.
+	<notification name="AppearanceToXMLSaved">
+		Görünüm XML olarak [PATH] konumuna kaydedildi
 	</notification>
-	<notification name="PresetNotDeleted">
-		[NAME] ön ayarı silinirken hata oluştu.
+	<notification name="AppearanceToXMLFailed">
+		Görünüm XML olarak kaydedilemedi.
+    icon=&quot;notifytip.tga&quot;
+	name=&quot;PresetNotDeleted&quot;
+    type=&quot;notifytip&quot;&gt;
+[NAME] ön ayarı silinirken hata oluştu.
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Bu öğe için yardım başlığı bulunamıyor.
@@ -4069,6 +4080,9 @@ Lütfen bir dakika sonra tekrar deneyin.
 	<notification name="CantAttachNotEnoughScriptResources">
 		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
 	</notification>
+	<notification name="IllegalAttachment">
+		Aksesuar avatarda var olmayan bir noktaya karşılık geliyor. Bunun yerine göğüs kısmına eklendi.
+	</notification>
 	<notification name="CantDropItemTrialUser">
 		Buraya nesne düşüremezsiniz; Ücretsiz Deneme alanını deneyin.
 	</notification>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml
index 46a4793c53..b0f026b285 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml
@@ -3,8 +3,9 @@
 	<text name="tell_me_label">
 		Bana söyle:
 	</text>
-	<check_box label="L$ harcadığımda veya aldığımda" name="notify_money_change_checkbox"/>
+	<check_box label="L$ harcadığımda" name="notify_money_spend_checkbox"/>
 	<check_box label="Arkadaşlarım oturum açtığında veya kapattığında" name="friends_online_notify_checkbox"/>
+	<check_box label="L$ aldığımda" name="notify_money_received_checkbox"/>
 	<text name="show_label">
 		Daima göster:
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
index 13984c2792..9cfa7d61f4 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
@@ -24,10 +24,15 @@
 	<text name="BetterText">
 		Daha iyi
 	</text>
+	<slider label="Avatarın Maksimum Karmaşıklığı:" name="IndirectMaxComplexity" tool_tip="Görsel olarak karmaşık bir avatarın hangi noktadan itibaren JellyDolll olarak çizileceğini kontrol eder"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
 	<check_box initial_value="true" label="Atmosferik gölgeleyiciler" name="WindLightUseAtmosShaders"/>
 	<check_box initial_value="true" label="Gelişmiş Aydınlatma Modeli" name="UseLightShaders"/>
 	<button label="Ayarları ön ayar olarak kaydet..." name="PrefSaveButton"/>
 	<button label="Ön ayarı yükle..." name="PrefLoadButton"/>
+	min_val=&quot;0,125&quot;
 	<button label="Ön ayarı sil..." name="PrefDeleteButton"/>
 	<button label="Önerilen ayarlara dön" name="Defaults"/>
 	<button label="Gelişmiş Ayarlar..." name="AdvancedSettings"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_sound_devices.xml b/indra/newview/skins/default/xui/tr/panel_sound_devices.xml
index 982ef2ea3b..be3299b89c 100644
--- a/indra/newview/skins/default/xui/tr/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/tr/panel_sound_devices.xml
@@ -16,9 +16,9 @@
 		Çıktı
 	</text>
 	<text name="My volume label">
-		Ses düzeyim:
+		Mik. ses düzeyi:
 	</text>
-	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Bu kaydırıcıyı kullanarak ses düzeyini değiştirin"/>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Bu kaydırma butonunu kullanarak mikrofonun ses düzeyini değiştirin"/>
 	<text name="wait_text">
 		Lütfen bekleyin
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 67c9197907..6aad65da22 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -39,7 +39,10 @@
 	</string>
 	<string name="AboutHeader">
 		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [Sürüm Notları]]
+[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</string>
+	<string name="BuildConfig">
+		Yapı Konfigürasyonu [BUILD_CONFIG]
 	</string>
 	<string name="AboutPosition">
 		&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP]) üzerinde bulunan [REGION] içerisinde [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] konumundasınız
@@ -59,12 +62,12 @@ Grafik Kartı: [GRAPHICS_CARD]
 		Windows Grafik Sürücüsü Sürümü: [GRAPHICS_DRIVER_VERSION]
 	</string>
 	<string name="AboutLibs">
-		OpenGL Sürümü: [OPENGL_VERSION]
+		OpenGL Sürümü [OPENGL_VERSION]
 
 J2C Kod Çözücü Sürümü: [J2C_VERSION]
 Ses Sürücüsü Sürümü: [AUDIO_DRIVER_VERSION]
 LLCEFLib/CEF Sürümü: [LLCEFLIB_VERSION]
-Ses Sunucusu Sürümü: [VOICE_VERSION]
+Ses Sunucu Sürümü: [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
 		Kaybolan Paketler: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
@@ -72,6 +75,9 @@ Ses Sunucusu Sürümü: [VOICE_VERSION]
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		Sunucu sürümü notları URL&apos;si alınırken hata oluştu.
 	</string>
+	<string name="BuildConfiguration">
+		Yapı Konfigürasyonu
+	</string>
 	<string name="ProgressRestoring">
 		Geri yükleniyor...
 	</string>
@@ -1387,6 +1393,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="BodyPartsRightLeg">
 		Sağ Bacak
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		Gelişmiş İskelet
+	</string>
 	<string name="GraphicsQualityLow">
 		Düşük
 	</string>
@@ -1835,6 +1844,51 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="Avatar Center">
 		Avatar Merkezi
 	</string>
+	<string name="Left Ring Finger">
+		Sol Yüzük Parmağı
+	</string>
+	<string name="Right Ring Finger">
+		Sağ Yüzük Parmağı
+	</string>
+	<string name="Tail Base">
+		Kuyruk Tabanı
+	</string>
+	<string name="Tail Tip">
+		Kuyruk Ucu
+	</string>
+	<string name="Left Wing">
+		Sol Kanat
+	</string>
+	<string name="Right Wing">
+		Sağ Kanat
+	</string>
+	<string name="Jaw">
+		Pençe
+	</string>
+	<string name="Alt Left Ear">
+		Altrntf Sol Kulak
+	</string>
+	<string name="Alt Right Ear">
+		Altrntf Sağ Kulak
+	</string>
+	<string name="Alt Left Eye">
+		Altrntf Sol Göz
+	</string>
+	<string name="Alt Right Eye">
+		Altrntf Sağ Göz
+	</string>
+	<string name="Tongue">
+		Dil
+	</string>
+	<string name="Groin">
+		Kasık
+	</string>
+	<string name="Left Hind Foot">
+		Sol Arka Ayak
+	</string>
+	<string name="Right Hind Foot">
+		Sağ Arka Ayak
+	</string>
 	<string name="Invalid Attachment">
 		Geçersiz Aksesuar Noktası
 	</string>
@@ -2224,12 +2278,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ATTACH_BELLY">
 		Göbek
 	</string>
-	<string name="ATTACH_RPEC">
-		Sağ Göğüs
-	</string>
-	<string name="ATTACH_LPEC">
+	<string name="ATTACH_LEFT_PEC">
 		Sol Göğüs
 	</string>
+	<string name="ATTACH_RIGHT_PEC">
+		Sağ Göğüs
+	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		BÜG 2. Merkez
 	</string>
@@ -2260,6 +2314,51 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ATTACH_AVATAR_CENTER">
 		Avatar Merkezi
 	</string>
+	<string name="ATTACH_LHAND_RING1">
+		Sol Yüzük Parmağı
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		Sağ Yüzük Parmağı
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		Kuyruk Tabanı
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		Kuyruk Ucu
+	</string>
+	<string name="ATTACH_LWING">
+		Sol Kanat
+	</string>
+	<string name="ATTACH_RWING">
+		Sağ Kanat
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		Pençe
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		Altrntf Sol Kulak
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		Altrntf Sağ Kulak
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		Altrntf Sol Göz
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		Altrntf Sağ Göz
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		Dil
+	</string>
+	<string name="ATTACH_GROIN">
+		Kasık
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		Sol Arka Ayak
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		Sağ Arka Ayak
+	</string>
 	<string name="CursorPos">
 		Satır [LINE], Sütun [COLUMN]
 	</string>
@@ -4249,6 +4348,12 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="OfflineStatus">
 		Çevrimdışı
 	</string>
+	<string name="not_online_msg">
+		Kullanıcı çevrimiçi değil - mesaj saklanıp daha sonra iletilecek.
+	</string>
+	<string name="not_online_inventory">
+		Kullanıcı çevrimiçi değil - envanter kaydedildi.
+	</string>
 	<string name="answered_call">
 		Aramanız yanıtlandı
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
index f9c2fe47e7..2a00bb6172 100644
--- a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
 	<text name="AvatarText">
 		化身
 	</text>
-	<slider label="最大複雜度：" name="IndirectMaxComplexity" tool_tip="控制在何時機下讓複雜化身呈像為「單色軟糖娃娃」"/>
+	<slider label="最大複雜度：" name="IndirectMaxComplexity" tool_tip="控制在何時機下讓複雜化身呈像為 JellyDoll"/>
 	<text name="IndirectMaxComplexityText">
 		0
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
index ace1302250..69bc4e7632 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="邀請加入群組" name="Invite..."/>
+	<menu_item_call label="重設骨架" name="Reset Skeleton"/>
 	<menu_item_call label="封鎖" name="Avatar Mute"/>
 	<menu_item_call label="回報" name="abuse"/>
 	<menu_item_call label="凍結" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
index d9e6eff897..cf56d7c86b 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -9,6 +9,7 @@
 	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="懸浮高度" name="Hover Height"/>
+	<menu_item_call label="重設骨架" name="Reset Skeleton"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
 	<menu_item_call label="我的群組" name="Groups..."/>
 	<menu_item_call label="我的個人檔案" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
index 0e0d1cc3d2..b58ec1d8cb 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -6,6 +6,7 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="邀請加入群組" name="Invite..."/>
+	<menu_item_call label="重設骨架" name="Reset Skeleton"/>
 	<menu_item_call label="封鎖" name="Avatar Mute"/>
 	<menu_item_call label="回報" name="abuse"/>
 	<menu_item_call label="凍結" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
index a644a45df6..e2ddb57307 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
@@ -26,6 +26,7 @@
 	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="懸浮高度" name="Hover Height"/>
+	<menu_item_call label="重設骨架" name="Reset Skeleton"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
 	<menu_item_call label="我的群組" name="Groups..."/>
 	<menu_item_call label="我的個人檔案" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 41590d60c7..f2971491ac 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -22,7 +22,6 @@
 			<menu_item_check label="請勿打擾" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
-		<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
 		<menu_item_call label="Marketplace 刊登…" name="MarketplaceListings"/>
 		<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
 		<menu_item_call label="偏好設定…" name="Preferences"/>
@@ -419,6 +418,7 @@
 			<menu_item_check label="停用細節層次" name="Disable LOD"/>
 			<menu_item_check label="除錯字元可見性" name="Debug Character Vis"/>
 			<menu_item_check label="顯示碰撞骨架" name="Show Collision Skeleton"/>
+			<menu_item_check label="顯示骨頭" name="Show Bones"/>
 			<menu_item_check label="顯示用戶目標" name="Display Agent Target"/>
 			<menu_item_call label="傾印附件" name="Dump Attachments"/>
 			<menu_item_call label="除錯化身材質" name="Debug Avatar Textures"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 3f08496a68..463afab1c0 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -480,6 +480,9 @@
 	<notification name="CannotWearInfoNotComplete">
 		無法穿戴該物件，它尚未完成載入。 請稍候再試。
 	</notification>
+	<notification name="MustEnterPasswordToLogIn">
+		請輸入密碼以便登入。
+	</notification>
 	<notification name="MustHaveAccountToLogIn">
 		糟糕！ 發現有內容留白。
 你必須為化身輸入一個使用者名稱。
@@ -548,6 +551,9 @@
 	<notification name="ChangeConnectionPort">
 		重新啟動 [APP_NAME] 後將啟用新的埠設定。
 	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		這個除錯設定將在重新啟動 [APP_NAME] 後啟用。
+	</notification>
 	<notification name="ChangeSkin">
 		重新啟動 [APP_NAME] 後將顯現新的皮膚。
 	</notification>
@@ -1359,12 +1365,13 @@
 			<ignore name="ignore" text="服裝花太多時間下載"/>
 		</form>
 	</notification>
-	<notification name="RegionAndAgentComplexity">
-		你的[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 視覺複雜度]是[AGENT_COMPLEXITY]。
+	<notification name="AgentComplexityWithVisibility">
+		你的[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 化身複雜度]是[AGENT_COMPLEXITY]。
 [OVERLIMIT_MSG]
+		<usetemplate ignoretext="警告我化身的複雜度是否可能過高" name="notifyignore"/>
 	</notification>
 	<notification name="AgentComplexity">
-		你的[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 視覺複雜度]是[AGENT_COMPLEXITY]。
+		你的[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 化身複雜度]是[AGENT_COMPLEXITY]。
 	</notification>
 	<notification name="FirstRun">
 		[APP_NAME] 安裝完成。
@@ -1479,6 +1486,10 @@ SHA1 指紋：[MD5_DIGEST]
 		你真的要確定產出目前地形，使其成為地形升/降極限的中間值，並設為「復原」工具的預設值？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
+	<notification name="ConfirmTextureHeights">
+		你設的海拔範圍值，低值大於高值。　 繼續？
+		<usetemplate canceltext="不要問" name="yesnocancelbuttons" notext="取消" yestext="確定"/>
+	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		你最多只能有 [MAX_AGENTS] 位允許居民。
 	</notification>
@@ -1713,14 +1724,6 @@ SHA1 指紋：[MD5_DIGEST]
 		無法離開群組。 你是此群組僅存的所有人，不得離開群組。 請先把所有人職銜指派給另一人。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="GroupDepartError">
-		無法離開群組：[reason]。
-		<usetemplate name="okbutton" yestext="確定"/>
-	</notification>
-	<notification name="GroupDepart">
-		你已經離開[group_name]群組。
-		<usetemplate name="okbutton" yestext="確定"/>
-	</notification>
 	<notification name="ConfirmKick">
 		你確定要踢出這網格內的全部居民？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="踢出全部居民"/>
@@ -2390,6 +2393,10 @@ SHA1 指紋：[MD5_DIGEST]
 		你確定你要對你垃圾筒中的內容進行刪除？
 		<usetemplate ignoretext="在我清空收納區垃圾筒資料夾前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
+	<notification name="TrashIsFull">
+		你的垃圾桶快滿了。 這可能會造成登入的問題。
+		<usetemplate name="okcancelbuttons" notext="我稍後再清空垃圾桶" yestext="現在清空垃圾桶"/>
+	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		你確定要刪除你的旅行、網頁及搜尋歷史紀錄嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
@@ -2973,11 +2980,11 @@ SHA1 指紋：[MD5_DIGEST]
 如果你繼續留在這地區，你將會被登出。
 	</notification>
 	<notification name="LoadWebPage">
-		載入網頁 [URL]?
+		載入網頁 [URL]？
 
 [MESSAGE]
 
-來源物件：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;（所有人：[NAME_SLURL]）
+來源物件：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;（所有人是[NAME_SLURL]）
 		<form name="form">
 			<button name="Gotopage" text="前往頁面"/>
 			<button name="Cancel" text="取消"/>
@@ -3246,11 +3253,15 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="AttachmentSaved">
 		附件已儲存。
 	</notification>
-	<notification name="PresetNotSaved">
-		儲存預設名稱[NAME]時出錯。
+	<notification name="AppearanceToXMLSaved">
+		外觀已經存成位於[PATH]的XML
 	</notification>
-	<notification name="PresetNotDeleted">
-		刪除預設名稱[NAME]時出錯。
+	<notification name="AppearanceToXMLFailed">
+		將外觀存為XML失敗。
+    icon=&quot;notifytip.tga&quot;
+	name=&quot;PresetNotDeleted&quot;
+    type=&quot;notifytip&quot;&gt;
+刪除預設名稱[NAME]時出錯。
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		找不到這個元件的幫助主題。
@@ -4065,6 +4076,9 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="CantAttachNotEnoughScriptResources">
 		腳本資源不足，無法附著物件！
 	</notification>
+	<notification name="IllegalAttachment">
+		這個附件要求了化身上不存在的點。 因此已將該附件附著到胸部。
+	</notification>
 	<notification name="CantDropItemTrialUser">
 		你無法在此卸除物件，請到「自由嘗試」區域再試。
 	</notification>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
index 94eb3c1389..212880df55 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
@@ -3,8 +3,9 @@
 	<text name="tell_me_label">
 		告訴我：
 	</text>
-	<check_box label="當我花費或取得 L$" name="notify_money_change_checkbox"/>
+	<check_box label="當我花用 L$ 時" name="notify_money_spend_checkbox"/>
 	<check_box label="當我的朋友上線或離線" name="friends_online_notify_checkbox"/>
+	<check_box label="當我得到 L$ 時" name="notify_money_received_checkbox"/>
 	<text name="show_label">
 		總是顯示：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index 8c4d2f9c18..b5c36668f6 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -24,10 +24,15 @@
 	<text name="BetterText">
 		最佳
 	</text>
+	<slider label="化身最大複雜度：" name="IndirectMaxComplexity" tool_tip="控制在何時機下讓複雜化身呈像為 JellyDoll"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
 	<check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
 	<check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/>
 	<button label="將設定存為預設值 …" name="PrefSaveButton"/>
 	<button label="載入預設..." name="PrefLoadButton"/>
+	min_val=&quot;0.125&quot;
 	<button label="刪除自訂配置…" name="PrefDeleteButton"/>
 	<button label="重設為我們建議的設定" name="Defaults"/>
 	<button label="進階設定…" name="AdvancedSettings"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
index fa4e24a605..e29ffe31af 100644
--- a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
@@ -16,9 +16,9 @@
 		輸出
 	</text>
 	<text name="My volume label">
-		我的音量：
+		麥克風音量：
 	</text>
-	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="用這控制條改變音量"/>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="用這個控制條調整麥克風音量"/>
 	<text name="wait_text">
 		請稍候
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 2ce310b224..5ce5adf3f0 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -41,6 +41,9 @@
 		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</string>
+	<string name="BuildConfig">
+		建製設置 [BUILD_CONFIG]
+	</string>
 	<string name="AboutPosition">
 		你的方位是 [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1]，地區名：[REGION]，主機：&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 第二人生URL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
@@ -72,6 +75,9 @@ LLCEFLib/CEF版本：[LLCEFLIB_VERSION]
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		擷取伺服器版本說明 URL 時出錯。
 	</string>
+	<string name="BuildConfiguration">
+		建製設置
+	</string>
 	<string name="ProgressRestoring">
 		回存中...
 	</string>
@@ -1382,6 +1388,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="BodyPartsRightLeg">
 		右腿
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		增強版骨架
+	</string>
 	<string name="GraphicsQualityLow">
 		低
 	</string>
@@ -1830,6 +1839,51 @@ http://secondlife.com/viewer-access-faq
 	<string name="Avatar Center">
 		化身中心
 	</string>
+	<string name="Left Ring Finger">
+		左無名指
+	</string>
+	<string name="Right Ring Finger">
+		右無名指
+	</string>
+	<string name="Tail Base">
+		尾巴基部
+	</string>
+	<string name="Tail Tip">
+		尾巴末梢
+	</string>
+	<string name="Left Wing">
+		左翼
+	</string>
+	<string name="Right Wing">
+		右翼
+	</string>
+	<string name="Jaw">
+		顎
+	</string>
+	<string name="Alt Left Ear">
+		替代左耳
+	</string>
+	<string name="Alt Right Ear">
+		替代右耳
+	</string>
+	<string name="Alt Left Eye">
+		替代左眼
+	</string>
+	<string name="Alt Right Eye">
+		替代右眼
+	</string>
+	<string name="Tongue">
+		舌頭
+	</string>
+	<string name="Groin">
+		鼠蹊
+	</string>
+	<string name="Left Hind Foot">
+		左後腳
+	</string>
+	<string name="Right Hind Foot">
+		右後腳
+	</string>
 	<string name="Invalid Attachment">
 		無效的附接點
 	</string>
@@ -2219,12 +2273,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="ATTACH_BELLY">
 		腹部
 	</string>
-	<string name="ATTACH_RPEC">
-		右胸肌
-	</string>
-	<string name="ATTACH_LPEC">
+	<string name="ATTACH_LEFT_PEC">
 		左胸肌
 	</string>
+	<string name="ATTACH_RIGHT_PEC">
+		右胸肌
+	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		擡頭顯示中央 2
 	</string>
@@ -2255,6 +2309,51 @@ http://secondlife.com/viewer-access-faq
 	<string name="ATTACH_AVATAR_CENTER">
 		化身中心
 	</string>
+	<string name="ATTACH_LHAND_RING1">
+		左無名指
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		右無名指
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		尾巴基部
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		尾巴末梢
+	</string>
+	<string name="ATTACH_LWING">
+		左翼
+	</string>
+	<string name="ATTACH_RWING">
+		右翼
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		顎
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		替代左耳
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		替代右耳
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		替代左眼
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		替代右眼
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		舌頭
+	</string>
+	<string name="ATTACH_GROIN">
+		鼠蹊
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		左後腳
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		右後腳
+	</string>
 	<string name="CursorPos">
 		橫行 [LINE]，縱列 [COLUMN]
 	</string>
@@ -4244,6 +4343,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="OfflineStatus">
 		離線
 	</string>
+	<string name="not_online_msg">
+		使用者不在線上 - 訊息將留存，稍後傳遞。
+	</string>
+	<string name="not_online_inventory">
+		使用者不在線上 - 收納區已儲存。
+	</string>
 	<string name="answered_call">
 		你的通話已經接通
 	</string>
-- 
cgit v1.2.3


From 6c46b3caf20af1a2987c0ca4ed0bf8e6ebe80fb4 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 6 Sep 2016 16:32:41 -0400
Subject: SL-395 - can enable/disable scale lock in mesh upload UI. Feature
 works.

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index d2c8dddfe1..2750316f2e 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1217,6 +1217,13 @@
              label_text.text_color="White"
              name="upload_joints"
              top_pad="15"/>
+           <check_box
+             follows="top|left"
+             height="15"
+             label="Lock scale if joint position defined"
+             label_text.text_color="White"
+             name="lock_scale_if_joint_position"
+             top_pad="15"/>
            <text
              follows="top|left"
              height="15"
-- 
cgit v1.2.3


From a6d9323c7266cf496bc1db6df8ce5bcb58f84ede Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 9 Nov 2016 16:10:04 -0500
Subject: MAINT-6915 - option for Reset Skeleton And Animations.

---
 indra/newview/skins/default/xui/en/menu_attachment_other.xml | 7 +++++++
 indra/newview/skins/default/xui/en/menu_attachment_self.xml  | 6 ++++++
 indra/newview/skins/default/xui/en/menu_avatar_other.xml     | 7 +++++++
 indra/newview/skins/default/xui/en/menu_avatar_self.xml      | 6 ++++++
 4 files changed, 26 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 8771660bcf..2f60bab0b7 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -48,6 +48,13 @@
         function="Avatar.ResetSkeleton" />
      </menu_item_call>
 
+     <menu_item_call label="Reset Skeleton And Animations"
+       layout="topleft"
+       name="Reset Skeleton And Animations">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeletonAndAnimations" />
+     </menu_item_call>
+
    <menu_item_separator />
     <menu_item_call
      enabled="false"
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index ced0dd37b1..59faf6a9f5 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -105,6 +105,12 @@ name="Edit Outfit">
        <menu_item_call.on_click
         function="Avatar.ResetSkeleton" />
   </menu_item_call>
+  <menu_item_call label="Reset Skeleton And Animations"
+       layout="topleft"
+       name="Reset Skeleton And Animations">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeletonAndAnimations" />
+  </menu_item_call>
 
   <menu_item_call
     label="My Friends"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index f89c0eadf8..ddfff23410 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -49,6 +49,13 @@
         function="Avatar.ResetSkeleton" />
      </menu_item_call>
 
+  <menu_item_call label="Reset Skeleton And Animations"
+       layout="topleft"
+       name="Reset Skeleton And Animations">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeletonAndAnimations" />
+  </menu_item_call>
+
    <menu_item_separator />
    
      <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index 924e8b8454..9e181d0b6d 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -243,6 +243,12 @@
      <menu_item_call.on_click
       function="Avatar.ResetSkeleton" />
    </menu_item_call>
+  <menu_item_call label="Reset Skeleton And Animations"
+       layout="topleft"
+       name="Reset Skeleton And Animations">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeletonAndAnimations" />
+  </menu_item_call>
    <menu_item_call
      label="My Friends"
      layout="topleft"
-- 
cgit v1.2.3